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

package/es/grid/src/grid.js

@@ -23,9 +23,11 @@ function getTableOns(_vm) {
     if (proxyConfig) {
         if (proxyOpts.sort) {
             ons['sort-change'] = _vm.sortChangeEvent;
+            ons['clear-all-sort'] = _vm.clearAllSortEvent;
         }
         if (proxyOpts.filter) {
             ons['filter-change'] = _vm.filterChangeEvent;
+            ons['clear-all-filter'] = _vm.clearAllFilterEvent;
         }
     }
     return ons;
@@ -251,6 +253,12 @@ export default {
             const pagerOpts = $xeGrid.computePagerOpts;
             return pagerOpts.total;
         },
+        computePageCount() {
+            const $xeGrid = this;
+            const reactData = $xeGrid.reactData;
+            const { tablePage } = reactData;
+            return Math.max(Math.ceil(tablePage.total / tablePage.pageSize), 1);
+        },
         computeIsLoading() {
             const $xeGrid = this;
             const props = $xeGrid;
@@ -321,7 +329,7 @@ export default {
                         tablePage.pageSize = pageSize;
                     }
                     if (total) {
-                        tablePage.pageSize = total;
+                        tablePage.total = total;
                     }
                 }
             }
@@ -919,29 +927,63 @@ export default {
             return $xeGrid.$nextTick();
         },
         homePage() {
+            const $xeGrid = this;
+            const reactData = $xeGrid.reactData;
+            const { tablePage } = reactData;
+            tablePage.currentPage = 1;
+            return $xeGrid.$nextTick();
+        },
+        homePageByEvent(evnt) {
             const $xeGrid = this;
             const $pager = $xeGrid.$refs.refPager;
             if ($pager) {
-                return $pager.homePage();
+                $pager.homePageByEvent(evnt);
             }
-            return $xeGrid.$nextTick();
         },
         endPage() {
+            const $xeGrid = this;
+            const reactData = $xeGrid.reactData;
+            const { tablePage } = reactData;
+            const pageCount = $xeGrid.computePageCount;
+            tablePage.currentPage = pageCount;
+            return $xeGrid.$nextTick();
+        },
+        endPageByEvent(evnt) {
             const $xeGrid = this;
             const $pager = $xeGrid.$refs.refPager;
             if ($pager) {
-                return $pager.endPage();
+                $pager.endPageByEvent(evnt);
             }
+        },
+        setCurrentPage(currentPage) {
+            const $xeGrid = this;
+            const reactData = $xeGrid.reactData;
+            const { tablePage } = reactData;
+            const pageCount = $xeGrid.computePageCount;
+            tablePage.currentPage = Math.min(pageCount, Math.max(1, XEUtils.toNumber(currentPage)));
             return $xeGrid.$nextTick();
         },
-        jumpPage(currentPage) {
+        setCurrentPageByEvent(evnt, currentPage) {
             const $xeGrid = this;
             const $pager = $xeGrid.$refs.refPager;
             if ($pager) {
-                return $pager.jumpPage(currentPage);
+                $pager.setCurrentPageByEvent(evnt, currentPage);
             }
+        },
+        setPageSize(pageSize) {
+            const $xeGrid = this;
+            const reactData = $xeGrid.reactData;
+            const { tablePage } = reactData;
+            tablePage.pageSize = Math.max(1, XEUtils.toNumber(pageSize));
             return $xeGrid.$nextTick();
         },
+        setPageSizeByEvent(evnt, pageSize) {
+            const $xeGrid = this;
+            const $pager = $xeGrid.$refs.refPager;
+            if ($pager) {
+                $pager.setPageSizeByEvent(evnt, pageSize);
+            }
+        },
         triggerToolbarCommitEvent(params, evnt) {
             const $xeGrid = this;
             const { code } = params;
@@ -961,7 +1003,24 @@ export default {
             $xeGrid.triggerToolbarCommitEvent(tool, evnt);
             $xeGrid.dispatchEvent('toolbar-tool-click', { code: tool.code, tool }, evnt);
         },
-        sortChangeEvent(params) {
+        pageChangeEvent(params) {
+            const $xeGrid = this;
+            const props = $xeGrid;
+            const reactData = $xeGrid.reactData;
+            const { proxyConfig } = props;
+            const { tablePage } = reactData;
+            const { $event, currentPage, pageSize } = params;
+            const proxyOpts = $xeGrid.computeProxyOpts;
+            tablePage.currentPage = currentPage;
+            tablePage.pageSize = pageSize;
+            $xeGrid.dispatchEvent('page-change', params, $event);
+            if (proxyConfig && isEnableConf(proxyOpts)) {
+                $xeGrid.commitProxy('query').then((rest) => {
+                    $xeGrid.dispatchEvent('proxy-query', rest, $event);
+                });
+            }
+        },
+        handleSortEvent(params) {
             const $xeGrid = this;
             const props = $xeGrid;
             const reactData = $xeGrid.reactData;
@@ -979,26 +1038,18 @@ export default {
                     });
                 }
             }
+        },
+        sortChangeEvent(params) {
+            const $xeGrid = this;
+            $xeGrid.handleSortEvent(params);
             $xeGrid.dispatchEvent('sort-change', params, params.$event);
         },
-        pageChangeEvent(params) {
+        clearAllSortEvent(params) {
             const $xeGrid = this;
-            const props = $xeGrid;
-            const reactData = $xeGrid.reactData;
-            const { proxyConfig } = props;
-            const { tablePage } = reactData;
-            const { $event, currentPage, pageSize } = params;
-            const proxyOpts = $xeGrid.computeProxyOpts;
-            tablePage.currentPage = currentPage;
-            tablePage.pageSize = pageSize;
-            $xeGrid.dispatchEvent('page-change', params, $event);
-            if (proxyConfig && isEnableConf(proxyOpts)) {
-                $xeGrid.commitProxy('query').then((rest) => {
-                    $xeGrid.dispatchEvent('proxy-query', rest, $event);
-                });
-            }
+            $xeGrid.handleSortEvent(params);
+            $xeGrid.dispatchEvent('clear-all-sort', params, params.$event);
         },
-        filterChangeEvent(params) {
+        handleFilterEvent(params) {
             const $xeGrid = this;
             const props = $xeGrid;
             const reactData = $xeGrid.reactData;
@@ -1016,8 +1067,17 @@ export default {
                     });
                 }
             }
+        },
+        filterChangeEvent(params) {
+            const $xeGrid = this;
+            $xeGrid.handleFilterEvent(params);
             $xeGrid.dispatchEvent('filter-change', params, params.$event);
         },
+        clearAllFilterEvent(params) {
+            const $xeGrid = this;
+            $xeGrid.handleFilterEvent(params);
+            $xeGrid.dispatchEvent('clear-all-filter', params, params.$event);
+        },
         submitFormEvent(params) {
             const $xeGrid = this;
             const props = $xeGrid;
@@ -1065,6 +1125,11 @@ export default {
             $xeGrid.zoom();
             $xeGrid.dispatchEvent('zoom', { type: reactData.isZMax ? 'max' : 'revert' }, evnt);
         },
+        getParams() {
+            const $xeGrid = this;
+            const props = $xeGrid;
+            return props.params;
+        },
         zoom() {
             const $xeGrid = this;
             const reactData = $xeGrid.reactData;