vxe-table 4.15.0-beta.10 → 4.15.0-beta.12

package/es/grid/src/grid.js

@@ -205,6 +205,10 @@ export default defineVxeComponent({
             const pagerOpts = computePagerOpts.value;
             return pagerOpts.total;
         });
+        const computePageCount = computed(() => {
+            const { tablePage } = reactData;
+            return Math.max(Math.ceil(tablePage.total / tablePage.pageSize), 1);
+        });
         const computeIsLoading = computed(() => {
             const { loading, proxyConfig } = props;
             const { tableLoading } = reactData;
@@ -272,7 +276,7 @@ export default defineVxeComponent({
                         tablePage.pageSize = pageSize;
                     }
                     if (total) {
-                        tablePage.pageSize = total;
+                        tablePage.total = total;
                     }
                 }
             }
@@ -343,7 +347,7 @@ export default defineVxeComponent({
                 });
             }
         };
-        const sortChangeEvent = (params) => {
+        const handleSortEvent = (params) => {
             const $xeTable = refTable.value;
             const { proxyConfig } = props;
             const { computeSortOpts } = $xeTable.getComputeMaps();
@@ -359,27 +363,16 @@ export default defineVxeComponent({
                     });
                 }
             }
+        };
+        const sortChangeEvent = (params) => {
+            handleSortEvent(params);
             $xeGrid.dispatchEvent('sort-change', params, params.$event);
         };
         const clearAllSortEvent = (params) => {
-            const $xeTable = refTable.value;
-            const { proxyConfig } = props;
-            const { computeSortOpts } = $xeTable.getComputeMaps();
-            const proxyOpts = computeProxyOpts.value;
-            const sortOpts = computeSortOpts.value;
-            // 如果是服务端排序
-            if (sortOpts.remote) {
-                reactData.sortData = params.sortList;
-                if (proxyConfig && isEnableConf(proxyOpts)) {
-                    reactData.tablePage.currentPage = 1;
-                    $xeGrid.commitProxy('query').then((rest) => {
-                        $xeGrid.dispatchEvent('proxy-query', rest, params.$event);
-                    });
-                }
-            }
+            handleSortEvent(params);
             $xeGrid.dispatchEvent('clear-all-sort', params, params.$event);
         };
-        const filterChangeEvent = (params) => {
+        const handleFilterEvent = (params) => {
             const $xeTable = refTable.value;
             const { proxyConfig } = props;
             const { computeFilterOpts } = $xeTable.getComputeMaps();
@@ -395,24 +388,13 @@ export default defineVxeComponent({
                     });
                 }
             }
+        };
+        const filterChangeEvent = (params) => {
+            handleFilterEvent(params);
             $xeGrid.dispatchEvent('filter-change', params, params.$event);
         };
         const clearAllFilterEvent = (params) => {
-            const $xeTable = refTable.value;
-            const { proxyConfig } = props;
-            const { computeFilterOpts } = $xeTable.getComputeMaps();
-            const proxyOpts = computeProxyOpts.value;
-            const filterOpts = computeFilterOpts.value;
-            // 如果是服务端过滤
-            if (filterOpts.remote) {
-                reactData.filterData = params.filterList;
-                if (proxyConfig && isEnableConf(proxyOpts)) {
-                    reactData.tablePage.currentPage = 1;
-                    $xeGrid.commitProxy('query').then((rest) => {
-                        $xeGrid.dispatchEvent('proxy-query', rest, params.$event);
-                    });
-                }
-            }
+            handleFilterEvent(params);
             $xeGrid.dispatchEvent('clear-all-filter', params, params.$event);
         };
         const submitFormEvent = (params) => {
@@ -1190,6 +1172,9 @@ export default defineVxeComponent({
                 }
                 return nextTick();
             },
+            getParams() {
+                return props.params;
+            },
             zoom() {
                 if (reactData.isZMax) {
                     return gridMethods.revert();
@@ -1245,26 +1230,51 @@ export default defineVxeComponent({
                 return nextTick();
             },
             homePage() {
+                const { tablePage } = reactData;
+                tablePage.currentPage = 1;
+                return nextTick();
+            },
+            homePageByEvent(evnt) {
                 const $pager = refPager.value;
                 if ($pager) {
-                    return $pager.homePage();
+                    $pager.homePageByEvent(evnt);
                 }
-                return nextTick();
             },
             endPage() {
+                const { tablePage } = reactData;
+                const pageCount = computePageCount.value;
+                tablePage.currentPage = pageCount;
+                return nextTick();
+            },
+            endPageByEvent(evnt) {
                 const $pager = refPager.value;
                 if ($pager) {
-                    return $pager.endPage();
+                    $pager.endPageByEvent(evnt);
                 }
+            },
+            setCurrentPage(currentPage) {
+                const { tablePage } = reactData;
+                const pageCount = computePageCount.value;
+                tablePage.currentPage = Math.min(pageCount, Math.max(1, XEUtils.toNumber(currentPage)));
                 return nextTick();
             },
-            jumpPage(currentPage) {
+            setCurrentPageByEvent(evnt, currentPage) {
                 const $pager = refPager.value;
                 if ($pager) {
-                    return $pager.jumpPage(currentPage);
+                    $pager.setCurrentPageByEvent(evnt, currentPage);
                 }
+            },
+            setPageSize(pageSize) {
+                const { tablePage } = reactData;
+                tablePage.pageSize = Math.max(1, XEUtils.toNumber(pageSize));
                 return nextTick();
             },
+            setPageSizeByEvent(evnt, pageSize) {
+                const $pager = refPager.value;
+                if ($pager) {
+                    $pager.setPageSizeByEvent(evnt, pageSize);
+                }
+            },
             getProxyInfo() {
                 const $xeTable = refTable.value;
                 if (props.proxyConfig) {