vxe-table 4.23.7 → 4.23.9

package/lib/grid/src/grid.js

@@ -32,11 +32,11 @@ __export(grid_exports, {
 });
 module.exports = __toCommonJS(grid_exports);
 var import_vue = require("vue");
+var import_core = require("@vxe-ui/core");
 var import_comp = require("../../ui/src/comp");
 var import_xe_utils = __toESM(require("xe-utils"));
 var import_utils = require("../../ui/src/utils");
 var import_dom = require("../../ui/src/dom");
-var import_ui = require("../../ui");
 var import_props = require("./props");
 var import_emits = require("./emits");
 var import_vn = require("../../ui/src/vn");
@@ -46,9 +46,193 @@ var import_props2 = require("../../table/src/props");
 var import_table = __toESM(require("../../table"));
 var import_toolbar = __toESM(require("../../toolbar"));
 const { warnLog, errLog } = (0, import_log.createComponentLog)("grid");
-const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = import_ui.VxeUI;
+const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = import_core.VxeUI;
 const tableComponentPropKeys = Object.keys(import_props2.tableProps);
-const tableComponentMethodKeys = ["clearAll", "syncData", "updateData", "loadData", "reloadData", "reloadRow", "loadColumn", "reloadColumn", "getRowNode", "getColumnNode", "getRowIndex", "getVTRowIndex", "getVMRowIndex", "getColumnIndex", "getVTColumnIndex", "getVMColumnIndex", "setRow", "createData", "createRow", "revertData", "clearData", "isRemoveByRow", "isInsertByRow", "isUpdateByRow", "getColumns", "getColumnById", "getColumnByField", "getTableColumn", "getFullColumns", "getData", "getCheckboxRecords", "getParentRow", "getTreeRowChildren", "getTreeRowLevel", "getTreeParentRow", "getRowSeq", "getRowById", "getRowid", "getTableData", "getFullData", "setColumnFixed", "clearColumnFixed", "setColumnWidth", "getColumnWidth", "recalcRowHeight", "setRowHeightConf", "getRowHeightConf", "setRowHeight", "getRowHeight", "hideColumn", "showColumn", "resetColumn", "refreshColumn", "refreshScroll", "recalculate", "closeTooltip", "isAllCheckboxChecked", "isAllCheckboxIndeterminate", "getCheckboxIndeterminateRecords", "setCheckboxRow", "setCheckboxRowKey", "isCheckedByCheckboxRow", "isCheckedByCheckboxRowKey", "isIndeterminateByCheckboxRow", "isIndeterminateByCheckboxRowKey", "toggleCheckboxRow", "setAllCheckboxRow", "getRadioReserveRecord", "clearRadioReserve", "getCheckboxReserveRecords", "clearCheckboxReserve", "toggleAllCheckboxRow", "clearCheckboxRow", "setCurrentRow", "isCheckedByRadioRow", "isCheckedByRadioRowKey", "setRadioRow", "setRadioRowKey", "clearCurrentRow", "clearRadioRow", "getCurrentRecord", "getRadioRecord", "getCurrentColumn", "setCurrentColumn", "clearCurrentColumn", "setPendingRow", "togglePendingRow", "hasPendingByRow", "isPendingByRow", "getPendingRecords", "clearPendingRow", "setFilterByEvent", "sort", "setSort", "setSortByEvent", "clearSort", "clearSortByEvent", "isSort", "getSortColumns", "closeFilter", "isFilter", "clearFilterByEvent", "isActiveFilterByColumn", "isRowExpandLoaded", "clearRowExpandLoaded", "reloadRowExpand", "reloadRowExpand", "toggleRowExpand", "setAllRowExpand", "setRowExpand", "isExpandByRow", "isRowExpandByRow", "clearRowExpand", "clearRowExpandReserve", "getRowExpandRecords", "getTreeExpandRecords", "isTreeExpandLoaded", "clearTreeExpandLoaded", "reloadTreeExpand", "reloadTreeChilds", "toggleTreeExpand", "setAllTreeExpand", "setTreeExpand", "isTreeExpandByRow", "clearTreeExpand", "clearTreeExpandReserve", "getScroll", "getScrollData", "scrollTo", "scrollToStartRow", "scrollToEndRow", "scrollToRow", "scrollToStartColumn", "scrollToEndColumn", "scrollToColumn", "clearScroll", "updateFooter", "updateStatus", "setMergeCells", "removeInsertRow", "removeMergeCells", "getMergeCells", "setMergeHeaderCells", "removeMergeHeaderCells", "getMergeHeaderCells", "clearMergeHeaderCells", "clearMergeCells", "setMergeFooterItems", "removeMergeFooterItems", "getMergeFooterItems", "clearMergeFooterItems", "setCustomStoreData", "getCustomStoreData", "setRowGroupExpand", "setRowGroupExpandByField", "setAllRowGroupExpand", "clearRowGroupExpand", "isRowGroupExpandByRow", "isRowGroupRecord", "isAggregateRecord", "isAggregateExpandByRow", "getAggregateContentByRow", "getAggregateRowChildren", "setRowGroups", "clearRowGroups", "openTooltip", "moveColumnTo", "moveRowTo", "getCellLabel", "updateCellLabel", "clearFormatterCache", "getFooterCellLabel", "updateFooterCellLabel", "clearFooterFormatterCache", "getUpdateCells", "undo", "redo", "effectCellData", "getCellElement", "focus", "blur", "connect", "connectToolbar"];
+const tableComponentMethodKeys = [
+  "clearAll",
+  "syncData",
+  "updateData",
+  "loadData",
+  "reloadData",
+  "reloadRow",
+  "loadColumn",
+  "reloadColumn",
+  "getRowNode",
+  "getColumnNode",
+  "getRowIndex",
+  "getVTRowIndex",
+  "getVMRowIndex",
+  "getColumnIndex",
+  "getVTColumnIndex",
+  "getVMColumnIndex",
+  "setRow",
+  "createData",
+  "createRow",
+  "revertData",
+  "clearData",
+  "isRemoveByRow",
+  "isInsertByRow",
+  "isUpdateByRow",
+  "getColumns",
+  "getColumnById",
+  "getColumnByField",
+  "getTableColumn",
+  "getFullColumns",
+  "getData",
+  "getCheckboxRecords",
+  "getParentRow",
+  "getTreeRowChildren",
+  "getTreeRowLevel",
+  "getTreeParentRow",
+  "getRowSeq",
+  "getRowById",
+  "getRowid",
+  "getTableData",
+  "getFullData",
+  "setColumnFixed",
+  "clearColumnFixed",
+  "setColumnWidth",
+  "getColumnWidth",
+  "recalcRowHeight",
+  "setRowHeightConf",
+  "getRowHeightConf",
+  "setRowHeight",
+  "getRowHeight",
+  "hideColumn",
+  "showColumn",
+  "resetColumn",
+  "refreshColumn",
+  "refreshScroll",
+  "recalculate",
+  "closeTooltip",
+  "isAllCheckboxChecked",
+  "isAllCheckboxIndeterminate",
+  "getCheckboxIndeterminateRecords",
+  "setCheckboxRow",
+  "setCheckboxRowKey",
+  "isCheckedByCheckboxRow",
+  "isCheckedByCheckboxRowKey",
+  "isIndeterminateByCheckboxRow",
+  "isIndeterminateByCheckboxRowKey",
+  "toggleCheckboxRow",
+  "setAllCheckboxRow",
+  "getRadioReserveRecord",
+  "clearRadioReserve",
+  "getCheckboxReserveRecords",
+  "clearCheckboxReserve",
+  "toggleAllCheckboxRow",
+  "clearCheckboxRow",
+  "setCurrentRow",
+  "isCheckedByRadioRow",
+  "isCheckedByRadioRowKey",
+  "setRadioRow",
+  "setRadioRowKey",
+  "clearCurrentRow",
+  "clearRadioRow",
+  "getCurrentRecord",
+  "getRadioRecord",
+  "getCurrentColumn",
+  "setCurrentColumn",
+  "clearCurrentColumn",
+  "setPendingRow",
+  "togglePendingRow",
+  "hasPendingByRow",
+  "isPendingByRow",
+  "getPendingRecords",
+  "clearPendingRow",
+  "setFilterByEvent",
+  "sort",
+  "setSort",
+  "setSortByEvent",
+  "clearSort",
+  "clearSortByEvent",
+  "isSort",
+  "getSortColumns",
+  "closeFilter",
+  "isFilter",
+  "clearFilterByEvent",
+  "isActiveFilterByColumn",
+  "isRowExpandLoaded",
+  "clearRowExpandLoaded",
+  "reloadRowExpand",
+  "reloadRowExpand",
+  "toggleRowExpand",
+  "setAllRowExpand",
+  "setRowExpand",
+  "isExpandByRow",
+  "isRowExpandByRow",
+  "clearRowExpand",
+  "clearRowExpandReserve",
+  "getRowExpandRecords",
+  "getTreeExpandRecords",
+  "isTreeExpandLoaded",
+  "clearTreeExpandLoaded",
+  "reloadTreeExpand",
+  "reloadTreeChilds",
+  "toggleTreeExpand",
+  "setAllTreeExpand",
+  "setTreeExpand",
+  "isTreeExpandByRow",
+  "clearTreeExpand",
+  "clearTreeExpandReserve",
+  "getScroll",
+  "getScrollData",
+  "scrollTo",
+  "scrollToStartRow",
+  "scrollToEndRow",
+  "scrollToRow",
+  "scrollToStartColumn",
+  "scrollToEndColumn",
+  "scrollToColumn",
+  "clearScroll",
+  "updateFooter",
+  "updateStatus",
+  "setMergeCells",
+  "removeInsertRow",
+  "removeMergeCells",
+  "getMergeCells",
+  "setMergeHeaderCells",
+  "removeMergeHeaderCells",
+  "getMergeHeaderCells",
+  "clearMergeHeaderCells",
+  "clearMergeCells",
+  "setMergeFooterItems",
+  "removeMergeFooterItems",
+  "getMergeFooterItems",
+  "clearMergeFooterItems",
+  "setCustomStoreData",
+  "getCustomStoreData",
+  "setRowGroupExpand",
+  "setRowGroupExpandByField",
+  "setAllRowGroupExpand",
+  "clearRowGroupExpand",
+  "isRowGroupExpandByRow",
+  "isRowGroupRecord",
+  "isAggregateRecord",
+  "isAggregateExpandByRow",
+  "getAggregateContentByRow",
+  "getAggregateRowChildren",
+  "setRowGroups",
+  "clearRowGroups",
+  "openTooltip",
+  "moveColumnTo",
+  "moveRowTo",
+  "getCellLabel",
+  "updateCellLabel",
+  "clearFormatterCache",
+  "getFooterCellLabel",
+  "updateFooterCellLabel",
+  "clearFooterFormatterCache",
+  "getUpdateCells",
+  "undo",
+  "redo",
+  "effectCellData",
+  "getCellElement",
+  "focus",
+  "blur",
+  "connect",
+  "connectToolbar"
+];
 function createReactData() {
   var _a;
   return {
@@ -80,8 +264,8 @@ var grid_default = (0, import_comp.defineVxeComponent)({
   setup(props, context) {
     const { slots, emit } = context;
     const xID = import_xe_utils.default.uniqueId();
-    const VxeUIFormComponent = import_ui.VxeUI.getComponent("VxeForm");
-    const VxeUIPagerComponent = import_ui.VxeUI.getComponent("VxePager");
+    const VxeUIFormComponent = import_core.VxeUI.getComponent("VxeForm");
+    const VxeUIPagerComponent = import_core.VxeUI.getComponent("VxePager");
     const defaultLayouts = [["Form"], ["Toolbar", "Top", "Table", "Bottom", "Pager"]];
     const { computeSize } = useFns.useSize(props);
     const { computeIsVScrollbar } = useFns.useVScrollbar(props);
@@ -330,8 +514,8 @@ var grid_default = (0, import_comp.defineVxeComponent)({
         $xeGrid.clearCheckboxRow();
       } else {
         if (isActiveMsg) {
-          if (import_ui.VxeUI.modal) {
-            import_ui.VxeUI.modal.message({ id: code, content: getI18n("vxe.grid.selectOneRecord"), status: "warning" });
+          if (import_core.VxeUI.modal) {
+            import_core.VxeUI.modal.message({ id: code, content: getI18n("vxe.grid.selectOneRecord"), status: "warning" });
           }
         }
       }
@@ -352,16 +536,16 @@ var grid_default = (0, import_comp.defineVxeComponent)({
       const selectRecords = $xeGrid.getCheckboxRecords();
       if (isActiveMsg) {
         if (selectRecords.length) {
-          if (import_ui.VxeUI.modal) {
-            return import_ui.VxeUI.modal.confirm({ id: `cfm_${code}`, content: getI18n(alertKey), escClosable: true }).then((type) => {
+          if (import_core.VxeUI.modal) {
+            return import_core.VxeUI.modal.confirm({ id: `cfm_${code}`, content: getI18n(alertKey), escClosable: true }).then((type) => {
               if (type === "confirm") {
                 return callback();
               }
             });
           }
         } else {
-          if (import_ui.VxeUI.modal) {
-            import_ui.VxeUI.modal.message({ id: `msg_${code}`, content: getI18n("vxe.grid.selectOneRecord"), status: "warning" });
+          if (import_core.VxeUI.modal) {
+            import_core.VxeUI.modal.message({ id: `msg_${code}`, content: getI18n("vxe.grid.selectOneRecord"), status: "warning" });
           }
         }
       } else {
@@ -548,6 +732,7 @@ var grid_default = (0, import_comp.defineVxeComponent)({
           if (formOpts.items) {
             const formSlots = {};
             if (!formOpts.inited) {
+              ;
               formOpts.inited = true;
               const beforeItem = proxyOpts.beforeItem;
               if (proxyOpts && beforeItem) {
@@ -567,25 +752,33 @@ var grid_default = (0, import_comp.defineVxeComponent)({
             });
             if (VxeUIFormComponent) {
               slotVNs.push(
-                (0, import_vue.h)(VxeUIFormComponent, {
-                  ref: refForm,
-                  ...Object.assign({}, formOpts, {
-                    data: proxyConfig && (0, import_utils.isEnableConf)(proxyOpts) && proxyOpts.form ? formData : formOpts.data
-                  }),
-                  onSubmit: submitFormEvent,
-                  onReset: resetFormEvent,
-                  onSubmitInvalid: submitInvalidEvent,
-                  onCollapse: collapseEvent
-                }, formSlots)
+                (0, import_vue.h)(
+                  VxeUIFormComponent,
+                  {
+                    ref: refForm,
+                    ...Object.assign({}, formOpts, {
+                      data: proxyConfig && (0, import_utils.isEnableConf)(proxyOpts) && proxyOpts.form ? formData : formOpts.data
+                    }),
+                    onSubmit: submitFormEvent,
+                    onReset: resetFormEvent,
+                    onSubmitInvalid: submitInvalidEvent,
+                    onCollapse: collapseEvent
+                  },
+                  formSlots
+                )
               );
             }
           }
         }
-        return (0, import_vue.h)("div", {
-          ref: refFormWrapper,
-          key: "form",
-          class: "vxe-grid--form-wrapper"
-        }, slotVNs);
+        return (0, import_vue.h)(
+          "div",
+          {
+            ref: refFormWrapper,
+            key: "form",
+            class: "vxe-grid--form-wrapper"
+          },
+          slotVNs
+        );
       }
       return renderEmptyElement($xeGrid);
     };
@@ -627,47 +820,67 @@ var grid_default = (0, import_comp.defineVxeComponent)({
             }
           }
           slotVNs.push(
-            (0, import_vue.h)(import_toolbar.default, {
-              ref: refToolbar,
-              ...toolbarOpts,
-              slots: void 0
-            }, toolbarSlots)
+            (0, import_vue.h)(
+              import_toolbar.default,
+              {
+                ref: refToolbar,
+                ...toolbarOpts,
+                slots: void 0
+              },
+              toolbarSlots
+            )
           );
         }
-        return (0, import_vue.h)("div", {
-          ref: refToolbarWrapper,
-          key: "toolbar",
-          class: "vxe-grid--toolbar-wrapper"
-        }, slotVNs);
+        return (0, import_vue.h)(
+          "div",
+          {
+            ref: refToolbarWrapper,
+            key: "toolbar",
+            class: "vxe-grid--toolbar-wrapper"
+          },
+          slotVNs
+        );
       }
       return renderEmptyElement($xeGrid);
     };
     const renderTop = () => {
       const topSlot = slots.top;
       if (topSlot) {
-        return (0, import_vue.h)("div", {
-          ref: refTopWrapper,
-          key: "top",
-          class: "vxe-grid--top-wrapper"
-        }, topSlot({ $grid: $xeGrid, $gantt: null }));
+        return (0, import_vue.h)(
+          "div",
+          {
+            ref: refTopWrapper,
+            key: "top",
+            class: "vxe-grid--top-wrapper"
+          },
+          topSlot({ $grid: $xeGrid, $gantt: null })
+        );
       }
       return renderEmptyElement($xeGrid);
     };
     const renderTableLeft = () => {
       const leftSlot = slots.left;
       if (leftSlot) {
-        return (0, import_vue.h)("div", {
-          class: "vxe-grid--left-wrapper"
-        }, leftSlot({ $grid: $xeGrid, $gantt: null }));
+        return (0, import_vue.h)(
+          "div",
+          {
+            class: "vxe-grid--left-wrapper"
+          },
+          leftSlot({ $grid: $xeGrid, $gantt: null })
+        );
       }
       return renderEmptyElement($xeGrid);
     };
     const renderTableRight = () => {
       const rightSlot = slots.right;
       if (rightSlot) {
-        return (0, import_vue.h)("div", {
-          class: "vxe-grid--right-wrapper"
-        }, rightSlot({ $grid: $xeGrid, $gantt: null }));
+        return (0, import_vue.h)(
+          "div",
+          {
+            class: "vxe-grid--right-wrapper"
+          },
+          rightSlot({ $grid: $xeGrid, $gantt: null })
+        );
       }
       return renderEmptyElement($xeGrid);
     };
@@ -715,23 +928,35 @@ var grid_default = (0, import_comp.defineVxeComponent)({
       if (footerTooltipSlot) {
         slotObj.footerTooltip = footerTooltipSlot;
       }
-      return (0, import_vue.h)("div", {
-        class: "vxe-grid--table-wrapper"
-      }, [
-        (0, import_vue.h)(import_table.default, {
-          ref: refTable,
-          ...tableProps2,
-          ...tableOns
-        }, slotObj)
-      ]);
+      return (0, import_vue.h)(
+        "div",
+        {
+          class: "vxe-grid--table-wrapper"
+        },
+        [
+          (0, import_vue.h)(
+            import_table.default,
+            {
+              ref: refTable,
+              ...tableProps2,
+              ...tableOns
+            },
+            slotObj
+          )
+        ]
+      );
     };
     const renderBottom = () => {
       if (slots.bottom) {
-        return (0, import_vue.h)("div", {
-          ref: refBottomWrapper,
-          key: "bottom",
-          class: "vxe-grid--bottom-wrapper"
-        }, slots.bottom({ $grid: $xeGrid, $gantt: null }));
+        return (0, import_vue.h)(
+          "div",
+          {
+            ref: refBottomWrapper,
+            key: "bottom",
+            class: "vxe-grid--bottom-wrapper"
+          },
+          slots.bottom({ $grid: $xeGrid, $gantt: null })
+        );
       }
       return renderEmptyElement($xeGrid);
     };
@@ -742,18 +967,26 @@ var grid_default = (0, import_comp.defineVxeComponent)({
       const pagerProps = computePagerProps.value;
       const pagerSlot = slots.pager;
       if (pagerConfig && (0, import_utils.isEnableConf)(pagerOpts) || slots.pager) {
-        return (0, import_vue.h)("div", {
-          ref: refPagerWrapper,
-          key: "pager",
-          class: "vxe-grid--pager-wrapper"
-        }, pagerSlot ? pagerSlot({ $grid: $xeGrid, $gantt: null }) : [
-          VxeUIPagerComponent ? (0, import_vue.h)(VxeUIPagerComponent, {
-            ref: refPager,
-            ...pagerProps,
-            ...proxyConfig && (0, import_utils.isEnableConf)(proxyOpts) ? reactData.tablePage : {},
-            onPageChange: pageChangeEvent
-          }, getConfigSlot(pagerOpts.slots)) : renderEmptyElement($xeGrid)
-        ]);
+        return (0, import_vue.h)(
+          "div",
+          {
+            ref: refPagerWrapper,
+            key: "pager",
+            class: "vxe-grid--pager-wrapper"
+          },
+          pagerSlot ? pagerSlot({ $grid: $xeGrid, $gantt: null }) : [
+            VxeUIPagerComponent ? (0, import_vue.h)(
+              VxeUIPagerComponent,
+              {
+                ref: refPager,
+                ...pagerProps,
+                ...proxyConfig && (0, import_utils.isEnableConf)(proxyOpts) ? reactData.tablePage : {},
+                onPageChange: pageChangeEvent
+              },
+              getConfigSlot(pagerOpts.slots)
+            ) : renderEmptyElement($xeGrid)
+          ]
+        );
       }
       return renderEmptyElement($xeGrid);
     };
@@ -772,14 +1005,14 @@ var grid_default = (0, import_comp.defineVxeComponent)({
             break;
           case "Table":
             childVNs.push(
-              (0, import_vue.h)("div", {
-                key: "table",
-                class: "vxe-grid--table-container"
-              }, [
-                renderTableLeft(),
-                renderTable(),
-                renderTableRight()
-              ])
+              (0, import_vue.h)(
+                "div",
+                {
+                  key: "table",
+                  class: "vxe-grid--table-container"
+                },
+                [renderTableLeft(), renderTable(), renderTableRight()]
+              )
             );
             break;
           case "Bottom":
@@ -801,25 +1034,49 @@ var grid_default = (0, import_comp.defineVxeComponent)({
       const asideLeftSlot = slots.asideLeft || slots["aside-left"];
       const asideRightSlot = slots.asideRight || slots["aside-right"];
       return [
-        (0, import_vue.h)("div", {
-          class: "vxe-grid--layout-header-wrapper"
-        }, renderChildLayout(headKeys)),
-        (0, import_vue.h)("div", {
-          class: "vxe-grid--layout-body-wrapper"
-        }, [
-          asideLeftSlot ? (0, import_vue.h)("div", {
-            class: "vxe-grid--layout-aside-left-wrapper"
-          }, asideLeftSlot({})) : renderEmptyElement($xeGrid),
-          (0, import_vue.h)("div", {
-            class: "vxe-grid--layout-body-content-wrapper"
-          }, renderChildLayout(bodyKeys)),
-          asideRightSlot ? (0, import_vue.h)("div", {
-            class: "vxe-grid--layout-aside-right-wrapper"
-          }, asideRightSlot({})) : renderEmptyElement($xeGrid)
-        ]),
-        (0, import_vue.h)("div", {
-          class: "vxe-grid--layout-footer-wrapper"
-        }, renderChildLayout(footKeys)),
+        (0, import_vue.h)(
+          "div",
+          {
+            class: "vxe-grid--layout-header-wrapper"
+          },
+          renderChildLayout(headKeys)
+        ),
+        (0, import_vue.h)(
+          "div",
+          {
+            class: "vxe-grid--layout-body-wrapper"
+          },
+          [
+            asideLeftSlot ? (0, import_vue.h)(
+              "div",
+              {
+                class: "vxe-grid--layout-aside-left-wrapper"
+              },
+              asideLeftSlot({})
+            ) : renderEmptyElement($xeGrid),
+            (0, import_vue.h)(
+              "div",
+              {
+                class: "vxe-grid--layout-body-content-wrapper"
+              },
+              renderChildLayout(bodyKeys)
+            ),
+            asideRightSlot ? (0, import_vue.h)(
+              "div",
+              {
+                class: "vxe-grid--layout-aside-right-wrapper"
+              },
+              asideRightSlot({})
+            ) : renderEmptyElement($xeGrid)
+          ]
+        ),
+        (0, import_vue.h)(
+          "div",
+          {
+            class: "vxe-grid--layout-footer-wrapper"
+          },
+          renderChildLayout(footKeys)
+        ),
         (0, import_vue.h)("div", {
           ref: refPopupContainerElem
         })
@@ -1054,10 +1311,7 @@ var grid_default = (0, import_comp.defineVxeComponent)({
                 reactData.sortData = sortList;
                 reactData.filterData = filterList;
                 reactData.tableLoading = true;
-                return Promise.all([
-                  Promise.resolve((oldBeforeQuery || qMethod)(commitParams, ...args)),
-                  operPromise
-                ]).then(([rest]) => {
+                return Promise.all([Promise.resolve((oldBeforeQuery || qMethod)(commitParams, ...args)), operPromise]).then(([rest]) => {
                   reactData.tableLoading = false;
                   if (aqMethod) {
                     aqMethod({ ...commitParams, response: rest, status: "success" }, ...args);
@@ -1233,8 +1487,8 @@ var grid_default = (0, import_comp.defineVxeComponent)({
                       } else {
                         $xeTable.setPendingRow(removeRecords, false);
                         if (isRespMsg) {
-                          if (import_ui.VxeUI.modal) {
-                            import_ui.VxeUI.modal.message({ content: getRespMsg(rest, "vxe.grid.delSuccess"), status: "success" });
+                          if (import_core.VxeUI.modal) {
+                            import_core.VxeUI.modal.message({ content: getRespMsg(rest, "vxe.grid.delSuccess"), status: "success" });
                           }
                         }
                         if (oldAfterDelete) {
@@ -1256,8 +1510,8 @@ var grid_default = (0, import_comp.defineVxeComponent)({
                         adMethod({ ...commitParams, response: rest, status: "error" }, ...args);
                       } else {
                         if (isRespMsg) {
-                          if (import_ui.VxeUI.modal) {
-                            import_ui.VxeUI.modal.message({ id: code, content: getRespMsg(rest, "vxe.grid.operError"), status: "error" });
+                          if (import_core.VxeUI.modal) {
+                            import_core.VxeUI.modal.message({ id: code, content: getRespMsg(rest, "vxe.grid.operError"), status: "error" });
                           }
                         }
                       }
@@ -1278,8 +1532,8 @@ var grid_default = (0, import_comp.defineVxeComponent)({
                 });
               } else {
                 if (isActiveMsg) {
-                  if (import_ui.VxeUI.modal) {
-                    import_ui.VxeUI.modal.message({ id: code, content: getI18n("vxe.grid.selectOneRecord"), status: "warning" });
+                  if (import_core.VxeUI.modal) {
+                    import_core.VxeUI.modal.message({ id: code, content: getI18n("vxe.grid.selectOneRecord"), status: "warning" });
                   }
                 }
               }
@@ -1331,8 +1585,8 @@ var grid_default = (0, import_comp.defineVxeComponent)({
                       } else {
                         $xeTable.clearPendingRow();
                         if (isRespMsg) {
-                          if (import_ui.VxeUI.modal) {
-                            import_ui.VxeUI.modal.message({ content: getRespMsg(rest, "vxe.grid.saveSuccess"), status: "success" });
+                          if (import_core.VxeUI.modal) {
+                            import_core.VxeUI.modal.message({ content: getRespMsg(rest, "vxe.grid.saveSuccess"), status: "success" });
                           }
                         }
                         if (oldAfterSave) {
@@ -1354,8 +1608,8 @@ var grid_default = (0, import_comp.defineVxeComponent)({
                         aSaveMethod({ ...commitParams, response: rest, status: "error" }, ...args);
                       } else {
                         if (isRespMsg) {
-                          if (import_ui.VxeUI.modal) {
-                            import_ui.VxeUI.modal.message({ id: code, content: getRespMsg(rest, "vxe.grid.operError"), status: "error" });
+                          if (import_core.VxeUI.modal) {
+                            import_core.VxeUI.modal.message({ id: code, content: getRespMsg(rest, "vxe.grid.operError"), status: "error" });
                           }
                         }
                       }
@@ -1375,8 +1629,8 @@ var grid_default = (0, import_comp.defineVxeComponent)({
                   return handleSave();
                 } else {
                   if (isActiveMsg) {
-                    if (import_ui.VxeUI.modal) {
-                      import_ui.VxeUI.modal.message({ id: code, content: getI18n("vxe.grid.dataUnchanged"), status: "info" });
+                    if (import_core.VxeUI.modal) {
+                      import_core.VxeUI.modal.message({ id: code, content: getI18n("vxe.grid.dataUnchanged"), status: "info" });
                     }
                   }
                 }
@@ -1428,9 +1682,13 @@ var grid_default = (0, import_comp.defineVxeComponent)({
         const { formConfig } = props;
         const { items } = formOpts;
         const itemList = [];
-        import_xe_utils.default.eachTree(formConfig && (0, import_utils.isEnableConf)(formOpts) && items ? items : [], (item) => {
-          itemList.push(item);
-        }, { children: "children" });
+        import_xe_utils.default.eachTree(
+          formConfig && (0, import_utils.isEnableConf)(formOpts) && items ? items : [],
+          (item) => {
+            itemList.push(item);
+          },
+          { children: "children" }
+        );
         return import_xe_utils.default.isUndefined(itemIndex) ? itemList : itemList[itemIndex];
       },
       getFormFlatItems() {
@@ -1698,31 +1956,47 @@ var grid_default = (0, import_comp.defineVxeComponent)({
       const vSize = computeSize.value;
       const styles = computeStyles.value;
       const isLoading = computeIsLoading.value;
-      return (0, import_vue.h)("div", {
-        ref: refElem,
-        class: ["vxe-grid", {
-          [`size--${vSize}`]: vSize,
-          "is--animat": !!props.animat,
-          "is--round": props.round,
-          "is--maximize": reactData.isZMax,
-          "is--loading": isLoading
-        }],
-        style: styles
-      }, renderLayout());
+      return (0, import_vue.h)(
+        "div",
+        {
+          ref: refElem,
+          class: [
+            "vxe-grid",
+            {
+              [`size--${vSize}`]: vSize,
+              "is--animat": !!props.animat,
+              "is--round": props.round,
+              "is--maximize": reactData.isZMax,
+              "is--loading": isLoading
+            }
+          ],
+          style: styles
+        },
+        renderLayout()
+      );
     };
     const columnFlag = (0, import_vue.ref)(0);
-    (0, import_vue.watch)(() => props.columns ? props.columns.length : -1, () => {
-      columnFlag.value++;
-    });
-    (0, import_vue.watch)(() => props.columns, () => {
-      columnFlag.value++;
-    });
+    (0, import_vue.watch)(
+      () => props.columns ? props.columns.length : -1,
+      () => {
+        columnFlag.value++;
+      }
+    );
+    (0, import_vue.watch)(
+      () => props.columns,
+      () => {
+        columnFlag.value++;
+      }
+    );
     (0, import_vue.watch)(columnFlag, () => {
       (0, import_vue.nextTick)(() => $xeGrid.loadColumn(props.columns || []));
     });
-    (0, import_vue.watch)(() => props.toolbarConfig, () => {
-      initToolbar();
-    });
+    (0, import_vue.watch)(
+      () => props.toolbarConfig,
+      () => {
+        initToolbar();
+      }
+    );
     (0, import_vue.watch)(computeCustomCurrentPageFlag, () => {
       initPages("currentPage");
     });
@@ -1732,9 +2006,12 @@ var grid_default = (0, import_comp.defineVxeComponent)({
     (0, import_vue.watch)(computeCustomTotalFlag, () => {
       initPages("total");
     });
-    (0, import_vue.watch)(() => props.proxyConfig, () => {
-      initProxy();
-    });
+    (0, import_vue.watch)(
+      () => props.proxyConfig,
+      () => {
+        initProxy();
+      }
+    );
     hooks.forEach((options) => {
       const { setupGrid } = options;
       if (setupGrid) {