vxe-table 3.15.34 → 3.15.36

package/es/grid/src/grid.js

@@ -11,6 +11,32 @@ const { getConfig, getI18n, commands, globalEvents, globalMixins, renderEmptyEle
 const methods = {};
 const propKeys = Object.keys(tableComponentProps);
 const defaultLayouts = [['Form'], ['Toolbar', 'Top', 'Table', 'Bottom', 'Pager']];
+function initPages($xeGrid, propKey) {
+    const props = $xeGrid;
+    const reactData = $xeGrid;
+    const { tablePage } = reactData;
+    const { pagerConfig } = props;
+    const pagerOpts = $xeGrid.computePagerOpts;
+    if (pagerConfig && isEnableConf(pagerOpts)) {
+        if (propKey) {
+            if (pagerOpts[propKey]) {
+                tablePage[propKey] = XEUtils.toNumber(pagerOpts[propKey]);
+            }
+        }
+        else {
+            const { currentPage, pageSize, total } = pagerOpts;
+            if (currentPage) {
+                tablePage.currentPage = currentPage;
+            }
+            if (pageSize) {
+                tablePage.pageSize = pageSize;
+            }
+            if (total) {
+                tablePage.pageSize = total;
+            }
+        }
+    }
+}
 function renderDefaultForm(h, $xeGrid) {
     const VxeUIFormComponent = VxeUI.getComponent('VxeForm');
     const props = $xeGrid;
@@ -515,10 +541,20 @@ export default {
                 footKeys
             };
         },
-        computePageConfFlag() {
+        computeCustomCurrentPageFlag() {
+            const $xeGrid = this;
+            const pagerOpts = $xeGrid.computePagerOpts;
+            return pagerOpts.currentPage;
+        },
+        computeCustomPageSizeFlag() {
             const $xeGrid = this;
             const pagerOpts = $xeGrid.computePagerOpts;
-            return `${pagerOpts.currentPage}${pagerOpts.pageSize}`;
+            return pagerOpts.pageSize;
+        },
+        computeCustomTotalFlag() {
+            const $xeGrid = this;
+            const pagerOpts = $xeGrid.computePagerOpts;
+            return pagerOpts.total;
         }
     },
     watch: {
@@ -538,8 +574,17 @@ export default {
         proxyConfig() {
             this.initProxy();
         },
-        computePageConfFlag() {
-            this.initPages();
+        computeCustomCurrentPageFlag() {
+            const $xeGrid = this;
+            initPages($xeGrid, 'currentPage');
+        },
+        computeCustomPageSizeFlag() {
+            const $xeGrid = this;
+            initPages($xeGrid, 'pageSize');
+        },
+        computeCustomTotalFlag() {
+            const $xeGrid = this;
+            initPages($xeGrid, 'total');
         }
     },
     created() {
@@ -573,7 +618,7 @@ export default {
                 }
             }
         });
-        this.initPages();
+        initPages($xeGrid);
         globalEvents.on(this, 'keydown', this.handleGlobalKeydownEvent);
     },
     mounted() {
@@ -659,18 +704,6 @@ export default {
                 }
             });
         },
-        initPages() {
-            const { tablePage, pagerConfig, pagerOpts } = this;
-            const { currentPage, pageSize } = pagerOpts;
-            if (pagerConfig) {
-                if (currentPage) {
-                    tablePage.currentPage = currentPage;
-                }
-                if (pageSize) {
-                    tablePage.pageSize = pageSize;
-                }
-            }
-        },
         initProxy() {
             const { proxyInited, proxyConfig, proxyOpts, formConfig, formOpts } = this;
             if (proxyConfig) {