vxe-table 3.24.2 → 3.24.4

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;
@@ -789,7 +794,8 @@ export default {
                     }
                     break;
                 }
-                case 'queryFooter': {
+                case 'queryFooter':
+                case 'query_footer': {
                     const bqfMethod = ajax.beforeQueryFooter;
                     const qfMethod = ajax.queryFooter;
                     const aqfMethod = ajax.afterQueryFooter;
@@ -1141,7 +1147,7 @@ export default {
             if ($form) {
                 return $form.validate();
             }
-            return $xeGrid.$nextTick();
+            return Promise.resolve();
         },
         validateFormField(field) {
             const $xeGrid = this;
@@ -1149,7 +1155,7 @@ export default {
             if ($form) {
                 return $form.validateField(field);
             }
-            return $xeGrid.$nextTick();
+            return Promise.resolve();
         },
         clearFormValidate(field) {
             const $xeGrid = this;
@@ -1373,12 +1379,13 @@ export default {
             const { $event } = params;
             const proxyOpts = $xeGrid.computeProxyOpts;
             if (proxyConfig && isEnableConf(proxyOpts)) {
+                const formOptions = proxyOpts.formOptions || {};
                 $xeGrid.dispatchEvent('form-reset', params, $event);
                 if ($xeTable) {
                     $xeTable.clearScroll();
                 }
                 internalData.uFoot = true;
-                $xeGrid.commitProxy('reload').then((rest) => {
+                $xeGrid.commitProxy(formOptions.resetMode === 'reset_form' ? 'query' : 'reload').then((rest) => {
                     $xeGrid.dispatchEvent('proxy-query', Object.assign(Object.assign({}, rest), { isReload: true }), $event);
                 });
                 internalData.uFoot = false;
@@ -1747,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', {
@@ -1759,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
                                 },