fix: Smart Browse table records. (#1984)

solop-develop · Mar 8, 2024 · 62463ce · 62463ce
1 parent c01a08b
commit 62463ce
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 47 deletions.
diff --git 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
@@ -112,7 +112,7 @@
           :selection="selection"
           :page-number="pageNumber"
           :page-size="recordsList.length"
-          :handle-change-page-number="setPage"
+          :handle-change-page-number="setPageNumber"
         />
       </el-col>
 
@@ -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
@@ -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/...onents/ADempiere/FieldDefinition/FieldSearch/BusinessPartnerInfo/businessPartnersList.vue b/...onents/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"
         />
       </el-col>
@@ -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
@@ -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"
         />
       </el-col>
@@ -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
@@ -30,7 +30,7 @@ along with this program. If not, see <https:www.gnu.org/licenses/>.
           @click="getListJobs"
         />
       </div>
-      <el-card class="box-card" style="margin: 0px 10px;padding: : 0px 10px;">
+      <el-card class="box-card" style="margin: 0px 10px;padding: 0px 10px;">
         <el-table
           v-if="isEmptyValue(currentJob)"
           :data="list"

diff --git a/src/components/ADempiere/Form/TimeControl/index.vue b/src/components/ADempiere/Form/TimeControl/index.vue
@@ -240,7 +240,7 @@
               :total-records="recordCount"
               :page-size="tableData.length"
               :selection="selection"
-              :handle-change-page-number="setPage"
+              :handle-change-page-number="setPageNumber"
             />
           </el-col>
         </el-row>
@@ -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
@@ -131,7 +131,7 @@
             :total-records="totalRecords"
             :selection="selection"
             :page-size="tableData.length"
-            :handle-change-page-number="setPage"
+            :handle-change-page-number="setPageNumber"
           />
         </el-col>
 
@@ -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
@@ -61,7 +61,7 @@
           <custom-pagination
             :total-records="recordCount"
             :page-size="tableData.length"
-            :handle-change-page-size="setPage"
+            :handle-change-page-size="setPageNumber"
           />
         </el-col>
 
@@ -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
@@ -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"
             />
           </el-card>
@@ -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"
         />
       </el-card>
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -409,6 +409,7 @@ export default defineComponent({
 <style lang="scss">
 // Browser View
 .browser-view {
+  height: 90%;
   .browser-collapse {
     margin-bottom: 10px;
   }