vxe-table 3.24.3 → 3.24.5

package/es/grid/src/grid.js

@@ -6,8 +6,8 @@ import { VxeUI } from '../../ui';
 import { getSlotVNs } from '../../ui/src/vn';
 import { createComponentLog } from '../../ui/src/log';
 import { tableProps } from '../../table/src/props';
-import VxeTableComponent from '../../table/src/table';
-import VxeToolbarComponent from '../../toolbar/src/toolbar';
+import VxeTableComponent from '../../table';
+import VxeToolbarComponent from '../../toolbar';
 const { warnLog, errLog } = createComponentLog('grid');
 const { getConfig, getI18n, commands, globalEvents, globalMixins, createEvent, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI;
 const tableMethods = {};
@@ -123,6 +123,11 @@ export default {
             const props = $xeGrid;
             return Object.assign({}, getConfig().grid.pagerConfig, props.pagerConfig);
         },
+        computePagerProps() {
+            const $xeGrid = this;
+            const pagerOpts = $xeGrid.computePagerOpts;
+            return Object.assign({}, pagerOpts, { enabled: undefined, slots: undefined });
+        },
         formOpts() {
             const $xeGrid = this;
             return $xeGrid.computeFormOpts;
@@ -1142,7 +1147,7 @@ export default {
             if ($form) {
                 return $form.validate();
             }
-            return $xeGrid.$nextTick();
+            return Promise.resolve();
         },
         validateFormField(field) {
             const $xeGrid = this;
@@ -1150,7 +1155,7 @@ export default {
             if ($form) {
                 return $form.validateField(field);
             }
-            return $xeGrid.$nextTick();
+            return Promise.resolve();
         },
         clearFormValidate(field) {
             const $xeGrid = this;
@@ -1749,6 +1754,7 @@ export default {
             const { proxyConfig, pagerConfig } = props;
             const proxyOpts = $xeGrid.computeProxyOpts;
             const pagerOpts = $xeGrid.computePagerOpts;
+            const pagerProps = $xeGrid.computePagerProps;
             const pagerSlot = slots.pager;
             if ((pagerConfig && isEnableConf(pagerOpts)) || slots.pager) {
                 return h('div', {
@@ -1761,7 +1767,7 @@ export default {
                         VxeUIPagerComponent
                             ? h(VxeUIPagerComponent, {
                                 ref: 'refPager',
-                                props: Object.assign(Object.assign({}, pagerOpts), (proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})),
+                                props: Object.assign(Object.assign({}, pagerProps), (proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})),
                                 on: {
                                     'page-change': $xeGrid.pageChangeEvent
                                 },

package/es/index.esm.js

@@ -17,5 +17,6 @@ Object.keys(VxeTableExport).forEach(function (key) {
     }
   });
 });
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+var cache;
+function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var r, c, a = Object.defineProperty, n = { __proto__: null, default: e }; if (Object(e) !== e) return n; if (cache || "function" != typeof WeakMap || (cache = new WeakMap()), cache) { if (cache.has(e)) return cache.get(e); cache.set(e, n); } for (c in e) "default" !== c && {}.hasOwnProperty.call(e, c) && ((r = a && Object.getOwnPropertyDescriptor(e, c)) && (r.get || r.set) ? a(n, c, r) : n[c] = e[c]); return n; }
 var _default = exports.default = VxeTableExport;