vxe-table 4.22.2 → 4.22.4

package/dist/all.esm.js

@@ -47,7 +47,7 @@ function getDefaultConfig(val1, def1) {
     return XEUtils.eqNull(val1) ? def1 : val1;
 }
 
-const version = "4.22.2";
+const version = "4.22.4";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -931,7 +931,7 @@ function getPopupWrapperElement(panelElem) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.22.2"}`;
+const tableVersion = `table v${"4.22.4"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -30599,7 +30599,7 @@ var VxeTableComponent = defineVxeComponent({
                     const parentEl = $xeTable.getParentElem();
                     resizeObserver = globalResize.create(() => {
                         if (props.autoResize) {
-                            handleResizeEvent();
+                            layoutReFlag.value++;
                         }
                     });
                     if (el) {
@@ -30717,6 +30717,54 @@ var VxeTableComponent = defineVxeComponent({
     }
 });
 
+function useCellView(props) {
+    const currColumn = computed(() => {
+        const { renderParams } = props;
+        return renderParams.column;
+    });
+    const currRow = computed(() => {
+        const { renderParams } = props;
+        return renderParams.row;
+    });
+    const cellOptions = computed(() => {
+        const { renderOpts } = props;
+        return renderOpts.props || {};
+    });
+    const cellModel = computed({
+        get() {
+            const { renderParams } = props;
+            const { row, column } = renderParams;
+            return XEUtils.get(row, column.field);
+        },
+        set(value) {
+            const { renderParams } = props;
+            const { row, column } = renderParams;
+            return XEUtils.set(row, column.field, value);
+        }
+    });
+    return {
+        currColumn,
+        currRow,
+        cellModel,
+        cellOptions
+    };
+}
+
+const VxeTable = Object.assign({}, VxeTableComponent, {
+    install(app) {
+        app.component(VxeTableComponent.name, VxeTableComponent);
+    }
+});
+const tableHandle = {
+    useCellView
+};
+if (VxeUI.dynamicApp) {
+    VxeUI.dynamicApp.component(VxeTableComponent.name, VxeTableComponent);
+}
+VxeUI.component(VxeTableComponent);
+VxeUI.tableHandle = tableHandle;
+const Table = VxeTable;
+
 const { warnLog: warnLog$1, errLog: errLog$1 } = createComponentLog('toolbar');
 const { getConfig: getConfig$1, getIcon, getI18n: getI18n$1, renderer, commands: commands$1, createEvent: createEvent$1, useFns: useFns$1 } = VxeUI;
 function createReactData$1() {
@@ -31335,6 +31383,17 @@ var VxeToolbarComponent = defineVxeComponent({
     }
 });
 
+const VxeToolbar = Object.assign({}, VxeToolbarComponent, {
+    install(app) {
+        app.component(VxeToolbarComponent.name, VxeToolbarComponent);
+    }
+});
+if (VxeUI.dynamicApp) {
+    VxeUI.dynamicApp.component(VxeToolbarComponent.name, VxeToolbarComponent);
+}
+VxeUI.component(VxeToolbarComponent);
+const Toolbar = VxeToolbar;
+
 const { warnLog, errLog } = createComponentLog('grid');
 const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI;
 const tableComponentPropKeys = Object.keys(tableProps);
@@ -31423,6 +31482,10 @@ var VxeGridComponent = 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);
         });
@@ -31765,12 +31828,13 @@ var VxeGridComponent = 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;
@@ -31930,7 +31994,7 @@ var VxeGridComponent = defineVxeComponent({
                             toolbarSlots.toolSuffix = toolSuffixSlot;
                         }
                     }
-                    slotVNs.push(h(VxeToolbarComponent, Object.assign(Object.assign({ ref: refToolbar }, toolbarOpts), { slots: undefined }), toolbarSlots));
+                    slotVNs.push(h(VxeToolbar, Object.assign(Object.assign({ ref: refToolbar }, toolbarOpts), { slots: undefined }), toolbarSlots));
                 }
                 return h('div', {
                     ref: refToolbarWrapper,
@@ -32022,7 +32086,7 @@ var VxeGridComponent = defineVxeComponent({
             return h('div', {
                 class: 'vxe-grid--table-wrapper'
             }, [
-                h(VxeTableComponent, Object.assign(Object.assign({ ref: refTable }, tableProps), tableOns), slotObj)
+                h(VxeTable, Object.assign(Object.assign({ ref: refTable }, tableProps), tableOns), slotObj)
             ]);
         };
         /**
@@ -32045,6 +32109,7 @@ var VxeGridComponent = 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', {
@@ -32055,7 +32120,7 @@ var VxeGridComponent = 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)
                     ]);
             }
@@ -32452,7 +32517,8 @@ var VxeGridComponent = defineVxeComponent({
                         }
                         break;
                     }
-                    case 'queryFooter': {
+                    case 'queryFooter':
+                    case 'query_footer': {
                         const bqfMethod = ajax.beforeQueryFooter;
                         const qfMethod = ajax.queryFooter;
                         const aqfMethod = ajax.afterQueryFooter;
@@ -32806,14 +32872,14 @@ var VxeGridComponent = 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;
@@ -33130,65 +33196,6 @@ if (VxeUI.dynamicApp) {
 VxeUI.component(VxeGridComponent);
 const Grid = VxeGrid;
 
-function useCellView(props) {
-    const currColumn = computed(() => {
-        const { renderParams } = props;
-        return renderParams.column;
-    });
-    const currRow = computed(() => {
-        const { renderParams } = props;
-        return renderParams.row;
-    });
-    const cellOptions = computed(() => {
-        const { renderOpts } = props;
-        return renderOpts.props || {};
-    });
-    const cellModel = computed({
-        get() {
-            const { renderParams } = props;
-            const { row, column } = renderParams;
-            return XEUtils.get(row, column.field);
-        },
-        set(value) {
-            const { renderParams } = props;
-            const { row, column } = renderParams;
-            return XEUtils.set(row, column.field, value);
-        }
-    });
-    return {
-        currColumn,
-        currRow,
-        cellModel,
-        cellOptions
-    };
-}
-
-const VxeTable = Object.assign({}, VxeTableComponent, {
-    install(app) {
-        app.component(VxeTableComponent.name, VxeTableComponent);
-    }
-});
-const tableHandle = {
-    useCellView
-};
-if (VxeUI.dynamicApp) {
-    VxeUI.dynamicApp.component(VxeTableComponent.name, VxeTableComponent);
-}
-VxeUI.component(VxeTableComponent);
-VxeUI.tableHandle = tableHandle;
-const Table = VxeTable;
-
-const VxeToolbar = Object.assign({}, VxeToolbarComponent, {
-    install(app) {
-        app.component(VxeToolbarComponent.name, VxeToolbarComponent);
-    }
-});
-if (VxeUI.dynamicApp) {
-    VxeUI.dynamicApp.component(VxeToolbarComponent.name, VxeToolbarComponent);
-}
-VxeUI.component(VxeToolbarComponent);
-const Toolbar = VxeToolbar;
-
 var zhCN = {
     vxe: {
         base: {