vxe-table 4.22.2 → 4.22.4

package/es/grid/src/grid.js

@@ -10,8 +10,8 @@ import { getSlotVNs } from '../../ui/src/vn';
 import { createComponentLog } from '../../ui/src/log';
 import { tableEmits } from '../../table/src/emits';
 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, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI;
 const tableComponentPropKeys = Object.keys(tableProps);
@@ -100,6 +100,10 @@ export default defineVxeComponent({
         const computePagerOpts = computed(() => {
             return Object.assign({}, getConfig().grid.pagerConfig, props.pagerConfig);
         });
+        const computePagerProps = computed(() => {
+            const pagerOpts = computePagerOpts.value;
+            return Object.assign({}, pagerOpts, { enabled: undefined, slots: undefined });
+        });
         const computeFormOpts = computed(() => {
             return Object.assign({}, getConfig().grid.formConfig, props.formConfig);
         });
@@ -442,12 +446,13 @@ export default defineVxeComponent({
             const { $event } = params;
             const proxyOpts = computeProxyOpts.value;
             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;
@@ -722,6 +727,7 @@ export default defineVxeComponent({
             const { proxyConfig, pagerConfig } = props;
             const proxyOpts = computeProxyOpts.value;
             const pagerOpts = computePagerOpts.value;
+            const pagerProps = computePagerProps.value;
             const pagerSlot = slots.pager;
             if ((pagerConfig && isEnableConf(pagerOpts)) || slots.pager) {
                 return h('div', {
@@ -732,7 +738,7 @@ export default defineVxeComponent({
                     ? pagerSlot({ $grid: $xeGrid, $gantt: null })
                     : [
                         VxeUIPagerComponent
-                            ? h(VxeUIPagerComponent, Object.assign(Object.assign(Object.assign({ ref: refPager }, pagerOpts), (proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})), { onPageChange: pageChangeEvent }), getConfigSlot(pagerOpts.slots))
+                            ? h(VxeUIPagerComponent, Object.assign(Object.assign(Object.assign({ ref: refPager }, pagerProps), (proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})), { onPageChange: pageChangeEvent }), getConfigSlot(pagerOpts.slots))
                             : renderEmptyElement($xeGrid)
                     ]);
             }
@@ -1129,7 +1135,8 @@ export default defineVxeComponent({
                         }
                         break;
                     }
-                    case 'queryFooter': {
+                    case 'queryFooter':
+                    case 'query_footer': {
                         const bqfMethod = ajax.beforeQueryFooter;
                         const qfMethod = ajax.queryFooter;
                         const aqfMethod = ajax.afterQueryFooter;
@@ -1483,14 +1490,14 @@ export default defineVxeComponent({
                 if ($form) {
                     return $form.validate();
                 }
-                return nextTick();
+                return Promise.resolve();
             },
             validateFormField(field) {
                 const $form = refForm.value;
                 if ($form) {
                     return $form.validateField(field);
                 }
-                return nextTick();
+                return Promise.resolve();
             },
             clearFormValidate(field) {
                 const $form = refForm.value;