vxe-table 4.23.4 → 4.23.6

package/lib/grid/src/grid.js

@@ -1,41 +1,54 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var grid_exports = {};
+__export(grid_exports, {
+  default: () => grid_default
 });
-exports.default = void 0;
-var _vue = require("vue");
-var _comp = require("../../ui/src/comp");
-var _xeUtils = _interopRequireDefault(require("xe-utils"));
-var _utils = require("../../ui/src/utils");
-var _dom = require("../../ui/src/dom");
-var _ui = require("../../ui");
-var _props = require("./props");
-var _emits = require("./emits");
-var _vn = require("../../ui/src/vn");
-var _log = require("../../ui/src/log");
-var _emits2 = require("../../table/src/emits");
-var _props2 = require("../../table/src/props");
-var _table = _interopRequireDefault(require("../../table"));
-var _toolbar = _interopRequireDefault(require("../../toolbar"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const {
-  warnLog,
-  errLog
-} = (0, _log.createComponentLog)('grid');
-const {
-  getConfig,
-  getI18n,
-  commands,
-  hooks,
-  useFns,
-  createEvent,
-  globalEvents,
-  GLOBAL_EVENT_KEYS,
-  renderEmptyElement
-} = _ui.VxeUI;
-const tableComponentPropKeys = Object.keys(_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'];
+module.exports = __toCommonJS(grid_exports);
+var import_vue = require("vue");
+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");
+var import_log = require("../../ui/src/log");
+var import_emits2 = require("../../table/src/emits");
+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 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"];
 function createReactData() {
   var _a;
   return {
@@ -50,7 +63,7 @@ function createReactData() {
     tZindex: 0,
     tablePage: {
       total: 0,
-      pageSize: ((_a = getConfig().pager) === null || _a === void 0 ? void 0 : _a.pageSize) || 10,
+      pageSize: ((_a = getConfig().pager) == null ? void 0 : _a.pageSize) || 10,
       currentPage: 1
     }
   };
@@ -60,42 +73,34 @@ function createInternalData() {
     uFoot: false
   };
 }
-var _default = exports.default = (0, _comp.defineVxeComponent)({
-  name: 'VxeGrid',
-  props: _props.gridProps,
-  emits: _emits.gridEmits,
+var grid_default = (0, import_comp.defineVxeComponent)({
+  name: "VxeGrid",
+  props: import_props.gridProps,
+  emits: import_emits.gridEmits,
   setup(props, context) {
-    const {
-      slots,
-      emit
-    } = context;
-    const xID = _xeUtils.default.uniqueId();
-    // 使用已安装的组件，如果未安装则不渲染
-    const VxeUIFormComponent = _ui.VxeUI.getComponent('VxeForm');
-    const VxeUIPagerComponent = _ui.VxeUI.getComponent('VxePager');
-    const defaultLayouts = [['Form'], ['Toolbar', 'Top', 'Table', 'Bottom', 'Pager']];
-    const {
-      computeSize
-    } = useFns.useSize(props);
-    const {
-      computeIsVScrollbar
-    } = useFns.useVScrollbar(props);
-    const reactData = (0, _vue.reactive)(createReactData());
+    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 defaultLayouts = [["Form"], ["Toolbar", "Top", "Table", "Bottom", "Pager"]];
+    const { computeSize } = useFns.useSize(props);
+    const { computeIsVScrollbar } = useFns.useVScrollbar(props);
+    const reactData = (0, import_vue.reactive)(createReactData());
     const internalData = createInternalData();
-    const refElem = (0, _vue.ref)();
-    const refTable = (0, _vue.ref)();
-    const refForm = (0, _vue.ref)();
-    const refToolbar = (0, _vue.ref)();
-    const refPager = (0, _vue.ref)();
-    const refPopupContainerElem = (0, _vue.ref)();
-    const refFormWrapper = (0, _vue.ref)();
-    const refToolbarWrapper = (0, _vue.ref)();
-    const refTopWrapper = (0, _vue.ref)();
-    const refBottomWrapper = (0, _vue.ref)();
-    const refPagerWrapper = (0, _vue.ref)();
-    const extendTableMethods = methodKeys => {
+    const refElem = (0, import_vue.ref)();
+    const refTable = (0, import_vue.ref)();
+    const refForm = (0, import_vue.ref)();
+    const refToolbar = (0, import_vue.ref)();
+    const refPager = (0, import_vue.ref)();
+    const refPopupContainerElem = (0, import_vue.ref)();
+    const refFormWrapper = (0, import_vue.ref)();
+    const refToolbarWrapper = (0, import_vue.ref)();
+    const refTopWrapper = (0, import_vue.ref)();
+    const refBottomWrapper = (0, import_vue.ref)();
+    const refPagerWrapper = (0, import_vue.ref)();
+    const extendTableMethods = (methodKeys) => {
       const funcs = {};
-      methodKeys.forEach(name => {
+      methodKeys.forEach((name) => {
         funcs[name] = (...args) => {
           const $xeTable = refTable.value;
           if ($xeTable && $xeTable[name]) {
@@ -106,7 +111,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       return funcs;
     };
     const gridExtendTableMethods = extendTableMethods(tableComponentMethodKeys);
-    tableComponentMethodKeys.forEach(name => {
+    tableComponentMethodKeys.forEach((name) => {
       gridExtendTableMethods[name] = (...args) => {
         const $xeTable = refTable.value;
         if ($xeTable && $xeTable[name]) {
@@ -114,105 +119,82 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         }
       };
     });
-    const computeProxyOpts = (0, _vue.computed)(() => {
-      return _xeUtils.default.merge({}, _xeUtils.default.clone(getConfig().grid.proxyConfig, true), props.proxyConfig);
+    const computeProxyOpts = (0, import_vue.computed)(() => {
+      return import_xe_utils.default.merge({}, import_xe_utils.default.clone(getConfig().grid.proxyConfig, true), props.proxyConfig);
     });
-    const computeIsRespMsg = (0, _vue.computed)(() => {
+    const computeIsRespMsg = (0, import_vue.computed)(() => {
       const proxyOpts = computeProxyOpts.value;
-      return !!(_xeUtils.default.isBoolean(proxyOpts.message) ? proxyOpts.message : proxyOpts.showResponseMsg);
+      return !!(import_xe_utils.default.isBoolean(proxyOpts.message) ? proxyOpts.message : proxyOpts.showResponseMsg);
     });
-    const computeIsActiveMsg = (0, _vue.computed)(() => {
+    const computeIsActiveMsg = (0, import_vue.computed)(() => {
       const proxyOpts = computeProxyOpts.value;
-      return _xeUtils.default.isBoolean(proxyOpts.showActionMsg) ? proxyOpts.showActionMsg : !!proxyOpts.showActiveMsg;
+      return import_xe_utils.default.isBoolean(proxyOpts.showActionMsg) ? proxyOpts.showActionMsg : !!proxyOpts.showActiveMsg;
     });
-    const computePagerOpts = (0, _vue.computed)(() => {
+    const computePagerOpts = (0, import_vue.computed)(() => {
       return Object.assign({}, getConfig().grid.pagerConfig, props.pagerConfig);
     });
-    const computePagerProps = (0, _vue.computed)(() => {
+    const computePagerProps = (0, import_vue.computed)(() => {
       const pagerOpts = computePagerOpts.value;
-      return Object.assign({}, pagerOpts, {
-        enabled: undefined,
-        slots: undefined
-      });
+      return Object.assign({}, pagerOpts, { enabled: void 0, slots: void 0 });
     });
-    const computeFormOpts = (0, _vue.computed)(() => {
+    const computeFormOpts = (0, import_vue.computed)(() => {
       return Object.assign({}, getConfig().grid.formConfig, props.formConfig);
     });
-    const computeToolbarOpts = (0, _vue.computed)(() => {
+    const computeToolbarOpts = (0, import_vue.computed)(() => {
       return Object.assign({}, getConfig().grid.toolbarConfig, props.toolbarConfig);
     });
-    const computeZoomOpts = (0, _vue.computed)(() => {
+    const computeZoomOpts = (0, import_vue.computed)(() => {
       return Object.assign({}, getConfig().grid.zoomConfig, props.zoomConfig);
     });
-    const computeStyles = (0, _vue.computed)(() => {
-      const {
-        height,
-        maxHeight
-      } = props;
-      const {
-        isZMax,
-        tZindex
-      } = reactData;
+    const computeStyles = (0, import_vue.computed)(() => {
+      const { height, maxHeight } = props;
+      const { isZMax, tZindex } = reactData;
       const stys = {};
       if (isZMax) {
         stys.zIndex = tZindex;
       } else {
         if (height) {
-          stys.height = height === 'auto' || height === '100%' ? '100%' : (0, _dom.toCssUnit)(height);
+          stys.height = height === "auto" || height === "100%" ? "100%" : (0, import_dom.toCssUnit)(height);
         }
         if (maxHeight) {
-          stys.maxHeight = maxHeight === 'auto' || maxHeight === '100%' ? '100%' : (0, _dom.toCssUnit)(maxHeight);
+          stys.maxHeight = maxHeight === "auto" || maxHeight === "100%" ? "100%" : (0, import_dom.toCssUnit)(maxHeight);
         }
       }
       return stys;
     });
-    const computeTableExtendProps = (0, _vue.computed)(() => {
+    const computeTableExtendProps = (0, import_vue.computed)(() => {
       const rest = {};
-      tableComponentPropKeys.forEach(key => {
-        if (props[key] !== undefined) {
+      tableComponentPropKeys.forEach((key) => {
+        if (props[key] !== void 0) {
           rest[key] = props[key];
         }
       });
       return rest;
     });
-    const computeTableProps = (0, _vue.computed)(() => {
-      const {
-        showFooter,
-        seqConfig,
-        pagerConfig,
-        editConfig,
-        proxyConfig
-      } = props;
-      const {
-        isZMax,
-        tablePage,
-        footerData
-      } = reactData;
+    const computeTableProps = (0, import_vue.computed)(() => {
+      const { showFooter, seqConfig, pagerConfig, editConfig, proxyConfig } = props;
+      const { isZMax, tablePage, footerData } = reactData;
       const tableExtendProps = computeTableExtendProps.value;
       const proxyOpts = computeProxyOpts.value;
       const pagerOpts = computePagerOpts.value;
       const isLoading = computeIsLoading.value;
       const tProps = Object.assign({}, tableExtendProps);
       if (showFooter && !tProps.footerData) {
-        // 如果未设置自己的标位数据，则使用代理的
         tProps.footerData = footerData;
       } else if (proxyOpts.footer && footerData.length) {
-        // 如果代理标为数据，且未请求到数据，则用自己的
         tProps.footerData = footerData;
       }
       if (isZMax) {
         if (tProps.maxHeight) {
-          tProps.maxHeight = '100%';
+          tProps.maxHeight = "100%";
         } else {
-          tProps.height = '100%';
+          tProps.height = "100%";
         }
       }
-      if (proxyConfig && (0, _utils.isEnableConf)(proxyOpts)) {
+      if (proxyConfig && (0, import_utils.isEnableConf)(proxyOpts)) {
         tProps.loading = isLoading;
-        if (pagerConfig && proxyOpts.seq && (0, _utils.isEnableConf)(pagerOpts)) {
-          tProps.seqConfig = Object.assign({}, seqConfig, {
-            startIndex: (tablePage.currentPage - 1) * tablePage.pageSize
-          });
+        if (pagerConfig && proxyOpts.seq && (0, import_utils.isEnableConf)(pagerOpts)) {
+          tProps.seqConfig = Object.assign({}, seqConfig, { startIndex: (tablePage.currentPage - 1) * tablePage.pageSize });
         }
       }
       if (editConfig) {
@@ -220,10 +202,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       }
       return tProps;
     });
-    const computeCurrLayoutConf = (0, _vue.computed)(() => {
-      const {
-        layouts
-      } = props;
+    const computeCurrLayoutConf = (0, import_vue.computed)(() => {
+      const { layouts } = props;
       let confs = [];
       if (layouts && layouts.length) {
         confs = layouts;
@@ -234,7 +214,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       let bodyKeys = [];
       let footKeys = [];
       if (confs.length) {
-        if (_xeUtils.default.isArray(confs[0])) {
+        if (import_xe_utils.default.isArray(confs[0])) {
           headKeys = confs[0];
           bodyKeys = confs[1] || [];
           footKeys = confs[2] || [];
@@ -248,37 +228,28 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         footKeys
       };
     });
-    const computeCustomCurrentPageFlag = (0, _vue.computed)(() => {
+    const computeCustomCurrentPageFlag = (0, import_vue.computed)(() => {
       const pagerOpts = computePagerOpts.value;
       return pagerOpts.currentPage;
     });
-    const computeCustomPageSizeFlag = (0, _vue.computed)(() => {
+    const computeCustomPageSizeFlag = (0, import_vue.computed)(() => {
       const pagerOpts = computePagerOpts.value;
       return pagerOpts.pageSize;
     });
-    const computeCustomTotalFlag = (0, _vue.computed)(() => {
+    const computeCustomTotalFlag = (0, import_vue.computed)(() => {
       const pagerOpts = computePagerOpts.value;
       return pagerOpts.total;
     });
-    const computePageCount = (0, _vue.computed)(() => {
-      const {
-        tablePage
-      } = reactData;
+    const computePageCount = (0, import_vue.computed)(() => {
+      const { tablePage } = reactData;
       return Math.max(Math.ceil(tablePage.total / tablePage.pageSize), 1);
     });
-    const computeIsLoading = (0, _vue.computed)(() => {
-      const {
-        loading,
-        proxyConfig
-      } = props;
-      const {
-        tableLoading
-      } = reactData;
+    const computeIsLoading = (0, import_vue.computed)(() => {
+      const { loading, proxyConfig } = props;
+      const { tableLoading } = reactData;
       const proxyOpts = computeProxyOpts.value;
-      const {
-        showLoading
-      } = proxyOpts;
-      return loading || tableLoading && showLoading && proxyConfig && (0, _utils.isEnableConf)(proxyOpts);
+      const { showLoading } = proxyOpts;
+      return loading || tableLoading && showLoading && proxyConfig && (0, import_utils.isEnableConf)(proxyOpts);
     });
     const refMaps = {
       refElem,
@@ -299,7 +270,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     };
     const $xeGrid = {
       xID,
-      props: props,
+      props,
       context,
       reactData,
       internalData,
@@ -308,8 +279,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     };
     const initToolbar = () => {
       const toolbarOpts = computeToolbarOpts.value;
-      if (props.toolbarConfig && (0, _utils.isEnableConf)(toolbarOpts)) {
-        (0, _vue.nextTick)(() => {
+      if (props.toolbarConfig && (0, import_utils.isEnableConf)(toolbarOpts)) {
+        (0, import_vue.nextTick)(() => {
           const $xeTable = refTable.value;
           const $xeToolbar = refToolbar.value;
           if ($xeTable && $xeToolbar) {
@@ -319,35 +290,23 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       }
     };
     const getFormData = () => {
-      const {
-        proxyConfig
-      } = props;
-      const {
-        formData
-      } = reactData;
+      const { proxyConfig } = props;
+      const { formData } = reactData;
       const proxyOpts = computeProxyOpts.value;
       const formOpts = computeFormOpts.value;
-      return proxyConfig && (0, _utils.isEnableConf)(proxyOpts) && proxyOpts.form ? formData : formOpts.data;
+      return proxyConfig && (0, import_utils.isEnableConf)(proxyOpts) && proxyOpts.form ? formData : formOpts.data;
     };
-    const initPages = propKey => {
-      const {
-        tablePage
-      } = reactData;
-      const {
-        pagerConfig
-      } = props;
+    const initPages = (propKey) => {
+      const { tablePage } = reactData;
+      const { pagerConfig } = props;
       const pagerOpts = computePagerOpts.value;
-      if (pagerConfig && (0, _utils.isEnableConf)(pagerOpts)) {
+      if (pagerConfig && (0, import_utils.isEnableConf)(pagerOpts)) {
         if (propKey) {
           if (pagerOpts[propKey]) {
-            tablePage[propKey] = _xeUtils.default.toNumber(pagerOpts[propKey]);
+            tablePage[propKey] = import_xe_utils.default.toNumber(pagerOpts[propKey]);
           }
         } else {
-          const {
-            currentPage,
-            pageSize,
-            total
-          } = pagerOpts;
+          const { currentPage, pageSize, total } = pagerOpts;
           if (currentPage) {
             tablePage.currentPage = currentPage;
           }
@@ -360,7 +319,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         }
       }
     };
-    const triggerPendingEvent = code => {
+    const triggerPendingEvent = (code) => {
       const isActiveMsg = computeIsActiveMsg.value;
       const $xeTable = refTable.value;
       const selectRecords = $xeTable ? $xeTable.getCheckboxRecords() : [];
@@ -371,12 +330,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         $xeGrid.clearCheckboxRow();
       } else {
         if (isActiveMsg) {
-          if (_ui.VxeUI.modal) {
-            _ui.VxeUI.modal.message({
-              id: code,
-              content: getI18n('vxe.grid.selectOneRecord'),
-              status: 'warning'
-            });
+          if (import_ui.VxeUI.modal) {
+            import_ui.VxeUI.modal.message({ id: code, content: getI18n("vxe.grid.selectOneRecord"), status: "warning" });
           }
         }
       }
@@ -388,12 +343,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       const $xeTable = refTable.value;
       let msg;
       if (rest && messageProp) {
-        msg = _xeUtils.default.isFunction(messageProp) ? messageProp({
-          data: rest,
-          $table: $xeTable,
-          $grid: $xeGrid,
-          $gantt: null
-        }) : _xeUtils.default.get(rest, messageProp);
+        msg = import_xe_utils.default.isFunction(messageProp) ? messageProp({ data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null }) : import_xe_utils.default.get(rest, messageProp);
       }
       return msg || getI18n(defaultMsg);
     };
@@ -402,24 +352,16 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       const selectRecords = $xeGrid.getCheckboxRecords();
       if (isActiveMsg) {
         if (selectRecords.length) {
-          if (_ui.VxeUI.modal) {
-            return _ui.VxeUI.modal.confirm({
-              id: `cfm_${code}`,
-              content: getI18n(alertKey),
-              escClosable: true
-            }).then(type => {
-              if (type === 'confirm') {
+          if (import_ui.VxeUI.modal) {
+            return import_ui.VxeUI.modal.confirm({ id: `cfm_${code}`, content: getI18n(alertKey), escClosable: true }).then((type) => {
+              if (type === "confirm") {
                 return callback();
               }
             });
           }
         } else {
-          if (_ui.VxeUI.modal) {
-            _ui.VxeUI.modal.message({
-              id: `msg_${code}`,
-              content: getI18n('vxe.grid.selectOneRecord'),
-              status: 'warning'
-            });
+          if (import_ui.VxeUI.modal) {
+            import_ui.VxeUI.modal.message({ id: `msg_${code}`, content: getI18n("vxe.grid.selectOneRecord"), status: "warning" });
           }
         }
       } else {
@@ -429,166 +371,134 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       }
       return Promise.resolve();
     };
-    const pageChangeEvent = params => {
-      const {
-        proxyConfig
-      } = props;
-      const {
-        tablePage
-      } = reactData;
-      const {
-        $event,
-        currentPage,
-        pageSize
-      } = params;
+    const pageChangeEvent = (params) => {
+      const { proxyConfig } = props;
+      const { tablePage } = reactData;
+      const { $event, currentPage, pageSize } = params;
       const proxyOpts = computeProxyOpts.value;
       tablePage.currentPage = currentPage;
       tablePage.pageSize = pageSize;
-      $xeGrid.dispatchEvent('page-change', params, $event);
-      if (proxyConfig && (0, _utils.isEnableConf)(proxyOpts)) {
-        $xeGrid.commitProxy('query').then(rest => {
-          $xeGrid.dispatchEvent('proxy-query', rest, $event);
+      $xeGrid.dispatchEvent("page-change", params, $event);
+      if (proxyConfig && (0, import_utils.isEnableConf)(proxyOpts)) {
+        $xeGrid.commitProxy("query").then((rest) => {
+          $xeGrid.dispatchEvent("proxy-query", rest, $event);
         });
       }
     };
-    const handleSortEvent = params => {
+    const handleSortEvent = (params) => {
       const $xeTable = refTable.value;
-      const {
-        proxyConfig
-      } = props;
+      const { proxyConfig } = props;
       if (!$xeTable) {
         return;
       }
-      const {
-        computeSortOpts
-      } = $xeTable.getComputeMaps();
+      const { computeSortOpts } = $xeTable.getComputeMaps();
       const proxyOpts = computeProxyOpts.value;
       const sortOpts = computeSortOpts.value;
-      // 如果是服务端排序
       if (sortOpts.remote) {
         reactData.sortData = params.sortList;
-        if (proxyConfig && (0, _utils.isEnableConf)(proxyOpts)) {
+        if (proxyConfig && (0, import_utils.isEnableConf)(proxyOpts)) {
           reactData.tablePage.currentPage = 1;
-          $xeGrid.commitProxy('query').then(rest => {
-            $xeGrid.dispatchEvent('proxy-query', rest, params.$event);
+          $xeGrid.commitProxy("query").then((rest) => {
+            $xeGrid.dispatchEvent("proxy-query", rest, params.$event);
           });
         }
       }
     };
-    const sortChangeEvent = params => {
+    const sortChangeEvent = (params) => {
       handleSortEvent(params);
-      $xeGrid.dispatchEvent('sort-change', params, params.$event);
+      $xeGrid.dispatchEvent("sort-change", params, params.$event);
     };
-    const clearAllSortEvent = params => {
+    const clearAllSortEvent = (params) => {
       handleSortEvent(params);
-      $xeGrid.dispatchEvent('clear-all-sort', params, params.$event);
+      $xeGrid.dispatchEvent("clear-all-sort", params, params.$event);
     };
-    const handleFilterEvent = params => {
+    const handleFilterEvent = (params) => {
       const $xeTable = refTable.value;
-      const {
-        proxyConfig
-      } = props;
+      const { proxyConfig } = props;
       if (!$xeTable) {
         return;
       }
-      const {
-        computeFilterOpts
-      } = $xeTable.getComputeMaps();
+      const { computeFilterOpts } = $xeTable.getComputeMaps();
       const proxyOpts = computeProxyOpts.value;
       const filterOpts = computeFilterOpts.value;
-      // 如果是服务端过滤
       if (filterOpts.remote) {
         reactData.filterData = params.filterList;
-        if (proxyConfig && (0, _utils.isEnableConf)(proxyOpts)) {
+        if (proxyConfig && (0, import_utils.isEnableConf)(proxyOpts)) {
           reactData.tablePage.currentPage = 1;
           internalData.uFoot = true;
-          $xeGrid.commitProxy('query').then(rest => {
-            $xeGrid.dispatchEvent('proxy-query', rest, params.$event);
+          $xeGrid.commitProxy("query").then((rest) => {
+            $xeGrid.dispatchEvent("proxy-query", rest, params.$event);
           });
           internalData.uFoot = false;
           updateQueryFooter();
         }
       }
     };
-    const filterChangeEvent = params => {
+    const filterChangeEvent = (params) => {
       handleFilterEvent(params);
-      $xeGrid.dispatchEvent('filter-change', params, params.$event);
+      $xeGrid.dispatchEvent("filter-change", params, params.$event);
     };
-    const clearAllFilterEvent = params => {
+    const clearAllFilterEvent = (params) => {
       handleFilterEvent(params);
-      $xeGrid.dispatchEvent('clear-all-filter', params, params.$event);
+      $xeGrid.dispatchEvent("clear-all-filter", params, params.$event);
     };
-    const submitFormEvent = params => {
-      const {
-        proxyConfig
-      } = props;
+    const submitFormEvent = (params) => {
+      const { proxyConfig } = props;
       const proxyOpts = computeProxyOpts.value;
       const formOptions = proxyOpts.formOptions || {};
       if (reactData.tableLoading) {
         return;
       }
-      if (proxyConfig && (0, _utils.isEnableConf)(proxyOpts)) {
-        $xeGrid.dispatchEvent('form-submit', params, params.$event);
+      if (proxyConfig && (0, import_utils.isEnableConf)(proxyOpts)) {
+        $xeGrid.dispatchEvent("form-submit", params, params.$event);
         internalData.uFoot = true;
-        $xeGrid.commitProxy(formOptions.submitMode || 'reload').then(rest => {
-          $xeGrid.dispatchEvent('proxy-query', Object.assign(Object.assign({}, rest), {
-            isReload: true
-          }), params.$event);
+        $xeGrid.commitProxy(formOptions.submitMode || "reload").then((rest) => {
+          $xeGrid.dispatchEvent("proxy-query", { ...rest, isReload: true }, params.$event);
         });
         internalData.uFoot = false;
         updateQueryFooter();
       } else {
-        $xeGrid.dispatchEvent('form-submit', params, params.$event);
+        $xeGrid.dispatchEvent("form-submit", params, params.$event);
       }
     };
-    const resetFormEvent = params => {
+    const resetFormEvent = (params) => {
       const $xeTable = refTable.value;
-      const {
-        proxyConfig
-      } = props;
-      const {
-        $event
-      } = params;
+      const { proxyConfig } = props;
+      const { $event } = params;
       const proxyOpts = computeProxyOpts.value;
-      if (proxyConfig && (0, _utils.isEnableConf)(proxyOpts)) {
+      if (proxyConfig && (0, import_utils.isEnableConf)(proxyOpts)) {
         const formOptions = proxyOpts.formOptions || {};
-        $xeGrid.dispatchEvent('form-reset', params, $event);
+        $xeGrid.dispatchEvent("form-reset", params, $event);
         if ($xeTable) {
           $xeTable.clearScroll();
         }
         internalData.uFoot = true;
-        $xeGrid.commitProxy(formOptions.resetMode === 'reset_form' ? 'query' : 'reload').then(rest => {
-          $xeGrid.dispatchEvent('proxy-query', Object.assign(Object.assign({}, rest), {
-            isReload: true
-          }), $event);
+        $xeGrid.commitProxy(formOptions.resetMode === "reset_form" ? "query" : "reload").then((rest) => {
+          $xeGrid.dispatchEvent("proxy-query", { ...rest, isReload: true }, $event);
         });
         internalData.uFoot = false;
         updateQueryFooter();
       } else {
-        $xeGrid.dispatchEvent('form-reset', params, $event);
+        $xeGrid.dispatchEvent("form-reset", params, $event);
       }
     };
-    const submitInvalidEvent = params => {
-      $xeGrid.dispatchEvent('form-submit-invalid', params, params.$event);
+    const submitInvalidEvent = (params) => {
+      $xeGrid.dispatchEvent("form-submit-invalid", params, params.$event);
     };
-    const collapseEvent = params => {
-      const {
-        $event
-      } = params;
-      $xeGrid.dispatchEvent('form-toggle-collapse', params, $event);
-      $xeGrid.dispatchEvent('form-collapse', params, $event);
+    const collapseEvent = (params) => {
+      const { $event } = params;
+      $xeGrid.dispatchEvent("form-toggle-collapse", params, $event);
+      $xeGrid.dispatchEvent("form-collapse", params, $event);
     };
-    const handleZoom = isMax => {
-      const {
-        isZMax
-      } = reactData;
+    const handleZoom = (isMax) => {
+      const { isZMax } = reactData;
       if (isMax ? !isZMax : isZMax) {
         reactData.isZMax = !isZMax;
-        if (reactData.tZindex < (0, _utils.getLastZIndex)()) {
-          reactData.tZindex = (0, _utils.nextZIndex)();
+        if (reactData.tZindex < (0, import_utils.getLastZIndex)()) {
+          reactData.tZindex = (0, import_utils.nextZIndex)();
         }
       }
-      return (0, _vue.nextTick)().then(() => $xeGrid.recalculate(true)).then(() => {
+      return (0, import_vue.nextTick)().then(() => $xeGrid.recalculate(true)).then(() => {
         setTimeout(() => $xeGrid.recalculate(true), 15);
         return reactData.isZMax;
       });
@@ -596,11 +506,11 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     const getFuncSlot = (optSlots, slotKey) => {
       const funcSlot = optSlots[slotKey];
       if (funcSlot) {
-        if (_xeUtils.default.isString(funcSlot)) {
+        if (import_xe_utils.default.isString(funcSlot)) {
           if (slots[funcSlot]) {
             return slots[funcSlot];
           } else {
-            errLog('vxe.error.notSlot', [funcSlot]);
+            errLog("vxe.error.notSlot", [funcSlot]);
           }
         } else {
           return funcSlot;
@@ -608,15 +518,15 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       }
       return null;
     };
-    const getConfigSlot = slotConfigs => {
+    const getConfigSlot = (slotConfigs) => {
       const slotConf = {};
-      _xeUtils.default.objectMap(slotConfigs, (slotFunc, slotKey) => {
+      import_xe_utils.default.objectMap(slotConfigs, (slotFunc, slotKey) => {
         if (slotFunc) {
-          if (_xeUtils.default.isString(slotFunc)) {
+          if (import_xe_utils.default.isString(slotFunc)) {
             if (slots[slotFunc]) {
               slotConf[slotKey] = slots[slotFunc];
             } else {
-              errLog('vxe.error.notSlot', [slotFunc]);
+              errLog("vxe.error.notSlot", [slotFunc]);
             }
           } else {
             slotConf[slotKey] = slotFunc;
@@ -625,26 +535,15 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       });
       return slotConf;
     };
-    /**
-     * 渲染表单
-     */
     const renderForm = () => {
-      const {
-        formConfig,
-        proxyConfig
-      } = props;
-      const {
-        formData
-      } = reactData;
+      const { formConfig, proxyConfig } = props;
+      const { formData } = reactData;
       const proxyOpts = computeProxyOpts.value;
       const formOpts = computeFormOpts.value;
-      if (formConfig && (0, _utils.isEnableConf)(formOpts) || slots.form) {
+      if (formConfig && (0, import_utils.isEnableConf)(formOpts) || slots.form) {
         let slotVNs = [];
         if (slots.form) {
-          slotVNs = slots.form({
-            $grid: $xeGrid,
-            $gantt: null
-          });
+          slotVNs = slots.form({ $grid: $xeGrid, $gantt: null });
         } else {
           if (formOpts.items) {
             const formSlots = {};
@@ -652,19 +551,14 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
               formOpts.inited = true;
               const beforeItem = proxyOpts.beforeItem;
               if (proxyOpts && beforeItem) {
-                formOpts.items.forEach(item => {
-                  beforeItem({
-                    $grid: $xeGrid,
-                    $gantt: null,
-                    item
-                  });
+                formOpts.items.forEach((item) => {
+                  beforeItem({ $grid: $xeGrid, $gantt: null, item });
                 });
               }
             }
-            // 处理插槽
-            formOpts.items.forEach(item => {
-              _xeUtils.default.each(item.slots, func => {
-                if (func && !_xeUtils.default.isFunction(func)) {
+            formOpts.items.forEach((item) => {
+              import_xe_utils.default.each(item.slots, (func) => {
+                if (func && !import_xe_utils.default.isFunction(func)) {
                   if (slots[func]) {
                     formSlots[func] = slots[func];
                   }
@@ -672,53 +566,47 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
               });
             });
             if (VxeUIFormComponent) {
-              slotVNs.push((0, _vue.h)(VxeUIFormComponent, Object.assign(Object.assign({
-                ref: refForm
-              }, Object.assign({}, formOpts, {
-                data: proxyConfig && (0, _utils.isEnableConf)(proxyOpts) && proxyOpts.form ? formData : formOpts.data
-              })), {
-                onSubmit: submitFormEvent,
-                onReset: resetFormEvent,
-                onSubmitInvalid: submitInvalidEvent,
-                onCollapse: collapseEvent
-              }), formSlots));
+              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)
+              );
             }
           }
         }
-        return (0, _vue.h)('div', {
+        return (0, import_vue.h)("div", {
           ref: refFormWrapper,
-          key: 'form',
-          class: 'vxe-grid--form-wrapper'
+          key: "form",
+          class: "vxe-grid--form-wrapper"
         }, slotVNs);
       }
       return renderEmptyElement($xeGrid);
     };
-    /**
-     * 渲染工具栏
-     */
     const renderToolbar = () => {
-      const {
-        toolbarConfig
-      } = props;
+      const { toolbarConfig } = props;
       const toolbarOpts = computeToolbarOpts.value;
       const toolbarSlot = slots.toolbar;
-      if (toolbarConfig && (0, _utils.isEnableConf)(toolbarOpts) || toolbarSlot) {
+      if (toolbarConfig && (0, import_utils.isEnableConf)(toolbarOpts) || toolbarSlot) {
         let slotVNs = [];
         if (toolbarSlot) {
-          slotVNs = toolbarSlot({
-            $grid: $xeGrid,
-            $gantt: null
-          });
+          slotVNs = toolbarSlot({ $grid: $xeGrid, $gantt: null });
         } else {
           const toolbarOptSlots = toolbarOpts.slots;
           const toolbarSlots = {};
           if (toolbarOptSlots) {
-            const buttonsSlot = getFuncSlot(toolbarOptSlots, 'buttons');
-            const buttonPrefixSlot = getFuncSlot(toolbarOptSlots, 'buttonPrefix');
-            const buttonSuffixSlot = getFuncSlot(toolbarOptSlots, 'buttonSuffix');
-            const toolsSlot = getFuncSlot(toolbarOptSlots, 'tools');
-            const toolPrefixSlot = getFuncSlot(toolbarOptSlots, 'toolPrefix');
-            const toolSuffixSlot = getFuncSlot(toolbarOptSlots, 'toolSuffix');
+            const buttonsSlot = getFuncSlot(toolbarOptSlots, "buttons");
+            const buttonPrefixSlot = getFuncSlot(toolbarOptSlots, "buttonPrefix");
+            const buttonSuffixSlot = getFuncSlot(toolbarOptSlots, "buttonSuffix");
+            const toolsSlot = getFuncSlot(toolbarOptSlots, "tools");
+            const toolPrefixSlot = getFuncSlot(toolbarOptSlots, "toolPrefix");
+            const toolSuffixSlot = getFuncSlot(toolbarOptSlots, "toolSuffix");
             if (buttonsSlot) {
               toolbarSlots.buttons = buttonsSlot;
             }
@@ -738,79 +626,64 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
               toolbarSlots.toolSuffix = toolSuffixSlot;
             }
           }
-          slotVNs.push((0, _vue.h)(_toolbar.default, Object.assign(Object.assign({
-            ref: refToolbar
-          }, toolbarOpts), {
-            slots: undefined
-          }), toolbarSlots));
+          slotVNs.push(
+            (0, import_vue.h)(import_toolbar.default, {
+              ref: refToolbar,
+              ...toolbarOpts,
+              slots: void 0
+            }, toolbarSlots)
+          );
         }
-        return (0, _vue.h)('div', {
+        return (0, import_vue.h)("div", {
           ref: refToolbarWrapper,
-          key: 'toolbar',
-          class: 'vxe-grid--toolbar-wrapper'
+          key: "toolbar",
+          class: "vxe-grid--toolbar-wrapper"
         }, slotVNs);
       }
       return renderEmptyElement($xeGrid);
     };
-    /**
-     * 渲染表格顶部区域
-     */
     const renderTop = () => {
       const topSlot = slots.top;
       if (topSlot) {
-        return (0, _vue.h)('div', {
+        return (0, import_vue.h)("div", {
           ref: refTopWrapper,
-          key: 'top',
-          class: 'vxe-grid--top-wrapper'
-        }, topSlot({
-          $grid: $xeGrid,
-          $gantt: null
-        }));
+          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, _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, _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);
     };
-    /**
-     * 渲染表格
-     */
     const renderTable = () => {
-      const {
-        proxyConfig
-      } = props;
-      const tableProps = computeTableProps.value;
+      const { proxyConfig } = props;
+      const tableProps2 = computeTableProps.value;
       const proxyOpts = computeProxyOpts.value;
       const tableOns = Object.assign({}, tableCompEvents);
       const emptySlot = slots.empty;
       const loadingSlot = slots.loading;
-      const rowDragIconSlot = slots.rowDragIcon || slots['row-drag-icon'];
-      const columnDragIconSlot = slots.columnDragIcon || slots['column-drag-icon'];
-      const headerTooltipSlot = slots.headerTooltip || slots['header-tooltip'];
+      const rowDragIconSlot = slots.rowDragIcon || slots["row-drag-icon"];
+      const columnDragIconSlot = slots.columnDragIcon || slots["column-drag-icon"];
+      const headerTooltipSlot = slots.headerTooltip || slots["header-tooltip"];
       const tooltipSlot = slots.tooltip;
-      const footerTooltipSlot = slots.footerTooltip || slots['footer-tooltip'];
-      if (proxyConfig && (0, _utils.isEnableConf)(proxyOpts)) {
+      const footerTooltipSlot = slots.footerTooltip || slots["footer-tooltip"];
+      if (proxyConfig && (0, import_utils.isEnableConf)(proxyOpts)) {
         if (proxyOpts.sort) {
           tableOns.onSortChange = sortChangeEvent;
           tableOns.onClearAllSort = clearAllSortEvent;
@@ -842,83 +715,81 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       if (footerTooltipSlot) {
         slotObj.footerTooltip = footerTooltipSlot;
       }
-      return (0, _vue.h)('div', {
-        class: 'vxe-grid--table-wrapper'
-      }, [(0, _vue.h)(_table.default, Object.assign(Object.assign({
-        ref: refTable
-      }, tableProps), 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, _vue.h)('div', {
+        return (0, import_vue.h)("div", {
           ref: refBottomWrapper,
-          key: 'bottom',
-          class: 'vxe-grid--bottom-wrapper'
-        }, slots.bottom({
-          $grid: $xeGrid,
-          $gantt: null
-        }));
+          key: "bottom",
+          class: "vxe-grid--bottom-wrapper"
+        }, slots.bottom({ $grid: $xeGrid, $gantt: null }));
       }
       return renderEmptyElement($xeGrid);
     };
-    /**
-     * 渲染分页
-     */
     const renderPager = () => {
-      const {
-        proxyConfig,
-        pagerConfig
-      } = props;
+      const { proxyConfig, pagerConfig } = props;
       const proxyOpts = computeProxyOpts.value;
       const pagerOpts = computePagerOpts.value;
       const pagerProps = computePagerProps.value;
       const pagerSlot = slots.pager;
-      if (pagerConfig && (0, _utils.isEnableConf)(pagerOpts) || slots.pager) {
-        return (0, _vue.h)('div', {
+      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, _vue.h)(VxeUIPagerComponent, Object.assign(Object.assign(Object.assign({
-          ref: refPager
-        }, pagerProps), proxyConfig && (0, _utils.isEnableConf)(proxyOpts) ? reactData.tablePage : {}), {
-          onPageChange: pageChangeEvent
-        }), getConfigSlot(pagerOpts.slots)) : renderEmptyElement($xeGrid)]);
+          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);
     };
-    const renderChildLayout = layoutKeys => {
+    const renderChildLayout = (layoutKeys) => {
       const childVNs = [];
-      layoutKeys.forEach(key => {
+      layoutKeys.forEach((key) => {
         switch (key) {
-          case 'Form':
+          case "Form":
             childVNs.push(renderForm());
             break;
-          case 'Toolbar':
+          case "Toolbar":
             childVNs.push(renderToolbar());
             break;
-          case 'Top':
+          case "Top":
             childVNs.push(renderTop());
             break;
-          case 'Table':
-            childVNs.push((0, _vue.h)('div', {
-              key: 'table',
-              class: 'vxe-grid--table-container'
-            }, [renderTableLeft(), renderTable(), renderTableRight()]));
+          case "Table":
+            childVNs.push(
+              (0, import_vue.h)("div", {
+                key: "table",
+                class: "vxe-grid--table-container"
+              }, [
+                renderTableLeft(),
+                renderTable(),
+                renderTableRight()
+              ])
+            );
             break;
-          case 'Bottom':
+          case "Bottom":
             childVNs.push(renderBottom());
             break;
-          case 'Pager':
+          case "Pager":
             childVNs.push(renderPager());
             break;
           default:
-            errLog('vxe.error.notProp', [`layouts -> ${key}`]);
+            errLog("vxe.error.notProp", [`layouts -> ${key}`]);
             break;
         }
       });
@@ -926,61 +797,57 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     };
     const renderLayout = () => {
       const currLayoutConf = computeCurrLayoutConf.value;
-      const {
-        headKeys,
-        bodyKeys,
-        footKeys
-      } = currLayoutConf;
-      const asideLeftSlot = slots.asideLeft || slots['aside-left'];
-      const asideRightSlot = slots.asideRight || slots['aside-right'];
-      return [(0, _vue.h)('div', {
-        class: 'vxe-grid--layout-header-wrapper'
-      }, renderChildLayout(headKeys)), (0, _vue.h)('div', {
-        class: 'vxe-grid--layout-body-wrapper'
-      }, [asideLeftSlot ? (0, _vue.h)('div', {
-        class: 'vxe-grid--layout-aside-left-wrapper'
-      }, asideLeftSlot({})) : renderEmptyElement($xeGrid), (0, _vue.h)('div', {
-        class: 'vxe-grid--layout-body-content-wrapper'
-      }, renderChildLayout(bodyKeys)), asideRightSlot ? (0, _vue.h)('div', {
-        class: 'vxe-grid--layout-aside-right-wrapper'
-      }, asideRightSlot({})) : renderEmptyElement($xeGrid)]), (0, _vue.h)('div', {
-        class: 'vxe-grid--layout-footer-wrapper'
-      }, renderChildLayout(footKeys)), (0, _vue.h)('div', {
-        ref: refPopupContainerElem
-      })];
+      const { headKeys, bodyKeys, footKeys } = currLayoutConf;
+      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", {
+          ref: refPopupContainerElem
+        })
+      ];
     };
     const tableCompEvents = {};
-    _emits2.tableEmits.forEach(name => {
-      const type = _xeUtils.default.camelCase(`on-${name}`);
+    import_emits2.tableEmits.forEach((name) => {
+      const type = import_xe_utils.default.camelCase(`on-${name}`);
       tableCompEvents[type] = (...args) => emit(name, ...args);
     });
     const getDefaultFormData = () => {
       const formOpts = computeFormOpts.value;
       if (formOpts.items) {
         const fData = {};
-        formOpts.items.forEach(item => {
-          const {
-            field,
-            itemRender
-          } = item;
+        formOpts.items.forEach((item) => {
+          const { field, itemRender } = item;
           if (field) {
             let itemValue = null;
             if (itemRender) {
-              const {
-                startField,
-                endField,
-                defaultValue
-              } = itemRender;
-              if (_xeUtils.default.isFunction(defaultValue)) {
-                itemValue = defaultValue({
-                  item
-                });
-              } else if (!_xeUtils.default.isUndefined(defaultValue)) {
+              const { startField, endField, defaultValue } = itemRender;
+              if (import_xe_utils.default.isFunction(defaultValue)) {
+                itemValue = defaultValue({ item });
+              } else if (!import_xe_utils.default.isUndefined(defaultValue)) {
                 itemValue = defaultValue;
               }
               if (startField && endField) {
-                _xeUtils.default.set(fData, startField, null);
-                _xeUtils.default.set(fData, endField, null);
+                import_xe_utils.default.set(fData, startField, null);
+                import_xe_utils.default.set(fData, endField, null);
               }
             }
             fData[field] = itemValue;
@@ -991,32 +858,25 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       return {};
     };
     const initProxy = () => {
-      const {
-        proxyConfig,
-        formConfig
-      } = props;
-      const {
-        proxyInited
-      } = reactData;
+      const { proxyConfig, formConfig } = props;
+      const { proxyInited } = reactData;
       const proxyOpts = computeProxyOpts.value;
       const formOpts = computeFormOpts.value;
-      if (proxyConfig && (0, _utils.isEnableConf)(proxyOpts)) {
-        if (formConfig && (0, _utils.isEnableConf)(formOpts) && proxyOpts.form && formOpts.items) {
+      if (proxyConfig && (0, import_utils.isEnableConf)(proxyOpts)) {
+        if (formConfig && (0, import_utils.isEnableConf)(formOpts) && proxyOpts.form && formOpts.items) {
           reactData.formData = getDefaultFormData();
         }
         if (!proxyInited) {
           reactData.proxyInited = true;
           if (proxyOpts.autoLoad !== false) {
-            (0, _vue.nextTick)().then(() => {
+            (0, import_vue.nextTick)().then(() => {
               internalData.uFoot = true;
-              const rest = $xeGrid.commitProxy('initial');
+              const rest = $xeGrid.commitProxy("initial");
               internalData.uFoot = false;
               updateQueryFooter();
               return rest;
-            }).then(rest => {
-              dispatchEvent('proxy-query', Object.assign(Object.assign({}, rest), {
-                isInited: true
-              }), new Event('initial'));
+            }).then((rest) => {
+              dispatchEvent("proxy-query", { ...rest, isInited: true }, new Event("initial"));
             });
           }
         }
@@ -1024,14 +884,12 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     };
     const updateQueryFooter = () => {
       const proxyOpts = computeProxyOpts.value;
-      const {
-        ajax
-      } = proxyOpts;
+      const { ajax } = proxyOpts;
       if (ajax && ajax.queryFooter) {
-        return $xeGrid.commitProxy('queryFooter');
+        return $xeGrid.commitProxy("queryFooter");
       }
     };
-    const handleGlobalKeydownEvent = evnt => {
+    const handleGlobalKeydownEvent = (evnt) => {
       const zoomOpts = computeZoomOpts.value;
       const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
       if (isEsc && reactData.isZMax && zoomOpts.escRestore !== false) {
@@ -1039,10 +897,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       }
     };
     const dispatchEvent = (type, params, evnt) => {
-      emit(type, createEvent(evnt, {
-        $grid: $xeGrid,
-        $gantt: null
-      }, params));
+      emit(type, createEvent(evnt, { $grid: $xeGrid, $gantt: null }, params));
     };
     const gridMethods = {
       dispatchEvent,
@@ -1054,48 +909,25 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
        * @param {String/Object} code 字符串或对象
        */
       commitProxy(proxyTarget, ...args) {
-        const {
-          showFooter,
-          proxyConfig,
-          toolbarConfig,
-          pagerConfig,
-          editRules,
-          validConfig
-        } = props;
-        const {
-          tablePage
-        } = reactData;
+        const { showFooter, proxyConfig, toolbarConfig, pagerConfig, editRules, validConfig } = props;
+        const { tablePage } = reactData;
         const isActiveMsg = computeIsActiveMsg.value;
         const isRespMsg = computeIsRespMsg.value;
         const proxyOpts = computeProxyOpts.value;
         const pagerOpts = computePagerOpts.value;
         const toolbarOpts = computeToolbarOpts.value;
-        const {
-          beforeQuery: oldBeforeQuery,
-          afterQuery: oldAfterQuery,
-          beforeQueryFooter: oldBeforeQueryFooter,
-          afterQueryFooter: oldAfterQueryFooter,
-          beforeDelete: oldBeforeDelete,
-          afterDelete: oldAfterDelete,
-          beforeSave: oldBeforeSave,
-          afterSave: oldAfterSave,
-          ajax = {}
-        } = proxyOpts;
+        const { beforeQuery: oldBeforeQuery, afterQuery: oldAfterQuery, beforeQueryFooter: oldBeforeQueryFooter, afterQueryFooter: oldAfterQueryFooter, beforeDelete: oldBeforeDelete, afterDelete: oldAfterDelete, beforeSave: oldBeforeSave, afterSave: oldAfterSave, ajax = {} } = proxyOpts;
         const resConfigs = proxyOpts.response || proxyOpts.props || {};
         const $xeTable = refTable.value;
         if (!$xeTable) {
-          return (0, _vue.nextTick)();
+          return (0, import_vue.nextTick)();
         }
         let formData = getFormData();
         let button = null;
         let code = null;
-        if (_xeUtils.default.isString(proxyTarget)) {
-          const {
-            buttons
-          } = toolbarOpts;
-          const matchObj = toolbarConfig && (0, _utils.isEnableConf)(toolbarOpts) && buttons ? _xeUtils.default.findTree(buttons, item => item.code === proxyTarget, {
-            children: 'dropdowns'
-          }) : null;
+        if (import_xe_utils.default.isString(proxyTarget)) {
+          const { buttons } = toolbarOpts;
+          const matchObj = toolbarConfig && (0, import_utils.isEnableConf)(toolbarOpts) && buttons ? import_xe_utils.default.findTree(buttons, (item) => item.code === proxyTarget, { children: "dropdowns" }) : null;
           button = matchObj ? matchObj.item : null;
           code = proxyTarget;
         } else {
@@ -1104,595 +936,469 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         }
         const btnParams = button ? button.params : null;
         switch (code) {
-          case 'insert':
+          case "insert":
             return $xeTable.insert({});
-          case 'insert_edit':
-            return $xeTable.insert({}).then(({
-              row
-            }) => $xeTable.setEditRow(row, true));
+          case "insert_edit":
+            return $xeTable.insert({}).then(({ row }) => $xeTable.setEditRow(row, true));
           // 已废弃
-          case 'insert_actived':
-            return $xeTable.insert({}).then(({
-              row
-            }) => $xeTable.setEditRow(row, true));
+          case "insert_actived":
+            return $xeTable.insert({}).then(({ row }) => $xeTable.setEditRow(row, true));
           // 已废弃
-          case 'mark_cancel':
+          case "mark_cancel":
             triggerPendingEvent(code);
             break;
-          case 'remove':
-            return handleDeleteRow(code, 'vxe.grid.removeSelectRecord', () => $xeTable.removeCheckboxRow());
-          case 'import':
+          case "remove":
+            return handleDeleteRow(code, "vxe.grid.removeSelectRecord", () => $xeTable.removeCheckboxRow());
+          case "import":
             $xeTable.importData(btnParams);
             break;
-          case 'open_import':
+          case "open_import":
             $xeTable.openImport(btnParams);
             break;
-          case 'export':
+          case "export":
             $xeTable.exportData(btnParams);
             break;
-          case 'open_export':
+          case "open_export":
             $xeTable.openExport(btnParams);
             break;
-          case 'reset_custom':
+          case "reset_custom":
             return $xeTable.resetCustom(true);
-          case 'initial':
-          case 'reload':
-          case 'query':
-            {
-              const bqMethod = ajax.beforeQuery;
-              const qMethod = ajax.query;
-              const aqMethod = ajax.afterQuery;
-              const qsMethod = ajax.querySuccess;
-              const qeMethod = ajax.queryError;
-              if (qMethod) {
-                const isInited = code === 'initial';
-                const isReload = code === 'reload';
-                if (!isInited && reactData.tableLoading) {
-                  return (0, _vue.nextTick)();
+          case "initial":
+          case "reload":
+          case "query": {
+            const bqMethod = ajax.beforeQuery;
+            const qMethod = ajax.query;
+            const aqMethod = ajax.afterQuery;
+            const qsMethod = ajax.querySuccess;
+            const qeMethod = ajax.queryError;
+            if (qMethod) {
+              const isInited = code === "initial";
+              const isReload = code === "reload";
+              if (!isInited && reactData.tableLoading) {
+                return (0, import_vue.nextTick)();
+              }
+              let operPromise = null;
+              let sortList = [];
+              let filterList = [];
+              let pageParams = {};
+              if (pagerConfig) {
+                if (isInited || isReload) {
+                  tablePage.currentPage = 1;
                 }
-                let operPromise = null;
-                let sortList = [];
-                let filterList = [];
-                let pageParams = {};
-                if (pagerConfig) {
-                  if (isInited || isReload) {
-                    // 重置分页
-                    tablePage.currentPage = 1;
-                  }
-                  if ((0, _utils.isEnableConf)(pagerOpts)) {
-                    pageParams = Object.assign({}, tablePage);
-                  }
+                if ((0, import_utils.isEnableConf)(pagerOpts)) {
+                  pageParams = { ...tablePage };
                 }
-                if (isInited) {
-                  // 重置代理表单数据
-                  if (proxyConfig && (0, _utils.isEnableConf)(proxyOpts) && proxyOpts.form) {
-                    formData = getDefaultFormData();
-                    reactData.formData = formData;
-                  }
-                  if ($xeTable) {
-                    const tableInternalData = $xeTable.internalData;
-                    const {
-                      tableFullColumn,
-                      fullColumnFieldData
-                    } = tableInternalData;
-                    const {
-                      computeSortOpts
-                    } = $xeTable.getComputeMaps();
-                    const sortOpts = computeSortOpts.value;
-                    let defaultSort = sortOpts.defaultSort;
-                    tableFullColumn.forEach(column => {
-                      column.order = null;
-                    });
-                    // 如果使用默认排序
-                    if (defaultSort) {
-                      if (!_xeUtils.default.isArray(defaultSort)) {
-                        defaultSort = [defaultSort];
-                      }
-                      sortList = defaultSort.map(item => {
-                        const {
-                          field,
-                          order
-                        } = item;
-                        const colRest = fullColumnFieldData[field];
-                        if (colRest) {
-                          const column = colRest.column;
-                          if (column) {
-                            column.order = order;
-                          }
-                        }
-                        return {
-                          field,
-                          property: field,
-                          order
-                        };
-                      });
+              }
+              if (isInited) {
+                if (proxyConfig && (0, import_utils.isEnableConf)(proxyOpts) && proxyOpts.form) {
+                  formData = getDefaultFormData();
+                  reactData.formData = formData;
+                }
+                if ($xeTable) {
+                  const tableInternalData = $xeTable.internalData;
+                  const { tableFullColumn, fullColumnFieldData } = tableInternalData;
+                  const { computeSortOpts } = $xeTable.getComputeMaps();
+                  const sortOpts = computeSortOpts.value;
+                  let defaultSort = sortOpts.defaultSort;
+                  tableFullColumn.forEach((column) => {
+                    column.order = null;
+                  });
+                  if (defaultSort) {
+                    if (!import_xe_utils.default.isArray(defaultSort)) {
+                      defaultSort = [defaultSort];
                     }
-                    filterList = $xeTable.getCheckedFilters();
+                    sortList = defaultSort.map((item) => {
+                      const { field, order } = item;
+                      const colRest = fullColumnFieldData[field];
+                      if (colRest) {
+                        const column = colRest.column;
+                        if (column) {
+                          column.order = order;
+                        }
+                      }
+                      return {
+                        field,
+                        property: field,
+                        order
+                      };
+                    });
                   }
-                } else {
-                  if ($xeTable) {
-                    if (isReload) {
-                      operPromise = $xeTable.clearAll();
-                    } else {
-                      sortList = $xeTable.getSortColumns();
-                      filterList = $xeTable.getCheckedFilters();
-                    }
+                  filterList = $xeTable.getCheckedFilters();
+                }
+              } else {
+                if ($xeTable) {
+                  if (isReload) {
+                    operPromise = $xeTable.clearAll();
+                  } else {
+                    sortList = $xeTable.getSortColumns();
+                    filterList = $xeTable.getCheckedFilters();
                   }
                 }
-                const commitParams = {
-                  $table: $xeTable,
-                  $grid: $xeGrid,
-                  $gantt: null,
-                  code,
-                  button,
-                  isInited,
-                  isReload,
-                  page: pageParams,
-                  sort: sortList.length ? sortList[0] : {},
-                  sorts: sortList,
-                  filters: filterList,
-                  form: formData,
-                  options: qMethod
-                };
-                const handleQuery = () => {
-                  reactData.sortData = sortList;
-                  reactData.filterData = filterList;
-                  reactData.tableLoading = true;
-                  return Promise.all([Promise.resolve((oldBeforeQuery || qMethod)(commitParams, ...args)), operPromise]).then(([rest]) => {
-                    reactData.tableLoading = false;
-                    if (aqMethod) {
-                      aqMethod(Object.assign(Object.assign({}, commitParams), {
-                        response: rest,
-                        status: 'success'
-                      }), ...args);
-                    } else {
-                      let tableData = [];
-                      if (rest) {
-                        const listProp = resConfigs.list;
-                        const resultProp = resConfigs.result;
-                        const reParams = {
-                          data: rest,
-                          $table: $xeTable,
-                          $grid: $xeGrid,
-                          $gantt: null
-                        };
-                        if (pagerConfig && (0, _utils.isEnableConf)(pagerOpts)) {
-                          const totalProp = resConfigs.total;
-                          const total = (_xeUtils.default.isFunction(totalProp) ? totalProp(reParams) : _xeUtils.default.get(rest, totalProp || 'page.total')) || 0;
-                          tablePage.total = _xeUtils.default.toNumber(total);
-                          tableData = (_xeUtils.default.isFunction(resultProp) ? resultProp(reParams) : _xeUtils.default.get(rest, resultProp || 'result')) || [];
-                          // 检验当前页码，不能超出当前最大页数
-                          const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
-                          if (tablePage.currentPage > pageCount) {
-                            tablePage.currentPage = pageCount;
-                          }
-                        } else {
-                          if (_xeUtils.default.isArray(rest)) {
-                            tableData = rest;
-                          } else if (listProp) {
-                            tableData = (_xeUtils.default.isFunction(listProp) ? listProp(reParams) : _xeUtils.default.get(rest, listProp)) || [];
-                          }
-                        }
-                        if (showFooter) {
-                          const fdProp = resConfigs.footerData;
-                          const footerList = fdProp ? _xeUtils.default.isFunction(fdProp) ? fdProp(reParams) : _xeUtils.default.get(rest, fdProp) : [];
-                          if (_xeUtils.default.isArray(footerList)) {
-                            reactData.footerData = footerList;
-                          }
+              }
+              const commitParams = {
+                $table: $xeTable,
+                $grid: $xeGrid,
+                $gantt: null,
+                code,
+                button,
+                isInited,
+                isReload,
+                page: pageParams,
+                sort: sortList.length ? sortList[0] : {},
+                sorts: sortList,
+                filters: filterList,
+                form: formData,
+                options: qMethod
+              };
+              const handleQuery = () => {
+                reactData.sortData = sortList;
+                reactData.filterData = filterList;
+                reactData.tableLoading = true;
+                return Promise.all([
+                  Promise.resolve((oldBeforeQuery || qMethod)(commitParams, ...args)),
+                  operPromise
+                ]).then(([rest]) => {
+                  reactData.tableLoading = false;
+                  if (aqMethod) {
+                    aqMethod({ ...commitParams, response: rest, status: "success" }, ...args);
+                  } else {
+                    let tableData = [];
+                    if (rest) {
+                      const listProp = resConfigs.list;
+                      const resultProp = resConfigs.result;
+                      const reParams = { data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null };
+                      if (pagerConfig && (0, import_utils.isEnableConf)(pagerOpts)) {
+                        const totalProp = resConfigs.total;
+                        const total = (import_xe_utils.default.isFunction(totalProp) ? totalProp(reParams) : import_xe_utils.default.get(rest, totalProp || "page.total")) || 0;
+                        tablePage.total = import_xe_utils.default.toNumber(total);
+                        tableData = (import_xe_utils.default.isFunction(resultProp) ? resultProp(reParams) : import_xe_utils.default.get(rest, resultProp || "result")) || [];
+                        const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
+                        if (tablePage.currentPage > pageCount) {
+                          tablePage.currentPage = pageCount;
                         }
-                      }
-                      if ($xeTable) {
-                        $xeTable.loadData(tableData);
                       } else {
-                        (0, _vue.nextTick)(() => {
-                          const $xeTable = refTable.value;
-                          if ($xeTable) {
-                            $xeTable.loadData(tableData);
-                          }
-                        });
+                        if (import_xe_utils.default.isArray(rest)) {
+                          tableData = rest;
+                        } else if (listProp) {
+                          tableData = (import_xe_utils.default.isFunction(listProp) ? listProp(reParams) : import_xe_utils.default.get(rest, listProp)) || [];
+                        }
                       }
-                      if (oldAfterQuery) {
-                        oldAfterQuery(Object.assign(Object.assign({}, commitParams), {
-                          response: rest
-                        }), ...args);
+                      if (showFooter) {
+                        const fdProp = resConfigs.footerData;
+                        const footerList = fdProp ? import_xe_utils.default.isFunction(fdProp) ? fdProp(reParams) : import_xe_utils.default.get(rest, fdProp) : [];
+                        if (import_xe_utils.default.isArray(footerList)) {
+                          reactData.footerData = footerList;
+                        }
                       }
                     }
-                    if (qsMethod) {
-                      qsMethod(Object.assign(Object.assign({}, commitParams), {
-                        response: rest
-                      }));
-                    }
-                    return {
-                      status: true
-                    };
-                  }).catch(rest => {
-                    reactData.tableLoading = false;
-                    if (aqMethod) {
-                      aqMethod(Object.assign(Object.assign({}, commitParams), {
-                        response: rest,
-                        status: 'error'
-                      }), ...args);
-                    }
-                    if (qeMethod) {
-                      qeMethod(Object.assign(Object.assign({}, commitParams), {
-                        response: rest
-                      }));
+                    if ($xeTable) {
+                      $xeTable.loadData(tableData);
+                    } else {
+                      (0, import_vue.nextTick)(() => {
+                        const $xeTable2 = refTable.value;
+                        if ($xeTable2) {
+                          $xeTable2.loadData(tableData);
+                        }
+                      });
                     }
-                    return {
-                      status: false
-                    };
-                  });
-                };
-                if (bqMethod) {
-                  return Promise.resolve(bqMethod(commitParams, ...args)).then(status => {
-                    if (status !== false) {
-                      return handleQuery();
+                    if (oldAfterQuery) {
+                      oldAfterQuery({ ...commitParams, response: rest }, ...args);
                     }
-                  });
-                }
-                return handleQuery();
-              } else {
-                errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
+                  }
+                  if (qsMethod) {
+                    qsMethod({ ...commitParams, response: rest });
+                  }
+                  return { status: true };
+                }).catch((rest) => {
+                  reactData.tableLoading = false;
+                  if (aqMethod) {
+                    aqMethod({ ...commitParams, response: rest, status: "error" }, ...args);
+                  }
+                  if (qeMethod) {
+                    qeMethod({ ...commitParams, response: rest });
+                  }
+                  return { status: false };
+                });
+              };
+              if (bqMethod) {
+                return Promise.resolve(bqMethod(commitParams, ...args)).then((status) => {
+                  if (status !== false) {
+                    return handleQuery();
+                  }
+                });
               }
-              break;
+              return handleQuery();
+            } else {
+              errLog("vxe.error.notFunc", ["proxy-config.ajax.query"]);
             }
-          case 'queryFooter':
-          case 'query_footer':
-            {
-              const bqfMethod = ajax.beforeQueryFooter;
-              const qfMethod = ajax.queryFooter;
-              const aqfMethod = ajax.afterQueryFooter;
-              const qfSuccessMethod = ajax.queryFooterSuccess;
-              const qfErrorMethod = ajax.queryFooterError;
-              if (qfMethod) {
-                let filterList = [];
-                if ($xeTable) {
-                  filterList = $xeTable.getCheckedFilters();
-                }
-                let pageParams = {};
-                if (pagerConfig) {
-                  if ((0, _utils.isEnableConf)(pagerOpts)) {
-                    pageParams = Object.assign({}, tablePage);
-                  }
+            break;
+          }
+          case "queryFooter":
+          case "query_footer": {
+            const bqfMethod = ajax.beforeQueryFooter;
+            const qfMethod = ajax.queryFooter;
+            const aqfMethod = ajax.afterQueryFooter;
+            const qfSuccessMethod = ajax.queryFooterSuccess;
+            const qfErrorMethod = ajax.queryFooterError;
+            if (qfMethod) {
+              let filterList = [];
+              if ($xeTable) {
+                filterList = $xeTable.getCheckedFilters();
+              }
+              let pageParams = {};
+              if (pagerConfig) {
+                if ((0, import_utils.isEnableConf)(pagerOpts)) {
+                  pageParams = { ...tablePage };
                 }
-                const commitParams = {
-                  $table: $xeTable,
-                  $grid: $xeGrid,
-                  $gantt: null,
-                  code,
-                  button,
-                  page: pageParams,
-                  filters: filterList,
-                  form: formData,
-                  options: qfMethod
-                };
-                const handleQueryFooter = () => {
-                  return Promise.resolve((oldBeforeQueryFooter || qfMethod)(commitParams, ...args)).then(rest => {
-                    if (aqfMethod) {
-                      aqfMethod(Object.assign(Object.assign({}, commitParams), {
-                        response: rest,
-                        status: 'success'
-                      }), ...args);
-                    } else {
-                      reactData.footerData = _xeUtils.default.isArray(rest) ? rest : [];
-                      if (oldAfterQueryFooter) {
-                        oldAfterQueryFooter(Object.assign(Object.assign({}, commitParams), {
-                          response: rest
-                        }), ...args);
-                      }
-                    }
-                    if (qfSuccessMethod) {
-                      qfSuccessMethod(Object.assign(Object.assign({}, commitParams), {
-                        response: rest
-                      }));
-                    }
-                    return {
-                      status: true
-                    };
-                  }).catch(rest => {
-                    if (aqfMethod) {
-                      aqfMethod(Object.assign(Object.assign({}, commitParams), {
-                        response: rest,
-                        status: 'error'
-                      }), ...args);
-                    }
-                    if (qfErrorMethod) {
-                      qfErrorMethod(Object.assign(Object.assign({}, commitParams), {
-                        response: rest
-                      }));
-                    }
-                    return {
-                      status: false
-                    };
-                  });
-                };
-                if (bqfMethod) {
-                  return Promise.resolve(bqfMethod(commitParams, ...args)).then(status => {
-                    if (status !== false) {
-                      return handleQueryFooter();
+              }
+              const commitParams = {
+                $table: $xeTable,
+                $grid: $xeGrid,
+                $gantt: null,
+                code,
+                button,
+                page: pageParams,
+                filters: filterList,
+                form: formData,
+                options: qfMethod
+              };
+              const handleQueryFooter = () => {
+                return Promise.resolve((oldBeforeQueryFooter || qfMethod)(commitParams, ...args)).then((rest) => {
+                  if (aqfMethod) {
+                    aqfMethod({ ...commitParams, response: rest, status: "success" }, ...args);
+                  } else {
+                    reactData.footerData = import_xe_utils.default.isArray(rest) ? rest : [];
+                    if (oldAfterQueryFooter) {
+                      oldAfterQueryFooter({ ...commitParams, response: rest }, ...args);
                     }
-                  });
-                }
-                return handleQueryFooter();
-              } else {
-                errLog('vxe.error.notFunc', ['proxy-config.ajax.queryFooter']);
+                  }
+                  if (qfSuccessMethod) {
+                    qfSuccessMethod({ ...commitParams, response: rest });
+                  }
+                  return { status: true };
+                }).catch((rest) => {
+                  if (aqfMethod) {
+                    aqfMethod({ ...commitParams, response: rest, status: "error" }, ...args);
+                  }
+                  if (qfErrorMethod) {
+                    qfErrorMethod({ ...commitParams, response: rest });
+                  }
+                  return { status: false };
+                });
+              };
+              if (bqfMethod) {
+                return Promise.resolve(bqfMethod(commitParams, ...args)).then((status) => {
+                  if (status !== false) {
+                    return handleQueryFooter();
+                  }
+                });
               }
-              break;
+              return handleQueryFooter();
+            } else {
+              errLog("vxe.error.notFunc", ["proxy-config.ajax.queryFooter"]);
             }
-          case 'delete':
-            {
-              const bdMethod = ajax.beforeDelete;
-              const dMethod = ajax.delete;
-              const adMethod = ajax.afterDelete;
-              const deleteSuccessMethods = ajax.deleteSuccess;
-              const deleteErrorMethods = ajax.deleteError;
-              if (dMethod) {
-                const selectRecords = $xeGrid.getCheckboxRecords();
-                const removeRecords = selectRecords.filter(row => !$xeTable.isInsertByRow(row));
-                const body = {
-                  removeRecords
-                };
-                const commitParams = {
-                  $table: $xeTable,
-                  $grid: $xeGrid,
-                  $gantt: null,
-                  code,
-                  button,
-                  body,
-                  form: formData,
-                  options: dMethod
-                };
-                if (selectRecords.length) {
-                  return handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', () => {
-                    if (!removeRecords.length) {
-                      return $xeTable.remove(selectRecords);
-                    }
-                    const handleDelete = () => {
-                      reactData.tableLoading = true;
-                      return Promise.resolve((oldBeforeDelete || dMethod)(commitParams, ...args)).then(rest => {
-                        reactData.tableLoading = false;
-                        if (adMethod) {
-                          adMethod(Object.assign(Object.assign({}, commitParams), {
-                            response: rest,
-                            status: 'success'
-                          }), ...args);
-                        } else {
-                          $xeTable.setPendingRow(removeRecords, false);
-                          if (isRespMsg) {
-                            if (_ui.VxeUI.modal) {
-                              _ui.VxeUI.modal.message({
-                                content: getRespMsg(rest, 'vxe.grid.delSuccess'),
-                                status: 'success'
-                              });
-                            }
-                          }
-                          if (oldAfterDelete) {
-                            oldAfterDelete(Object.assign(Object.assign({}, commitParams), {
-                              response: rest
-                            }), ...args);
-                          } else {
-                            internalData.uFoot = true;
-                            $xeGrid.commitProxy('query');
-                            internalData.uFoot = false;
-                            updateQueryFooter();
+            break;
+          }
+          case "delete": {
+            const bdMethod = ajax.beforeDelete;
+            const dMethod = ajax.delete;
+            const adMethod = ajax.afterDelete;
+            const deleteSuccessMethods = ajax.deleteSuccess;
+            const deleteErrorMethods = ajax.deleteError;
+            if (dMethod) {
+              const selectRecords = $xeGrid.getCheckboxRecords();
+              const removeRecords = selectRecords.filter((row) => !$xeTable.isInsertByRow(row));
+              const body = { removeRecords };
+              const commitParams = {
+                $table: $xeTable,
+                $grid: $xeGrid,
+                $gantt: null,
+                code,
+                button,
+                body,
+                form: formData,
+                options: dMethod
+              };
+              if (selectRecords.length) {
+                return handleDeleteRow(code, "vxe.grid.deleteSelectRecord", () => {
+                  if (!removeRecords.length) {
+                    return $xeTable.remove(selectRecords);
+                  }
+                  const handleDelete = () => {
+                    reactData.tableLoading = true;
+                    return Promise.resolve((oldBeforeDelete || dMethod)(commitParams, ...args)).then((rest) => {
+                      reactData.tableLoading = false;
+                      if (adMethod) {
+                        adMethod({ ...commitParams, response: rest, status: "success" }, ...args);
+                      } 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 (deleteSuccessMethods) {
-                          deleteSuccessMethods(Object.assign(Object.assign({}, commitParams), {
-                            response: rest
-                          }));
-                        }
-                        return {
-                          status: true
-                        };
-                      }).catch(rest => {
-                        reactData.tableLoading = false;
-                        if (adMethod) {
-                          adMethod(Object.assign(Object.assign({}, commitParams), {
-                            response: rest,
-                            status: 'error'
-                          }), ...args);
+                        if (oldAfterDelete) {
+                          oldAfterDelete({ ...commitParams, response: rest }, ...args);
                         } else {
-                          if (isRespMsg) {
-                            if (_ui.VxeUI.modal) {
-                              _ui.VxeUI.modal.message({
-                                id: code,
-                                content: getRespMsg(rest, 'vxe.grid.operError'),
-                                status: 'error'
-                              });
-                            }
-                          }
-                        }
-                        if (deleteErrorMethods) {
-                          deleteErrorMethods(Object.assign(Object.assign({}, commitParams), {
-                            response: rest
-                          }));
+                          internalData.uFoot = true;
+                          $xeGrid.commitProxy("query");
+                          internalData.uFoot = false;
+                          updateQueryFooter();
                         }
-                        return {
-                          status: false
-                        };
-                      });
-                    };
-                    if (bdMethod) {
-                      return Promise.resolve(bdMethod(commitParams, ...args)).then(status => {
-                        if (status !== false) {
-                          return handleDelete();
+                      }
+                      if (deleteSuccessMethods) {
+                        deleteSuccessMethods({ ...commitParams, response: rest });
+                      }
+                      return { status: true };
+                    }).catch((rest) => {
+                      reactData.tableLoading = false;
+                      if (adMethod) {
+                        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" });
+                          }
                         }
-                      });
-                    }
-                    return handleDelete();
-                  });
-                } else {
-                  if (isActiveMsg) {
-                    if (_ui.VxeUI.modal) {
-                      _ui.VxeUI.modal.message({
-                        id: code,
-                        content: getI18n('vxe.grid.selectOneRecord'),
-                        status: 'warning'
-                      });
-                    }
+                      }
+                      if (deleteErrorMethods) {
+                        deleteErrorMethods({ ...commitParams, response: rest });
+                      }
+                      return { status: false };
+                    });
+                  };
+                  if (bdMethod) {
+                    return Promise.resolve(bdMethod(commitParams, ...args)).then((status) => {
+                      if (status !== false) {
+                        return handleDelete();
+                      }
+                    });
                   }
-                }
+                  return handleDelete();
+                });
               } else {
-                errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
+                if (isActiveMsg) {
+                  if (import_ui.VxeUI.modal) {
+                    import_ui.VxeUI.modal.message({ id: code, content: getI18n("vxe.grid.selectOneRecord"), status: "warning" });
+                  }
+                }
               }
-              break;
+            } else {
+              errLog("vxe.error.notFunc", ["proxy-config.ajax.delete"]);
             }
-          case 'save':
-            {
-              const bSaveMethod = ajax.beforeSave;
-              const sMethod = ajax.save;
-              const aSaveMethod = ajax.afterSave;
-              const sSuccessMethod = ajax.saveSuccess;
-              const sErrorMethod = ajax.saveError;
-              if (sMethod) {
-                const body = $xeTable.getRecordset();
-                const {
-                  insertRecords,
-                  removeRecords,
-                  updateRecords,
-                  pendingRecords
-                } = body;
-                const commitParams = {
-                  $table: $xeTable,
-                  $grid: $xeGrid,
-                  $gantt: null,
-                  code,
-                  button,
-                  body,
-                  form: formData,
-                  options: sMethod
-                };
-                // 排除掉新增且标记为删除的数据
-                if (insertRecords.length) {
-                  body.pendingRecords = pendingRecords.filter(row => $xeTable.findRowIndexOf(insertRecords, row) === -1);
-                }
-                // 排除已标记为删除的数据
-                if (pendingRecords.length) {
-                  body.insertRecords = insertRecords.filter(row => $xeTable.findRowIndexOf(pendingRecords, row) === -1);
-                }
-                let restPromise = Promise.resolve();
-                if (editRules) {
-                  // 只校验新增和修改的数据
-                  restPromise = $xeTable[validConfig && validConfig.msgMode === 'full' ? 'fullValidate' : 'validate'](body.insertRecords.concat(updateRecords));
+            break;
+          }
+          case "save": {
+            const bSaveMethod = ajax.beforeSave;
+            const sMethod = ajax.save;
+            const aSaveMethod = ajax.afterSave;
+            const sSuccessMethod = ajax.saveSuccess;
+            const sErrorMethod = ajax.saveError;
+            if (sMethod) {
+              const body = $xeTable.getRecordset();
+              const { insertRecords, removeRecords, updateRecords, pendingRecords } = body;
+              const commitParams = {
+                $table: $xeTable,
+                $grid: $xeGrid,
+                $gantt: null,
+                code,
+                button,
+                body,
+                form: formData,
+                options: sMethod
+              };
+              if (insertRecords.length) {
+                body.pendingRecords = pendingRecords.filter((row) => $xeTable.findRowIndexOf(insertRecords, row) === -1);
+              }
+              if (pendingRecords.length) {
+                body.insertRecords = insertRecords.filter((row) => $xeTable.findRowIndexOf(pendingRecords, row) === -1);
+              }
+              let restPromise = Promise.resolve();
+              if (editRules) {
+                restPromise = $xeTable[validConfig && validConfig.msgMode === "full" ? "fullValidate" : "validate"](body.insertRecords.concat(updateRecords));
+              }
+              return restPromise.then((errMap) => {
+                if (errMap) {
+                  return;
                 }
-                return restPromise.then(errMap => {
-                  if (errMap) {
-                    // 如果校验不通过
-                    return;
-                  }
-                  if (body.insertRecords.length || removeRecords.length || updateRecords.length || body.pendingRecords.length) {
-                    const handleSave = () => {
-                      reactData.tableLoading = true;
-                      return Promise.resolve((oldBeforeSave || sMethod)(commitParams, ...args)).then(rest => {
-                        reactData.tableLoading = false;
-                        if (aSaveMethod) {
-                          aSaveMethod(Object.assign(Object.assign({}, commitParams), {
-                            response: rest,
-                            status: 'success'
-                          }), ...args);
-                        } else {
-                          $xeTable.clearPendingRow();
-                          if (isRespMsg) {
-                            if (_ui.VxeUI.modal) {
-                              _ui.VxeUI.modal.message({
-                                content: getRespMsg(rest, 'vxe.grid.saveSuccess'),
-                                status: 'success'
-                              });
-                            }
-                          }
-                          if (oldAfterSave) {
-                            oldAfterSave(Object.assign(Object.assign({}, commitParams), {
-                              response: rest
-                            }), ...args);
-                          } else {
-                            internalData.uFoot = true;
-                            $xeGrid.commitProxy('query');
-                            internalData.uFoot = false;
-                            updateQueryFooter();
+                if (body.insertRecords.length || removeRecords.length || updateRecords.length || body.pendingRecords.length) {
+                  const handleSave = () => {
+                    reactData.tableLoading = true;
+                    return Promise.resolve((oldBeforeSave || sMethod)(commitParams, ...args)).then((rest) => {
+                      reactData.tableLoading = false;
+                      if (aSaveMethod) {
+                        aSaveMethod({ ...commitParams, response: rest, status: "success" }, ...args);
+                      } else {
+                        $xeTable.clearPendingRow();
+                        if (isRespMsg) {
+                          if (import_ui.VxeUI.modal) {
+                            import_ui.VxeUI.modal.message({ content: getRespMsg(rest, "vxe.grid.saveSuccess"), status: "success" });
                           }
                         }
-                        if (sSuccessMethod) {
-                          sSuccessMethod(Object.assign(Object.assign({}, commitParams), {
-                            response: rest
-                          }));
-                        }
-                        return {
-                          status: true
-                        };
-                      }).catch(rest => {
-                        reactData.tableLoading = false;
-                        if (aSaveMethod) {
-                          aSaveMethod(Object.assign(Object.assign({}, commitParams), {
-                            response: rest,
-                            status: 'error'
-                          }), ...args);
+                        if (oldAfterSave) {
+                          oldAfterSave({ ...commitParams, response: rest }, ...args);
                         } else {
-                          if (isRespMsg) {
-                            if (_ui.VxeUI.modal) {
-                              _ui.VxeUI.modal.message({
-                                id: code,
-                                content: getRespMsg(rest, 'vxe.grid.operError'),
-                                status: 'error'
-                              });
-                            }
-                          }
+                          internalData.uFoot = true;
+                          $xeGrid.commitProxy("query");
+                          internalData.uFoot = false;
+                          updateQueryFooter();
                         }
-                        if (sErrorMethod) {
-                          sErrorMethod(Object.assign(Object.assign({}, commitParams), {
-                            response: rest
-                          }));
-                        }
-                        return {
-                          status: false
-                        };
-                      });
-                    };
-                    if (bSaveMethod) {
-                      return Promise.resolve(bSaveMethod(commitParams, ...args)).then(status => {
-                        if (status !== false) {
-                          return handleSave();
+                      }
+                      if (sSuccessMethod) {
+                        sSuccessMethod({ ...commitParams, response: rest });
+                      }
+                      return { status: true };
+                    }).catch((rest) => {
+                      reactData.tableLoading = false;
+                      if (aSaveMethod) {
+                        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" });
+                          }
                         }
-                      });
-                    }
-                    return handleSave();
-                  } else {
-                    if (isActiveMsg) {
-                      if (_ui.VxeUI.modal) {
-                        _ui.VxeUI.modal.message({
-                          id: code,
-                          content: getI18n('vxe.grid.dataUnchanged'),
-                          status: 'info'
-                        });
                       }
-                    }
+                      if (sErrorMethod) {
+                        sErrorMethod({ ...commitParams, response: rest });
+                      }
+                      return { status: false };
+                    });
+                  };
+                  if (bSaveMethod) {
+                    return Promise.resolve(bSaveMethod(commitParams, ...args)).then((status) => {
+                      if (status !== false) {
+                        return handleSave();
+                      }
+                    });
                   }
-                });
-              } else {
-                errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
-              }
-              break;
-            }
-          default:
-            {
-              const gCommandOpts = commands.get(code);
-              if (gCommandOpts) {
-                const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
-                if (tCommandMethod) {
-                  tCommandMethod({
-                    code,
-                    button,
-                    $grid: $xeGrid,
-                    $table: $xeTable,
-                    $gantt: null
-                  }, ...args);
+                  return handleSave();
                 } else {
-                  errLog('vxe.error.notCommands', [code]);
+                  if (isActiveMsg) {
+                    if (import_ui.VxeUI.modal) {
+                      import_ui.VxeUI.modal.message({ id: code, content: getI18n("vxe.grid.dataUnchanged"), status: "info" });
+                    }
+                  }
                 }
+              });
+            } else {
+              errLog("vxe.error.notFunc", ["proxy-config.ajax.save"]);
+            }
+            break;
+          }
+          default: {
+            const gCommandOpts = commands.get(code);
+            if (gCommandOpts) {
+              const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
+              if (tCommandMethod) {
+                tCommandMethod({ code, button, $grid: $xeGrid, $table: $xeTable, $gantt: null }, ...args);
+              } else {
+                errLog("vxe.error.notCommands", [code]);
               }
             }
+          }
         }
-        return (0, _vue.nextTick)();
+        return (0, import_vue.nextTick)();
       },
       getParams() {
         return props.params;
@@ -1719,20 +1425,13 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
        */
       getFormItems(itemIndex) {
         const formOpts = computeFormOpts.value;
-        const {
-          formConfig
-        } = props;
-        const {
-          items
-        } = formOpts;
+        const { formConfig } = props;
+        const { items } = formOpts;
         const itemList = [];
-        _xeUtils.default.eachTree(formConfig && (0, _utils.isEnableConf)(formOpts) && items ? items : [], item => {
+        import_xe_utils.default.eachTree(formConfig && (0, import_utils.isEnableConf)(formOpts) && items ? items : [], (item) => {
           itemList.push(item);
-        }, {
-          children: 'children'
-        });
-        // errLog('vxe.error.delFunc', ['getFormItems', 'getFormFlatItems'])
-        return _xeUtils.default.isUndefined(itemIndex) ? itemList : itemList[itemIndex];
+        }, { children: "children" });
+        return import_xe_utils.default.isUndefined(itemIndex) ? itemList : itemList[itemIndex];
       },
       getFormFlatItems() {
         const $form = refForm.value;
@@ -1760,7 +1459,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         if ($form) {
           return $form.reset();
         }
-        return (0, _vue.nextTick)();
+        return (0, import_vue.nextTick)();
       },
       validateForm() {
         const $form = refForm.value;
@@ -1781,14 +1480,12 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         if ($form) {
           return $form.clearValidate(field);
         }
-        return (0, _vue.nextTick)();
+        return (0, import_vue.nextTick)();
       },
       homePage() {
-        const {
-          tablePage
-        } = reactData;
+        const { tablePage } = reactData;
         tablePage.currentPage = 1;
-        return (0, _vue.nextTick)();
+        return (0, import_vue.nextTick)();
       },
       homePageByEvent(evnt) {
         const $pager = refPager.value;
@@ -1797,12 +1494,10 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         }
       },
       endPage() {
-        const {
-          tablePage
-        } = reactData;
+        const { tablePage } = reactData;
         const pageCount = computePageCount.value;
         tablePage.currentPage = pageCount;
-        return (0, _vue.nextTick)();
+        return (0, import_vue.nextTick)();
       },
       endPageByEvent(evnt) {
         const $pager = refPager.value;
@@ -1811,18 +1506,14 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         }
       },
       getCurrentPage() {
-        const {
-          tablePage
-        } = reactData;
+        const { tablePage } = reactData;
         return tablePage.currentPage;
       },
       setCurrentPage(currentPage) {
-        const {
-          tablePage
-        } = reactData;
+        const { tablePage } = reactData;
         const pageCount = computePageCount.value;
-        tablePage.currentPage = Math.min(pageCount, Math.max(1, _xeUtils.default.toNumber(currentPage)));
-        return (0, _vue.nextTick)();
+        tablePage.currentPage = Math.min(pageCount, Math.max(1, import_xe_utils.default.toNumber(currentPage)));
+        return (0, import_vue.nextTick)();
       },
       setCurrentPageByEvent(evnt, currentPage) {
         const $pager = refPager.value;
@@ -1831,17 +1522,13 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         }
       },
       getPageSize() {
-        const {
-          tablePage
-        } = reactData;
+        const { tablePage } = reactData;
         return tablePage.pageSize;
       },
       setPageSize(pageSize) {
-        const {
-          tablePage
-        } = reactData;
-        tablePage.pageSize = Math.max(1, _xeUtils.default.toNumber(pageSize));
-        return (0, _vue.nextTick)();
+        const { tablePage } = reactData;
+        tablePage.pageSize = Math.max(1, import_xe_utils.default.toNumber(pageSize));
+        return (0, import_vue.nextTick)();
       },
       setPageSizeByEvent(evnt, pageSize) {
         const $pager = refPager.value;
@@ -1852,9 +1539,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       getProxyInfo() {
         const $xeTable = refTable.value;
         if (props.proxyConfig) {
-          const {
-            sortData
-          } = reactData;
+          const { sortData } = reactData;
           return {
             data: $xeTable ? $xeTable.getFullData() : [],
             filter: reactData.filterData,
@@ -1868,14 +1553,10 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         return null;
       },
       getCustomPagerData() {
-        const {
-          pagerConfig
-        } = props;
-        const {
-          tablePage
-        } = reactData;
+        const { pagerConfig } = props;
+        const { tablePage } = reactData;
         const pagerOpts = computePagerOpts.value;
-        if (pagerConfig && (0, _utils.isEnableConf)(pagerOpts)) {
+        if (pagerConfig && (0, import_utils.isEnableConf)(pagerOpts)) {
           return {
             pSize: tablePage.pageSize
           };
@@ -1905,11 +1586,11 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       extendTableMethods,
       callSlot(slotFunc, params) {
         if (slotFunc) {
-          if (_xeUtils.default.isString(slotFunc)) {
+          if (import_xe_utils.default.isString(slotFunc)) {
             slotFunc = slots[slotFunc] || null;
           }
-          if (_xeUtils.default.isFunction(slotFunc)) {
-            return (0, _vn.getSlotVNs)(slotFunc(params));
+          if (import_xe_utils.default.isFunction(slotFunc)) {
+            return (0, import_vn.getSlotVNs)(slotFunc(params));
           }
         }
         return [];
@@ -1918,12 +1599,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
        * 获取需要排除的高度
        */
       getExcludeHeight() {
-        const {
-          height
-        } = props;
-        const {
-          isZMax
-        } = reactData;
+        const { height } = props;
+        const { isZMax } = reactData;
         const el = refElem.value;
         if (el) {
           const formWrapper = refFormWrapper.value;
@@ -1933,10 +1610,10 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           const pagerWrapper = refPagerWrapper.value;
           const parentEl = el.parentElement;
           let parentPaddingSize = 0;
-          if (parentEl && (height === '100%' || height === 'auto')) {
-            parentPaddingSize = isZMax ? 0 : (0, _dom.getPaddingTopBottomSize)(parentEl);
+          if (parentEl && (height === "100%" || height === "auto")) {
+            parentPaddingSize = isZMax ? 0 : (0, import_dom.getPaddingTopBottomSize)(parentEl);
           }
-          return parentPaddingSize + (0, _dom.getPaddingTopBottomSize)(el) + (0, _dom.getOffsetHeight)(formWrapper) + (0, _dom.getOffsetHeight)(toolbarWrapper) + (0, _dom.getOffsetHeight)(topWrapper) + (0, _dom.getOffsetHeight)(bottomWrapper) + (0, _dom.getOffsetHeight)(pagerWrapper);
+          return parentPaddingSize + (0, import_dom.getPaddingTopBottomSize)(el) + (0, import_dom.getOffsetHeight)(formWrapper) + (0, import_dom.getOffsetHeight)(toolbarWrapper) + (0, import_dom.getOffsetHeight)(topWrapper) + (0, import_dom.getOffsetHeight)(bottomWrapper) + (0, import_dom.getOffsetHeight)(pagerWrapper);
         }
         return 0;
       },
@@ -1946,8 +1623,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           return null;
         }
         let parentEl = el.parentElement;
-        // 如果是虚拟滚动条
-        if (parentEl && (0, _dom.hasClass)(parentEl, 'vxe-scrollbar--view-inner')) {
+        if (parentEl && (0, import_dom.hasClass)(parentEl, "vxe-scrollbar--view-inner")) {
           parentEl = parentEl.parentElement;
         }
         return parentEl;
@@ -1956,24 +1632,20 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         const el = refElem.value;
         if (el) {
           const parentEl = $xeGrid.getParentElem();
-          return (reactData.isZMax ? (0, _dom.getDomNode)().visibleHeight : parentEl ? _xeUtils.default.toNumber(getComputedStyle(parentEl).height) : 0) - gridPrivateMethods.getExcludeHeight();
+          return (reactData.isZMax ? (0, import_dom.getDomNode)().visibleHeight : parentEl ? import_xe_utils.default.toNumber(getComputedStyle(parentEl).height) : 0) - gridPrivateMethods.getExcludeHeight();
         }
         return 0;
       },
       triggerToolbarCommitEvent(params, evnt) {
-        const {
-          code
-        } = params;
+        const { code } = params;
         if (code) {
-          const isUf = ['reload', 'delete', 'save'].includes(code);
+          const isUf = ["reload", "delete", "save"].includes(code);
           if (isUf) {
             internalData.uFoot = true;
           }
-          const rest = $xeGrid.commitProxy(params, evnt).then(rest => {
-            if (rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
-              $xeGrid.dispatchEvent(code === 'delete' || code === 'save' ? `proxy-${code}` : 'proxy-query', Object.assign(Object.assign({}, rest), {
-                isReload: code === 'reload'
-              }), evnt);
+          const rest = $xeGrid.commitProxy(params, evnt).then((rest2) => {
+            if (rest2 && rest2.status && ["query", "reload", "delete", "save"].includes(code)) {
+              $xeGrid.dispatchEvent(code === "delete" || code === "save" ? `proxy-${code}` : "proxy-query", { ...rest2, isReload: code === "reload" }, evnt);
             }
           });
           internalData.uFoot = false;
@@ -1982,39 +1654,31 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           }
           return rest;
         }
-        return (0, _vue.nextTick)();
+        return (0, import_vue.nextTick)();
       },
       triggerToolbarBtnEvent(button, evnt) {
         $xeGrid.triggerToolbarCommitEvent(button, evnt);
-        $xeGrid.dispatchEvent('toolbar-button-click', {
-          code: button.code,
-          button
-        }, evnt);
+        $xeGrid.dispatchEvent("toolbar-button-click", { code: button.code, button }, evnt);
       },
       triggerToolbarTolEvent(tool, evnt) {
         $xeGrid.triggerToolbarCommitEvent(tool, evnt);
-        $xeGrid.dispatchEvent('toolbar-tool-click', {
-          code: tool.code,
-          tool
-        }, evnt);
+        $xeGrid.dispatchEvent("toolbar-tool-click", { code: tool.code, tool }, evnt);
       },
       triggerZoomEvent(evnt) {
         $xeGrid.zoom();
-        $xeGrid.dispatchEvent('zoom', {
-          type: reactData.isZMax ? 'max' : 'revert'
-        }, evnt);
+        $xeGrid.dispatchEvent("zoom", { type: reactData.isZMax ? "max" : "revert" }, evnt);
       }
     };
     Object.assign($xeGrid, gridExtendTableMethods, gridMethods, gridPrivateMethods, {
       // 检查插槽
       loadColumn(columns) {
         const $xeTable = refTable.value;
-        _xeUtils.default.eachTree(columns, column => {
+        import_xe_utils.default.eachTree(columns, (column) => {
           if (column.slots) {
-            _xeUtils.default.each(column.slots, func => {
-              if (func && !_xeUtils.default.isFunction(func)) {
+            import_xe_utils.default.each(column.slots, (func) => {
+              if (func && !import_xe_utils.default.isFunction(func)) {
                 if (!slots[func]) {
-                  errLog('vxe.error.notSlot', [func]);
+                  errLog("vxe.error.notSlot", [func]);
                 }
               }
             });
@@ -2023,7 +1687,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         if ($xeTable) {
           return $xeTable.loadColumn(columns);
         }
-        return (0, _vue.nextTick)();
+        return (0, import_vue.nextTick)();
       },
       reloadColumn(columns) {
         $xeGrid.clearAll();
@@ -2034,78 +1698,69 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       const vSize = computeSize.value;
       const styles = computeStyles.value;
       const isLoading = computeIsLoading.value;
-      return (0, _vue.h)('div', {
+      return (0, import_vue.h)("div", {
         ref: refElem,
-        class: ['vxe-grid', {
+        class: ["vxe-grid", {
           [`size--${vSize}`]: vSize,
-          'is--animat': !!props.animat,
-          'is--round': props.round,
-          'is--maximize': reactData.isZMax,
-          'is--loading': isLoading
+          "is--animat": !!props.animat,
+          "is--round": props.round,
+          "is--maximize": reactData.isZMax,
+          "is--loading": isLoading
         }],
         style: styles
       }, renderLayout());
     };
-    const columnFlag = (0, _vue.ref)(0);
-    (0, _vue.watch)(() => props.columns ? props.columns.length : -1, () => {
+    const columnFlag = (0, import_vue.ref)(0);
+    (0, import_vue.watch)(() => props.columns ? props.columns.length : -1, () => {
       columnFlag.value++;
     });
-    (0, _vue.watch)(() => props.columns, () => {
+    (0, import_vue.watch)(() => props.columns, () => {
       columnFlag.value++;
     });
-    (0, _vue.watch)(columnFlag, () => {
-      (0, _vue.nextTick)(() => $xeGrid.loadColumn(props.columns || []));
+    (0, import_vue.watch)(columnFlag, () => {
+      (0, import_vue.nextTick)(() => $xeGrid.loadColumn(props.columns || []));
     });
-    (0, _vue.watch)(() => props.toolbarConfig, () => {
+    (0, import_vue.watch)(() => props.toolbarConfig, () => {
       initToolbar();
     });
-    (0, _vue.watch)(computeCustomCurrentPageFlag, () => {
-      initPages('currentPage');
+    (0, import_vue.watch)(computeCustomCurrentPageFlag, () => {
+      initPages("currentPage");
     });
-    (0, _vue.watch)(computeCustomPageSizeFlag, () => {
-      initPages('pageSize');
+    (0, import_vue.watch)(computeCustomPageSizeFlag, () => {
+      initPages("pageSize");
     });
-    (0, _vue.watch)(computeCustomTotalFlag, () => {
-      initPages('total');
+    (0, import_vue.watch)(computeCustomTotalFlag, () => {
+      initPages("total");
     });
-    (0, _vue.watch)(() => props.proxyConfig, () => {
+    (0, import_vue.watch)(() => props.proxyConfig, () => {
       initProxy();
     });
-    hooks.forEach(options => {
-      const {
-        setupGrid
-      } = options;
+    hooks.forEach((options) => {
+      const { setupGrid } = options;
       if (setupGrid) {
         const hookRest = setupGrid($xeGrid);
-        if (hookRest && _xeUtils.default.isObject(hookRest)) {
+        if (hookRest && import_xe_utils.default.isObject(hookRest)) {
           Object.assign($xeGrid, hookRest);
         }
       }
     });
     initPages();
-    (0, _vue.onMounted)(() => {
-      (0, _vue.nextTick)(() => {
-        const {
-          columns
-        } = props;
+    (0, import_vue.onMounted)(() => {
+      (0, import_vue.nextTick)(() => {
+        const { columns } = props;
         const proxyOpts = computeProxyOpts.value;
         if (props.formConfig) {
           if (!VxeUIFormComponent) {
-            errLog('vxe.error.reqComp', ['vxe-form']);
+            errLog("vxe.error.reqComp", ["vxe-form"]);
           }
         }
         if (props.pagerConfig) {
           if (!VxeUIPagerComponent) {
-            errLog('vxe.error.reqComp', ['vxe-pager']);
+            errLog("vxe.error.reqComp", ["vxe-pager"]);
           }
         }
-        // const { data, columns, proxyConfig } = props
-        // const formOpts = computeFormOpts.value
-        // if (isEnableConf(proxyConfig) && (data || (proxyOpts.form && formOpts.data))) {
-        //   errLog('vxe.error.errConflicts', ['[grid] data', 'proxy-config'])
-        // }
         if (proxyOpts.props) {
-          warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response']);
+          warnLog("vxe.error.delProp", ["proxy-config.props", "proxy-config.response"]);
         }
         if (columns && columns.length) {
           $xeGrid.loadColumn(columns);
@@ -2113,19 +1768,19 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         initToolbar();
         initProxy();
       });
-      globalEvents.on($xeGrid, 'keydown', handleGlobalKeydownEvent);
+      globalEvents.on($xeGrid, "keydown", handleGlobalKeydownEvent);
     });
-    (0, _vue.onBeforeUnmount)(() => {
-      globalEvents.off($xeGrid, 'keydown');
-      _xeUtils.default.assign(reactData, createReactData());
-      _xeUtils.default.assign(internalData, createInternalData());
+    (0, import_vue.onBeforeUnmount)(() => {
+      globalEvents.off($xeGrid, "keydown");
+      import_xe_utils.default.assign(reactData, createReactData());
+      import_xe_utils.default.assign(internalData, createInternalData());
     });
     $xeGrid.renderVN = renderVN;
-    (0, _vue.provide)('$xeGrid', $xeGrid);
-    (0, _vue.provide)('$xeGantt', null);
+    (0, import_vue.provide)("$xeGrid", $xeGrid);
+    (0, import_vue.provide)("$xeGantt", null);
     return $xeGrid;
   },
   render() {
     return this.renderVN();
   }
-});
+});