vxe-table 4.13.35 → 4.13.37

package/es/grid/src/grid.js

@@ -191,9 +191,17 @@ export default defineComponent({
                 footKeys
             };
         });
-        const computePageConfFlag = computed(() => {
+        const computeCustomCurrentPageFlag = computed(() => {
             const pagerOpts = computePagerOpts.value;
-            return `${pagerOpts.currentPage}${pagerOpts.pageSize}`;
+            return pagerOpts.currentPage;
+        });
+        const computeCustomPageSizeFlag = computed(() => {
+            const pagerOpts = computePagerOpts.value;
+            return pagerOpts.pageSize;
+        });
+        const computeCustomTotalFlag = computed(() => {
+            const pagerOpts = computePagerOpts.value;
+            return pagerOpts.total;
         });
         const refMaps = {
             refElem,
@@ -236,17 +244,27 @@ export default defineComponent({
             const formOpts = computeFormOpts.value;
             return proxyConfig && isEnableConf(proxyOpts) && proxyOpts.form ? formData : formOpts.data;
         };
-        const initPages = () => {
+        const initPages = (propKey) => {
             const { tablePage } = reactData;
             const { pagerConfig } = props;
             const pagerOpts = computePagerOpts.value;
-            const { currentPage, pageSize } = pagerOpts;
             if (pagerConfig && isEnableConf(pagerOpts)) {
-                if (currentPage) {
-                    tablePage.currentPage = currentPage;
+                if (propKey) {
+                    if (pagerOpts[propKey]) {
+                        tablePage[propKey] = XEUtils.toNumber(pagerOpts[propKey]);
+                    }
                 }
-                if (pageSize) {
-                    tablePage.pageSize = pageSize;
+                else {
+                    const { currentPage, pageSize, total } = pagerOpts;
+                    if (currentPage) {
+                        tablePage.currentPage = currentPage;
+                    }
+                    if (pageSize) {
+                        tablePage.pageSize = pageSize;
+                    }
+                    if (total) {
+                        tablePage.pageSize = total;
+                    }
                 }
             }
         };
@@ -1246,8 +1264,14 @@ export default defineComponent({
         watch(() => props.toolbarConfig, () => {
             initToolbar();
         });
-        watch(computePageConfFlag, () => {
-            initPages();
+        watch(computeCustomCurrentPageFlag, () => {
+            initPages('currentPage');
+        });
+        watch(computeCustomPageSizeFlag, () => {
+            initPages('pageSize');
+        });
+        watch(computeCustomTotalFlag, () => {
+            initPages('total');
         });
         watch(() => props.proxyConfig, () => {
             initProxy();