From 62463ce995261325e09cc747e6cc0dd8d0dcbbd5 Mon Sep 17 00:00:00 2001 From: Edwin Betancourt Date: Thu, 7 Mar 2024 20:47:53 -0400 Subject: [PATCH] fix: `Smart Browse` table records. (#1984) --- .../ADempiere/DataTable/Browser/index.vue | 4 ++-- .../tableQueryCriteria.vue | 6 +++--- .../tableQueryCriteria2.vue | 2 +- .../businessPartnersList.vue | 6 +++--- .../FieldSearch/GeneralInfoSearch/panel.vue | 6 +++--- .../ADempiere/Form/TaskManager/index.vue | 2 +- .../ADempiere/Form/TimeControl/index.vue | 6 +++--- .../ADempiere/Form/TimeControl/table.vue | 6 +++--- .../ADempiere/Form/TimeRecord/tableData.vue | 6 +++--- .../Form/WorkflowActivity/index2.vue | 8 ++++---- .../ADempiere/TabManager/TabPanel.vue | 4 ++-- .../TabManager/TabPanel/modeDesktop.vue | 4 ++-- .../TabManager/TabPanel/modeMobile.vue | 4 ++-- src/utils/ADempiere/dictionary/browser.js | 20 +++++++++++-------- src/utils/ADempiere/dictionary/window.js | 17 +++++++++------- src/views/ADempiere/Browser/index.vue | 1 + 16 files changed, 55 insertions(+), 47 deletions(-) diff --git a/src/components/ADempiere/DataTable/Browser/index.vue b/src/components/ADempiere/DataTable/Browser/index.vue index 299c3d279f..5e83fa4059 100644 --- a/src/components/ADempiere/DataTable/Browser/index.vue +++ b/src/components/ADempiere/DataTable/Browser/index.vue @@ -336,7 +336,7 @@ export default defineComponent({ * custom method to handle change page */ function handleChangePage(pageNumber) { - props.containerManager.setPage({ + props.containerManager.setPageNumber({ parentUuid: props.parentUuid, containerUuid: props.containerUuid, pageNumber, @@ -354,7 +354,7 @@ export default defineComponent({ } function handleChangeSizePage(pageSize) { - props.containerManager.setSizePage({ + props.containerManager.setPageSize({ parentUuid: props.parentUuid, containerUuid: props.containerUuid, pageSize, diff --git a/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/tableQueryCriteria.vue b/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/tableQueryCriteria.vue index 548ae20cab..6829de9ce2 100644 --- a/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/tableQueryCriteria.vue +++ b/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/tableQueryCriteria.vue @@ -112,7 +112,7 @@ :selection="selection" :page-number="pageNumber" :page-size="recordsList.length" - :handle-change-page-number="setPage" + :handle-change-page-number="setPageNumber" /> @@ -257,7 +257,7 @@ export default { return { ...this.containerManager, ...containerManagerForm, - setPage: this.setPage + setPageNumber: this.setPageNumber } }, labelTable() { @@ -463,7 +463,7 @@ export default { show: false }) }, - setPage(pageNumber) { + setPageNumber(pageNumber) { this.searchRecordsList(pageNumber) }, subscribeChanges() { diff --git a/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/tableQueryCriteria2.vue b/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/tableQueryCriteria2.vue index c6b5b9124d..62518ed090 100644 --- a/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/tableQueryCriteria2.vue +++ b/src/components/ADempiere/FieldDefinition/FieldAccountingCombination/tableQueryCriteria2.vue @@ -128,7 +128,7 @@ :total="recordData.recordCount" :current-page="pageNumber" :container-manager="containerManagerSearchList" - :handle-change-page="setPage" + :handle-change-page="setPageNumber" :records-page="recordsList.length" :selection="selection" /> diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/businessPartnersList.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/businessPartnersList.vue index 8fc55ad027..adde5f1855 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/businessPartnersList.vue +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/businessPartnersList.vue @@ -99,7 +99,7 @@ :selection="selection" :page-number="pageNumber" :page-size="recordsList.length" - :handle-change-page-number="setPage" + :handle-change-page-number="setPageNumber" :handle-change-page-size="handleChangeSizePage" /> @@ -250,7 +250,7 @@ export default { return { ...this.containerManager, ...containerManagerForm, - setPage: this.setPage + setPageNumber: this.setPageNumber } }, labelTable() { @@ -380,7 +380,7 @@ export default { show: false }) }, - setPage(pageNumber) { + setPageNumber(pageNumber) { this.searchBPartnerList(pageNumber, this.pageSize) }, subscribeChanges() { diff --git a/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/panel.vue b/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/panel.vue index eb4636fdaa..eaabf30526 100644 --- a/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/panel.vue +++ b/src/components/ADempiere/FieldDefinition/FieldSearch/GeneralInfoSearch/panel.vue @@ -103,7 +103,7 @@ :selection="selection" :page-number="pageNumber" :page-size="recordsList.length" - :handle-change-page-number="setPage" + :handle-change-page-number="setPageNumber" :handle-change-page-size="handleChangeSizePage" /> @@ -255,7 +255,7 @@ export default { isDisplayedDefault: () => { return true }, isReadOnlyColumn: ({ field, row }) => { return true }, setDefaultValues: () => {}, - setPage: this.setPage + setPageNumber: this.setPageNumber } }, storedFieldsListQuery() { @@ -371,7 +371,7 @@ export default { show: false }) }, - setPage(pageNumber) { + setPageNumber(pageNumber) { this.getListSearchRecords(pageNumber, this.pageSize) }, subscribeChanges() { diff --git a/src/components/ADempiere/Form/TaskManager/index.vue b/src/components/ADempiere/Form/TaskManager/index.vue index fd28651ee0..f4b1258f67 100644 --- a/src/components/ADempiere/Form/TaskManager/index.vue +++ b/src/components/ADempiere/Form/TaskManager/index.vue @@ -30,7 +30,7 @@ along with this program. If not, see . @click="getListJobs" /> - + @@ -645,7 +645,7 @@ export default defineComponent({ } // Get Record Control Table - function setPage(pageNumber) { + function setPageNumber(pageNumber) { listResource(pageNumber) } @@ -700,7 +700,7 @@ export default defineComponent({ editChild, listResource, confirmResiurce, - setPage, + setPageNumber, handleRowClick, closeList } diff --git a/src/components/ADempiere/Form/TimeControl/table.vue b/src/components/ADempiere/Form/TimeControl/table.vue index 9f1612882f..aa435de5bd 100644 --- a/src/components/ADempiere/Form/TimeControl/table.vue +++ b/src/components/ADempiere/Form/TimeControl/table.vue @@ -131,7 +131,7 @@ :total-records="totalRecords" :selection="selection" :page-size="tableData.length" - :handle-change-page-number="setPage" + :handle-change-page-number="setPageNumber" /> @@ -614,7 +614,7 @@ export default defineComponent({ }) } - function setPage(pageName) { + function setPageNumber(pageName) { listResourcesAssignment(pageName) } @@ -671,7 +671,7 @@ export default defineComponent({ createOrder, listResourcesAssignment, setFieldsList, - setPage + setPageNumber } } }) diff --git a/src/components/ADempiere/Form/TimeRecord/tableData.vue b/src/components/ADempiere/Form/TimeRecord/tableData.vue index ca2e31027c..96987de8c6 100644 --- a/src/components/ADempiere/Form/TimeRecord/tableData.vue +++ b/src/components/ADempiere/Form/TimeRecord/tableData.vue @@ -61,7 +61,7 @@ @@ -172,7 +172,7 @@ export default defineComponent({ } // Get Record Control Table - function setPage(pageNumber) { + function setPageNumber(pageNumber) { listResource(pageNumber) } @@ -192,7 +192,7 @@ export default defineComponent({ heardList, // Methods listResource, - setPage, + setPageNumber, handleRowClick } } diff --git a/src/components/ADempiere/Form/WorkflowActivity/index2.vue b/src/components/ADempiere/Form/WorkflowActivity/index2.vue index 9774ae9fbe..36c47b55c8 100644 --- a/src/components/ADempiere/Form/WorkflowActivity/index2.vue +++ b/src/components/ADempiere/Form/WorkflowActivity/index2.vue @@ -56,7 +56,7 @@ :total-records="recordCount" :page-number="currentPagePagination" :page-size="activityList.length" - :handle-change-page-number="setPage" + :handle-change-page-number="setPageNumber" :handle-change-page-size="handleChangeSizePage" /> @@ -227,7 +227,7 @@ :total-records="recordCount" :page-number="currentPagePagination" :page-size="activityList.length" - :handle-change-page-number="setPage" + :handle-change-page-number="setPageNumber" :handle-change-page-size="handleChangeSizePage" /> @@ -509,7 +509,7 @@ export default { getFieldsLit: () => {}, isReadOnlyColumn: ({ field, row }) => { return true }, setDefaultValues: () => {}, - setPage: this.setPage + setPageNumber: this.setPageNumber } }, currentPagePagination() { @@ -548,7 +548,7 @@ export default { activity = this.activityList.find(activity => activity.node === this.currentActivity.node) // this.$refs.WorkflowActivity.setCurrentRow(activity) }, - setPage(pageNumber) { + setPageNumber(pageNumber) { this.$store.dispatch('serverListActivity', { pageNumber }) }, handleChangeSizePage(pageSize) { diff --git a/src/components/ADempiere/TabManager/TabPanel.vue b/src/components/ADempiere/TabManager/TabPanel.vue index 7275647bd9..5463042fb4 100644 --- a/src/components/ADempiere/TabManager/TabPanel.vue +++ b/src/components/ADempiere/TabManager/TabPanel.vue @@ -332,7 +332,7 @@ export default defineComponent({ }) function handleChangePage(pageNumber) { - props.containerManager.setPage({ + props.containerManager.setPageNumber({ parentUuid: props.parentUuid, containerUuid: props.tabAttributes.uuid, pageSize: store.getters.getTabPageSize({ containerUuid: props.tabAttributes.uuid }), @@ -352,7 +352,7 @@ export default defineComponent({ * custom method to handle change size page */ function handleChangeSizePage(pageSize) { - props.containerManager.setSizePage({ + props.containerManager.setPageSize({ parentUuid: props.parentUuid, containerUuid: props.tabAttributes.uuid, pageSize, diff --git a/src/components/ADempiere/TabManager/TabPanel/modeDesktop.vue b/src/components/ADempiere/TabManager/TabPanel/modeDesktop.vue index 8c2057d986..f34db8ceb0 100644 --- a/src/components/ADempiere/TabManager/TabPanel/modeDesktop.vue +++ b/src/components/ADempiere/TabManager/TabPanel/modeDesktop.vue @@ -324,7 +324,7 @@ export default defineComponent({ }) function handleChangePage(pageNumber) { - props.containerManager.setPage({ + props.containerManager.setPageNumber({ parentUuid: props.parentUuid, containerUuid: props.tabAttributes.uuid, pageSize: store.getters.getTabPageSize({ containerUuid: props.tabAttributes.uuid }), @@ -344,7 +344,7 @@ export default defineComponent({ * custom method to handle change size page */ function handleChangeSizePage(pageSize) { - props.containerManager.setSizePage({ + props.containerManager.setPageSize({ parentUuid: props.parentUuid, containerUuid: props.tabAttributes.uuid, pageSize, diff --git a/src/components/ADempiere/TabManager/TabPanel/modeMobile.vue b/src/components/ADempiere/TabManager/TabPanel/modeMobile.vue index 6df3246b6b..39f5979f9e 100644 --- a/src/components/ADempiere/TabManager/TabPanel/modeMobile.vue +++ b/src/components/ADempiere/TabManager/TabPanel/modeMobile.vue @@ -349,7 +349,7 @@ export default defineComponent({ }) function handleChangePage(pageNumber) { - props.containerManager.setPage({ + props.containerManager.setPageNumber({ parentUuid: props.parentUuid, containerUuid: props.tabAttributes.uuid, pageSize: store.getters.getTabPageSize({ containerUuid: props.tabAttributes.uuid }), @@ -369,7 +369,7 @@ export default defineComponent({ * custom method to handle change size page */ function handleChangeSizePage(pageSize) { - props.containerManager.setSizePage({ + props.containerManager.setPageSize({ parentUuid: props.parentUuid, containerUuid: props.tabAttributes.uuid, pageSize, diff --git a/src/utils/ADempiere/dictionary/browser.js b/src/utils/ADempiere/dictionary/browser.js index dafb9ed9fe..10a7abd9d8 100644 --- a/src/utils/ADempiere/dictionary/browser.js +++ b/src/utils/ADempiere/dictionary/browser.js @@ -420,12 +420,6 @@ export const containerManager = { }) }, - getPageNumber({ containerUuid }) { - return store.getters.getBrowserPageNumber({ - containerUuid - }) - }, - setRow: ({ containerUuid, rowIndex, row }) => { return store.commit('setBrowserRow', { containerUuid, @@ -456,20 +450,30 @@ export const containerManager = { }) }, - setPage: ({ containerUuid, pageNumber, pageSize }) => { + setPageNumber: ({ containerUuid, pageNumber, pageSize }) => { store.dispatch('getBrowserSearch', { containerUuid, pageSize, pageNumber }) }, - setSizePage: ({ containerUuid, pageSize, pageNumber = 1 }) => { + getPageNumber({ containerUuid }) { + return store.getters.getBrowserPageNumber({ + containerUuid + }) + }, + setPageSize: ({ containerUuid, pageSize, pageNumber = 1 }) => { store.dispatch('getBrowserSearch', { containerUuid, pageNumber, pageSize }) }, + getPageSize({ containerUuid }) { + return store.getters.getBrowserPageSize({ + containerUuid + }) + }, /** * @returns Promisse with value and displayedValue diff --git a/src/utils/ADempiere/dictionary/window.js b/src/utils/ADempiere/dictionary/window.js index 5e2c905ae8..12febccc52 100644 --- a/src/utils/ADempiere/dictionary/window.js +++ b/src/utils/ADempiere/dictionary/window.js @@ -2023,7 +2023,7 @@ export const containerManager = { }, // To Default Table - setPage: ({ + setPageNumber: ({ parentUuid, containerUuid, pageSize, @@ -2041,10 +2041,14 @@ export const containerManager = { pageNumber }) }, - setSizePage: ({ + getPageNumber({ containerUuid }) { + return store.getters.getTabPageNumber({ + containerUuid + }) + }, + setPageSize: ({ parentUuid, containerUuid, - pageNumber = 1, pageSize = 15 }) => { const filters = store.getters.getTabDataFilters({ @@ -2055,12 +2059,11 @@ export const containerManager = { parentUuid, containerUuid, filters, - pageSize, - pageNumber + pageSize }) }, - getPageNumber({ containerUuid }) { - return store.getters.getTabPageNumber({ + getPageSize({ containerUuid }) { + return store.getters.getTabPageSize({ containerUuid }) }, diff --git a/src/views/ADempiere/Browser/index.vue b/src/views/ADempiere/Browser/index.vue index 383b161a78..9f6fe6a346 100644 --- a/src/views/ADempiere/Browser/index.vue +++ b/src/views/ADempiere/Browser/index.vue @@ -409,6 +409,7 @@ export default defineComponent({