@fecp/designer 5.4.104 → 5.4.107

package/lib/node_modules/vxe-table/es/table/src/table.js

@@ -2,7 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const vue = require("vue");
 const comp = require("../../ui/src/comp.js");
-require("../../../../xe-utils/es/index.esm.js");
+const index = require("../../../../../_virtual/index2.js");
 const dom = require("../../ui/src/dom.js");
 const utils = require("../../ui/src/utils.js");
 require("../../ui/index.js");
@@ -31,7 +31,6 @@ require("../module/validator/hook.js");
 require("../module/custom/hook.js");
 require("../render/index.js");
 const index_esm = require("../../../../@vxe-ui/core/es/index.esm.js");
-const ctor = require("../../../../xe-utils/es/ctor.js");
 const { getConfig, getIcon, getI18n, renderer, formats, createEvent, globalResize, interceptor, hooks, globalEvents, GLOBAL_EVENT_KEYS, useFns, renderEmptyElement } = index_esm.VxeUI;
 const supportMaxRow = 5e6;
 const customStorageKey = "VXE_CUSTOM_STORE";
@@ -45,8 +44,8 @@ const VxeTableComponent = comp.defineVxeComponent({
   emits: emits.tableEmits,
   setup(props$1, context) {
     const { slots, emit } = context;
-    const xID = ctor.default.uniqueId();
-    const browseObj = ctor.default.browse();
+    const xID = index.default.uniqueId();
+    const browseObj = index.default.browse();
     const VxeUILoadingComponent = index_esm.VxeUI.getComponent("VxeLoading");
     const VxeUITooltipComponent = index_esm.VxeUI.getComponent("VxeTooltip");
     const $xeTabs = vue.inject("$xeTabs", null);
@@ -56,7 +55,246 @@ const VxeTableComponent = comp.defineVxeComponent({
     const $xeGGWrapper = $xeGrid || $xeGantt;
     const { computeSize } = useFns.useSize(props$1);
     const crossTableDragRowInfo = store.getCrossTableDragRowInfo();
-    const reactData = vue.reactive(util.createReactData());
+    const reactData = vue.reactive({
+      // 低性能的静态列
+      staticColumns: [],
+      // 渲染的列分组
+      tableGroupColumn: [],
+      // 可视区渲染的列
+      tableColumn: [],
+      // 渲染中的数据
+      tableData: [],
+      // 是否启用了横向 X 可视渲染方式加载
+      scrollXLoad: false,
+      // 是否启用了纵向 Y 可视渲染方式加载
+      scrollYLoad: false,
+      // 是否存在纵向滚动条
+      overflowY: true,
+      // 是否存在横向滚动条
+      overflowX: false,
+      // 纵向滚动条的宽度
+      scrollbarWidth: 0,
+      // 横向滚动条的高度
+      scrollbarHeight: 0,
+      // 最后滚动时间戳
+      lastScrollTime: 0,
+      // 行高
+      rowHeight: 0,
+      // 表格父容器的高度
+      parentHeight: 0,
+      // 是否使用分组表头
+      isGroup: false,
+      isAllOverflow: false,
+      // 复选框属性，是否全选
+      isAllSelected: false,
+      // 复选框属性，有选中且非全选状态
+      isIndeterminate: false,
+      // 当前行
+      currentRow: null,
+      // 单选框属性，选中列
+      currentColumn: null,
+      // 单选框属性，选中行
+      selectRadioRow: null,
+      // 表尾合计数据
+      footerTableData: [],
+      // 行分组列信息
+      rowGroupColumn: null,
+      // 展开列信息
+      expandColumn: null,
+      checkboxColumn: null,
+      radioColumn: null,
+      // 树节点列信息
+      treeNodeColumn: null,
+      hasFixedColumn: false,
+      // 刷新列标识，当列筛选被改变时，触发表格刷新数据
+      upDataFlag: 0,
+      // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
+      reColumnFlag: 0,
+      // 初始化标识
+      initStore: {
+        filter: false,
+        import: false,
+        export: false,
+        custom: false
+      },
+      // 自定义列相关的信息
+      customStore: {
+        btnEl: null,
+        isAll: false,
+        isIndeterminate: false,
+        activeBtn: false,
+        activeWrapper: false,
+        visible: false,
+        maxHeight: 0,
+        oldSortMaps: {},
+        oldFixedMaps: {},
+        oldVisibleMaps: {}
+      },
+      customColumnList: [],
+      // 当前选中的筛选列
+      filterStore: {
+        isAllSelected: false,
+        isIndeterminate: false,
+        style: null,
+        column: null,
+        visible: false,
+        maxHeight: null
+      },
+      // 存放列相关的信息
+      columnStore: {
+        leftList: [],
+        centerList: [],
+        rightList: [],
+        resizeList: [],
+        pxList: [],
+        pxMinList: [],
+        autoMinList: [],
+        scaleList: [],
+        scaleMinList: [],
+        autoList: [],
+        remainList: []
+      },
+      // 存放快捷菜单的信息
+      ctxMenuStore: {
+        selected: null,
+        visible: false,
+        showChild: false,
+        selectChild: null,
+        list: [],
+        style: null
+      },
+      // 存放可编辑相关信息
+      editStore: {
+        indexs: {
+          columns: []
+        },
+        titles: {
+          columns: []
+        },
+        // 选中源
+        selected: {
+          row: null,
+          column: null
+        },
+        // 已复制源
+        copyed: {
+          cut: false,
+          rows: [],
+          columns: []
+        },
+        // 激活
+        actived: {
+          row: null,
+          column: null
+        },
+        // 当前被强制聚焦单元格，只会在鼠标点击后算聚焦
+        focused: {
+          row: null,
+          column: null
+        }
+      },
+      // 存放 tooltip 相关信息
+      tooltipStore: {
+        row: null,
+        column: null,
+        content: null,
+        visible: false,
+        type: null,
+        currOpts: {}
+      },
+      // 存放数据校验相关信息
+      validStore: {
+        visible: false
+      },
+      validErrorMaps: {},
+      // 导入相关信息
+      importStore: {
+        inited: false,
+        file: null,
+        type: "",
+        modeList: [],
+        typeList: [],
+        filename: "",
+        visible: false
+      },
+      importParams: {
+        mode: "",
+        types: null,
+        message: true
+      },
+      // 导出相关信息
+      exportStore: {
+        inited: false,
+        name: "",
+        modeList: [],
+        typeList: [],
+        columns: [],
+        isPrint: false,
+        hasFooter: false,
+        hasMerge: false,
+        hasTree: false,
+        hasColgroup: false,
+        visible: false
+      },
+      exportParams: {
+        filename: "",
+        sheetName: "",
+        mode: "",
+        type: "",
+        isColgroup: false,
+        isMerge: false,
+        isAllExpand: false,
+        useStyle: false,
+        original: false,
+        message: true,
+        isHeader: false,
+        isTitle: false,
+        isFooter: false
+      },
+      visiblwRowsFlag: 1,
+      isRowGroupStatus: false,
+      rowGroupList: [],
+      aggHandleFields: [],
+      aggHandleAggColumns: [],
+      rowGroupExpandedFlag: 1,
+      rowExpandedFlag: 1,
+      treeExpandedFlag: 1,
+      updateCheckboxFlag: 1,
+      pendingRowFlag: 1,
+      insertRowFlag: 1,
+      removeRowFlag: 1,
+      mergeHeadFlag: 1,
+      mergeBodyFlag: 1,
+      mergeFootFlag: 1,
+      rowHeightStore: {
+        large: 52,
+        default: 48,
+        medium: 44,
+        small: 40,
+        mini: 36
+      },
+      scrollVMLoading: false,
+      scrollYHeight: 0,
+      scrollYTop: 0,
+      isScrollYBig: false,
+      scrollXLeft: 0,
+      scrollXWidth: 0,
+      isScrollXBig: false,
+      lazScrollLoading: false,
+      rowExpandHeightFlag: 1,
+      calcCellHeightFlag: 1,
+      resizeHeightFlag: 1,
+      resizeWidthFlag: 1,
+      isCustomStatus: false,
+      isCrossDragRow: false,
+      dragRow: null,
+      isCrossDragCol: false,
+      dragCol: null,
+      dragTipText: "",
+      isDragResize: false,
+      isRowLoading: false,
+      isColLoading: false
+    });
     const internalData = util.createInternalData();
     let tableMethods = {};
     let tablePrivateMethods = {};
@@ -106,7 +344,7 @@ const VxeTableComponent = comp.defineVxeComponent({
     const computeTableId = vue.computed(() => {
       const { id } = props$1;
       if (id) {
-        if (ctor.default.isFunction(id)) {
+        if (index.default.isFunction(id)) {
           return `${id({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }) || ""}`;
         }
         return `${id}`;
@@ -118,11 +356,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       return `${props$1.rowId || rowOpts.keyField || "_X_ROW_KEY"}`;
     });
     const computeValidOpts = vue.computed(() => {
-      const opts = Object.assign({}, getConfig().table.validConfig, props$1.validConfig);
-      if (ctor.default.isBoolean(opts.showMessage)) {
-        opts.showErrorMessage = opts.showMessage;
-      }
-      return opts;
+      return Object.assign({}, getConfig().table.validConfig, props$1.validConfig);
     });
     const computeSXOpts = vue.computed(() => {
       const virtualXOpts = computeVirtualXOpts.value;
@@ -132,7 +366,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       const virtualXOpts = computeVirtualXOpts.value;
       const { threshold } = virtualXOpts;
       if (threshold) {
-        return ctor.default.toNumber(threshold);
+        return index.default.toNumber(threshold);
       }
       return 0;
     });
@@ -195,7 +429,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       const virtualYOpts = computeVirtualYOpts.value;
       const { threshold } = virtualYOpts;
       if (threshold) {
-        return ctor.default.toNumber(threshold);
+        return index.default.toNumber(threshold);
       }
       return 0;
     });
@@ -216,7 +450,7 @@ const VxeTableComponent = comp.defineVxeComponent({
     const computeCellOpts = vue.computed(() => {
       const cellOpts = Object.assign({}, getConfig().table.cellConfig, props$1.cellConfig);
       if (cellOpts.height) {
-        cellOpts.height = ctor.default.toNumber(cellOpts.height);
+        cellOpts.height = index.default.toNumber(cellOpts.height);
       }
       return cellOpts;
     });
@@ -224,7 +458,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       const headerCellOpts = Object.assign({}, getConfig().table.headerCellConfig, props$1.headerCellConfig);
       const defaultRowHeight = computeDefaultRowHeight.value;
       const cellOpts = computeCellOpts.value;
-      let headCellHeight = ctor.default.toNumber(util.getCalcHeight(headerCellOpts.height || cellOpts.height));
+      let headCellHeight = index.default.toNumber(util.getCalcHeight(headerCellOpts.height || cellOpts.height));
       if ($xeGantt) {
         const { computeTaskViewScales } = $xeGantt.getComputeMaps();
         const taskViewScales = computeTaskViewScales.value;
@@ -239,7 +473,7 @@ const VxeTableComponent = comp.defineVxeComponent({
     const computeFooterCellOpts = vue.computed(() => {
       const footerCellOpts = Object.assign({}, getConfig().table.footerCellConfig, props$1.footerCellConfig);
       const cellOpts = computeCellOpts.value;
-      footerCellOpts.height = ctor.default.toNumber(util.getCalcHeight(footerCellOpts.height || cellOpts.height));
+      footerCellOpts.height = index.default.toNumber(util.getCalcHeight(footerCellOpts.height || cellOpts.height));
       return footerCellOpts;
     });
     const computeRowOpts = vue.computed(() => {
@@ -251,9 +485,6 @@ const VxeTableComponent = comp.defineVxeComponent({
     const computeRowGroupOpts = vue.computed(() => {
       return computeAggregateOpts.value;
     });
-    const computeAggregateAccuracyOpts = vue.computed(() => {
-      return Object.assign({}, getConfig().table.aggregateAccuracyConfig, props$1.aggregateAccuracyConfig);
-    });
     const computeCurrentRowOpts = vue.computed(() => {
       return Object.assign({}, getConfig().table.currentRowConfig, props$1.currentRowConfig);
     });
@@ -299,9 +530,6 @@ const VxeTableComponent = comp.defineVxeComponent({
     const computeEditOpts = vue.computed(() => {
       return Object.assign({}, getConfig().table.editConfig, props$1.editConfig);
     });
-    const computeEditDirtyOpts = vue.computed(() => {
-      return Object.assign({}, getConfig().table.editDirtyConfig, props$1.editDirtyConfig);
-    });
     const computeSortOpts = vue.computed(() => {
       return Object.assign({ orders: ["asc", "desc", null] }, getConfig().table.sortConfig, props$1.sortConfig);
     });
@@ -365,9 +593,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const lecIndex = leftList.length;
         for (let i = 0; i < mergeBodyList.length; i++) {
           const { col, colspan } = mergeBodyList[i];
-          if (col < lecIndex && col + colspan > lecIndex) {
-            return true;
-          } else if (col < rscIndex && col + colspan > rscIndex) {
+          if (col < lecIndex || col + colspan > rscIndex) {
             return true;
           }
         }
@@ -478,44 +704,12 @@ const VxeTableComponent = comp.defineVxeComponent({
     const computeCustomOpts = vue.computed(() => {
       return Object.assign({}, getConfig().table.customConfig, props$1.customConfig);
     });
-    const computeCustomSimpleMode = vue.computed(() => {
-      const { minHeight, height } = props$1;
-      const customOpts = computeCustomOpts.value;
-      const { mode, popupOptions, placement } = customOpts;
-      if (!placement || placement === "top-left" || placement === "top-right") {
-        if (!(mode === "modal" || mode === "drawer")) {
-          const { mode: mode2 } = popupOptions || {};
-          if (!mode2 || mode2 === "auto") {
-            if (height || minHeight) {
-              return "inside";
-            }
-            return "outside";
-          }
-          if (mode2) {
-            return mode2;
-          }
-        }
-      }
-      return "";
-    });
-    const computeTableStyle = vue.computed(() => {
-      const scrollbarOpts = computeScrollbarOpts.value;
-      const { width, height } = scrollbarOpts;
-      const tStys = {};
-      if (width) {
-        tStys["--vxe-ui-table-view-scrollbar-width"] = dom.toCssUnit(width);
-      }
-      if (height) {
-        tStys["--vxe-ui-table-view-scrollbar-height"] = dom.toCssUnit(height);
-      }
-      return tStys;
-    });
     const computeTableRowExpandedList = vue.computed(() => {
       const { tableData, rowExpandedFlag, expandColumn, rowGroupExpandedFlag, treeExpandedFlag } = reactData;
       const { visibleDataRowIdData, rowExpandedMaps } = internalData;
       const expandList = [];
       if (tableData.length && expandColumn && rowExpandedFlag && rowGroupExpandedFlag && treeExpandedFlag) {
-        ctor.default.each(rowExpandedMaps, (row, rowid) => {
+        index.default.each(rowExpandedMaps, (row, rowid) => {
           if (visibleDataRowIdData[rowid]) {
             expandList.push(row);
           }
@@ -550,32 +744,6 @@ const VxeTableComponent = comp.defineVxeComponent({
       }
       return false;
     });
-    const computeKeepFields = vue.computed(() => {
-      const { tableFullColumn } = internalData;
-      const { updateColFlag } = reactData;
-      const editDirtyOpts = computeEditDirtyOpts.value;
-      const { includeFields, excludeFields } = editDirtyOpts;
-      const kpFields = [];
-      if (updateColFlag) {
-        if (includeFields && includeFields.length) {
-          return includeFields;
-        }
-        const exfMaps = {};
-        if (excludeFields && excludeFields.length) {
-          excludeFields.forEach((field) => {
-            exfMaps[field] = 1;
-          });
-        }
-        for (let i = 0; i < tableFullColumn.length; i++) {
-          const column = tableFullColumn[i];
-          const { field, type, editRender, cellRender } = column;
-          if (field && !type && (editRender || cellRender) && !exfMaps[field]) {
-            kpFields.push(field);
-          }
-        }
-      }
-      return kpFields;
-    });
     const computeTableBorder = vue.computed(() => {
       const { border } = props$1;
       if (border === true) {
@@ -683,7 +851,6 @@ const VxeTableComponent = comp.defineVxeComponent({
       computeFooterCellOpts,
       computeRowOpts,
       computeAggregateOpts,
-      computeAggregateAccuracyOpts,
       computeRowGroupOpts,
       computeCurrentRowOpts,
       computeRowDragOpts,
@@ -697,7 +864,6 @@ const VxeTableComponent = comp.defineVxeComponent({
       computeHeaderTooltipOpts,
       computeFooterTooltipOpts,
       computeEditOpts,
-      computeEditDirtyOpts,
       computeSortOpts,
       computeFilterOpts,
       computeFloatingFilterOpts,
@@ -722,13 +888,11 @@ const VxeTableComponent = comp.defineVxeComponent({
       computeLoadingOpts,
       computeCellOffsetWidth,
       computeCustomOpts,
-      computeCustomSimpleMode,
       computeLeftFixedWidth,
       computeRightFixedWidth,
       computeBodyMergeCoverFixed,
       computeFixedColumnSize,
       computeIsMaxFixedColumn,
-      computeKeepFields,
       computeIsAllCheckboxDisabled,
       computeIsHeaderRenderOptimize,
       computeIsBodyRenderOptimize,
@@ -756,15 +920,15 @@ const VxeTableComponent = comp.defineVxeComponent({
       xegrid: $xeGrid
     };
     const eqCellValue = (row1, row2, field) => {
-      const val1 = ctor.default.get(row1, field);
-      const val2 = ctor.default.get(row2, field);
+      const val1 = index.default.get(row1, field);
+      const val2 = index.default.get(row2, field);
       if (utils.eqEmptyValue(val1) && utils.eqEmptyValue(val2)) {
         return true;
       }
-      if (ctor.default.isString(val1) || ctor.default.isNumber(val1)) {
+      if (index.default.isString(val1) || index.default.isNumber(val1)) {
         return "" + val1 === "" + val2;
       }
-      return ctor.default.isEqual(val1, val2);
+      return index.default.isEqual(val1, val2);
     };
     const handleKeyField = () => {
       const keyField = computeRowField.value;
@@ -772,7 +936,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       internalData.isCurrDeepKey = util.hasDeepKey(keyField);
     };
     const hangleStorageDefaultValue = (value, isAll) => {
-      return ctor.default.isBoolean(value) ? value : isAll;
+      return index.default.isBoolean(value) ? value : isAll;
     };
     const getNextSortOrder = (column) => {
       const sortOpts = computeSortOpts.value;
@@ -783,7 +947,7 @@ const VxeTableComponent = comp.defineVxeComponent({
     };
     const getCustomStorageMap = (id) => {
       const version = getConfig().version;
-      const rest = ctor.default.toStringJSON(localStorage.getItem(customStorageKey) || "");
+      const rest = index.default.toStringJSON(localStorage.getItem(customStorageKey) || "");
       const maps = rest && rest._v === version ? rest : { _v: version };
       return (id ? maps[id] : maps) || {};
     };
@@ -792,12 +956,12 @@ const VxeTableComponent = comp.defineVxeComponent({
       const maps = getCustomStorageMap();
       maps[id] = data || void 0;
       maps._v = version;
-      localStorage.setItem(customStorageKey, ctor.default.toJSONString(maps));
+      localStorage.setItem(customStorageKey, index.default.toJSONString(maps));
     };
     const getRecoverRowMaps = (keyMaps) => {
       const { fullAllDataRowIdData } = internalData;
       const restKeys = {};
-      ctor.default.each(keyMaps, (row, rowid) => {
+      index.default.each(keyMaps, (row, rowid) => {
         if (fullAllDataRowIdData[rowid]) {
           restKeys[rowid] = row;
         }
@@ -807,7 +971,7 @@ const VxeTableComponent = comp.defineVxeComponent({
     const handleReserveRow = (reserveRowMap) => {
       const { fullDataRowIdData } = internalData;
       const reserveList = [];
-      ctor.default.each(reserveRowMap, (item, rowid) => {
+      index.default.each(reserveRowMap, (item, rowid) => {
         if (fullDataRowIdData[rowid] && $xeTable.findRowIndexOf(reserveList, fullDataRowIdData[rowid].row) === -1) {
           reserveList.push(fullDataRowIdData[rowid].row);
         }
@@ -940,44 +1104,32 @@ const VxeTableComponent = comp.defineVxeComponent({
       }
       return { toVisibleIndex: 0, visibleSize: 6 };
     };
-    const calculateMergerOffsetIndex = (list, mergeMaps, offsetItem, type) => {
-      const mKey = `${offsetItem.startIndex}:${offsetItem.endIndex}`;
-      const mObj = mergeMaps[mKey];
-      if (mObj) {
-        offsetItem.startIndex = mObj.startIndex;
-        offsetItem.endIndex = mObj.endIndex;
-      } else {
-        for (let mcIndex = 0, len = list.length; mcIndex < len; mcIndex++) {
-          const mergeItem = list[mcIndex];
-          const { startIndex, endIndex } = offsetItem;
-          const mergeStartIndex = mergeItem[type];
-          const mergeSpanNumber = mergeItem[type + "span"];
-          const mergeEndIndex = mergeStartIndex + mergeSpanNumber;
-          if (mergeStartIndex < startIndex && startIndex < mergeEndIndex) {
-            offsetItem.startIndex = mergeStartIndex;
-          }
-          if (mergeStartIndex < endIndex && endIndex < mergeEndIndex) {
-            offsetItem.endIndex = mergeEndIndex;
-          }
-          if (offsetItem.startIndex !== startIndex || offsetItem.endIndex !== endIndex) {
-            mcIndex = -1;
-          }
+    const calculateMergerOffsetIndex = (list, offsetItem, type) => {
+      for (let mcIndex = 0, len = list.length; mcIndex < len; mcIndex++) {
+        const mergeItem = list[mcIndex];
+        const { startIndex, endIndex } = offsetItem;
+        const mergeStartIndex = mergeItem[type];
+        const mergeSpanNumber = mergeItem[type + "span"];
+        const mergeEndIndex = mergeStartIndex + mergeSpanNumber;
+        if (mergeStartIndex < startIndex && startIndex < mergeEndIndex) {
+          offsetItem.startIndex = mergeStartIndex;
+        }
+        if (mergeStartIndex < endIndex && endIndex < mergeEndIndex) {
+          offsetItem.endIndex = mergeEndIndex;
+        }
+        if (offsetItem.startIndex !== startIndex || offsetItem.endIndex !== endIndex) {
+          mcIndex = -1;
         }
-        mergeMaps[mKey] = offsetItem;
       }
     };
     function buildMergeData(mergeConfigs) {
       const mergeMaps = {};
-      const mergeRowMaps = {};
-      const mergeColMaps = {};
       if (mergeConfigs && mergeConfigs.length) {
         for (let mIndex = 0; mIndex < mergeConfigs.length; mIndex++) {
           const { row: _rowIndex, col: _columnIndex, rowspan: mergeRowspan, colspan: mergeColspan } = mergeConfigs[mIndex];
           for (let i = 0; i < mergeRowspan; i++) {
-            const currRIndex = _rowIndex + i;
             for (let j = 0; j < mergeColspan; j++) {
-              const currCIndex = _columnIndex + j;
-              mergeMaps[`${currRIndex}:${currCIndex}`] = !i && !j ? {
+              mergeMaps[`${_rowIndex + i}:${_columnIndex + j}`] = !i && !j ? {
                 rowspan: mergeRowspan,
                 colspan: mergeColspan
               } : {
@@ -988,28 +1140,26 @@ const VxeTableComponent = comp.defineVxeComponent({
           }
         }
       }
-      return { mergeMaps, mergeRowMaps, mergeColMaps };
+      return mergeMaps;
     }
     const handleUpdateMergeBodyCells = (merges) => {
       internalData.mergeBodyList = [];
       internalData.mergeBodyMaps = {};
       internalData.mergeBodyCellMaps = {};
-      internalData.mergeBodyRowMaps = {};
-      internalData.mergeBodyColMaps = {};
       $xeTable.setMergeCells(merges);
     };
     const handleBodyMerge = (merges) => {
       const { fullAllDataRowIdData, fullColumnIdData, visibleColumn, afterFullData, mergeBodyList, mergeBodyMaps } = internalData;
       if (merges) {
         const { handleGetRowId } = util.createHandleGetRowId($xeTable);
-        if (!ctor.default.isArray(merges)) {
+        if (!index.default.isArray(merges)) {
           merges = [merges];
         }
         merges.forEach((item) => {
           let { row: margeRow, col: margeCol, rowspan, colspan } = item;
           let mergeRowIndex = -1;
           let mergeColumnIndex = -1;
-          if (ctor.default.isNumber(margeRow)) {
+          if (index.default.isNumber(margeRow)) {
             mergeRowIndex = margeRow;
           } else {
             const rowid = margeRow ? handleGetRowId(margeRow) : null;
@@ -1018,7 +1168,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               mergeRowIndex = rowRest._index;
             }
           }
-          if (ctor.default.isNumber(margeCol)) {
+          if (index.default.isNumber(margeCol)) {
             mergeColumnIndex = margeCol;
           } else {
             const colid = margeCol ? margeCol.id : null;
@@ -1028,8 +1178,8 @@ const VxeTableComponent = comp.defineVxeComponent({
             }
           }
           if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
-            rowspan = ctor.default.toNumber(rowspan) || 1;
-            colspan = ctor.default.toNumber(colspan) || 1;
+            rowspan = index.default.toNumber(rowspan) || 1;
+            colspan = index.default.toNumber(colspan) || 1;
             if (rowspan > 1 || colspan > 1) {
               const row = afterFullData[mergeRowIndex];
               const column = visibleColumn[mergeColumnIndex];
@@ -1063,14 +1213,14 @@ const VxeTableComponent = comp.defineVxeComponent({
       const rest = [];
       if (merges) {
         const { handleGetRowId } = util.createHandleGetRowId($xeTable);
-        if (!ctor.default.isArray(merges)) {
+        if (!index.default.isArray(merges)) {
           merges = [merges];
         }
         merges.forEach((item) => {
           const { row: margeRow, col: margeCol } = item;
           let mergeRowIndex = -1;
           let mergeColumnIndex = -1;
-          if (ctor.default.isNumber(margeRow)) {
+          if (index.default.isNumber(margeRow)) {
             mergeRowIndex = margeRow;
           } else {
             const rowid = margeRow ? handleGetRowId(margeRow) : null;
@@ -1079,7 +1229,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               mergeRowIndex = rowRest._index;
             }
           }
-          if (ctor.default.isNumber(margeCol)) {
+          if (index.default.isNumber(margeCol)) {
             mergeColumnIndex = margeCol;
           } else {
             const colid = margeCol ? margeCol.id : null;
@@ -1088,7 +1238,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               mergeColumnIndex = colRest._index;
             }
           }
-          const mcIndex = ctor.default.findIndexOf(mergeBodyList, (item2) => item2.row === mergeRowIndex && item2.col === mergeColumnIndex);
+          const mcIndex = index.default.findIndexOf(mergeBodyList, (item2) => item2.row === mergeRowIndex && item2.col === mergeColumnIndex);
           if (mcIndex > -1) {
             const rItems = mergeBodyList.splice(mcIndex, 1);
             const item2 = rItems[0];
@@ -1107,8 +1257,6 @@ const VxeTableComponent = comp.defineVxeComponent({
       internalData.mergeHeaderList = [];
       internalData.mergeHeaderMaps = {};
       internalData.mergeHeaderCellMaps = {};
-      internalData.mergeHeaderRowMaps = {};
-      internalData.mergeBodyColMaps = {};
       $xeTable.setMergeHeaderCells(merges);
     };
     const handleHeaderMerge = (merges) => {
@@ -1117,14 +1265,14 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { mergeHeaderList, mergeHeaderMaps, fullColumnIdData } = internalData;
       if (merges) {
         const { visibleColumn } = internalData;
-        if (!ctor.default.isArray(merges)) {
+        if (!index.default.isArray(merges)) {
           merges = [merges];
         }
         merges.forEach((item) => {
           let { row: margeRow, col: margeCol, rowspan, colspan } = item;
-          const mergeRowIndex = ctor.default.isNumber(margeRow) ? margeRow : -1;
+          const mergeRowIndex = index.default.isNumber(margeRow) ? margeRow : -1;
           let mergeColumnIndex = -1;
-          if (ctor.default.isNumber(margeCol)) {
+          if (index.default.isNumber(margeCol)) {
             mergeColumnIndex = margeCol;
           } else {
             const colid = margeCol ? margeCol.id : null;
@@ -1134,8 +1282,8 @@ const VxeTableComponent = comp.defineVxeComponent({
             }
           }
           if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
-            rowspan = ctor.default.toNumber(rowspan) || 1;
-            colspan = ctor.default.toNumber(colspan) || 1;
+            rowspan = index.default.toNumber(rowspan) || 1;
+            colspan = index.default.toNumber(colspan) || 1;
             if (!showCustomHeader && rowspan > 1) {
               log.errLog("vxe.error.notSupportProp", ["[table] show-custom-header=false", `rowspan=${rowspan}`, "rowspan=1"]);
               return;
@@ -1172,14 +1320,14 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { mergeHeaderList, fullColumnIdData, mergeHeaderMaps } = internalData;
       const rest = [];
       if (merges) {
-        if (!ctor.default.isArray(merges)) {
+        if (!index.default.isArray(merges)) {
           merges = [merges];
         }
         merges.forEach((item) => {
           const { row: margeRow, col: margeCol } = item;
-          const mergeRowIndex = ctor.default.isNumber(margeRow) ? margeRow : -1;
+          const mergeRowIndex = index.default.isNumber(margeRow) ? margeRow : -1;
           let mergeColumnIndex = -1;
-          if (ctor.default.isNumber(margeCol)) {
+          if (index.default.isNumber(margeCol)) {
             mergeColumnIndex = margeCol;
           } else {
             const colid = margeCol ? margeCol.id : null;
@@ -1188,7 +1336,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               mergeColumnIndex = colRest._index;
             }
           }
-          const mcIndex = ctor.default.findIndexOf(mergeHeaderList, (item2) => item2.row === mergeRowIndex && item2.col === mergeColumnIndex);
+          const mcIndex = index.default.findIndexOf(mergeHeaderList, (item2) => item2.row === mergeRowIndex && item2.col === mergeColumnIndex);
           if (mcIndex > -1) {
             const rItems = mergeHeaderList.splice(mcIndex, 1);
             const item2 = rItems[0];
@@ -1207,8 +1355,6 @@ const VxeTableComponent = comp.defineVxeComponent({
       internalData.mergeFooterList = [];
       internalData.mergeFooterMaps = {};
       internalData.mergeFooterCellMaps = {};
-      internalData.mergeFooterRowMaps = {};
-      internalData.mergeFooterColMaps = {};
       $xeTable.setMergeFooterCells(merges);
     };
     const handleFooterMerge = (merges) => {
@@ -1216,14 +1362,14 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { mergeFooterList, mergeFooterMaps, fullColumnIdData } = internalData;
       if (merges) {
         const { visibleColumn } = internalData;
-        if (!ctor.default.isArray(merges)) {
+        if (!index.default.isArray(merges)) {
           merges = [merges];
         }
         merges.forEach((item) => {
           let { row: margeRow, col: margeCol, rowspan, colspan } = item;
-          const mergeRowIndex = ctor.default.isNumber(margeRow) ? margeRow : -1;
+          const mergeRowIndex = index.default.isNumber(margeRow) ? margeRow : -1;
           let mergeColumnIndex = -1;
-          if (ctor.default.isNumber(margeCol)) {
+          if (index.default.isNumber(margeCol)) {
             mergeColumnIndex = margeCol;
           } else {
             const colid = margeCol ? margeCol.id : null;
@@ -1233,8 +1379,8 @@ const VxeTableComponent = comp.defineVxeComponent({
             }
           }
           if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
-            rowspan = ctor.default.toNumber(rowspan) || 1;
-            colspan = ctor.default.toNumber(colspan) || 1;
+            rowspan = index.default.toNumber(rowspan) || 1;
+            colspan = index.default.toNumber(colspan) || 1;
             if (rowspan > 1 || colspan > 1) {
               const row = footerTableData[mergeRowIndex];
               const column = visibleColumn[mergeColumnIndex];
@@ -1267,14 +1413,14 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { mergeFooterList, fullColumnIdData, mergeFooterMaps } = internalData;
       const rest = [];
       if (merges) {
-        if (!ctor.default.isArray(merges)) {
+        if (!index.default.isArray(merges)) {
           merges = [merges];
         }
         merges.forEach((item) => {
           const { row: margeRow, col: margeCol } = item;
-          const mergeRowIndex = ctor.default.isNumber(margeRow) ? margeRow : -1;
+          const mergeRowIndex = index.default.isNumber(margeRow) ? margeRow : -1;
           let mergeColumnIndex = -1;
-          if (ctor.default.isNumber(margeCol)) {
+          if (index.default.isNumber(margeCol)) {
             mergeColumnIndex = margeCol;
           } else {
             const colid = margeCol ? margeCol.id : null;
@@ -1283,7 +1429,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               mergeColumnIndex = colRest._index;
             }
           }
-          const mcIndex = ctor.default.findIndexOf(mergeFooterList, (item2) => item2.row === mergeRowIndex && item2.col === mergeColumnIndex);
+          const mcIndex = index.default.findIndexOf(mergeFooterList, (item2) => item2.row === mergeRowIndex && item2.col === mergeColumnIndex);
           if (mcIndex > -1) {
             const rItems = mergeFooterList.splice(mcIndex, 1);
             const item2 = rItems[0];
@@ -1302,7 +1448,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { tableFullColumn } = internalData;
       const sortOpts = computeSortOpts.value;
       const { multiple, remote, orders } = sortOpts;
-      if (!ctor.default.isArray(sortConfs)) {
+      if (!index.default.isArray(sortConfs)) {
         sortConfs = [sortConfs];
       }
       if (sortConfs && sortConfs.length) {
@@ -1317,10 +1463,10 @@ const VxeTableComponent = comp.defineVxeComponent({
         }
         const sortColMpps = {};
         let firstColumn = null;
-        sortConfs.forEach((confs, index) => {
+        sortConfs.forEach((confs, index$1) => {
           let { field, order } = confs;
           let column = field;
-          if (ctor.default.isString(field)) {
+          if (index.default.isString(field)) {
             column = $xeTable.getColumnByField(field);
           }
           if (!firstColumn) {
@@ -1333,12 +1479,12 @@ const VxeTableComponent = comp.defineVxeComponent({
             if (column.order !== order) {
               column.order = order;
             }
-            column.sortTime = Date.now() + index;
+            column.sortTime = Date.now() + index$1;
             sortColMpps[column.id] = column;
           }
         });
         if (!multiple) {
-          ctor.default.each(orderActiveMaps, (oaCol, oaId) => {
+          index.default.each(orderActiveMaps, (oaCol, oaId) => {
             if (!sortColMpps[oaId]) {
               oaCol.order = null;
             }
@@ -1372,7 +1518,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       let val = props$1[key];
       if (key === "minHeight") {
         const defMinHeight = getConfig().table.minHeight;
-        if (ctor.default.eqNull(val)) {
+        if (index.default.eqNull(val)) {
           if (utils.eqEmptyValue(defMinHeight)) {
             if (!tableColumn.length) {
               val = 40;
@@ -1391,9 +1537,9 @@ const VxeTableComponent = comp.defineVxeComponent({
         } else {
           const excludeHeight = $xeTable.getExcludeHeight();
           if (dom.isScale(val)) {
-            num = Math.floor((ctor.default.toInteger(val) || 1) / 100 * parentHeight);
+            num = Math.floor((index.default.toInteger(val) || 1) / 100 * parentHeight);
           } else {
-            num = ctor.default.toNumber(val);
+            num = index.default.toNumber(val);
           }
           num = Math.max(40, num - excludeHeight);
         }
@@ -1417,15 +1563,15 @@ const VxeTableComponent = comp.defineVxeComponent({
       if (isCustomResizable && resizableData || isCustomSort && sortData || isCustomVisible && visibleData || isCustomFixed && fixedData || isCustomAggGroup && aggGroupData || isCustomAggFunc && aggFuncData) {
         const sortColMaps = {};
         if (isCustomSort && sortData) {
-          if (!ctor.default.isArray(sortData)) {
+          if (!index.default.isArray(sortData)) {
             const sortRests = [];
-            ctor.default.each(sortData, (index, colKey) => {
-              sortRests.push({ key: colKey, index });
+            index.default.each(sortData, (index2, colKey) => {
+              sortRests.push({ key: colKey, index: index2 });
             });
-            sortData = ctor.default.orderBy(sortRests, { field: "index", order: "asc" }).map((item) => ({ k: item.key }));
+            sortData = index.default.orderBy(sortRests, { field: "index", order: "asc" }).map((item) => ({ k: item.key }));
           }
           let colNum = 1;
-          ctor.default.eachTree(sortData, (sObj, index, sOjs, path, pSObj) => {
+          index.default.eachTree(sortData, (sObj, index2, sOjs, path, pSObj) => {
             sortColMaps[sObj.k] = {
               key: sObj.k,
               sNum: colNum++,
@@ -1436,17 +1582,17 @@ const VxeTableComponent = comp.defineVxeComponent({
         const colKeyMaps = {};
         const allCols = [];
         const aggGroupConfs = [];
-        ctor.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+        index.default.eachTree(collectColumn, (column, index$1, items, path, parentColumn) => {
           const colKey = column.getKey();
           if (!parentColumn) {
             if (isCustomFixed && fixedData && fixedData[colKey] !== void 0) {
               column.fixed = fixedData[colKey];
             }
           }
-          if (isCustomResizable && resizableData && ctor.default.isNumber(resizableData[colKey])) {
+          if (isCustomResizable && resizableData && index.default.isNumber(resizableData[colKey])) {
             column.resizeWidth = resizableData[colKey];
           }
-          if (isCustomVisible && visibleData && ctor.default.isBoolean(visibleData[colKey])) {
+          if (isCustomVisible && visibleData && index.default.isBoolean(visibleData[colKey])) {
             column.visible = visibleData[colKey];
           }
           if (isCustomAggFunc && aggFuncData && (aggregateConfig || rowGroupConfig) && aggFuncData[colKey]) {
@@ -1476,10 +1622,9 @@ const VxeTableComponent = comp.defineVxeComponent({
               column.renderSortNumber = scItem.sNum;
             }
           });
-          const newCollectCols = ctor.default.toArrayTree(ctor.default.orderBy(allCols, "renderSortNumber"), { key: "id", parentKey: "parentId", children: "children" });
+          const newCollectCols = index.default.toArrayTree(index.default.orderBy(allCols, "renderSortNumber"), { key: "id", parentKey: "parentId", children: "children" });
           internalData.collectColumn = newCollectCols;
           internalData.tableFullColumn = util.getColumnList(newCollectCols);
-          reactData.updateColFlag++;
         }
         reactData.isCustomStatus = true;
       } else {
@@ -1517,26 +1662,6 @@ const VxeTableComponent = comp.defineVxeComponent({
         }
       }
     };
-    const updateColumnAllOverflow = () => {
-      const { showOverflow } = props$1;
-      const { isGroup } = reactData;
-      const { fullAllDataRowIdData, tableFullColumn, collectColumn } = internalData;
-      let isAllOverflow = !!showOverflow;
-      const handleFunc = (column) => {
-        if (isAllOverflow && column.showOverflow === false) {
-          isAllOverflow = false;
-        }
-      };
-      if (isGroup) {
-        ctor.default.eachTree(collectColumn, handleFunc);
-      } else {
-        tableFullColumn.forEach(handleFunc);
-      }
-      ctor.default.each(fullAllDataRowIdData, (rowRest) => {
-        rowRest.height = 0;
-      });
-      reactData.isAllOverflow = isAllOverflow;
-    };
     const cacheColumnMap = () => {
       const { treeConfig, showOverflow } = props$1;
       const { tableFullColumn, collectColumn } = internalData;
@@ -1560,9 +1685,9 @@ const VxeTableComponent = comp.defineVxeComponent({
       let checkboxColumn;
       let radioColumn;
       let htmlColumn;
-      const handleFunc = (column, index, items, path, parentColumn) => {
+      const handleFunc = (column, index2, items, path, parentColumn) => {
         const { id: colid, field, fixed, type, treeNode, rowGroupNode } = column;
-        const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0, oLeft: 0 };
+        const rest = { $index: -1, _index: -1, column, colid, index: index2, items, parent: parentColumn || null, width: 0, oLeft: 0 };
         if (field) {
           if (fullColFieldData[field]) {
             log.errLog("vxe.error.colRepet", ["field", field]);
@@ -1627,9 +1752,9 @@ const VxeTableComponent = comp.defineVxeComponent({
         fullColIdData[colid] = rest;
       };
       if (isGroup) {
-        ctor.default.eachTree(collectColumn, (column, index, items, path, parentColumn, nodes) => {
+        index.default.eachTree(collectColumn, (column, index2, items, path, parentColumn, nodes) => {
           column.level = nodes.length;
-          handleFunc(column, index, items, path, parentColumn);
+          handleFunc(column, index2, items, path, parentColumn);
         });
       } else {
         tableFullColumn.forEach(handleFunc);
@@ -1691,7 +1816,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       const firstCellEl = cellElemList[0];
       if (firstCellEl && firstCellEl.parentElement) {
         const cellStyle = getComputedStyle(firstCellEl.parentElement);
-        leftRightPadding = Math.ceil(ctor.default.toNumber(cellStyle.paddingLeft) + ctor.default.toNumber(cellStyle.paddingRight));
+        leftRightPadding = Math.ceil(index.default.toNumber(cellStyle.paddingLeft) + index.default.toNumber(cellStyle.paddingRight));
       }
       let colWidth = column.renderAutoWidth - leftRightPadding;
       for (let i = 0; i < cellElemList.length; i++) {
@@ -1742,37 +1867,37 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { columnStore } = reactData;
       const { resizeList, pxMinList, autoMinList, pxList, scaleList, scaleMinList, autoList, remainList } = columnStore;
       pxMinList.forEach((column) => {
-        const minWidth = ctor.default.toInteger(column.minWidth);
+        const minWidth = index.default.toInteger(column.minWidth);
         tWidth += minWidth;
         column.renderWidth = minWidth;
       });
       autoMinList.forEach((column) => {
-        const caWidth = Math.max(60, ctor.default.toInteger(column.renderAutoWidth));
+        const caWidth = Math.max(60, index.default.toInteger(column.renderAutoWidth));
         tWidth += caWidth;
         column.renderWidth = caWidth;
       });
       scaleMinList.forEach((column) => {
-        const smWidth = Math.floor(ctor.default.toInteger(column.minWidth) * meanWidth);
+        const smWidth = Math.floor(index.default.toInteger(column.minWidth) * meanWidth);
         tWidth += smWidth;
         column.renderWidth = smWidth;
       });
       scaleList.forEach((column) => {
-        const sfWidth = Math.floor(ctor.default.toInteger(column.width) * meanWidth);
+        const sfWidth = Math.floor(index.default.toInteger(column.width) * meanWidth);
         tWidth += sfWidth;
         column.renderWidth = sfWidth;
       });
       pxList.forEach((column) => {
-        const pWidth = ctor.default.toInteger(column.width);
+        const pWidth = index.default.toInteger(column.width);
         tWidth += pWidth;
         column.renderWidth = pWidth;
       });
       autoList.forEach((column) => {
-        const aWidth = Math.max(60, ctor.default.toInteger(column.renderAutoWidth));
+        const aWidth = Math.max(60, index.default.toInteger(column.renderAutoWidth));
         tWidth += aWidth;
         column.renderWidth = aWidth;
       });
       resizeList.forEach((column) => {
-        const reWidth = ctor.default.toInteger(column.resizeWidth);
+        const reWidth = index.default.toInteger(column.resizeWidth);
         tWidth += reWidth;
         column.renderWidth = reWidth;
       });
@@ -1828,7 +1953,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         }
         if (!firstCellStyle) {
           firstCellStyle = getComputedStyle(cellElem);
-          topBottomPadding = firstCellStyle ? Math.ceil(ctor.default.toNumber(firstCellStyle.paddingTop) + ctor.default.toNumber(firstCellStyle.paddingBottom)) : 0;
+          topBottomPadding = firstCellStyle ? Math.ceil(index.default.toNumber(firstCellStyle.paddingTop) + index.default.toNumber(firstCellStyle.paddingBottom)) : 0;
         }
         if (!scrollXLoad) {
           cellStyle.height = orHeight;
@@ -1874,31 +1999,31 @@ const VxeTableComponent = comp.defineVxeComponent({
         }
         let cellValue;
         if (sortBy) {
-          cellValue = ctor.default.isFunction(sortBy) ? sortBy({ row, column }) : ctor.default.get(row, sortBy);
+          cellValue = index.default.isFunction(sortBy) ? sortBy({ row, column }) : index.default.get(row, sortBy);
         } else {
-          cellValue = $xeTable.getCellLabel(row, column);
+          cellValue = tableMethods.getCellLabel(row, column);
         }
         if (!sortType || sortType === "auto") {
-          return isNaN(cellValue) ? cellValue : ctor.default.toNumber(cellValue);
+          return isNaN(cellValue) ? cellValue : index.default.toNumber(cellValue);
         } else if (sortType === "number") {
-          return ctor.default.toNumber(cellValue);
+          return index.default.toNumber(cellValue);
         } else if (sortType === "string") {
-          return ctor.default.toValueString(cellValue);
+          return index.default.toValueString(cellValue);
         }
         return cellValue;
       } : (row) => {
         let cellValue;
         if (sortBy) {
-          cellValue = ctor.default.isFunction(sortBy) ? sortBy({ row, column }) : ctor.default.get(row, sortBy);
+          cellValue = index.default.isFunction(sortBy) ? sortBy({ row, column }) : index.default.get(row, sortBy);
         } else {
-          cellValue = $xeTable.getCellLabel(row, column);
+          cellValue = tableMethods.getCellLabel(row, column);
         }
         if (!sortType || sortType === "auto") {
-          return isNaN(cellValue) ? cellValue : ctor.default.toNumber(cellValue);
+          return isNaN(cellValue) ? cellValue : index.default.toNumber(cellValue);
         } else if (sortType === "number") {
-          return ctor.default.toNumber(cellValue);
+          return index.default.toNumber(cellValue);
         } else if (sortType === "string") {
-          return ctor.default.toValueString(cellValue);
+          return index.default.toValueString(cellValue);
         }
         return cellValue;
       };
@@ -1908,17 +2033,17 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { afterFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData;
       const { handleGetRowId } = util.createHandleGetRowId($xeTable);
       const fullMaps = {};
-      afterFullData.forEach((row, index) => {
+      afterFullData.forEach((row, index2) => {
         const rowid = handleGetRowId(row);
         const rowRest = fullAllDataRowIdData[rowid];
-        const seq = index + 1;
+        const seq = index2 + 1;
         if (rowRest) {
           if (!treeConfig) {
             rowRest.seq = seq;
           }
-          rowRest._index = index;
+          rowRest._index = index2;
         } else {
-          const rest = { row, rowid, seq, index: -1, $index: -1, _index: index, treeIndex: -1, _tIndex: -1, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+          const rest = { row, rowid, seq, index: -1, $index: -1, _index: index2, treeIndex: -1, _tIndex: -1, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
           fullAllDataRowIdData[rowid] = rest;
           fullDataRowIdData[rowid] = rest;
         }
@@ -1936,13 +2061,13 @@ const VxeTableComponent = comp.defineVxeComponent({
       if (treeConfig) {
         let _treeIndex = 0;
         const { handleGetRowId } = util.createHandleGetRowId($xeTable);
-        ctor.default.eachTree(afterTreeFullData, (row, index, items, path) => {
+        index.default.eachTree(afterTreeFullData, (row, index2, items, path) => {
           const rowid = handleGetRowId(row);
           const rowRest = fullAllDataRowIdData[rowid];
           const seq = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : ".").join("");
           if (rowRest) {
             rowRest.seq = seq;
-            rowRest.treeIndex = index;
+            rowRest.treeIndex = index2;
             rowRest._tIndex = _treeIndex;
           } else {
             const rest = { row, rowid, seq, index: -1, $index: -1, _index: -1, treeIndex: -1, _tIndex: _treeIndex, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
@@ -1953,15 +2078,15 @@ const VxeTableComponent = comp.defineVxeComponent({
           fullMaps[rowid] = row;
         }, { children: transform ? treeOpts.mapChildrenField : childrenField });
         if (transform) {
-          afterFullData.forEach((row, index) => {
+          afterFullData.forEach((row, index2) => {
             const rowid = handleGetRowId(row);
             const rowRest = fullAllDataRowIdData[rowid];
-            const seq = index + 1;
+            const seq = index2 + 1;
             if (rowRest) {
               if (!treeConfig) {
                 rowRest.seq = seq;
               }
-              rowRest._index = index;
+              rowRest._index = index2;
             }
           });
         }
@@ -1981,7 +2106,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       const expandMaps = {};
       if (treeConfig && treeOpts.transform) {
         const childrenField = treeOpts.children || treeOpts.childrenField;
-        ctor.default.eachTree(internalData.afterTreeFullData, (row, index, items, path, parentRow) => {
+        index.default.eachTree(internalData.afterTreeFullData, (row, index2, items, path, parentRow) => {
           const rowid = handleGetRowId(row);
           const parentRowid = handleGetRowId(parentRow);
           if (!parentRow || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
@@ -1998,7 +2123,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         return fullData;
       } else if (isRowGroupStatus) {
         const { childrenField } = aggregateOpts;
-        ctor.default.eachTree(internalData.afterGroupFullData, (row, index, items, path, parentRow) => {
+        index.default.eachTree(internalData.afterGroupFullData, (row, index2, items, path, parentRow) => {
           const rowid = handleGetRowId(row);
           const parentRowid = handleGetRowId(parentRow);
           if (!parentRow || expandMaps[parentRowid] && rowGroupExpandedMaps[parentRowid]) {
@@ -2026,8 +2151,8 @@ const VxeTableComponent = comp.defineVxeComponent({
       const treeOpts = computeTreeOpts.value;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       const { transform, rowField, parentField, mapChildrenField } = treeOpts;
-      const { isEvery, remote: allRemoteFilter, filterMethod: allFilterMethod, isDeep: isFilterDeep } = filterOpts;
-      const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological, isDeep: isSortDeep } = sortOpts;
+      const { isEvery, remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts;
+      const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological } = sortOpts;
       let tableData = [];
       let tableTree = [];
       if (!allRemoteFilter || !allRemoteSort) {
@@ -2053,7 +2178,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           }
         });
         if (sortMultiple && chronological && orderColumns.length > 1) {
-          orderColumns = ctor.default.orderBy(orderColumns, "sortTime");
+          orderColumns = index.default.orderBy(orderColumns, "sortTime");
         }
         if (!allRemoteFilter && filterColumns.length) {
           const handleFilter = (row) => {
@@ -2072,19 +2197,19 @@ const VxeTableComponent = comp.defineVxeComponent({
               } else if (tdFilterMethod) {
                 return itemList.some((item) => tdFilterMethod({ value: item.value, option: item, cellValue, row, column, $table: $xeTable }));
               }
-              return valueList.indexOf(ctor.default.get(row, column.field)) > -1;
+              return valueList.indexOf(index.default.get(row, column.field)) > -1;
             });
           };
           if (isRowGroupStatus) {
-            tableTree = ctor.default.searchTree(tableFullGroupData, handleFilter, {
+            tableTree = index.default.searchTree(tableFullGroupData, handleFilter, {
               original: true,
               isEvery: true,
               children: aggregateOpts.mapChildrenField,
               mapChildren: aggregateOpts.childrenField
             });
             tableData = tableTree;
-          } else if (treeConfig && transform && isFilterDeep !== false) {
-            tableTree = ctor.default.searchTree(tableFullTreeData, handleFilter, {
+          } else if (treeConfig && transform) {
+            tableTree = index.default.searchTree(tableFullTreeData, handleFilter, {
               original: true,
               isEvery,
               children: mapChildrenField,
@@ -2097,15 +2222,15 @@ const VxeTableComponent = comp.defineVxeComponent({
           }
         } else {
           if (isRowGroupStatus) {
-            tableTree = ctor.default.searchTree(tableFullGroupData, () => true, {
+            tableTree = index.default.searchTree(tableFullGroupData, () => true, {
               original: true,
               isEvery: true,
               children: aggregateOpts.mapChildrenField,
               mapChildren: aggregateOpts.childrenField
             });
             tableData = tableTree;
-          } else if (treeConfig && transform && isFilterDeep !== false) {
-            tableTree = ctor.default.searchTree(tableFullTreeData, () => true, {
+          } else if (treeConfig && transform) {
+            tableTree = index.default.searchTree(tableFullTreeData, () => true, {
               original: true,
               isEvery,
               children: mapChildrenField,
@@ -2121,14 +2246,14 @@ const VxeTableComponent = comp.defineVxeComponent({
           if (isRowGroupStatus) {
             if (allSortMethod) {
               const sortRests = allSortMethod({ data: tableTree, sortList: orderColumns, $table: $xeTable });
-              tableTree = ctor.default.isArray(sortRests) ? sortRests : tableTree;
+              tableTree = index.default.isArray(sortRests) ? sortRests : tableTree;
             } else {
-              const treeList = ctor.default.toTreeArray(tableTree, {
+              const treeList = index.default.toTreeArray(tableTree, {
                 key: aggregateOpts.rowField,
                 parentKey: aggregateOpts.parentField,
                 children: aggregateOpts.mapChildrenField
               });
-              tableTree = ctor.default.toArrayTree(ctor.default.orderBy(treeList, orderColumns.map(({ column, order }) => [getOrderField(column), order])), {
+              tableTree = index.default.toArrayTree(index.default.orderBy(treeList, orderColumns.map(({ column, order }) => [getOrderField(column), order])), {
                 key: aggregateOpts.rowField,
                 parentKey: aggregateOpts.parentField,
                 children: aggregateOpts.childrenField,
@@ -2136,15 +2261,15 @@ const VxeTableComponent = comp.defineVxeComponent({
               });
             }
             tableData = tableTree;
-          } else if (treeConfig && transform && isSortDeep !== false) {
+          } else if (treeConfig && transform) {
             if (allSortMethod) {
               const sortRests = allSortMethod({ data: tableTree, sortList: orderColumns, $table: $xeTable });
-              tableTree = ctor.default.isArray(sortRests) ? sortRests : tableTree;
+              tableTree = index.default.isArray(sortRests) ? sortRests : tableTree;
             } else {
-              const treeList = ctor.default.toTreeArray(tableTree, {
+              const treeList = index.default.toTreeArray(tableTree, {
                 children: mapChildrenField
               });
-              tableTree = ctor.default.toArrayTree(ctor.default.orderBy(treeList, orderColumns.map(({ column, order }) => [getOrderField(column), order])), {
+              tableTree = index.default.toArrayTree(index.default.orderBy(treeList, orderColumns.map(({ column, order }) => [getOrderField(column), order])), {
                 key: rowField,
                 parentKey: parentField,
                 children: childrenField,
@@ -2155,24 +2280,24 @@ const VxeTableComponent = comp.defineVxeComponent({
           } else {
             if (allSortMethod) {
               const sortRests = allSortMethod({ data: tableData, sortList: orderColumns, $table: $xeTable });
-              tableData = ctor.default.isArray(sortRests) ? sortRests : tableData;
+              tableData = index.default.isArray(sortRests) ? sortRests : tableData;
             } else {
-              tableData = ctor.default.orderBy(tableData, orderColumns.map(({ column, order }) => [getOrderField(column), order]));
+              tableData = index.default.orderBy(tableData, orderColumns.map(({ column, order }) => [getOrderField(column), order]));
             }
             tableTree = tableData;
           }
         }
       } else {
         if (isRowGroupStatus) {
-          tableTree = ctor.default.searchTree(tableFullGroupData, () => true, {
+          tableTree = index.default.searchTree(tableFullGroupData, () => true, {
             original: true,
             isEvery: true,
             children: aggregateOpts.mapChildrenField,
             mapChildren: aggregateOpts.childrenField
           });
           tableData = tableTree;
-        } else if (treeConfig && transform && isSortDeep !== false) {
-          tableTree = ctor.default.searchTree(tableFullTreeData, () => true, {
+        } else if (treeConfig && transform) {
+          tableTree = index.default.searchTree(tableFullTreeData, () => true, {
             original: true,
             isEvery,
             children: mapChildrenField,
@@ -2313,8 +2438,8 @@ const VxeTableComponent = comp.defineVxeComponent({
         rowExpandEl.style.top = `${tHeaderHeight}px`;
       }
       internalData.tBodyHeight = tbHeight;
-      containerList.forEach((name, index) => {
-        const fixedType = index > 0 ? name : "";
+      containerList.forEach((name, index2) => {
+        const fixedType = index2 > 0 ? name : "";
         const layoutList = ["header", "body", "footer"];
         const isFixedLeft = fixedType === "left";
         let fixedColumn = [];
@@ -2472,17 +2597,17 @@ const VxeTableComponent = comp.defineVxeComponent({
         const sortOpts = computeSortOpts.value;
         let { defaultSort } = sortOpts;
         if (defaultSort) {
-          if (!ctor.default.isArray(defaultSort)) {
+          if (!index.default.isArray(defaultSort)) {
             defaultSort = [defaultSort];
           }
           if (defaultSort.length) {
-            (sortConfig.multiple ? defaultSort : defaultSort.slice(0, 1)).forEach((item, index) => {
+            (sortConfig.multiple ? defaultSort : defaultSort.slice(0, 1)).forEach((item, index2) => {
               const { field, order } = item;
               if (field && order) {
                 const column = $xeTable.getColumnByField(field);
                 if (column && column.sortable) {
                   column.order = order;
-                  column.sortTime = Date.now() + index;
+                  column.sortTime = Date.now() + index2;
                 }
               }
             });
@@ -2576,7 +2701,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       return vue.nextTick();
     };
     const handleCheckedCheckboxRow = (rows, value, isForce) => {
-      if (rows && !ctor.default.isArray(rows)) {
+      if (rows && !index.default.isArray(rows)) {
         rows = [rows];
       }
       $xeTable.handleBatchSelectRows(rows, !!value, isForce);
@@ -2601,21 +2726,21 @@ const VxeTableComponent = comp.defineVxeComponent({
             if (checked) {
               selectRowMaps[handleGetRowId(row)] = row;
             }
-            ctor.default.set(row, checkField, checked);
+            index.default.set(row, checkField, checked);
           }
           if ((treeConfig || isRowGroupStatus) && indeterminateField) {
-            ctor.default.set(row, indeterminateField, false);
+            index.default.set(row, indeterminateField, false);
           }
         };
         if (treeConfig || isRowGroupStatus) {
-          ctor.default.eachTree(afterFullData, checkValFn, { children: childrenField });
+          index.default.eachTree(afterFullData, checkValFn, { children: childrenField });
         } else {
           afterFullData.forEach(checkValFn);
         }
       } else {
         if (isRowGroupStatus) {
           if (checked) {
-            ctor.default.eachTree(afterGroupFullData, (row) => {
+            index.default.eachTree(afterGroupFullData, (row) => {
               if (isForce || (!checkMethod || checkMethod({ $table: $xeTable, row }))) {
                 const rowid = handleGetRowId(row);
                 selectRowMaps[rowid] = row;
@@ -2623,7 +2748,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             }, { children: aggregateOpts.mapChildrenField });
           } else {
             if (!isForce && checkMethod) {
-              ctor.default.eachTree(afterGroupFullData, (row) => {
+              index.default.eachTree(afterGroupFullData, (row) => {
                 const rowid = handleGetRowId(row);
                 if (checkMethod({ $table: $xeTable, row }) ? false : selectCheckboxMaps[rowid]) {
                   selectRowMaps[rowid] = row;
@@ -2633,7 +2758,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           }
         } else if (treeConfig) {
           if (checked) {
-            ctor.default.eachTree(afterTreeFullData, (row) => {
+            index.default.eachTree(afterTreeFullData, (row) => {
               if (isForce || (!checkMethod || checkMethod({ $table: $xeTable, row }))) {
                 const rowid = handleGetRowId(row);
                 selectRowMaps[rowid] = row;
@@ -2641,7 +2766,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             }, { children: childrenField });
           } else {
             if (!isForce && checkMethod) {
-              ctor.default.eachTree(afterTreeFullData, (row) => {
+              index.default.eachTree(afterTreeFullData, (row) => {
                 const rowid = handleGetRowId(row);
                 if (checkMethod({ $table: $xeTable, row }) ? false : selectCheckboxMaps[rowid]) {
                   selectRowMaps[rowid] = row;
@@ -2678,7 +2803,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       }
       if (reserve) {
         if (checked) {
-          ctor.default.each(selectRowMaps, (row, rowid) => {
+          index.default.each(selectRowMaps, (row, rowid) => {
             checkboxReserveRowMap[rowid] = row;
           });
         } else {
@@ -2767,7 +2892,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             if (treeExpandLazyLoadedMaps[rowid]) {
               delete treeExpandLazyLoadedMaps[rowid];
             }
-            if (!ctor.default.isArray(childRecords)) {
+            if (!index.default.isArray(childRecords)) {
               childRecords = [];
             }
             if (childRecords) {
@@ -2890,8 +3015,8 @@ const VxeTableComponent = comp.defineVxeComponent({
         const virtualXOpts = computeVirtualXOpts.value;
         if (scrollXLoad) {
           const { toVisibleIndex: toXVisibleIndex, visibleSize: visibleXSize } = handleVirtualXVisible();
-          const offsetXSize = Math.max(0, virtualXOpts.oSize ? ctor.default.toNumber(virtualXOpts.oSize) : 0);
-          scrollXStore.preloadSize = ctor.default.toNumber(virtualXOpts.preSize);
+          const offsetXSize = Math.max(0, virtualXOpts.oSize ? index.default.toNumber(virtualXOpts.oSize) : 0);
+          scrollXStore.preloadSize = index.default.toNumber(virtualXOpts.preSize);
           scrollXStore.offsetSize = offsetXSize;
           scrollXStore.visibleSize = visibleXSize;
           scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
@@ -2908,8 +3033,8 @@ const VxeTableComponent = comp.defineVxeComponent({
         reactData.rowHeight = rowHeight;
         const { toVisibleIndex: toYVisibleIndex, visibleSize: visibleYSize } = handleVirtualYVisible();
         if (scrollYLoad) {
-          const offsetYSize = Math.max(0, virtualYOpts.oSize ? ctor.default.toNumber(virtualYOpts.oSize) : 0);
-          scrollYStore.preloadSize = ctor.default.toNumber(virtualYOpts.preSize);
+          const offsetYSize = Math.max(0, virtualYOpts.oSize ? index.default.toNumber(virtualYOpts.oSize) : 0);
+          scrollYStore.preloadSize = index.default.toNumber(virtualYOpts.preSize);
           scrollYStore.offsetSize = offsetYSize;
           scrollYStore.visibleSize = visibleYSize;
           scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
@@ -3055,7 +3180,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       const aggGroupFields = [];
       const aggGroupConfs = [];
       if (groupFields) {
-        (ctor.default.isArray(groupFields) ? groupFields : [groupFields]).forEach((field) => {
+        (index.default.isArray(groupFields) ? groupFields : [groupFields]).forEach((field) => {
           aggGroupFields.push(field);
           aggGroupConfs.push({
             field
@@ -3073,9 +3198,9 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { mapChildrenField } = aggregateOpts;
       const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod;
       if (mapChildrenField) {
-        ctor.default.lastEach(aggList, (aggRow) => {
+        index.default.lastEach(aggList, (aggRow) => {
           let count = 0;
-          ctor.default.each(aggRow[mapChildrenField], (row) => {
+          index.default.each(aggRow[mapChildrenField], (row) => {
             if (row.isAggregate) {
               count += row.childCount || 0;
             } else {
@@ -3088,7 +3213,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           $xeTable.handlePivotTableAggregateData(aggList);
         } else {
           if (aggFuncColumns.length) {
-            ctor.default.lastEach(aggList, (aggRow) => {
+            index.default.lastEach(aggList, (aggRow) => {
               const aggDtObj = {};
               const aggData = aggRow.aggData;
               const groupField = aggRow.groupField;
@@ -3121,7 +3246,7 @@ const VxeTableComponent = comp.defineVxeComponent({
                 };
                 let aggVal = 0;
                 if (childList.length && childList[0].isAggregate) {
-                  ctor.default.each(childList, (row) => {
+                  index.default.each(childList, (row) => {
                     if (row.isAggregate) {
                       const currAggData2 = row.aggData[field];
                       if (currAggData2) {
@@ -3152,7 +3277,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { mapChildrenField } = aggregateOpts;
       if ((aggregateConfig || rowGroupConfig) && isRowGroupStatus) {
         const aggList = [];
-        ctor.default.eachTree(tableFullGroupData, (row) => {
+        index.default.eachTree(tableFullGroupData, (row) => {
           if (row.isAggregate) {
             aggList.push(row);
           }
@@ -3166,7 +3291,6 @@ const VxeTableComponent = comp.defineVxeComponent({
       if (rowGroups) {
         const aggregateOpts = computeAggregateOpts.value;
         const { rowField, parentField, childrenField, mapChildrenField } = aggregateOpts;
-        const rowOpts = computeRowOpts.value;
         const checkboxOpts = computeCheckboxOpts.value;
         const { checkField } = checkboxOpts;
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
@@ -3180,8 +3304,8 @@ const VxeTableComponent = comp.defineVxeComponent({
           const aggList = [];
           const rowkey = util.getRowkey($xeTable);
           list.forEach((row) => {
-            const cellValue = groupColumn ? $xeTable.getCellLabel(row, groupColumn) : ctor.default.get(row, groupField);
-            const groupValue = ctor.default.eqNull(cellValue) ? "" : cellValue;
+            const cellValue = groupColumn ? $xeTable.getCellLabel(row, groupColumn) : index.default.get(row, groupField);
+            const groupValue = index.default.eqNull(cellValue) ? "" : cellValue;
             let childList = groupMaps[groupValue];
             if (!childList) {
               childList = [];
@@ -3192,7 +3316,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             }
             childList.push(row);
           });
-          ctor.default.objectEach(groupMaps, (childList, groupValue) => {
+          index.default.objectEach(groupMaps, (childList, groupValue) => {
             const { fullData: childFullData, treeData: childTreeData } = handleGroupData(childList, rowGroups.slice(1));
             const aggRow = {
               isAggregate: true,
@@ -3202,10 +3326,10 @@ const VxeTableComponent = comp.defineVxeComponent({
               childCount: 0,
               [rowField]: util.getRowUniqueId(),
               [parentField]: null,
+              [rowkey]: util.getRowUniqueId(),
               [childrenField]: childTreeData,
               [mapChildrenField]: childTreeData
             };
-            aggRow[rowkey] = util.createRowId(rowOpts, aggRow, rowkey);
             if (checkField) {
               aggRow[checkField] = false;
             }
@@ -3286,7 +3410,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           if (childrenField === treeOpts.mapChildrenField) {
             log.errLog("vxe.error.errConflicts", ["tree-config.childrenField", "tree-config.mapChildrenField"]);
           }
-          treeData = ctor.default.toArrayTree(fullData, {
+          treeData = index.default.toArrayTree(fullData, {
             key: treeOpts.rowField,
             parentKey: treeOpts.parentField,
             children: childrenField,
@@ -3351,7 +3475,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           if (reactData.expandColumn && expandOpts.mode !== "fixed") {
             log.errLog("vxe.error.notConflictProp", ['column.type="expand', 'expand-config.mode="fixed"']);
           }
-          if (virtualYOpts.mode === "scroll" && reactData.expandColumn && expandOpts.mode === "fixed") {
+          if (virtualYOpts.mode === "scroll" && expandOpts.mode === "fixed") {
             log.warnLog("vxe.error.notConflictProp", ["virtual-y-config.mode=scroll", "expand-config.mode=inside"]);
           }
           if (!(props$1.height || props$1.maxHeight)) {
@@ -3452,16 +3576,15 @@ const VxeTableComponent = comp.defineVxeComponent({
       reactData.tableColumn = tableColumn;
     };
     const handleUpdateColumn = () => {
-      const columnList = ctor.default.orderBy(internalData.collectColumn, "renderSortNumber");
+      const columnList = index.default.orderBy(internalData.collectColumn, "renderSortNumber");
       internalData.collectColumn = columnList;
-      const tFullColumn = util.getColumnList(columnList);
-      internalData.tableFullColumn = tFullColumn;
-      reactData.updateColFlag++;
+      const tableFullColumn = util.getColumnList(columnList);
+      internalData.tableFullColumn = tableFullColumn;
       cacheColumnMap();
     };
     const loadScrollXData = () => {
       const { isScrollXBig } = reactData;
-      const { mergeBodyList, mergeFooterList, mergeBodyRowMaps, scrollXStore } = internalData;
+      const { mergeBodyList, mergeFooterList, scrollXStore } = internalData;
       const { preloadSize, startIndex, endIndex, offsetSize } = scrollXStore;
       const { toVisibleIndex, visibleSize } = handleVirtualXVisible();
       const offsetItem = {
@@ -3470,7 +3593,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       };
       scrollXStore.visibleStartIndex = toVisibleIndex - 1;
       scrollXStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
-      calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList), mergeBodyRowMaps, offsetItem, "col");
+      calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList), offsetItem, "col");
       const { startIndex: offsetStartIndex, endIndex: offsetEndIndex } = offsetItem;
       if (toVisibleIndex <= startIndex || toVisibleIndex >= endIndex - visibleSize - 1) {
         if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
@@ -3491,7 +3614,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const leftGroupList = [];
         const centerGroupList = [];
         const rightGroupList = [];
-        ctor.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+        index.default.eachTree(collectColumn, (column, index$1, items, path, parentColumn) => {
           const isColGroup = utils.hasChildrenList(column);
           if (parentColumn && parentColumn.fixed) {
             column.fixed = parentColumn.fixed;
@@ -3500,7 +3623,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             log.errLog("vxe.error.groupFixed");
           }
           if (isColGroup) {
-            column.visible = !!ctor.default.findTree(column.children, (subColumn) => utils.hasChildrenList(subColumn) ? false : subColumn.visible);
+            column.visible = !!index.default.findTree(column.children, (subColumn) => utils.hasChildrenList(subColumn) ? false : subColumn.visible);
           } else if (column.visible) {
             if (column.fixed === "left") {
               leftList.push(column);
@@ -3558,15 +3681,15 @@ const VxeTableComponent = comp.defineVxeComponent({
           scrollXStore.visibleEndIndex = visibleSize;
         }
       }
-      if (visibleColumn.length !== internalData.visibleColumn.length || !internalData.visibleColumn.every((column, index) => column === visibleColumn[index])) {
+      if (visibleColumn.length !== internalData.visibleColumn.length || !internalData.visibleColumn.every((column, index2) => column === visibleColumn[index2])) {
         $xeTable.clearMergeCells();
         $xeTable.clearMergeFooterItems();
       }
-      visibleColumn.forEach((column, index) => {
+      visibleColumn.forEach((column, index2) => {
         const colid = column.id;
         const colRest = fullColumnIdData[colid];
         if (colRest) {
-          colRest._index = index;
+          colRest._index = index2;
         }
       });
       handleTableColumn();
@@ -3587,10 +3710,10 @@ const VxeTableComponent = comp.defineVxeComponent({
       const fullColIdData = {};
       const fullColFieldData = {};
       let sortIndex = 1;
-      ctor.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+      index.default.eachTree(collectColumn, (column, index2, items, path, parentColumn) => {
         const { id: colid, field } = column;
         const parentId = parentColumn ? parentColumn.id : null;
-        const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0, oLeft: 0 };
+        const rest = { $index: -1, _index: -1, column, colid, index: index2, items, parent: parentColumn || null, width: 0, oLeft: 0 };
         column.parentId = parentId;
         column.defaultParentId = parentId;
         column.sortNumber = sortIndex;
@@ -3610,9 +3733,8 @@ const VxeTableComponent = comp.defineVxeComponent({
     const handleInitColumn = (collectColumn) => {
       const expandOpts = computeExpandOpts.value;
       internalData.collectColumn = collectColumn;
-      const tFullColumn = util.getColumnList(collectColumn);
-      internalData.tableFullColumn = tFullColumn;
-      reactData.updateColFlag++;
+      const tableFullColumn = util.getColumnList(collectColumn);
+      internalData.tableFullColumn = tableFullColumn;
       reactData.isColLoading = true;
       initColumnHierarchy();
       return Promise.resolve(restoreCustomStorage()).then(() => {
@@ -3684,7 +3806,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       let validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows;
       if (accordion) {
         validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
-        const matchObj = ctor.default.findTree(tableFullTreeData, (item) => item === validRows[0], { children: childrenField });
+        const matchObj = index.default.findTree(tableFullTreeData, (item) => item === validRows[0], { children: childrenField });
         if (matchObj) {
           matchObj.items.forEach((item) => {
             const rowid = handleGetRowId(item);
@@ -3755,7 +3877,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       if (mapChildrenField) {
         if (accordion) {
           validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
-          const matchObj = ctor.default.findTree(tableFullGroupData, (item) => util.getRowid($xeTable, item) === util.getRowid($xeTable, validRows[0]), { children: mapChildrenField });
+          const matchObj = index.default.findTree(tableFullGroupData, (item) => util.getRowid($xeTable, item) === util.getRowid($xeTable, validRows[0]), { children: mapChildrenField });
           if (matchObj) {
             matchObj.items.forEach((item) => {
               const rowid = handleGetRowId(item);
@@ -3829,7 +3951,7 @@ const VxeTableComponent = comp.defineVxeComponent({
     };
     const loadScrollYData = () => {
       const { isAllOverflow, isScrollYBig } = reactData;
-      const { mergeBodyList, mergeBodyColMaps, scrollYStore } = internalData;
+      const { mergeBodyList, scrollYStore } = internalData;
       const { preloadSize, startIndex, endIndex, offsetSize } = scrollYStore;
       const autoOffsetYSize = isAllOverflow ? offsetSize : offsetSize + 1;
       const { toVisibleIndex, visibleSize } = handleVirtualYVisible();
@@ -3839,7 +3961,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       };
       scrollYStore.visibleStartIndex = toVisibleIndex - 1;
       scrollYStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
-      calculateMergerOffsetIndex(mergeBodyList, mergeBodyColMaps, offsetItem, "row");
+      calculateMergerOffsetIndex(mergeBodyList, offsetItem, "row");
       const { startIndex: offsetStartIndex, endIndex: offsetEndIndex } = offsetItem;
       if (toVisibleIndex <= startIndex || toVisibleIndex >= endIndex - visibleSize - 1) {
         if (startIndex !== offsetStartIndex || endIndex !== offsetEndIndex) {
@@ -3942,7 +4064,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       return Promise.all([
         xRest,
         yRest,
-        scrollXLoad || scrollYLoad ? $xeTable.updateCellAreas() : null
+        $xeTable.updateCellAreas()
       ]);
     };
     const checkLastSyncScroll = (isRollX, isRollY) => {
@@ -3982,6 +4104,32 @@ const VxeTableComponent = comp.defineVxeComponent({
       }
       return multiple;
     };
+    const wheelScrollLeftTo = (scrollLeft, cb) => {
+      requestAnimationFrame(() => {
+        cb(scrollLeft);
+      });
+    };
+    const wheelScrollTopTo = (diffNum, cb) => {
+      const duration = Math.abs(diffNum);
+      const startTime = performance.now();
+      let countTop = 0;
+      const step = (timestamp) => {
+        let progress = (timestamp - startTime) / duration;
+        if (progress < 0) {
+          progress = 0;
+        } else if (progress > 1) {
+          progress = 1;
+        }
+        const easedProgress = Math.pow(progress, 2);
+        const offsetTop = Math.floor(diffNum * easedProgress) - countTop;
+        countTop += offsetTop;
+        cb(offsetTop);
+        if (progress < 1) {
+          requestAnimationFrame(step);
+        }
+      };
+      requestAnimationFrame(step);
+    };
     const syncGanttScrollTop = (scrollTop) => {
       const $xeGanttView = internalData.xeGanttView;
       if ($xeGanttView) {
@@ -3996,11 +4144,11 @@ const VxeTableComponent = comp.defineVxeComponent({
     const dispatchEvent = (type, params, evnt) => {
       emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }, params));
     };
-    const handleScrollToRowColumn = (fieldOrColumn, row, options) => {
+    const handleScrollToRowColumn = (fieldOrColumn, row) => {
       const { fullColumnIdData } = internalData;
       const column = util.handleFieldOrColumn($xeTable, fieldOrColumn);
       if (column && fullColumnIdData[column.id]) {
-        return util.colToVisible($xeTable, options ? options.colAlign !== false : true, column, row);
+        return util.colToVisible($xeTable, column, row);
       }
       return vue.nextTick();
     };
@@ -4082,12 +4230,12 @@ const VxeTableComponent = comp.defineVxeComponent({
         const bodyScrollElem = util.getRefElem(elemStore["main-body-scroll"]);
         if (rowExpandEl && bodyScrollElem) {
           let isUpdateHeight = false;
-          ctor.default.arrayEach(rowExpandEl.children, (reEl) => {
+          index.default.arrayEach(rowExpandEl.children, (reEl) => {
             const expandEl = reEl;
             const rowid = expandEl.getAttribute("rowid") || "";
             const rowRest = fullAllDataRowIdData[rowid];
             if (rowRest) {
-              const expandHeight = expandEl.offsetHeight;
+              const expandHeight = expandEl.offsetHeight + 1;
               const trEl = bodyScrollElem.querySelector(`.vxe-body--row[rowid="${rowid}"]`);
               let offsetTop = 0;
               if (scrollYLoad) {
@@ -4168,7 +4316,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       tableData.forEach((row, rIndex) => {
         handleNodeRow(row, rIndex, tableData);
       });
-      ctor.default.lastArrayEach(expParentList, ({ row, nextRow }) => {
+      index.default.lastArrayEach(expParentList, ({ row, nextRow }) => {
         const rowid = handleGetRowId(row);
         const childList = row[transform ? mapChildrenField : childrenField];
         const rowRest = fullAllDataRowIdData[rowid];
@@ -4215,12 +4363,12 @@ const VxeTableComponent = comp.defineVxeComponent({
     const handleColumnVisible = (visible) => {
       return function(fieldOrColumn) {
         let status = false;
-        const cols = ctor.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        const cols = index.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
         cols.forEach((item) => {
           const column = util.handleFieldOrColumn($xeTable, item);
           if (column) {
             if (column.children && column.children.length) {
-              ctor.default.eachTree([column], (item2) => {
+              index.default.eachTree([column], (item2) => {
                 item2.visible = visible;
                 item2.renderVisible = visible;
               });
@@ -4322,14 +4470,14 @@ const VxeTableComponent = comp.defineVxeComponent({
       setRow(rows, record) {
         if (rows && record) {
           let rest = rows;
-          if (!ctor.default.isArray(rows)) {
+          if (!index.default.isArray(rows)) {
             rest = [rows];
           }
           const rowkey = util.getRowkey($xeTable);
           rest.forEach((row) => {
             const rowid = util.getRowid($xeTable, row);
-            const newRecord = ctor.default.clone(Object.assign({}, record), true);
-            ctor.default.set(newRecord, rowkey, rowid);
+            const newRecord = index.default.clone(Object.assign({}, record), true);
+            index.default.set(newRecord, rowkey, rowid);
             Object.assign(row, newRecord);
           });
         }
@@ -4351,17 +4499,17 @@ const VxeTableComponent = comp.defineVxeComponent({
             return vue.nextTick();
           }
           const rowkey = util.getRowkey($xeTable);
-          const rowid = ctor.default.get(row, rowkey);
+          const rowid = index.default.get(row, rowkey);
           const oRow = sourceDataRowIdData[rowid];
           if (oRow && row) {
             if (field) {
-              const newValue = ctor.default.clone(ctor.default.get(record || row, field), true);
-              ctor.default.set(row, field, newValue);
-              ctor.default.set(oRow, field, newValue);
+              const newValue = index.default.clone(index.default.get(record || row, field), true);
+              index.default.set(row, field, newValue);
+              index.default.set(oRow, field, newValue);
             } else {
-              const newRecord = ctor.default.clone(Object.assign({}, record), true);
-              ctor.default.set(newRecord, rowkey, rowid);
-              ctor.default.destructuring(oRow, Object.assign(row, newRecord));
+              const newRecord = index.default.clone(Object.assign({}, record), true);
+              index.default.set(newRecord, rowkey, rowid);
+              index.default.destructuring(oRow, Object.assign(row, newRecord));
             }
           }
           reactData.tableData = tableData.slice(0);
@@ -4384,28 +4532,28 @@ const VxeTableComponent = comp.defineVxeComponent({
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const parentRest = fullAllDataRowIdData[util.getRowid($xeTable, row)];
         const parentLevel = parentRest ? parentRest.level : 0;
-        return $xeTable.createData(childRecords).then((rows) => {
+        return tableMethods.createData(childRecords).then((rows) => {
           if (keepSource) {
             const rowid = util.getRowid($xeTable, row);
-            const matchObj = ctor.default.findTree(tableSourceData, (item) => rowid === util.getRowid($xeTable, item), { children: childrenField });
+            const matchObj = index.default.findTree(tableSourceData, (item) => rowid === util.getRowid($xeTable, item), { children: childrenField });
             if (matchObj) {
-              matchObj.item[childrenField] = ctor.default.clone(rows, true);
+              matchObj.item[childrenField] = index.default.clone(rows, true);
             }
             rows.forEach((childRow) => {
               const rowid2 = util.getRowid($xeTable, childRow);
-              sourceDataRowIdData[rowid2] = ctor.default.clone(childRow, true);
+              sourceDataRowIdData[rowid2] = index.default.clone(childRow, true);
             });
           }
-          ctor.default.eachTree(rows, (childRow, index, items, path, parentItem, nodes) => {
+          index.default.eachTree(rows, (childRow, index2, items, path, parentItem, nodes) => {
             const rowid = util.getRowid($xeTable, childRow);
             const parentRow = parentItem || parentRest.row;
-            const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+            const rest = { row: childRow, rowid, seq: -1, index: index2, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
             fullDataRowIdData[rowid] = rest;
             fullAllDataRowIdData[rowid] = rest;
           }, { children: childrenField });
           row[childrenField] = rows;
           if (transform) {
-            row[mapChildrenField] = ctor.default.clone(rows, false);
+            row[mapChildrenField] = index.default.clone(rows, false);
           }
           updateAfterDataIndex();
           return rows;
@@ -4418,7 +4566,7 @@ const VxeTableComponent = comp.defineVxeComponent({
        */
       loadColumn(columns) {
         const { lastScrollLeft, lastScrollTop } = internalData;
-        const collectColumn = ctor.default.mapTree(columns, (column) => vue.reactive(cell.Cell.createColumn($xeTable, column)));
+        const collectColumn = index.default.mapTree(columns, (column) => vue.reactive(cell.Cell.createColumn($xeTable, column)));
         return handleInitColumn(collectColumn).then(() => {
           let targetScrollLeft = lastScrollLeft;
           let targetScrollTop = lastScrollTop;
@@ -4439,8 +4587,8 @@ const VxeTableComponent = comp.defineVxeComponent({
        * @param {ColumnInfo} columns 列配置
        */
       reloadColumn(columns) {
-        return $xeTable.clearAll().then(() => {
-          return $xeTable.loadColumn(columns);
+        return tableMethods.clearAll().then(() => {
+          return tableMethods.loadColumn(columns);
         });
       },
       /**
@@ -4531,7 +4679,7 @@ const VxeTableComponent = comp.defineVxeComponent({
        */
       createData(records) {
         return vue.nextTick().then(() => {
-          return vue.reactive($xeTable.defineField(records));
+          return vue.reactive(tablePrivateMethods.defineField(records));
         });
       },
       /**
@@ -4540,11 +4688,11 @@ const VxeTableComponent = comp.defineVxeComponent({
        * @param {Array/Object} records 新数据
        */
       createRow(records) {
-        const isArr = ctor.default.isArray(records);
+        const isArr = index.default.isArray(records);
         if (!isArr) {
           records = [records || {}];
         }
-        return $xeTable.createData(records).then((rows) => isArr ? rows : rows[0]);
+        return tableMethods.createData(records).then((rows) => isArr ? rows : rows[0]);
       },
       /**
        * 还原数据
@@ -4565,11 +4713,11 @@ const VxeTableComponent = comp.defineVxeComponent({
         }
         let targetRows = rows;
         if (rows) {
-          if (!ctor.default.isArray(rows)) {
+          if (!index.default.isArray(rows)) {
             targetRows = [rows];
           }
         } else {
-          targetRows = ctor.default.toArray($xeTable.getUpdateRecords());
+          targetRows = index.default.toArray($xeTable.getUpdateRecords());
         }
         let reDelFlag = false;
         if (targetRows.length) {
@@ -4582,9 +4730,9 @@ const VxeTableComponent = comp.defineVxeComponent({
                 const oRow = sourceDataRowIdData[rowid];
                 if (oRow && row) {
                   if (field) {
-                    ctor.default.set(row, field, ctor.default.clone(ctor.default.get(oRow, field), true));
+                    index.default.set(row, field, index.default.clone(index.default.get(oRow, field), true));
                   } else {
-                    ctor.default.destructuring(row, ctor.default.clone(oRow, true));
+                    index.default.destructuring(row, index.default.clone(oRow, true));
                   }
                   if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
                     if (removeRowMaps[rowid]) {
@@ -4633,11 +4781,11 @@ const VxeTableComponent = comp.defineVxeComponent({
         const { tableFullData, visibleColumn } = internalData;
         if (!arguments.length) {
           rows = tableFullData;
-        } else if (rows && !ctor.default.isArray(rows)) {
+        } else if (rows && !index.default.isArray(rows)) {
           rows = [rows];
         }
         if (field) {
-          rows.forEach((row) => ctor.default.set(row, field, null));
+          rows.forEach((row) => index.default.set(row, field, null));
         } else {
           rows.forEach((row) => {
             visibleColumn.forEach((column) => {
@@ -4719,16 +4867,16 @@ const VxeTableComponent = comp.defineVxeComponent({
             columnIndex: $xeTable.getColumnIndex(column)
           };
           if (formatter) {
-            if (ctor.default.isString(formatter)) {
+            if (index.default.isString(formatter)) {
               const gFormatOpts = formats.get(formatter);
               const tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
               cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : "";
-            } else if (ctor.default.isArray(formatter)) {
+            } else if (index.default.isArray(formatter)) {
               const gFormatOpts = formats.get(formatter[0]);
               const tcFormatMethod = gFormatOpts ? gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod : null;
               cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : "";
             } else {
-              cellLabel = formatter(formatParams);
+              cellLabel = `${formatter(formatParams)}`;
             }
           } else if (renderOpts && tcFormatter) {
             cellLabel = tcFormatter(renderOpts, formatParams);
@@ -4739,43 +4887,6 @@ const VxeTableComponent = comp.defineVxeComponent({
         }
         return cellLabel;
       },
-      updateCellLabel(row, fieldOrColumn) {
-        const column = util.handleFieldOrColumn($xeTable, fieldOrColumn);
-        if (!column) {
-          return null;
-        }
-        const { fullAllDataRowIdData } = internalData;
-        const rowid = util.getRowid($xeTable, row);
-        if (rowid) {
-          const colid = column.id;
-          const rowid2 = util.getRowid($xeTable, row);
-          const rowRest = fullAllDataRowIdData[rowid2];
-          if (rowRest) {
-            const formatData = rowRest.formatData;
-            if (formatData) {
-              delete formatData[colid];
-            }
-          }
-        }
-        return $xeTable.getFooterCellLabel(row, column);
-      },
-      clearFormatterCache(isUpdate) {
-        const { tableData, tableColumn } = reactData;
-        const { fullAllDataRowIdData } = internalData;
-        ctor.default.each(fullAllDataRowIdData, (rowRest) => {
-          if (rowRest.formatData) {
-            rowRest.formatData = void 0;
-          }
-        });
-        if (isUpdate) {
-          tableData.forEach((row) => {
-            tableColumn.forEach((column) => {
-              $xeTable.getCellLabel(row, column);
-            });
-          });
-        }
-        return vue.nextTick();
-      },
       getFooterCellLabel(row, fieldOrColumn) {
         const column = util.handleFieldOrColumn($xeTable, fieldOrColumn);
         if (!column) {
@@ -4784,10 +4895,10 @@ const VxeTableComponent = comp.defineVxeComponent({
         const { footerFormatter } = column;
         const _columnIndex = $xeTable.getVTColumnIndex(column);
         let itemValue = "";
-        if (ctor.default.isArray(row)) {
+        if (index.default.isArray(row)) {
           itemValue = row[_columnIndex];
         } else {
-          itemValue = ctor.default.get(row, column.field);
+          itemValue = index.default.get(row, column.field);
         }
         let cellLabel = itemValue;
         if (footerFormatter) {
@@ -4823,11 +4934,11 @@ const VxeTableComponent = comp.defineVxeComponent({
             _columnIndex,
             columnIndex: $xeTable.getColumnIndex(column)
           };
-          if (ctor.default.isString(footerFormatter)) {
+          if (index.default.isString(footerFormatter)) {
             const gFormatOpts = formats.get(footerFormatter);
             const fcFormatMethod = gFormatOpts ? gFormatOpts.tableFooterCellFormatMethod : null;
             cellLabel = fcFormatMethod ? fcFormatMethod(footerFormatParams) : "";
-          } else if (ctor.default.isArray(footerFormatter)) {
+          } else if (index.default.isArray(footerFormatter)) {
             const gFormatOpts = formats.get(footerFormatter[0]);
             const fcFormatMethod = gFormatOpts ? gFormatOpts.tableFooterCellFormatMethod : null;
             cellLabel = fcFormatMethod ? fcFormatMethod(footerFormatParams, ...footerFormatter.slice(1)) : "";
@@ -4840,41 +4951,6 @@ const VxeTableComponent = comp.defineVxeComponent({
         }
         return cellLabel;
       },
-      updateFooterCellLabel(row, fieldOrColumn) {
-        const column = util.handleFieldOrColumn($xeTable, fieldOrColumn);
-        if (!column) {
-          return null;
-        }
-        const { footerTableData } = reactData;
-        const { footerFullDataRowData } = internalData;
-        const colid = column.id;
-        const $rowIndex = footerTableData.indexOf(row);
-        const rowRest = footerFullDataRowData[$rowIndex];
-        if (rowRest) {
-          const formatData = rowRest.formatData;
-          if (formatData) {
-            delete formatData[colid];
-          }
-        }
-        return $xeTable.getFooterCellLabel(row, column);
-      },
-      clearFooterFormatterCache(isUpdate) {
-        const { tableData, tableColumn } = reactData;
-        const { footerFullDataRowData } = internalData;
-        ctor.default.each(footerFullDataRowData, (rowRest) => {
-          if (rowRest.formatData) {
-            rowRest.formatData = void 0;
-          }
-        });
-        if (isUpdate) {
-          tableData.forEach((row) => {
-            tableColumn.forEach((column) => {
-              $xeTable.getFooterCellLabel(row, column);
-            });
-          });
-        }
-        return vue.nextTick();
-      },
       /**
        * 检查是否为临时行数据
        */
@@ -4891,17 +4967,16 @@ const VxeTableComponent = comp.defineVxeComponent({
        */
       removeInsertRow() {
         const { insertRowMaps } = internalData;
-        return $xeTable.remove(ctor.default.values(insertRowMaps));
+        return $xeTable.remove(index.default.values(insertRowMaps));
       },
       /**
        * 检查行或列数据是否发生改变
        */
       isUpdateByRow(rowidOrRow, field) {
         const { keepSource } = props$1;
-        const { fullDataRowIdData, sourceDataRowIdData } = internalData;
-        const keepFields = computeKeepFields.value;
+        const { tableFullColumn, fullDataRowIdData, sourceDataRowIdData } = internalData;
         if (keepSource) {
-          const rowid = ctor.default.isString(rowidOrRow) || ctor.default.isNumber(rowidOrRow) ? rowidOrRow : util.getRowid($xeTable, rowidOrRow);
+          const rowid = index.default.isString(rowidOrRow) || index.default.isNumber(rowidOrRow) ? rowidOrRow : util.getRowid($xeTable, rowidOrRow);
           const rowRest = fullDataRowIdData[rowid];
           if (!rowRest) {
             return false;
@@ -4912,8 +4987,9 @@ const VxeTableComponent = comp.defineVxeComponent({
             if (arguments.length > 1) {
               return !eqCellValue(oRow, row, field);
             }
-            for (let i = 0; i < keepFields.length; i++) {
-              if (!eqCellValue(oRow, row, keepFields[i])) {
+            for (let index2 = 0, len = tableFullColumn.length; index2 < len; index2++) {
+              const property = tableFullColumn[index2].field;
+              if (property && !eqCellValue(oRow, row, property)) {
                 return true;
               }
             }
@@ -4927,7 +5003,7 @@ const VxeTableComponent = comp.defineVxeComponent({
        */
       getColumns(columnIndex) {
         const { visibleColumn } = internalData;
-        return ctor.default.isUndefined(columnIndex) ? visibleColumn.slice(0) : visibleColumn[columnIndex];
+        return index.default.isUndefined(columnIndex) ? visibleColumn.slice(0) : visibleColumn[columnIndex];
       },
       /**
        * 根据列获取列的唯一主键
@@ -4982,7 +5058,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         let prevDragCol = null;
         const colRest = dragCol ? fullColumnIdData[dragCol.id] : null;
         let defPos = "left";
-        if (ctor.default.isNumber(targetFieldOrColumn)) {
+        if (index.default.isNumber(targetFieldOrColumn)) {
           if (colRest && targetFieldOrColumn) {
             let currList = colRest.items;
             let offsetIndex = colRest._index + targetFieldOrColumn;
@@ -5023,7 +5099,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         let prevDragRow = null;
         let defPos = "top";
         const rowRest = dragRow ? fullAllDataRowIdData[util.getRowid($xeTable, dragRow)] : null;
-        if (ctor.default.isNumber(targetRowidOrRow)) {
+        if (index.default.isNumber(targetRowidOrRow)) {
           if (rowRest && targetRowidOrRow) {
             let currList = afterFullData;
             let offsetIndex = rowRest._index + targetRowidOrRow;
@@ -5068,7 +5144,7 @@ const VxeTableComponent = comp.defineVxeComponent({
        */
       getData(rowIndex) {
         const tableSynchData = props$1.data || internalData.tableSynchData;
-        return ctor.default.isUndefined(rowIndex) ? tableSynchData.slice(0) : tableSynchData[rowIndex];
+        return index.default.isUndefined(rowIndex) ? tableSynchData.slice(0) : tableSynchData[rowIndex];
       },
       /**
        * 用于多选行，获取已选中的数据
@@ -5087,14 +5163,14 @@ const VxeTableComponent = comp.defineVxeComponent({
           if (checkField) {
             if (treeConfig) {
               const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? tableFullTreeData : afterFullData;
-              rowList = ctor.default.filterTree(currTableData, (row) => ctor.default.get(row, checkField), { children: transform ? mapChildrenField : childrenField });
+              rowList = index.default.filterTree(currTableData, (row) => index.default.get(row, checkField), { children: transform ? mapChildrenField : childrenField });
             } else {
               const currTableData = isFull ? tableFullData : afterFullData;
-              rowList = currTableData.filter((row) => ctor.default.get(row, checkField));
+              rowList = currTableData.filter((row) => index.default.get(row, checkField));
             }
           } else {
             const currMaps = isFull || treeConfig && !transform ? fullDataRowIdData : afterFullRowMaps;
-            ctor.default.each(selectCheckboxMaps, (row, rowid) => {
+            index.default.each(selectCheckboxMaps, (row, rowid) => {
               if (currMaps[rowid]) {
                 rowList.push(fullDataRowIdData[rowid].row);
               }
@@ -5114,7 +5190,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const childrenField = treeOpts.children || treeOpts.childrenField;
         if (rowOrRowid && treeConfig) {
           let rowid;
-          if (ctor.default.isString(rowOrRowid)) {
+          if (index.default.isString(rowOrRowid)) {
             rowid = rowOrRowid;
           } else {
             rowid = util.getRowid($xeTable, rowOrRowid);
@@ -5137,7 +5213,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const { fullAllDataRowIdData } = internalData;
         if (rowOrRowid && treeConfig) {
           let rowid;
-          if (ctor.default.isString(rowOrRowid)) {
+          if (index.default.isString(rowOrRowid)) {
             rowid = rowOrRowid;
           } else {
             rowid = util.getRowid($xeTable, rowOrRowid);
@@ -5159,7 +5235,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const { fullAllDataRowIdData } = internalData;
         if (rowOrRowid && treeConfig) {
           let rowid;
-          if (ctor.default.isString(rowOrRowid)) {
+          if (index.default.isString(rowOrRowid)) {
             rowid = rowOrRowid;
           } else {
             rowid = util.getRowid($xeTable, rowOrRowid);
@@ -5183,7 +5259,7 @@ const VxeTableComponent = comp.defineVxeComponent({
        */
       getRowById(cellValue) {
         const { fullAllDataRowIdData } = internalData;
-        const rowid = ctor.default.eqNull(cellValue) ? "" : encodeURIComponent(cellValue || "");
+        const rowid = index.default.eqNull(cellValue) ? "" : encodeURIComponent(cellValue || "");
         return fullAllDataRowIdData[rowid] ? fullAllDataRowIdData[rowid].row : null;
       },
       /**
@@ -5224,7 +5300,7 @@ const VxeTableComponent = comp.defineVxeComponent({
        */
       setColumnFixed(fieldOrColumn, fixed) {
         let status = false;
-        const cols = ctor.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        const cols = index.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
         const columnOpts = computeColumnOpts.value;
         const isMaxFixedColumn = computeIsMaxFixedColumn.value;
         for (let i = 0; i < cols.length; i++) {
@@ -5241,18 +5317,18 @@ const VxeTableComponent = comp.defineVxeComponent({
               }
               return vue.nextTick();
             }
-            ctor.default.eachTree([targetColumn], (column2) => {
+            index.default.eachTree([targetColumn], (column2) => {
               column2.fixed = fixed;
               column2.renderFixed = fixed;
             });
-            $xeTable.saveCustomStore("update:fixed");
+            tablePrivateMethods.saveCustomStore("update:fixed");
             if (!status) {
               status = true;
             }
           }
         }
         if (status) {
-          return $xeTable.refreshColumn();
+          return tableMethods.refreshColumn();
         }
         return vue.nextTick();
       },
@@ -5261,23 +5337,23 @@ const VxeTableComponent = comp.defineVxeComponent({
        */
       clearColumnFixed(fieldOrColumn) {
         let status = false;
-        const cols = ctor.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        const cols = index.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
         cols.forEach((item) => {
           const column = util.handleFieldOrColumn($xeTable, item);
           const targetColumn = util.getRootColumn($xeTable, column);
           if (targetColumn && targetColumn.fixed) {
-            ctor.default.eachTree([targetColumn], (column2) => {
+            index.default.eachTree([targetColumn], (column2) => {
               column2.fixed = null;
               column2.renderFixed = null;
             });
-            $xeTable.saveCustomStore("update:fixed");
+            tablePrivateMethods.saveCustomStore("update:fixed");
             if (!status) {
               status = true;
             }
           }
         });
         if (status) {
-          return $xeTable.refreshColumn();
+          return tableMethods.refreshColumn();
         }
         return vue.nextTick();
       },
@@ -5292,8 +5368,8 @@ const VxeTableComponent = comp.defineVxeComponent({
       setColumnWidth(fieldOrColumn, width) {
         const { elemStore } = internalData;
         let status = false;
-        const cols = ctor.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
-        let cWidth = ctor.default.toInteger(width);
+        const cols = index.default.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn];
+        let cWidth = index.default.toInteger(width);
         if (dom.isScale(width)) {
           const bodyScrollElem = util.getRefElem(elemStore["main-body-scroll"]);
           const bodyWidth = bodyScrollElem ? bodyScrollElem.clientWidth - 1 : 0;
@@ -5354,10 +5430,10 @@ const VxeTableComponent = comp.defineVxeComponent({
         const { fullAllDataRowIdData } = internalData;
         let status = false;
         if (heightConf) {
-          ctor.default.each(heightConf, (height, rowid) => {
+          index.default.each(heightConf, (height, rowid) => {
             const rowRest = fullAllDataRowIdData[rowid];
             if (rowRest) {
-              const rHeight = ctor.default.toInteger(height);
+              const rHeight = index.default.toInteger(height);
               if (rHeight) {
                 rowRest.resizeHeight = rHeight;
                 if (!status) {
@@ -5398,13 +5474,13 @@ const VxeTableComponent = comp.defineVxeComponent({
       },
       recalcRowHeight(rowOrId) {
         const { fullAllDataRowIdData } = internalData;
-        const rows = ctor.default.isArray(rowOrId) ? rowOrId : [rowOrId];
+        const rows = index.default.isArray(rowOrId) ? rowOrId : [rowOrId];
         const el = refElem.value;
         if (el) {
           const { handleGetRowId } = util.createHandleGetRowId($xeTable);
           el.setAttribute("data-calc-row", "Y");
           rows.forEach((row) => {
-            const rowid = ctor.default.isString(row) || ctor.default.isNumber(row) ? row : handleGetRowId(row);
+            const rowid = index.default.isString(row) || index.default.isNumber(row) ? row : handleGetRowId(row);
             const rowRest = fullAllDataRowIdData[rowid];
             if (rowRest) {
               rowRest.resizeHeight = calcCellAutoHeight(rowRest, el);
@@ -5418,8 +5494,8 @@ const VxeTableComponent = comp.defineVxeComponent({
       setRowHeight(rowOrId, height) {
         const { fullAllDataRowIdData } = internalData;
         let status = false;
-        const rows = ctor.default.isArray(rowOrId) ? rowOrId : [rowOrId];
-        let rHeight = ctor.default.toInteger(height);
+        const rows = index.default.isArray(rowOrId) ? rowOrId : [rowOrId];
+        let rHeight = index.default.toInteger(height);
         if (dom.isScale(height)) {
           const tableBody = refTableBody.value;
           const bodyElem = tableBody ? tableBody.$el : null;
@@ -5429,7 +5505,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         if (rHeight) {
           const { handleGetRowId } = util.createHandleGetRowId($xeTable);
           rows.forEach((row) => {
-            const rowid = ctor.default.isString(row) || ctor.default.isNumber(row) ? row : handleGetRowId(row);
+            const rowid = index.default.isString(row) || index.default.isNumber(row) ? row : handleGetRowId(row);
             const rowRest = fullAllDataRowIdData[rowid];
             if (rowRest) {
               rowRest.resizeHeight = rHeight;
@@ -5452,7 +5528,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const rowOpts = computeRowOpts.value;
         const cellOpts = computeCellOpts.value;
         const defaultRowHeight = computeDefaultRowHeight.value;
-        const rowid = ctor.default.isString(rowOrId) || ctor.default.isNumber(rowOrId) ? rowOrId : util.getRowid($xeTable, rowOrId);
+        const rowid = index.default.isString(rowOrId) || index.default.isNumber(rowOrId) ? rowOrId : util.getRowid($xeTable, rowOrId);
         const rowRest = fullAllDataRowIdData[rowid];
         if (rowRest) {
           return rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
@@ -5553,7 +5629,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         if (treeConfig) {
           const fullRest = [];
           const defRest = [];
-          ctor.default.each(treeIndeterminateRowMaps, (item, rowid) => {
+          index.default.each(treeIndeterminateRowMaps, (item, rowid) => {
             if (item) {
               fullRest.push(item);
               if (fullDataRowIdData[rowid]) {
@@ -5574,14 +5650,14 @@ const VxeTableComponent = comp.defineVxeComponent({
        * @param {Boolean} value 是否选中
        */
       setCheckboxRow(rows, checked) {
-        if (rows && !ctor.default.isArray(rows)) {
+        if (rows && !index.default.isArray(rows)) {
           rows = [rows];
         }
         return handleCheckedCheckboxRow(rows, checked, true);
       },
       setCheckboxRowKey(keys, checked) {
         const { fullAllDataRowIdData } = internalData;
-        if (!ctor.default.isArray(keys)) {
+        if (!index.default.isArray(keys)) {
           keys = [keys];
         }
         const rows = [];
@@ -5599,7 +5675,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const checkboxOpts = computeCheckboxOpts.value;
         const { checkField } = checkboxOpts;
         if (checkField) {
-          return ctor.default.get(row, checkField);
+          return index.default.get(row, checkField);
         }
         return !!updateCheckboxFlag && !!selectCheckboxMaps[util.getRowid($xeTable, row)];
       },
@@ -5611,7 +5687,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         if (checkField) {
           const rowRest = fullAllDataRowIdData[rowid];
           if (rowRest) {
-            return ctor.default.get(rowRest.row, checkField);
+            return index.default.get(rowRest.row, checkField);
           }
           return false;
         }
@@ -5632,9 +5708,9 @@ const VxeTableComponent = comp.defineVxeComponent({
         const { selectCheckboxMaps } = internalData;
         const checkboxOpts = computeCheckboxOpts.value;
         const { checkField } = checkboxOpts;
-        const checked = checkField ? !ctor.default.get(row, checkField) : !selectCheckboxMaps[util.getRowid($xeTable, row)];
-        $xeTable.handleBatchSelectRows([row], checked, true);
-        $xeTable.checkSelectionStatus();
+        const checked = checkField ? !index.default.get(row, checkField) : !selectCheckboxMaps[util.getRowid($xeTable, row)];
+        tablePrivateMethods.handleBatchSelectRows([row], checked, true);
+        tablePrivateMethods.checkSelectionStatus();
         return vue.nextTick();
       },
       /**
@@ -5662,12 +5738,12 @@ const VxeTableComponent = comp.defineVxeComponent({
           } else {
             const rowkey = util.getRowkey($xeTable);
             if (treeConfig) {
-              const matchObj = ctor.default.findTree(afterFullData, (row) => rowid === ctor.default.get(row, rowkey), { children: childrenField });
+              const matchObj = index.default.findTree(afterFullData, (row) => rowid === index.default.get(row, rowkey), { children: childrenField });
               if (matchObj) {
                 return radioReserveRow;
               }
             } else {
-              if (!afterFullData.some((row) => rowid === ctor.default.get(row, rowkey))) {
+              if (!afterFullData.some((row) => rowid === index.default.get(row, rowkey))) {
                 return radioReserveRow;
               }
             }
@@ -5693,7 +5769,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           const { handleGetRowId } = util.createHandleGetRowId($xeTable);
           const afterFullIdMaps = {};
           if (treeConfig) {
-            ctor.default.eachTree(afterFullData, (row) => {
+            index.default.eachTree(afterFullData, (row) => {
               afterFullIdMaps[handleGetRowId(row)] = 1;
             }, { children: childrenField });
           } else {
@@ -5701,7 +5777,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               afterFullIdMaps[handleGetRowId(row)] = 1;
             });
           }
-          ctor.default.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
+          index.default.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
             if (oldRow) {
               if (isFull) {
                 if (!fullDataRowIdData[oldRowid]) {
@@ -5743,12 +5819,12 @@ const VxeTableComponent = comp.defineVxeComponent({
         if (checkField) {
           const handleClearChecked = (item) => {
             if (treeConfig && indeterminateField) {
-              ctor.default.set(item, indeterminateField, false);
+              index.default.set(item, indeterminateField, false);
             }
-            ctor.default.set(item, checkField, false);
+            index.default.set(item, checkField, false);
           };
           if (treeConfig) {
-            ctor.default.eachTree(tableFullData, handleClearChecked, { children: childrenField });
+            index.default.eachTree(tableFullData, handleClearChecked, { children: childrenField });
           } else {
             tableFullData.forEach(handleClearChecked);
           }
@@ -5771,11 +5847,11 @@ const VxeTableComponent = comp.defineVxeComponent({
         const $xeGanttView = internalData.xeGanttView;
         const rowOpts = computeRowOpts.value;
         const el = refElem.value;
-        $xeTable.clearCurrentRow();
+        tableMethods.clearCurrentRow();
         reactData.currentRow = row;
         if (rowOpts.isCurrent || props$1.highlightCurrentRow) {
           if (el) {
-            ctor.default.arrayEach(el.querySelectorAll(`[rowid="${util.getRowid($xeTable, row)}"]`), (elem) => dom.addClass(elem, "row--current"));
+            index.default.arrayEach(el.querySelectorAll(`[rowid="${util.getRowid($xeTable, row)}"]`), (elem) => dom.addClass(elem, "row--current"));
           }
         }
         if ($xeGanttView && $xeGanttView.handleUpdateCurrentRow) {
@@ -5825,7 +5901,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         reactData.currentRow = null;
         internalData.hoverRow = null;
         if (el) {
-          ctor.default.arrayEach(el.querySelectorAll(".row--current"), (elem) => dom.removeClass(elem, "row--current"));
+          index.default.arrayEach(el.querySelectorAll(".row--current"), (elem) => dom.removeClass(elem, "row--current"));
         }
         if ($xeGanttView && $xeGanttView.handleUpdateCurrentRow) {
           $xeGanttView.handleUpdateCurrentRow();
@@ -5912,7 +5988,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       setPendingRow(rows, status) {
         const { handleGetRowId } = util.createHandleGetRowId($xeTable);
         const { pendingRowMaps } = internalData;
-        if (rows && !ctor.default.isArray(rows)) {
+        if (rows && !index.default.isArray(rows)) {
           rows = [rows];
         }
         if (status) {
@@ -5936,7 +6012,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       togglePendingRow(rows) {
         const { handleGetRowId } = util.createHandleGetRowId($xeTable);
         const { pendingRowMaps } = internalData;
-        if (rows && !ctor.default.isArray(rows)) {
+        if (rows && !index.default.isArray(rows)) {
           rows = [rows];
         }
         rows.forEach((row) => {
@@ -5953,7 +6029,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         return vue.nextTick();
       },
       hasPendingByRow(row) {
-        return $xeTable.isPendingByRow(row);
+        return tableMethods.isPendingByRow(row);
       },
       isPendingByRow(row) {
         const { pendingRowMaps } = internalData;
@@ -5963,7 +6039,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       getPendingRecords() {
         const { fullAllDataRowIdData, pendingRowMaps } = internalData;
         const insertRecords = [];
-        ctor.default.each(pendingRowMaps, (row, rowid) => {
+        index.default.each(pendingRowMaps, (row, rowid) => {
           if (fullAllDataRowIdData[rowid]) {
             insertRecords.push(row);
           }
@@ -5979,24 +6055,24 @@ const VxeTableComponent = comp.defineVxeComponent({
         const sortOpts = computeSortOpts.value;
         const { multiple, remote, orders } = sortOpts;
         if (sortConfs) {
-          if (ctor.default.isString(sortConfs)) {
+          if (index.default.isString(sortConfs)) {
             sortConfs = [
               { field: sortConfs, order: sortOrder }
             ];
           }
         }
-        if (!ctor.default.isArray(sortConfs)) {
+        if (!index.default.isArray(sortConfs)) {
           sortConfs = [sortConfs];
         }
         if (sortConfs.length) {
           if (!multiple) {
             clearAllSort();
           }
-          (multiple ? sortConfs : [sortConfs[0]]).forEach((confs, index) => {
+          (multiple ? sortConfs : [sortConfs[0]]).forEach((confs, index$1) => {
             let { field, order } = confs;
             let column = field;
-            if (ctor.default.isString(field)) {
-              column = $xeTable.getColumnByField(field);
+            if (index.default.isString(field)) {
+              column = tableMethods.getColumnByField(field);
             }
             if (column && column.sortable) {
               if (orders && orders.indexOf(order) === -1) {
@@ -6005,15 +6081,15 @@ const VxeTableComponent = comp.defineVxeComponent({
               if (column.order !== order) {
                 column.order = order;
               }
-              column.sortTime = Date.now() + index;
+              column.sortTime = Date.now() + index$1;
             }
           });
           if (!remote) {
-            $xeTable.handleTableData(true);
+            tablePrivateMethods.handleTableData(true);
           }
           return vue.nextTick().then(() => {
             updateRowOffsetTop();
-            $xeTable.updateCellAreas();
+            tableMethods.updateCellAreas();
             return updateStyle();
           });
         }
@@ -6092,7 +6168,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           const column = util.handleFieldOrColumn($xeTable, fieldOrColumn);
           return column ? column.sortable && !!column.order : false;
         }
-        return $xeTable.getSortColumns().length > 0;
+        return tableMethods.getSortColumns().length > 0;
       },
       getSortColumns() {
         const sortOpts = computeSortOpts.value;
@@ -6106,7 +6182,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           }
         });
         if (multiple && chronological && sortList.length > 1) {
-          return ctor.default.orderBy(sortList, "sortTime");
+          return index.default.orderBy(sortList, "sortTime");
         }
         return sortList;
       },
@@ -6152,7 +6228,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         return $xeTable.getCheckedFilters().length > 0;
       },
       isFilter(fieldOrColumn) {
-        return $xeTable.isActiveFilterByColumn(fieldOrColumn);
+        return tableMethods.isActiveFilterByColumn(fieldOrColumn);
       },
       clearFilterByEvent(evnt, fieldOrColumn) {
         const { filterStore } = reactData;
@@ -6277,13 +6353,13 @@ const VxeTableComponent = comp.defineVxeComponent({
         const childrenField = treeOpts.children || treeOpts.childrenField;
         let expandedRows = [];
         if (props$1.treeConfig) {
-          ctor.default.eachTree(tableFullTreeData, (row) => {
+          index.default.eachTree(tableFullTreeData, (row) => {
             expandedRows.push(row);
           }, { children: childrenField });
         } else {
           expandedRows = tableFullData;
         }
-        return $xeTable.setRowExpand(expandedRows, expanded);
+        return tableMethods.setRowExpand(expandedRows, expanded);
       },
       /**
        * 设置展开行，二个参数设置这一行展开与否
@@ -6302,7 +6378,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const columnIndex = expandColumn ? $xeTable.getColumnIndex(expandColumn) : -1;
         const $columnIndex = expandColumn ? $xeTable.getVMColumnIndex(expandColumn) : -1;
         if (rows) {
-          if (!ctor.default.isArray(rows)) {
+          if (!index.default.isArray(rows)) {
             rows = [rows];
           }
           if (accordion) {
@@ -6356,7 +6432,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       },
       isExpandByRow(row) {
         log.warnLog("vxe.error.delFunc", ["isExpandByRow", "isRowExpandByRow"]);
-        return $xeTable.isRowExpandByRow(row);
+        return tableMethods.isRowExpandByRow(row);
       },
       /**
        * 手动清空展开行状态，数据会恢复成未展开的状态
@@ -6390,7 +6466,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       },
       getRowExpandRecords() {
         const rest = [];
-        ctor.default.each(internalData.rowExpandedMaps, (item) => {
+        index.default.each(internalData.rowExpandedMaps, (item) => {
           if (item) {
             rest.push(item);
           }
@@ -6405,7 +6481,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           log.errLog("vxe.error.reqProp", ["aggregate-config"]);
           return vue.nextTick();
         }
-        const confList = fieldOrColumns ? ctor.default.isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns] : [];
+        const confList = fieldOrColumns ? index.default.isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns] : [];
         if (maxGroupSize && confList.length > maxGroupSize) {
           if (index_esm.VxeUI.modal) {
             index_esm.VxeUI.modal.message({
@@ -6417,7 +6493,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         }
         if (confList.length) {
           handleUpdateRowGroup(confList.map((fieldOrColumn) => {
-            return ctor.default.isString(fieldOrColumn) ? fieldOrColumn : fieldOrColumn.field;
+            return index.default.isString(fieldOrColumn) ? fieldOrColumn : fieldOrColumn.field;
           }));
           return loadTableData(internalData.tableSynchData, false, true);
         }
@@ -6483,7 +6559,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       },
       setRowGroupExpand(rows, expanded) {
         if (rows) {
-          if (!ctor.default.isArray(rows)) {
+          if (!index.default.isArray(rows)) {
             rows = [rows];
           }
           return handleRowGroupVirtualExpand(rows, expanded);
@@ -6495,7 +6571,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const aggregateOpts = computeAggregateOpts.value;
         const { childrenField } = aggregateOpts;
         if (groupFields) {
-          if (!ctor.default.isArray(groupFields)) {
+          if (!index.default.isArray(groupFields)) {
             groupFields = [groupFields];
           }
           if (isRowGroupStatus) {
@@ -6504,7 +6580,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             groupFields.forEach((groupField) => {
               gfKeys[groupField] = true;
             });
-            ctor.default.eachTree(internalData.afterGroupFullData, (row) => {
+            index.default.eachTree(internalData.afterGroupFullData, (row) => {
               if (row.isAggregate && gfKeys[row.groupField]) {
                 rows.push(row);
               }
@@ -6522,7 +6598,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const { mapChildrenField } = aggregateOpts;
         const rgExpandedMaps = {};
         if (expanded && mapChildrenField) {
-          ctor.default.eachTree(tableFullGroupData, (row) => {
+          index.default.eachTree(tableFullGroupData, (row) => {
             if (row[mapChildrenField] && row[mapChildrenField].length) {
               rgExpandedMaps[util.getRowid($xeTable, row)] = row;
             }
@@ -6545,7 +6621,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       },
       getTreeExpandRecords() {
         const rest = [];
-        ctor.default.each(internalData.treeExpandedMaps, (item) => {
+        index.default.each(internalData.treeExpandedMaps, (item) => {
           if (item) {
             rest.push(item);
           }
@@ -6566,7 +6642,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const treeOpts = computeTreeOpts.value;
         const { transform } = treeOpts;
         if (rows) {
-          if (!ctor.default.isArray(rows)) {
+          if (!index.default.isArray(rows)) {
             rows = [rows];
           }
           rows.forEach((row) => {
@@ -6580,7 +6656,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             }
           });
         } else {
-          ctor.default.each(fullAllDataRowIdData, (rowRest) => {
+          index.default.each(fullAllDataRowIdData, (rowRest) => {
             rowRest.treeLoaded = false;
           });
           internalData.treeExpandedMaps = {};
@@ -6637,7 +6713,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const { transform, lazy } = treeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const expandeds = [];
-        ctor.default.eachTree(tableFullData, (row) => {
+        index.default.eachTree(tableFullData, (row) => {
           const rowChildren = row[childrenField];
           if (lazy || rowChildren && rowChildren.length) {
             expandeds.push(row);
@@ -6662,7 +6738,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const treeOpts = computeTreeOpts.value;
         const { transform } = treeOpts;
         if (rows) {
-          if (!ctor.default.isArray(rows)) {
+          if (!index.default.isArray(rows)) {
             rows = [rows];
           }
           if (rows.length) {
@@ -6695,7 +6771,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const expList = $xeTable.getTreeExpandRecords();
         internalData.treeExpandedMaps = {};
         if (reserve) {
-          ctor.default.eachTree(tableFullTreeData, (row) => handleTreeExpandReserve(row, false), { children: childrenField });
+          index.default.eachTree(tableFullTreeData, (row) => handleTreeExpandReserve(row, false), { children: childrenField });
         }
         return $xeTable.handleTableData().then(() => {
           if (transform) {
@@ -6768,55 +6844,47 @@ const VxeTableComponent = comp.defineVxeComponent({
         const yHandleEl = refScrollYHandleElem.value;
         internalData.intoRunScroll = true;
         if (scrollLeft) {
-          if (!ctor.default.isNumber(scrollLeft)) {
+          if (!index.default.isNumber(scrollLeft)) {
             scrollTop = scrollLeft.top;
             scrollLeft = scrollLeft.left;
           }
         }
-        if (ctor.default.isNumber(scrollLeft)) {
+        if (index.default.isNumber(scrollLeft)) {
           dom.setScrollLeft(xHandleEl, scrollLeft);
           dom.setScrollLeft(bodyScrollElem, scrollLeft);
           dom.setScrollLeft(headerScrollElem, scrollLeft);
           dom.setScrollLeft(footerScrollElem, scrollLeft);
-          if (reactData.scrollXLoad) {
-            loadScrollXData();
-          }
+          loadScrollXData();
         }
-        if (ctor.default.isNumber(scrollTop)) {
+        if (index.default.isNumber(scrollTop)) {
           dom.setScrollTop(yHandleEl, scrollTop);
           dom.setScrollTop(bodyScrollElem, scrollTop);
           dom.setScrollTop(leftScrollElem, scrollTop);
           dom.setScrollTop(rightScrollElem, scrollTop);
-          if (reactData.scrollYLoad) {
-            loadScrollYData();
-          }
+          loadScrollYData();
         }
-        return new Promise((resolve) => {
-          setTimeout(() => {
-            vue.nextTick(() => {
-              internalData.intoRunScroll = false;
-              resolve();
-            });
-          }, reactData.scrollXLoad || reactData.scrollYLoad ? 30 : 0);
+        if (reactData.scrollXLoad || reactData.scrollYLoad) {
+          return new Promise((resolve) => {
+            setTimeout(() => {
+              vue.nextTick(() => {
+                internalData.intoRunScroll = false;
+                resolve();
+              });
+            }, 30);
+          });
+        }
+        return vue.nextTick().then(() => {
+          internalData.intoRunScroll = false;
         });
       },
       /**
        * 如果有滚动条，则滚动到对应的行
+       * @param {Row} row 行对象
+       * @param {ColumnInfo} fieldOrColumn 列配置
        */
-      scrollToRow(rowOrRowid, fieldOrColumn, options) {
+      scrollToRow(row, fieldOrColumn) {
         const { isAllOverflow, scrollYLoad, scrollXLoad } = reactData;
-        const { fullAllDataRowIdData, _sToTime } = internalData;
         const rest = [];
-        let row;
-        if (ctor.default.isString(rowOrRowid) || ctor.default.isNumber(rowOrRowid)) {
-          const rowid = rowOrRowid;
-          const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
-          if (rowRest) {
-            row = rowRest.row;
-          }
-        } else {
-          row = rowOrRowid;
-        }
         if (row) {
           if (props$1.treeConfig) {
             rest.push($xeTable.scrollToTreeRow(row));
@@ -6825,29 +6893,13 @@ const VxeTableComponent = comp.defineVxeComponent({
           }
         }
         if (fieldOrColumn) {
-          rest.push(handleScrollToRowColumn(fieldOrColumn, row, options));
-        }
-        if (_sToTime) {
-          clearTimeout(_sToTime);
+          rest.push(handleScrollToRowColumn(fieldOrColumn, row));
         }
         return Promise.all(rest).then(() => {
           if (row) {
             if (!isAllOverflow && (scrollYLoad || scrollXLoad)) {
               calcCellHeight();
               calcCellWidth();
-              internalData._sToTime = setTimeout(() => {
-                internalData._sToTime = void 0;
-                if (scrollYLoad) {
-                  if (props$1.treeConfig) {
-                    $xeTable.scrollToTreeRow(row);
-                  } else {
-                    util.rowToVisible($xeTable, row);
-                  }
-                }
-                if (scrollXLoad && fieldOrColumn) {
-                  handleScrollToRowColumn(fieldOrColumn, row, options);
-                }
-              }, 350);
             }
             return vue.nextTick();
           }
@@ -6856,36 +6908,41 @@ const VxeTableComponent = comp.defineVxeComponent({
       /**
        * 如果有滚动条，则滚动到第一行
        */
-      scrollToStartRow(fieldOrColumn, options) {
+      scrollToStartRow(fieldOrColumn) {
         const { afterFullData } = internalData;
-        return $xeTable.scrollToRow(afterFullData[0], fieldOrColumn, options);
+        return $xeTable.scrollToRow(afterFullData[0], fieldOrColumn);
       },
       /**
        * 如果有滚动条，则滚动到最后一行
        */
-      scrollToEndRow(fieldOrColumn, options) {
+      scrollToEndRow(fieldOrColumn) {
         const { afterFullData } = internalData;
-        return $xeTable.scrollToRow(afterFullData[afterFullData.length - 1], fieldOrColumn, options);
+        return $xeTable.scrollToRow(afterFullData[afterFullData.length - 1], fieldOrColumn);
       },
       /**
        * 如果有滚动条，则滚动到对应的列
        */
-      scrollToColumn(fieldOrColumn, options) {
-        return handleScrollToRowColumn(fieldOrColumn, null, options);
+      scrollToColumn(fieldOrColumn) {
+        const { fullColumnIdData } = internalData;
+        const column = util.handleFieldOrColumn($xeTable, fieldOrColumn);
+        if (column && fullColumnIdData[column.id]) {
+          return util.colToVisible($xeTable, column);
+        }
+        return vue.nextTick();
       },
       /**
        * 如果有滚动条，则滚动到第一列
        */
-      scrollToStartColumn(options) {
+      scrollToStartColumn() {
         const { visibleColumn } = internalData;
-        return $xeTable.scrollToColumn(visibleColumn[0], options);
+        return $xeTable.scrollToColumn(visibleColumn[0]);
       },
       /**
        * 如果有滚动条，则滚动到最后一列
        */
-      scrollToEndColumn(options) {
+      scrollToEndColumn() {
         const { visibleColumn } = internalData;
-        return $xeTable.scrollToColumn(visibleColumn[visibleColumn.length - 1], options);
+        return $xeTable.scrollToColumn(visibleColumn[visibleColumn.length - 1]);
       },
       /**
        * 手动清除滚动相关信息，还原到初始状态
@@ -6950,8 +7007,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       updateStatus(slotParams, cellValue) {
         return vue.nextTick().then(() => {
           const { editRules } = props$1;
-          const { isActivated } = internalData;
-          if (isActivated && slotParams && editRules) {
+          if (slotParams && editRules) {
             return $xeTable.handleCellRuleUpdateStatus("change", slotParams, cellValue);
           }
         });
@@ -7003,8 +7059,6 @@ const VxeTableComponent = comp.defineVxeComponent({
         internalData.mergeBodyList = [];
         internalData.mergeBodyMaps = {};
         internalData.mergeBodyCellMaps = {};
-        internalData.mergeBodyRowMaps = {};
-        internalData.mergeBodyColMaps = {};
         reactData.mergeBodyFlag++;
         return vue.nextTick().then(() => {
           return updateStyle();
@@ -7041,8 +7095,6 @@ const VxeTableComponent = comp.defineVxeComponent({
         internalData.mergeHeaderList = [];
         internalData.mergeHeaderMaps = {};
         internalData.mergeHeaderCellMaps = {};
-        internalData.mergeHeaderRowMaps = {};
-        internalData.mergeBodyColMaps = {};
         reactData.mergeHeadFlag++;
         return vue.nextTick().then(() => {
           return updateStyle();
@@ -7091,8 +7143,6 @@ const VxeTableComponent = comp.defineVxeComponent({
         internalData.mergeFooterList = [];
         internalData.mergeFooterMaps = {};
         internalData.mergeFooterCellMaps = {};
-        internalData.mergeFooterRowMaps = {};
-        internalData.mergeFooterColMaps = {};
         reactData.mergeFootFlag++;
         return vue.nextTick().then(() => {
           return updateStyle();
@@ -7149,7 +7199,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         let hasVisible = 0;
         let hasAggFunc = 0;
         const sortMaps = {};
-        ctor.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+        index.default.eachTree(collectColumn, (column, index2, items, path, parentColumn) => {
           const colKey = column.getKey();
           if (!colKey) {
             log.errLog("vxe.error.reqProp", [`${column.getTitle() || column.type || ""} -> column.field=?`]);
@@ -7271,7 +7321,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         else if (dom.getEventTargetNode(evnt, tableFilter.getRefMaps().refElem.value).flag) ;
         else {
           if (!dom.getEventTargetNode(evnt, document.body, "vxe-table--ignore-clear").flag) {
-            $xeTable.preventEvent(evnt, "event.clearFilter", internalData._currFilterParams, $xeTable.closeFilter);
+            tablePrivateMethods.preventEvent(evnt, "event.clearFilter", internalData._currFilterParams, tableMethods.closeFilter);
           }
         }
       }
@@ -7281,7 +7331,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         else {
           if (!dom.getEventTargetNode(evnt, document.body, "vxe-table--ignore-clear").flag) {
             if (customStore.visible && $xeTable.closeCustom) {
-              $xeTable.preventEvent(evnt, "event.clearCustom", {}, () => {
+              tablePrivateMethods.preventEvent(evnt, "event.clearCustom", {}, () => {
                 $xeTable.closeCustom();
                 $xeTable.dispatchEvent("custom", { type: "close" }, evnt);
               });
@@ -7296,11 +7346,11 @@ const VxeTableComponent = comp.defineVxeComponent({
             if ($validTooltip && dom.getEventTargetNode(evnt, $validTooltip.$el).flag) ;
             else if (!internalData._lastCallTime || internalData._lastCallTime + 50 < Date.now()) {
               if (!dom.getEventTargetNode(evnt, document.body, "vxe-table--ignore-clear").flag) {
-                $xeTable.preventEvent(evnt, "event.clearEdit", actived.args, () => {
+                tablePrivateMethods.preventEvent(evnt, "event.clearEdit", actived.args, () => {
                   let isClear;
                   if (editOpts.mode === "row") {
                     const rowTargetNode = dom.getEventTargetNode(evnt, el, "vxe-body--row");
-                    const rowNodeRest = rowTargetNode.flag ? $xeTable.getRowNode(rowTargetNode.targetElem) : null;
+                    const rowNodeRest = rowTargetNode.flag ? tableMethods.getRowNode(rowTargetNode.targetElem) : null;
                     isClear = rowNodeRest ? !$xeTable.eqRow(rowNodeRest.item, actived.args.row) : false;
                   } else {
                     isClear = !dom.getEventTargetNode(evnt, el, "col--edit").flag;
@@ -7341,7 +7391,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             if ($xeTable.getCellAreas) {
               const cellAreas = $xeTable.getCellAreas();
               if (cellAreas && cellAreas.length && !dom.getEventTargetNode(evnt, document.body, "vxe-table--ignore-areas-clear").flag) {
-                $xeTable.preventEvent(evnt, "event.clearAreas", {}, () => {
+                tablePrivateMethods.preventEvent(evnt, "event.clearAreas", {}, () => {
                   $xeTable.clearCellAreas();
                   $xeTable.clearCopyCellArea();
                   dispatchEvent("clear-cell-area-selection", { cellAreas }, evnt);
@@ -7356,22 +7406,20 @@ const VxeTableComponent = comp.defineVxeComponent({
           $xeTable.closeMenu();
         }
       }
-      if (!(actived.row && dom.getEventTargetNode(evnt, document.body, "vxe-table--ignore-clear").flag)) {
-        const isActivated = dom.getEventTargetNode(evnt, $xeGGWrapper ? $xeGGWrapper.getRefMaps().refElem.value : el).flag;
-        if (!isActivated && editRules && validOpts.autoClear) {
-          reactData.validErrorMaps = {};
-        }
-        internalData.isActivated = isActivated;
+      const isActivated = dom.getEventTargetNode(evnt, $xeGGWrapper ? $xeGGWrapper.getRefMaps().refElem.value : el).flag;
+      if (!isActivated && editRules && validOpts.autoClear) {
+        reactData.validErrorMaps = {};
       }
+      internalData.isActivated = isActivated;
     };
     const handleGlobalBlurEvent = () => {
-      $xeTable.closeFilter();
+      tableMethods.closeFilter();
       if ($xeTable.closeMenu) {
         $xeTable.closeMenu();
       }
     };
     const handleGlobalMousewheelEvent = () => {
-      $xeTable.closeTooltip();
+      tableMethods.closeTooltip();
       if ($xeTable.closeMenu) {
         $xeTable.closeMenu();
       }
@@ -7384,7 +7432,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { actived } = editStore;
       const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
       if (isEsc) {
-        $xeTable.preventEvent(evnt, "event.keydown", null, () => {
+        tablePrivateMethods.preventEvent(evnt, "event.keydown", null, () => {
           dispatchEvent("keydown-start", {}, evnt);
           if (keyboardConfig && mouseConfig && mouseOpts.area && $xeTable.handleKeyboardCellAreaEvent) {
             $xeTable.handleKeyboardCellAreaEvent(evnt);
@@ -7393,7 +7441,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             if ($xeTable.closeMenu) {
               $xeTable.closeMenu();
             }
-            $xeTable.closeFilter();
+            tableMethods.closeFilter();
             if (keyboardConfig && keyboardOpts.isEsc) {
               if (actived.row) {
                 const params = actived.args;
@@ -7417,7 +7465,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         $xeTable.preventEvent(evnt, "event.keydown", null, () => {
           const { mouseConfig, keyboardConfig, treeConfig, editConfig, highlightCurrentRow, highlightCurrentColumn } = props$1;
           const { ctxMenuStore, editStore, currentRow } = reactData;
-          const { afterFullData, visibleColumn } = internalData;
+          const { afterFullData } = internalData;
           const isContentMenu = computeIsContentMenu.value;
           const bodyMenu = computeBodyMenu.value;
           const keyboardOpts = computeKeyboardOpts.value;
@@ -7427,7 +7475,6 @@ const VxeTableComponent = comp.defineVxeComponent({
           const menuList = computeMenuList.value;
           const rowOpts = computeRowOpts.value;
           const columnOpts = computeColumnOpts.value;
-          const { isLastEnterAppendRow, beforeEnterMethod, enterMethod, isLastTabAppendRow, beforeTabMethod, tabMethod } = keyboardOpts;
           const { selected, actived } = editStore;
           const childrenField = treeOpts.children || treeOpts.childrenField;
           const keyCode = evnt.keyCode;
@@ -7476,9 +7523,9 @@ const VxeTableComponent = comp.defineVxeComponent({
           } else if (isSpacebar && keyboardConfig && keyboardOpts.isChecked && selected.row && selected.column && (selected.column.type === "checkbox" || selected.column.type === "radio")) {
             evnt.preventDefault();
             if (selected.column.type === "checkbox") {
-              $xeTable.handleToggleCheckRowEvent(evnt, selected.args);
+              tablePrivateMethods.handleToggleCheckRowEvent(evnt, selected.args);
             } else {
-              $xeTable.triggerRadioRowEvent(evnt, selected.args);
+              tablePrivateMethods.triggerRadioRowEvent(evnt, selected.args);
             }
           } else if (isF2 && utils.isEnableConf(editConfig)) {
             if (!isEditStatus) {
@@ -7494,6 +7541,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               internalData._keyCtx = false;
             }, 1e3);
           } else if (isEnter && !isAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
+            const { isLastEnterAppendRow, beforeEnterMethod, enterMethod } = keyboardOpts;
             if (isControlKey) {
               if (actived.row) {
                 const params = actived.args;
@@ -7506,8 +7554,6 @@ const VxeTableComponent = comp.defineVxeComponent({
               }
             } else {
               if (selected.row || actived.row) {
-                const activeRow = selected.row || actived.row;
-                const activeColumn = selected.column || actived.column;
                 const activeParams = selected.row ? selected.args : actived.args;
                 if (hasShiftKey) {
                   if (keyboardOpts.enterToTab) {
@@ -7516,43 +7562,12 @@ const VxeTableComponent = comp.defineVxeComponent({
                     $xeTable.moveEnterSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
                   }
                 } else {
-                  const _rowIndex = $xeTable.getVTRowIndex(activeRow);
-                  const _columnIndex = $xeTable.getVTColumnIndex(activeColumn);
                   if (keyboardOpts.enterToTab) {
-                    const ttrParams = {
-                      row: activeRow,
-                      rowIndex: $xeTable.getRowIndex(activeRow),
-                      $rowIndex: $xeTable.getVMRowIndex(activeRow),
-                      _rowIndex,
-                      column: activeColumn,
-                      columnIndex: $xeTable.getColumnIndex(activeColumn),
-                      $columnIndex: $xeTable.getVMColumnIndex(activeColumn),
-                      _columnIndex,
-                      $table: $xeTable
-                    };
-                    if (!beforeTabMethod || beforeTabMethod(ttrParams) !== false) {
-                      evnt.preventDefault();
-                      if (isLastTabAppendRow) {
-                        const newColumn = visibleColumn[0];
-                        if (_rowIndex >= afterFullData.length - 1 && _columnIndex >= visibleColumn.length - 1) {
-                          if (actived.row) {
-                            $xeTable.handleClearEdit(evnt);
-                          }
-                          $xeTable.insertAt({}, -1).then(({ row: newRow }) => {
-                            $xeTable.scrollToRow(newRow, newColumn);
-                            $xeTable.handleSelected(Object.assign(Object.assign({}, activeParams), { row: newRow, column: newColumn }), evnt);
-                          });
-                          $xeTable.dispatchEvent("tab-append-row", ttrParams, evnt);
-                          return;
-                        }
-                      }
-                      if (tabMethod) {
-                        tabMethod(ttrParams);
-                      } else {
-                        $xeTable.moveTabSelected(activeParams, hasShiftKey, evnt);
-                      }
-                    }
+                    $xeTable.moveTabSelected(activeParams, hasShiftKey, evnt);
                   } else {
+                    const activeRow = selected.row || actived.row;
+                    const activeColumn = selected.column || actived.column;
+                    const _rowIndex = $xeTable.getVTRowIndex(activeRow);
                     const etrParams = {
                       row: activeRow,
                       rowIndex: $xeTable.getRowIndex(activeRow),
@@ -7561,11 +7576,10 @@ const VxeTableComponent = comp.defineVxeComponent({
                       column: activeColumn,
                       columnIndex: $xeTable.getColumnIndex(activeColumn),
                       $columnIndex: $xeTable.getVMColumnIndex(activeColumn),
-                      _columnIndex,
+                      _columnIndex: $xeTable.getVTColumnIndex(activeColumn),
                       $table: $xeTable
                     };
                     if (!beforeEnterMethod || beforeEnterMethod(etrParams) !== false) {
-                      evnt.preventDefault();
                       if (isLastEnterAppendRow) {
                         if (_rowIndex >= afterFullData.length - 1) {
                           $xeTable.insertAt({}, -1).then(({ row: newRow }) => {
@@ -7576,13 +7590,9 @@ const VxeTableComponent = comp.defineVxeComponent({
                           return;
                         }
                       }
+                      $xeTable.moveEnterSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
                       if (enterMethod) {
                         enterMethod(etrParams);
-                      } else {
-                        if (actived.row) {
-                          $xeTable.handleClearEdit(evnt);
-                        }
-                        $xeTable.moveEnterSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
                       }
                     }
                   }
@@ -7616,57 +7626,19 @@ const VxeTableComponent = comp.defineVxeComponent({
               }
             }
           } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
-            if (selected.row || actived.row) {
-              const activeRow = selected.row || actived.row;
-              const activeColumn = selected.column || actived.column;
-              const activeParams = selected.row ? selected.args : actived.args;
-              const _rowIndex = $xeTable.getVTRowIndex(activeRow);
-              const _columnIndex = $xeTable.getVTColumnIndex(activeColumn);
-              const ttrParams = {
-                row: activeRow,
-                rowIndex: $xeTable.getRowIndex(activeRow),
-                $rowIndex: $xeTable.getVMRowIndex(activeRow),
-                _rowIndex,
-                column: activeColumn,
-                columnIndex: $xeTable.getColumnIndex(activeColumn),
-                $columnIndex: $xeTable.getVMColumnIndex(activeColumn),
-                _columnIndex,
-                $table: $xeTable
-              };
-              if (!beforeTabMethod || beforeTabMethod(ttrParams) !== false) {
-                evnt.preventDefault();
-                if (isLastTabAppendRow) {
-                  const newColumn = visibleColumn[0];
-                  if (_rowIndex >= afterFullData.length - 1 && _columnIndex >= visibleColumn.length - 1) {
-                    if (actived.row) {
-                      $xeTable.handleClearEdit(evnt);
-                    }
-                    $xeTable.insertAt({}, -1).then(({ row: newRow }) => {
-                      $xeTable.scrollToRow(newRow, newColumn);
-                      $xeTable.handleSelected(Object.assign(Object.assign({}, activeParams), { row: newRow, column: newColumn }), evnt);
-                    });
-                    $xeTable.dispatchEvent("tab-append-row", ttrParams, evnt);
-                    return;
-                  }
-                }
-                if (tabMethod) {
-                  tabMethod(ttrParams);
-                } else {
-                  if (actived.row) {
-                    $xeTable.handleClearEdit(evnt);
-                  }
-                  $xeTable.moveTabSelected(activeParams, hasShiftKey, evnt);
-                }
-              }
+            if (selected.row || selected.column) {
+              $xeTable.moveTabSelected(selected.args, hasShiftKey, evnt);
+            } else if (actived.row || actived.column) {
+              $xeTable.moveTabSelected(actived.args, hasShiftKey, evnt);
             }
           } else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && utils.isEnableConf(editConfig) && (selected.row || selected.column)) {
             if (!isEditStatus) {
               const { delMethod } = keyboardOpts;
               const params = {
                 row: selected.row,
-                rowIndex: $xeTable.getRowIndex(selected.row),
+                rowIndex: tableMethods.getRowIndex(selected.row),
                 column: selected.column,
-                columnIndex: $xeTable.getColumnIndex(selected.column),
+                columnIndex: tableMethods.getColumnIndex(selected.column),
                 $table: $xeTable,
                 $grid: $xeGrid,
                 $gantt: $xeGantt
@@ -7677,7 +7649,7 @@ const VxeTableComponent = comp.defineVxeComponent({
                 } else {
                   util.setCellValue(selected.row, selected.column, null);
                 }
-                $xeTable.updateFooter();
+                tableMethods.updateFooter();
                 dispatchEvent("cell-delete-value", params, evnt);
               }
             }
@@ -7706,7 +7678,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               }
             }
           } else if (hasBackspaceKey && keyboardConfig && treeConfig && keyboardOpts.isBack && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
-            const { parent: parentRow } = ctor.default.findTree(internalData.afterTreeFullData, (item) => item === currentRow, { children: childrenField });
+            const { parent: parentRow } = index.default.findTree(internalData.afterTreeFullData, (item) => item === currentRow, { children: childrenField });
             if (parentRow) {
               evnt.preventDefault();
               const params = {
@@ -7757,8 +7729,8 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { actived } = editStore;
       if (isActivated && !filterStore.visible) {
         if (!(actived.row || actived.column)) {
-          if (keyboardConfig && keyboardOpts.isClip && mouseConfig && mouseOpts.area && $xeTable.handlePeClAreaEvent) {
-            $xeTable.handlePeClAreaEvent(evnt);
+          if (keyboardConfig && keyboardOpts.isClip && mouseConfig && mouseOpts.area && $xeTable.handlePasteCellAreaEvent) {
+            $xeTable.handlePasteCellAreaEvent(evnt);
           }
         }
         dispatchEvent("paste", {}, evnt);
@@ -7773,8 +7745,8 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { actived } = editStore;
       if (isActivated && !filterStore.visible) {
         if (!(actived.row || actived.column)) {
-          if (keyboardConfig && keyboardOpts.isClip && mouseConfig && mouseOpts.area && $xeTable.handleCyClAreaEvent) {
-            $xeTable.handleCyClAreaEvent(evnt);
+          if (keyboardConfig && keyboardOpts.isClip && mouseConfig && mouseOpts.area && $xeTable.handleCopyCellAreaEvent) {
+            $xeTable.handleCopyCellAreaEvent(evnt);
           }
         }
         dispatchEvent("copy", {}, evnt);
@@ -7811,7 +7783,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       const $tooltip = refTooltip.value;
       clearTimeout(internalData.tooltipTimeout);
       if (isClear) {
-        $xeTable.closeTooltip();
+        tableMethods.closeTooltip();
       } else {
         if ($tooltip && $tooltip.setActived) {
           $tooltip.setActived(true);
@@ -7847,7 +7819,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       const el = refElem.value;
       if (el) {
         const clss = "row--drag-origin";
-        ctor.default.arrayEach(el.querySelectorAll(`.${clss}`), (elem) => {
+        index.default.arrayEach(el.querySelectorAll(`.${clss}`), (elem) => {
           elem.draggable = false;
           dom.removeClass(elem, clss);
         });
@@ -7858,7 +7830,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       if (el) {
         const clss = "row--drag-origin";
         const rowid = util.getRowid($xeTable, row);
-        ctor.default.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), (elem) => {
+        index.default.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), (elem) => {
           dom.addClass(elem, clss);
         });
       }
@@ -7885,11 +7857,11 @@ const VxeTableComponent = comp.defineVxeComponent({
       const el = refElem.value;
       if (el) {
         const colQuerys = [];
-        ctor.default.eachTree([column], (item) => {
+        index.default.eachTree([column], (item) => {
           colQuerys.push(`[colid="${item.id}"]`);
         });
         const clss = "col--drag-origin";
-        ctor.default.arrayEach(el.querySelectorAll(colQuerys.join(",")), (elem) => {
+        index.default.arrayEach(el.querySelectorAll(colQuerys.join(",")), (elem) => {
           dom.addClass(elem, clss);
         });
       }
@@ -7898,7 +7870,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       const el = refElem.value;
       if (el) {
         const clss = "col--drag-origin";
-        ctor.default.arrayEach(el.querySelectorAll(`.${clss}`), (elem) => {
+        index.default.arrayEach(el.querySelectorAll(`.${clss}`), (elem) => {
           elem.draggable = false;
           dom.removeClass(elem, clss);
         });
@@ -8058,8 +8030,8 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { column, row } = params;
       const { showAll, contentMethod } = tipOpts;
       const customContent = contentMethod ? contentMethod(params) : null;
-      const useCustom = contentMethod && !ctor.default.eqNull(customContent);
-      const content = useCustom ? customContent : ctor.default.toString(column.type === "html" ? tipOverEl.innerText : tipOverEl.textContent).trim();
+      const useCustom = contentMethod && !index.default.eqNull(customContent);
+      const content = useCustom ? customContent : index.default.toString(column.type === "html" ? tipOverEl.innerText : tipOverEl.textContent).trim();
       const isOver = tipOverEl.scrollWidth > tipOverEl.clientWidth;
       if (content && (showAll || useCustom || isOver)) {
         const tipContent = utils.formatText(content);
@@ -8085,7 +8057,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         if ($xeGGWrapper) {
           return $xeGGWrapper.callSlot(slotFunc, params);
         }
-        if (ctor.default.isFunction(slotFunc)) {
+        if (index.default.isFunction(slotFunc)) {
           return vn.getSlotVNs(slotFunc(params));
         }
       }
@@ -8149,40 +8121,39 @@ const VxeTableComponent = comp.defineVxeComponent({
         const expandOpts = computeExpandOpts.value;
         const treeOpts = computeTreeOpts.value;
         const radioOpts = computeRadioOpts.value;
-        const rowOpts = computeRowOpts.value;
         const checkboxOpts = computeCheckboxOpts.value;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const rowkey = util.getRowkey($xeTable);
-        if (!ctor.default.isArray(records)) {
+        if (!index.default.isArray(records)) {
           records = [records];
         }
         return records.map((record) => {
           internalData.tableFullColumn.forEach((column) => {
             const { field, editRender } = column;
-            if (field && !ctor.default.has(record, field) && !record[field]) {
+            if (field && !index.default.has(record, field) && !record[field]) {
               let cellValue = null;
               if (editRender) {
                 const { defaultValue } = editRender;
-                if (ctor.default.isFunction(defaultValue)) {
+                if (index.default.isFunction(defaultValue)) {
                   cellValue = defaultValue({ column });
-                } else if (!ctor.default.isUndefined(defaultValue)) {
+                } else if (!index.default.isUndefined(defaultValue)) {
                   cellValue = defaultValue;
                 }
               }
-              ctor.default.set(record, field, cellValue);
+              index.default.set(record, field, cellValue);
             }
           });
           const otherFields = [radioOpts.labelField, checkboxOpts.checkField, checkboxOpts.labelField, expandOpts.labelField];
           otherFields.forEach((key) => {
-            if (key && utils.eqEmptyValue(ctor.default.get(record, key))) {
-              ctor.default.set(record, key, null);
+            if (key && utils.eqEmptyValue(index.default.get(record, key))) {
+              index.default.set(record, key, null);
             }
           });
-          if (treeConfig && treeOpts.lazy && ctor.default.isUndefined(record[childrenField])) {
+          if (treeConfig && treeOpts.lazy && index.default.isUndefined(record[childrenField])) {
             record[childrenField] = null;
           }
-          if (utils.eqEmptyValue(ctor.default.get(record, rowkey))) {
-            ctor.default.set(record, rowkey, util.createRowId(rowOpts, record, rowkey));
+          if (utils.eqEmptyValue(index.default.get(record, rowkey))) {
+            index.default.set(record, rowkey, util.getRowUniqueId());
           }
           return record;
         });
@@ -8195,12 +8166,6 @@ const VxeTableComponent = comp.defineVxeComponent({
         if (force) {
           updateAfterFullData();
           fullList = handleVirtualTreeToList();
-          internalData.mergeHeaderRowMaps = {};
-          internalData.mergeHeaderColMaps = {};
-          internalData.mergeBodyRowMaps = {};
-          internalData.mergeBodyColMaps = {};
-          internalData.mergeFooterRowMaps = {};
-          internalData.mergeFooterColMaps = {};
         }
         const tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
         const visibleDataRowIdMaps = {};
@@ -8230,13 +8195,13 @@ const VxeTableComponent = comp.defineVxeComponent({
         const fullDataRowIdMaps = {};
         const idMaps = {};
         const { handleUpdateRowId } = util.createHandleUpdateRowId($xeTable);
-        const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
+        const handleRowCache = (row, index2, items, currIndex, parentRow, rowid, level, seq) => {
           let rowRest = fullAllDataRowIdMaps[rowid];
           if (idMaps[rowid]) {
             log.errLog("vxe.error.repeatKey", [currKeyField, rowid]);
           }
           if (!rowRest) {
-            rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, _tIndex: -1, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+            rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index2, _tIndex: -1, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
             fullDataRowIdMaps[rowid] = rowRest;
             fullAllDataRowIdMaps[rowid] = rowRest;
           }
@@ -8247,7 +8212,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           rowRest.parent = parentRow;
           rowRest.level = level;
           rowRest.index = currIndex;
-          rowRest.treeIndex = index;
+          rowRest.treeIndex = index2;
           if (selectCheckboxMaps[rowid]) {
             selectCheckboxMaps[rowid] = row;
           }
@@ -8263,7 +8228,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           const { lazy } = treeOpts;
           const childrenField = treeOpts.children || treeOpts.childrenField;
           const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
-          ctor.default.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
+          index.default.eachTree(tableFullTreeData, (row, index2, items, path, parentRow, nodes) => {
             const rowid = handleUpdateRowId(row);
             if (treeConfig && lazy) {
               if (row[hasChildField] && row[childrenField] === void 0) {
@@ -8275,18 +8240,18 @@ const VxeTableComponent = comp.defineVxeComponent({
                 }
               }
             }
-            handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, util.toTreePathSeq(path));
+            handleRowCache(row, index2, items, parentRow ? -1 : index2, parentRow, rowid, nodes.length - 1, util.toTreePathSeq(path));
           }, { children: childrenField });
         } else if (isRowGroupStatus) {
           const aggregateOpts = computeAggregateOpts.value;
           const { mapChildrenField } = aggregateOpts;
-          ctor.default.eachTree(tableFullGroupData, (row, index, items, path, parentRow, nodes) => {
+          index.default.eachTree(tableFullGroupData, (row, index2, items, path, parentRow, nodes) => {
             const rowid = handleUpdateRowId(row);
-            handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, util.toTreePathSeq(path));
+            handleRowCache(row, index2, items, parentRow ? -1 : index2, parentRow, rowid, nodes.length - 1, util.toTreePathSeq(path));
           }, { children: mapChildrenField });
         } else {
-          tableFullData.forEach((row, index, items) => {
-            handleRowCache(row, index, items, index, null, handleUpdateRowId(row), 0, index + 1);
+          tableFullData.forEach((row, index2, items) => {
+            handleRowCache(row, index2, items, index2, null, handleUpdateRowId(row), 0, index2 + 1);
           });
         }
         internalData.fullDataRowIdData = fullDataRowIdMaps;
@@ -8296,7 +8261,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       cacheSourceMap(fullData) {
         const { treeConfig } = props$1;
         const treeOpts = computeTreeOpts.value;
-        const sourceData = ctor.default.clone(fullData, true);
+        const sourceData = index.default.clone(fullData, true);
         const { handleUpdateRowId } = util.createHandleUpdateRowId($xeTable);
         const sourceRowIdData = {};
         const handleSourceRow = (row) => {
@@ -8305,7 +8270,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         };
         if (treeConfig) {
           const childrenField = treeOpts.children || treeOpts.childrenField;
-          ctor.default.eachTree(sourceData, handleSourceRow, { children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField });
+          index.default.eachTree(sourceData, handleSourceRow, { children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField });
         } else {
           sourceData.forEach(handleSourceRow);
         }
@@ -8396,14 +8361,14 @@ const VxeTableComponent = comp.defineVxeComponent({
         if (!cell2) {
           return;
         }
-        const cellParams = ctor.default.assign(params, { cell: cell2, $table: $xeTable });
+        const cellParams = index.default.assign(params, { cell: cell2, $table: $xeTable });
         let dragLeft = 0;
         const tableRect = tableEl.getBoundingClientRect();
         const rightContainerRect = rightContainerElem ? rightContainerElem.getBoundingClientRect() : null;
         const cellRect = cell2.getBoundingClientRect();
         const dragBtnRect = dragBtnElem.getBoundingClientRect();
         const dragBtnWidth = dragBtnElem.clientWidth;
-        const dragBtnOffsetWidth = ctor.default.floor(dragBtnWidth / 2);
+        const dragBtnOffsetWidth = index.default.floor(dragBtnWidth / 2);
         const dragPosLeft = dragBtnRect.x - tableRect.x + dragBtnOffsetWidth;
         const minInterval = util.getColReMinWidth(cellParams) - dragBtnOffsetWidth;
         const dragMinLeft = isRightFixed ? 0 : cellRect.x - tableRect.x + dragBtnWidth + minInterval;
@@ -8510,7 +8475,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           const { column } = params;
           let resizeColumn = column;
           if (column.children && column.children.length) {
-            ctor.default.eachTree(column.children, (childColumn) => {
+            index.default.eachTree(column.children, (childColumn) => {
               resizeColumn = childColumn;
             });
           }
@@ -8590,7 +8555,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         let cellMinHeight = 0;
         if (cellEl) {
           const cellStyle = getComputedStyle(cellEl);
-          cellMinHeight = Math.max(1, Math.ceil(ctor.default.toNumber(cellStyle.paddingTop) + ctor.default.toNumber(cellStyle.paddingBottom)));
+          cellMinHeight = Math.max(1, Math.ceil(index.default.toNumber(cellStyle.paddingTop) + index.default.toNumber(cellStyle.paddingBottom)));
         }
         const minTop = trRect.y - tableRect.y + cellMinHeight;
         const updateEvent = (evnt2) => {
@@ -8716,7 +8681,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             fixedData: {},
             aggGroupData: {},
             aggFuncData: {}
-          } : $xeTable.getCustomStoreData();
+          } : tableMethods.getCustomStoreData();
           if (updateStore) {
             return updateStore({
               $table: $xeTable,
@@ -8741,8 +8706,8 @@ const VxeTableComponent = comp.defineVxeComponent({
             $xeTable.clearCopyCellArea();
           }
         }
-        $xeTable.analyColumnWidth();
-        return $xeTable.refreshColumn(true);
+        tablePrivateMethods.analyColumnWidth();
+        return tableMethods.refreshColumn(true);
       },
       handleUpdateDataQueue() {
         reactData.upDataFlag++;
@@ -8821,7 +8786,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           if (isRowGroupStatus) {
             const mapChildrenField = aggregateOpts.mapChildrenField;
             if (mapChildrenField) {
-              ctor.default.eachTree(afterGroupFullData, (row) => {
+              index.default.eachTree(afterGroupFullData, (row) => {
                 const rowid = handleGetRowId(row);
                 const childList = row[mapChildrenField];
                 if (childList && childList.length && !childRowMaps[rowid]) {
@@ -8832,7 +8797,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             }
           } else if (treeConfig) {
             const { transform, mapChildrenField } = treeOpts;
-            ctor.default.eachTree(afterTreeFullData, (row) => {
+            index.default.eachTree(afterTreeFullData, (row) => {
               const rowid = handleGetRowId(row);
               const childList = row[transform ? mapChildrenField : childrenField];
               if (childList && childList.length && !childRowMaps[rowid]) {
@@ -8840,7 +8805,7 @@ const VxeTableComponent = comp.defineVxeComponent({
                 childRowList.unshift([row, rowid, childList]);
               } else {
                 if (indeterminateField) {
-                  ctor.default.set(row, indeterminateField, false);
+                  index.default.set(row, indeterminateField, false);
                 }
               }
             }, { children: transform ? mapChildrenField : childrenField });
@@ -8855,7 +8820,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             const cLen = childList.length;
             childList.forEach(checkMethod ? (item) => {
               const childRowid = handleGetRowId(item);
-              const isSelect = checkField ? ctor.default.get(item, checkField) : selectCheckboxMaps[childRowid];
+              const isSelect = checkField ? index.default.get(item, checkField) : selectCheckboxMaps[childRowid];
               if (checkMethod({ $table: $xeTable, row: item })) {
                 if (isSelect) {
                   sLen++;
@@ -8872,7 +8837,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               }
             } : (item) => {
               const childRowid = handleGetRowId(item);
-              const isSelect = checkField ? ctor.default.get(item, checkField) : selectCheckboxMaps[childRowid];
+              const isSelect = checkField ? index.default.get(item, checkField) : selectCheckboxMaps[childRowid];
               if (isSelect) {
                 sLen++;
               } else if (treeIndeterminateRowMaps[childRowid]) {
@@ -8898,10 +8863,10 @@ const VxeTableComponent = comp.defineVxeComponent({
             }
             const halfSelect = !isSelected && (sLen > 0 || hLen > 0);
             if (checkField) {
-              ctor.default.set(row, checkField, isSelected);
+              index.default.set(row, checkField, isSelected);
             }
             if (indeterminateField) {
-              ctor.default.set(row, indeterminateField, halfSelect);
+              index.default.set(row, indeterminateField, halfSelect);
             }
             if (isSelected) {
               if (!checkField) {
@@ -8945,7 +8910,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const rootList = treeConfig ? afterTreeFullData : isRowGroupStatus ? afterGroupFullData : afterFullData;
         rootList.forEach(checkMethod ? (row) => {
           const childRowid = handleGetRowId(row);
-          const selected = checkField ? ctor.default.get(row, checkField) : selectCheckboxMaps[childRowid];
+          const selected = checkField ? index.default.get(row, checkField) : selectCheckboxMaps[childRowid];
           if (isRowGroupStatus && $xeTable.isAggregateRecord(row)) {
             const childList = row[mapChildrenField || ""];
             if (selected) {
@@ -8973,7 +8938,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           }
         } : (row) => {
           const childRowid = handleGetRowId(row);
-          const selected = checkField ? ctor.default.get(row, checkField) : selectCheckboxMaps[childRowid];
+          const selected = checkField ? index.default.get(row, checkField) : selectCheckboxMaps[childRowid];
           if (selected) {
             sLen++;
           } else if (treeIndeterminateRowMaps[childRowid]) {
@@ -8984,7 +8949,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const isSelected = rootList.length > 0 ? vLen > 0 ? sLen >= vLen : sLen >= rootList.length : false;
         let halfSelect = !isSelected && (sLen > 0 || hLen > 0 || dsLen > 0 || dhLen > 0);
         if (!isSelected && !halfSelect && showReserveStatus) {
-          halfSelect = !ctor.default.isEmpty(checkboxReserveRowMap);
+          halfSelect = !index.default.isEmpty(checkboxReserveRowMap);
         }
         reactData.isAllSelected = isSelected;
         reactData.isIndeterminate = halfSelect;
@@ -9011,11 +8976,11 @@ const VxeTableComponent = comp.defineVxeComponent({
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
         if (checkField) {
           if ((treeConfig || isRowGroupStatus) && !checkStrictly) {
-            ctor.default.eachTree(rows, (row) => {
+            index.default.eachTree(rows, (row) => {
               if (isForce || (!checkMethod || checkMethod({ $table: $xeTable, row }))) {
-                ctor.default.set(row, checkField, checked);
+                index.default.set(row, checkField, checked);
                 if (indeterminateField) {
-                  ctor.default.set(row, indeterminateField, false);
+                  index.default.set(row, indeterminateField, false);
                 }
                 handleCheckboxReserveRow(row, checked);
               }
@@ -9025,7 +8990,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           }
           rows.forEach((row) => {
             if (isForce || (!checkMethod || checkMethod({ $table: $xeTable, row }))) {
-              ctor.default.set(row, checkField, checked);
+              index.default.set(row, checkField, checked);
               handleCheckboxReserveRow(row, checked);
             }
           });
@@ -9034,7 +8999,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         }
         if (!checkStrictly) {
           if (isRowGroupStatus) {
-            ctor.default.eachTree(rows, (row) => {
+            index.default.eachTree(rows, (row) => {
               const rowid = handleGetRowId(row);
               if (isForce || (!checkMethod || checkMethod({ $table: $xeTable, row }))) {
                 if (checked) {
@@ -9050,7 +9015,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             reactData.updateCheckboxFlag++;
             return;
           } else if (treeConfig) {
-            ctor.default.eachTree(rows, (row) => {
+            index.default.eachTree(rows, (row) => {
               const rowid = handleGetRowId(row);
               if (isForce || (!checkMethod || checkMethod({ $table: $xeTable, row }))) {
                 if (checked) {
@@ -9091,31 +9056,22 @@ const VxeTableComponent = comp.defineVxeComponent({
       handleSelectRow({ row }, checked, isForce) {
         $xeTable.handleBatchSelectRows([row], checked, isForce);
       },
-      handleUpdateHeaderMerge() {
-        const { mergeHeaderList } = internalData;
-        const { mergeMaps, mergeRowMaps, mergeColMaps } = buildMergeData(mergeHeaderList);
-        internalData.mergeHeaderCellMaps = mergeMaps;
-        internalData.mergeHeaderRowMaps = mergeRowMaps;
-        internalData.mergeHeaderColMaps = mergeColMaps;
-        reactData.mergeHeadFlag++;
-      },
       /**
        * 处理合并
        */
       handleUpdateBodyMerge() {
         const { mergeBodyList } = internalData;
-        const { mergeMaps, mergeRowMaps, mergeColMaps } = buildMergeData(mergeBodyList);
-        internalData.mergeBodyCellMaps = mergeMaps;
-        internalData.mergeBodyRowMaps = mergeRowMaps;
-        internalData.mergeBodyColMaps = mergeColMaps;
+        internalData.mergeBodyCellMaps = buildMergeData(mergeBodyList);
         reactData.mergeBodyFlag++;
       },
+      handleUpdateHeaderMerge() {
+        const { mergeHeaderList } = internalData;
+        internalData.mergeHeaderCellMaps = buildMergeData(mergeHeaderList);
+        reactData.mergeHeadFlag++;
+      },
       handleUpdateFooterMerge() {
         const { mergeFooterList } = internalData;
-        const { mergeMaps, mergeRowMaps, mergeColMaps } = buildMergeData(mergeFooterList);
-        internalData.mergeFooterCellMaps = mergeMaps;
-        internalData.mergeFooterRowMaps = mergeRowMaps;
-        internalData.mergeFooterColMaps = mergeColMaps;
+        internalData.mergeFooterCellMaps = buildMergeData(mergeFooterList);
         reactData.mergeFootFlag++;
       },
       handleAggregateSummaryData() {
@@ -9255,10 +9211,6 @@ const VxeTableComponent = comp.defineVxeComponent({
         if (sortOpts.trigger === "cell" && !(triggerResizable || triggerSort || triggerFilter)) {
           $xeTable.triggerSortEvent(evnt, column, getNextSortOrder(column));
         }
-        if ($xeGantt) {
-          const ganttReactData = $xeGantt.reactData;
-          ganttReactData.activeBarRowid = null;
-        }
         dispatchEvent("header-cell-click", Object.assign({ triggerResizable, triggerSort, triggerFilter, cell: cell2 }, params), evnt);
         if ((columnOpts.isCurrent || props$1.highlightCurrentColumn) && (!currentColumnOpts.trigger || ["header", "default"].includes(currentColumnOpts.trigger))) {
           $xeTable.triggerCurrentColumnEvent(evnt, params);
@@ -9364,10 +9316,6 @@ const VxeTableComponent = comp.defineVxeComponent({
             }
           }
         }
-        if ($xeGantt) {
-          const ganttReactData = $xeGantt.reactData;
-          ganttReactData.activeBarRowid = null;
-        }
         dispatchEvent("cell-click", params, evnt);
       },
       /**
@@ -9397,20 +9345,6 @@ const VxeTableComponent = comp.defineVxeComponent({
         }
         dispatchEvent("cell-dblclick", params, evnt);
       },
-      triggerFooterCellClickEvent(evnt, params) {
-        const cell2 = evnt.currentTarget;
-        params = Object.assign({ cell: cell2 }, params);
-        if ($xeGantt) {
-          const ganttReactData = $xeGantt.reactData;
-          ganttReactData.activeBarRowid = null;
-        }
-        $xeTable.dispatchEvent("footer-cell-click", params, evnt);
-      },
-      triggerFooterCellDblclickEvent(evnt, params) {
-        const cell2 = evnt.currentTarget;
-        params = Object.assign({ cell: cell2 }, params);
-        $xeTable.dispatchEvent("footer-cell-dblclick", params, evnt);
-      },
       handleToggleCheckRowEvent(evnt, params) {
         const { selectCheckboxMaps } = internalData;
         const checkboxOpts = computeCheckboxOpts.value;
@@ -9421,7 +9355,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         }
         let checked = false;
         if (checkField) {
-          checked = !ctor.default.get(row, checkField);
+          checked = !index.default.get(row, checkField);
         } else {
           checked = !selectCheckboxMaps[util.getRowid($xeTable, row)];
         }
@@ -9492,7 +9426,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const { selectRadioRow: oldValue } = reactData;
         const { row } = params;
         const radioOpts = computeRadioOpts.value;
-        const { trigger, strict, checkMethod } = radioOpts;
+        const { trigger, checkMethod } = radioOpts;
         if (trigger === "manual") {
           return;
         }
@@ -9500,22 +9434,17 @@ const VxeTableComponent = comp.defineVxeComponent({
         if (!checkMethod || checkMethod({ $table: $xeTable, row })) {
           let newValue = row;
           let isChange = oldValue !== newValue;
-          if (strict) {
+          if (isChange) {
             handleCheckedRadioRow(newValue);
-          } else {
-            if (oldValue === newValue) {
-              newValue = null;
-            }
-            isChange = oldValue !== newValue;
-            if (isChange && newValue) {
-              handleCheckedRadioRow(newValue);
-            } else {
+          } else if (!radioOpts.strict) {
+            isChange = oldValue === newValue;
+            if (isChange) {
               newValue = null;
               $xeTable.clearRadioRow();
             }
           }
           if (isChange) {
-            dispatchEvent("radio-change", Object.assign({ oldValue, newValue, selected: !!newValue }, params), evnt);
+            dispatchEvent("radio-change", Object.assign({ oldValue, newValue }, params), evnt);
           }
         }
       },
@@ -9524,29 +9453,16 @@ const VxeTableComponent = comp.defineVxeComponent({
         const columnOpts = computeColumnOpts.value;
         const currentColumnOpts = computeCurrentColumnOpts.value;
         const beforeRowMethod = currentColumnOpts.beforeSelectMethod || columnOpts.currentMethod;
-        let newValue = params.column;
-        const { trigger, strict } = currentColumnOpts;
+        const { column: newValue } = params;
+        const { trigger } = currentColumnOpts;
         if (trigger === "manual") {
           return;
         }
-        let isChange = oldValue !== newValue;
+        const isChange = oldValue !== newValue;
         if (!beforeRowMethod || beforeRowMethod({ column: newValue, $table: $xeTable })) {
-          if (strict) {
-            $xeTable.setCurrentColumn(newValue);
-          } else {
-            if (oldValue === newValue) {
-              newValue = null;
-            }
-            isChange = oldValue !== newValue;
-            if (isChange && newValue) {
-              $xeTable.setCurrentColumn(newValue);
-            } else {
-              newValue = null;
-              $xeTable.clearCurrentColumn();
-            }
-          }
+          $xeTable.setCurrentColumn(newValue);
           if (isChange) {
-            dispatchEvent("current-column-change", Object.assign({ oldValue, newValue, selected: !!newValue }, params), evnt);
+            dispatchEvent("current-column-change", Object.assign({ oldValue, newValue }, params), evnt);
           }
         } else {
           dispatchEvent("current-column-disabled", params, evnt);
@@ -9557,29 +9473,16 @@ const VxeTableComponent = comp.defineVxeComponent({
         const rowOpts = computeRowOpts.value;
         const currentRowOpts = computeCurrentRowOpts.value;
         const beforeRowMethod = currentRowOpts.beforeSelectMethod || rowOpts.currentMethod;
-        let { row: newValue } = params;
-        const { trigger, strict } = currentRowOpts;
+        const { row: newValue } = params;
+        const { trigger } = currentRowOpts;
         if (trigger === "manual") {
           return;
         }
-        let isChange = oldValue !== newValue;
+        const isChange = oldValue !== newValue;
         if (!beforeRowMethod || beforeRowMethod({ row: newValue, $table: $xeTable })) {
-          if (strict) {
-            $xeTable.setCurrentRow(newValue);
-          } else {
-            if (oldValue === newValue) {
-              newValue = null;
-            }
-            isChange = oldValue !== newValue;
-            if (isChange && newValue) {
-              $xeTable.setCurrentRow(newValue);
-            } else {
-              newValue = null;
-              $xeTable.clearCurrentRow();
-            }
-          }
+          $xeTable.setCurrentRow(newValue);
           if (isChange) {
-            dispatchEvent("current-row-change", Object.assign({ oldValue, newValue, selected: !!newValue }, params), evnt);
+            dispatchEvent("current-row-change", Object.assign({ oldValue, newValue }, params), evnt);
             dispatchEvent("current-change", Object.assign({ oldValue, newValue }, params), evnt);
           }
         } else {
@@ -9671,7 +9574,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const mouseOpts = computeMouseOpts.value;
         const { field, sortable, order } = column;
         if (sortable) {
-          const params = { $table: $xeTable, $event: evnt, column, field, property: field, order, sortList: $xeTable.getSortColumns(), sortTime: column.sortTime };
+          const params = { $table: $xeTable, $event: evnt, column, field, property: field, order, sortList: tableMethods.getSortColumns(), sortTime: column.sortTime };
           if (mouseConfig && mouseOpts.area && $xeTable.handleSortEvent) {
             $xeTable.handleSortEvent(evnt, params);
           }
@@ -9706,7 +9609,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           if ($xeTable.hasCellRules(type, row, column)) {
             const cell2 = $xeTable.getCellElement(row, column);
             if (cell2) {
-              const customVal = !ctor.default.isUndefined(cellValue);
+              const customVal = !index.default.isUndefined(cellValue);
               return $xeTable.validCellRules(type, row, column, cellValue).then(() => {
                 if (customVal && validStore.visible) {
                   util.setCellValue(row, column, cellValue);
@@ -9858,7 +9761,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               if (oldRest && newRest) {
                 const { level: oldLevel } = oldRest;
                 const { level: newLevel } = newRest;
-                ctor.default.eachTree([dragRow], (item) => {
+                index.default.eachTree([dragRow], (item) => {
                   oldAllMaps[util.getRowid($xeTable, item)] = item;
                 }, { children: mapChildrenField });
                 if (oldLevel && newLevel) {
@@ -9921,8 +9824,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             if (treeConfig) {
               if (transform) {
                 if (oldRest && newRest) {
-                  const fullList = ctor.default.toTreeArray(internalData.afterTreeFullData, {
-                    updated: false,
+                  const fullList = index.default.toTreeArray(internalData.afterTreeFullData, {
                     key: rowField,
                     parentKey: parentField,
                     children: mapChildrenField
@@ -9933,12 +9835,12 @@ const VxeTableComponent = comp.defineVxeComponent({
                   const ntfIndex = ptfIndex + dragOffsetIndex;
                   fullList.splice(ntfIndex, 0, dragRow);
                   if (isSelfToChildStatus && (isCrossDrag && isSelfToChildDrag)) {
-                    ctor.default.each(dragRow[childrenField], (childRow) => {
+                    index.default.each(dragRow[childrenField], (childRow) => {
                       childRow[parentField] = dragRow[parentField];
                     });
                   }
                   dragRow[parentField] = isDragToChildFlag ? prevDragRow[rowField] : prevDragRow[parentField];
-                  internalData.tableFullTreeData = ctor.default.toArrayTree(fullList, {
+                  internalData.tableFullTreeData = index.default.toArrayTree(fullList, {
                     key: rowField,
                     parentKey: parentField,
                     children: childrenField,
@@ -10096,7 +9998,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               rsIndex = dragRowRest.$index;
             }
             const dragRangeList = rsIndex > -1 && rsIndex < tableData.length - 1 ? tableData.slice(rsIndex + 1) : [];
-            const dragList = ctor.default.toTreeArray([dragRow], {
+            const dragList = index.default.toTreeArray([dragRow], {
               updated: true,
               children: mapChildrenField
             });
@@ -10203,7 +10105,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               }
               let insertRest = Promise.resolve();
               if (treeConfig) {
-                const dragList = ctor.default.toTreeArray([dragRow], {
+                const dragList = index.default.toTreeArray([dragRow], {
                   updated: true,
                   children: mapChildrenField
                 });
@@ -10460,7 +10362,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           const dragAllTargetCols = [];
           let dragColWidth = 0;
           if (animation) {
-            ctor.default.eachTree([dragColumn], (column) => {
+            index.default.eachTree([dragColumn], (column) => {
               if (!dragTargetColumn && (!column.children || !column.children.length)) {
                 dragTargetColumn = column;
                 dragColWidth += column.renderWidth;
@@ -10483,7 +10385,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           let oafIndex = -1;
           let nafIndex = -1;
           const oldAllMaps = {};
-          ctor.default.eachTree([dragColumn], (column) => {
+          index.default.eachTree([dragColumn], (column) => {
             oldAllMaps[column.id] = column;
           });
           let isSelfToChildStatus = false;
@@ -10541,7 +10443,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             if (!status) {
               return errRest;
             }
-            const oldewMatchRest = ctor.default.findTree(collectColumn, (item) => item.id === dragColumn.id);
+            const oldewMatchRest = index.default.findTree(collectColumn, (item) => item.id === dragColumn.id);
             if (isSelfToChildStatus && (isCrossDrag && isSelfToChildDrag)) {
               if (oldewMatchRest) {
                 const { items: oCols, index: oIndex } = oldewMatchRest;
@@ -10561,7 +10463,7 @@ const VxeTableComponent = comp.defineVxeComponent({
                 }
               }
             }
-            const newMatchRest = ctor.default.findTree(collectColumn, (item) => item.id === newColumn.id);
+            const newMatchRest = index.default.findTree(collectColumn, (item) => item.id === newColumn.id);
             if (newMatchRest) {
               const { items: nCols, index: nIndex, parent: nParent } = newMatchRest;
               if (isCrossDrag && isToChildDrag && isDragToChildFlag) {
@@ -10575,9 +10477,9 @@ const VxeTableComponent = comp.defineVxeComponent({
                 nafIndex = nIndex;
               }
             }
-            ctor.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+            index.default.eachTree(collectColumn, (column, index2, items, path, parentColumn) => {
               if (!parentColumn) {
-                const sortIndex = index + 1;
+                const sortIndex = index2 + 1;
                 column.renderSortNumber = sortIndex;
               }
             });
@@ -10614,7 +10516,7 @@ const VxeTableComponent = comp.defineVxeComponent({
                 const { visibleColumn, fullColumnIdData: fullColumnIdData2 } = internalData;
                 let dragNewColumn = null;
                 const dragNewColMaps = {};
-                ctor.default.eachTree([dragColumn], (column) => {
+                index.default.eachTree([dragColumn], (column) => {
                   if (!dragNewColumn && (!column.children || !column.children.length)) {
                     dragNewColumn = column;
                   }
@@ -10624,7 +10526,7 @@ const VxeTableComponent = comp.defineVxeComponent({
                   dragNewColumn = dragColumn;
                 }
                 if (dragColWidth && dragAllTargetCols.length) {
-                  const _newColIndex = ctor.default.findIndexOf(visibleColumn, (column) => !!dragNewColumn && column.id === dragNewColumn.id);
+                  const _newColIndex = index.default.findIndexOf(visibleColumn, (column) => !!dragNewColumn && column.id === dragNewColumn.id);
                   const firstCol = tableColumn[0];
                   const firstColRest = fullColumnIdData2[firstCol.id];
                   if (firstColRest) {
@@ -10660,7 +10562,7 @@ const VxeTableComponent = comp.defineVxeComponent({
                         dragRangeList.push(column);
                       }
                     }
-                    ctor.default.eachTree([newColumn], (column) => {
+                    index.default.eachTree([newColumn], (column) => {
                       if (!dragRangeMaps[column.id]) {
                         dragRangeMaps[column.id] = column;
                         dragRangeList.push(column);
@@ -10855,7 +10757,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           }
           internalData.lastScrollTop = scrollTop;
         }
-        internalData.lastSTime = Date.now();
+        reactData.lastScrollTime = Date.now();
         const evntParams = Object.assign({
           source: sourceType,
           scrollTop,
@@ -11094,7 +10996,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         if (!bodyScrollElem) {
           return;
         }
-        const wheelSpeed = getWheelSpeed(internalData.lastSTime);
+        const wheelSpeed = getWheelSpeed(reactData.lastScrollTime);
         const deltaTop = shiftKey ? 0 : deltaY * wheelSpeed;
         const deltaLeft = (shiftKey ? deltaX || deltaY : deltaX) * wheelSpeed;
         const currScrollTop = bodyScrollElem.scrollTop;
@@ -11142,9 +11044,8 @@ const VxeTableComponent = comp.defineVxeComponent({
         if (isRollX) {
           evnt.preventDefault();
           internalData.inWheelScroll = true;
-          dom.wheelScrollLeftTo(scrollLeft, (offsetLeft) => {
-            internalData.inWheelScroll = true;
-            const currLeftNum = offsetLeft;
+          if (browseObj.firefox || browseObj.safari) {
+            const currLeftNum = scrollLeft;
             dom.setScrollLeft(xHandleEl, currLeftNum);
             dom.setScrollLeft(bodyScrollElem, currLeftNum);
             dom.setScrollLeft(headerScrollElem, currLeftNum);
@@ -11156,14 +11057,29 @@ const VxeTableComponent = comp.defineVxeComponent({
               type: "table",
               fixed: ""
             });
-          });
+          } else {
+            wheelScrollLeftTo(scrollLeft, (offsetLeft) => {
+              internalData.inWheelScroll = true;
+              const currLeftNum = offsetLeft;
+              dom.setScrollLeft(xHandleEl, currLeftNum);
+              dom.setScrollLeft(bodyScrollElem, currLeftNum);
+              dom.setScrollLeft(headerScrollElem, currLeftNum);
+              dom.setScrollLeft(footerScrollElem, currLeftNum);
+              if (scrollXLoad) {
+                $xeTable.triggerScrollXEvent(evnt);
+              }
+              $xeTable.handleScrollEvent(evnt, isRollY, isRollX, bodyScrollElem.scrollTop, currLeftNum, {
+                type: "table",
+                fixed: ""
+              });
+            });
+          }
         }
         if (isRollY) {
           evnt.preventDefault();
           internalData.inWheelScroll = true;
-          dom.wheelScrollTopTo(scrollTop, (offsetTop) => {
-            internalData.inWheelScroll = true;
-            const currTopNum = offsetTop;
+          if (browseObj.firefox || browseObj.safari) {
+            const currTopNum = scrollTop;
             dom.setScrollTop(yHandleEl, currTopNum);
             dom.setScrollTop(bodyScrollElem, currTopNum);
             dom.setScrollTop(leftScrollElem, currTopNum);
@@ -11173,11 +11089,29 @@ const VxeTableComponent = comp.defineVxeComponent({
             if (scrollYLoad) {
               $xeTable.triggerScrollYEvent(evnt);
             }
-            $xeTable.handleScrollEvent(evnt, isRollY, isRollX, offsetTop, bodyScrollElem.scrollLeft, {
+            $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, bodyScrollElem.scrollLeft, {
               type: "table",
               fixed: ""
             });
-          });
+          } else {
+            wheelScrollTopTo(scrollTop - currScrollTop, (offsetTop) => {
+              internalData.inWheelScroll = true;
+              const currTopNum = bodyScrollElem.scrollTop + offsetTop;
+              dom.setScrollTop(yHandleEl, currTopNum);
+              dom.setScrollTop(bodyScrollElem, currTopNum);
+              dom.setScrollTop(leftScrollElem, currTopNum);
+              dom.setScrollTop(rightScrollElem, currTopNum);
+              dom.setScrollTop(rowExpandEl, currTopNum);
+              syncGanttScrollTop(currTopNum);
+              if (scrollYLoad) {
+                $xeTable.triggerScrollYEvent(evnt);
+              }
+              $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, bodyScrollElem.scrollLeft, {
+                type: "table",
+                fixed: ""
+              });
+            });
+          }
         }
       },
       triggerVirtualScrollXEvent(evnt) {
@@ -11265,11 +11199,11 @@ const VxeTableComponent = comp.defineVxeComponent({
           const aggregateOpts = computeAggregateOpts.value;
           const treeOpts = computeTreeOpts.value;
           const childrenField = treeOpts.children || treeOpts.childrenField;
-          const matchObj = ctor.default.findTree(tableFullData, (item) => $xeTable.eqRow(item, row), { children: isRowGroupStatus ? aggregateOpts.mapChildrenField : childrenField });
+          const matchObj = index.default.findTree(tableFullData, (item) => $xeTable.eqRow(item, row), { children: isRowGroupStatus ? aggregateOpts.mapChildrenField : childrenField });
           if (matchObj) {
             const nodes = matchObj.nodes;
-            nodes.forEach((row2, index) => {
-              if (index < nodes.length - 1 && !$xeTable.isTreeExpandByRow(row2)) {
+            nodes.forEach((row2, index2) => {
+              if (index2 < nodes.length - 1 && !$xeTable.isTreeExpandByRow(row2)) {
                 rests.push($xeTable.setTreeExpand(row2, true));
               }
             });
@@ -11553,15 +11487,15 @@ const VxeTableComponent = comp.defineVxeComponent({
        * 行 hover 事件
        */
       triggerHoverEvent(evnt, { row }) {
-        $xeTable.setHoverRow(row);
+        tablePrivateMethods.setHoverRow(row);
       },
       setHoverRow(row) {
         const $xeGanttView = internalData.xeGanttView;
         const rowid = util.getRowid($xeTable, row);
         const el = refElem.value;
-        $xeTable.clearHoverRow();
+        tablePrivateMethods.clearHoverRow();
         if (el) {
-          ctor.default.arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), (elem) => dom.addClass(elem, "row--hover"));
+          index.default.arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), (elem) => dom.addClass(elem, "row--hover"));
         }
         internalData.hoverRow = row;
         if ($xeGanttView && $xeGanttView.handleUpdateHoverRow) {
@@ -11572,7 +11506,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         const $xeGanttView = internalData.xeGanttView;
         const el = refElem.value;
         if (el) {
-          ctor.default.arrayEach(el.querySelectorAll(".vxe-body--row.row--hover"), (elem) => dom.removeClass(elem, "row--hover"));
+          index.default.arrayEach(el.querySelectorAll(".vxe-body--row.row--hover"), (elem) => dom.removeClass(elem, "row--hover"));
         }
         internalData.hoverRow = null;
         if ($xeGanttView && $xeGanttView.handleUpdateHoverRow) {
@@ -11584,10 +11518,10 @@ const VxeTableComponent = comp.defineVxeComponent({
        * @deprecated
        */
       getCell(row, column) {
-        return $xeTable.getCellElement(row, column);
+        return tableMethods.getCellElement(row, column);
       },
       findRowIndexOf(list, row) {
-        return row ? ctor.default.findIndexOf(list, (item) => $xeTable.eqRow(item, row)) : -1;
+        return row ? index.default.findIndexOf(list, (item) => $xeTable.eqRow(item, row)) : -1;
       },
       eqRow(row1, row2) {
         if (row1 && row2) {
@@ -11617,8 +11551,8 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { overscrollBehavior: overscrollYBehavior } = scrollbarYOpts;
       const isFixedLeft = fixedType === "left";
       const fixedColumn = isFixedLeft ? columnStore.leftList : columnStore.rightList;
-      const osXBehavior = ctor.default.eqNull(overscrollXBehavior) ? scrollbarOpts.overscrollBehavior : overscrollXBehavior;
-      const osYBehavior = ctor.default.eqNull(overscrollYBehavior) ? scrollbarOpts.overscrollBehavior : overscrollYBehavior;
+      const osXBehavior = index.default.eqNull(overscrollXBehavior) ? scrollbarOpts.overscrollBehavior : overscrollXBehavior;
+      const osYBehavior = index.default.eqNull(overscrollYBehavior) ? scrollbarOpts.overscrollBehavior : overscrollYBehavior;
       return vue.h("div", {
         ref: isFixedLeft ? refLeftContainer : refRightContainer,
         class: [`vxe-table--fixed-${fixedType}-wrapper`, `sx--${scrollbarXOpts.visible}`, `sy--${scrollbarYOpts.visible}`, {
@@ -11784,7 +11718,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             cellStyle.height = `${expandHeight}px`;
           }
           if (isRowGroupStatus || treeConfig) {
-            cellStyle.paddingLeft = `${rowLevel * (ctor.default.isNumber(indent) ? indent : treeOpts.indent) + 30}px`;
+            cellStyle.paddingLeft = `${rowLevel * (index.default.isNumber(indent) ? indent : treeOpts.indent) + 30}px`;
           }
           let columnIndex = -1;
           let $columnIndex = -1;
@@ -11826,11 +11760,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             }],
             rowid,
             style: cellStyle
-          }, [
-            vue.h("div", {
-              class: "vxe-body--row-expanded-content"
-            }, expandColumn.renderData(expandParams))
-          ]));
+          }, expandColumn.renderData(expandParams)));
         });
       }
       return vue.h("div", {
@@ -11914,8 +11844,8 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { overscrollBehavior: overscrollXBehavior } = scrollbarXOpts;
       const { overscrollBehavior: overscrollYBehavior } = scrollbarYOpts;
       const { leftList, rightList } = columnStore;
-      const osXBehavior = ctor.default.eqNull(overscrollXBehavior) ? scrollbarOpts.overscrollBehavior : overscrollXBehavior;
-      const osYBehavior = ctor.default.eqNull(overscrollYBehavior) ? scrollbarOpts.overscrollBehavior : overscrollYBehavior;
+      const osXBehavior = index.default.eqNull(overscrollXBehavior) ? scrollbarOpts.overscrollBehavior : overscrollXBehavior;
+      const osYBehavior = index.default.eqNull(overscrollYBehavior) ? scrollbarOpts.overscrollBehavior : overscrollYBehavior;
       return vue.h("div", {
         ref: refTableViewportElem,
         class: ["vxe-table--viewport-wrapper", {
@@ -11985,7 +11915,6 @@ const VxeTableComponent = comp.defineVxeComponent({
         footer: slots.footerTooltip || slots["footer-tooltip"]
       };
       const currTooltipSlot = tooltipStore.visible && tooltipStore.type ? tipSlots[tooltipStore.type] : null;
-      const tableStyle = computeTableStyle.value;
       const rowDragOpts = computeRowDragOpts.value;
       const tableTipConfig = computeTableTipConfig.value;
       const validTipConfig = computeValidTipConfig.value;
@@ -12006,8 +11935,6 @@ const VxeTableComponent = comp.defineVxeComponent({
       const columnDragOpts = computeColumnDragOpts.value;
       const scrollbarXToTop = computeScrollbarXToTop.value;
       const scrollbarYToLeft = computeScrollbarYToLeft.value;
-      const customSimpleMode = computeCustomSimpleMode.value;
-      const showCustomSimpleOutside = customSimpleMode === "outside";
       const { isCrossTableDrag } = rowDragOpts;
       const tbOns = {
         onKeydown: keydownEvent,
@@ -12050,7 +11977,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         "not--scroll-x": !overflowX,
         "is--virtual-x": scrollXLoad,
         "is--virtual-y": scrollYLoad
-      }], style: tableStyle, spellcheck: false }, tbOns), [
+      }], spellcheck: false }, tbOns), [
         /**
          * 隐藏列
          */
@@ -12145,7 +12072,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               /**
                * 自定义列
                */
-              !showCustomSimpleOutside && initStore.custom ? vue.h(panel.default, {
+              initStore.custom ? vue.h(panel.default, {
                 key: "cs",
                 ref: refTableCustom,
                 customStore
@@ -12183,14 +12110,6 @@ const VxeTableComponent = comp.defineVxeComponent({
             vue.h("div", {
               ref: refPopupWrapperElem
             }, [
-              /**
-               * 自定义列
-               */
-              showCustomSimpleOutside && initStore.custom ? vue.h(panel.default, {
-                key: "cs",
-                ref: refTableCustom,
-                customStore
-              }) : renderEmptyElement($xeTable),
               /**
                * 筛选
                */
@@ -12254,10 +12173,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             minWidth: tableTipConfig.minWidth,
             minHeight: tableTipConfig.minHeight,
             maxWidth: tableTipConfig.maxWidth,
-            maxHeight: tableTipConfig.maxHeight,
-            placement: tableTipConfig.placement,
-            defaultPlacement: tableTipConfig.defaultPlacement,
-            popupClassName: tableTipConfig.popupClassName
+            maxHeight: tableTipConfig.maxHeight
           }, currTooltipSlot ? {
             content: () => {
               const { type, row, column, content: tooltipContent } = tooltipStore;
@@ -12284,7 +12200,7 @@ const VxeTableComponent = comp.defineVxeComponent({
           /**
             * 校验提示
             */
-          props$1.editRules && validOpts.showErrorMessage && (validOpts.message === "default" ? !height : validOpts.message === "tooltip") ? vue.h(VxeUITooltipComponent, {
+          props$1.editRules && validOpts.showMessage && (validOpts.message === "default" ? !height : validOpts.message === "tooltip") ? vue.h(VxeUITooltipComponent, {
             key: "vtp",
             ref: refValidTooltip,
             class: [{
@@ -12322,7 +12238,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== "fixed")) {
           log.warnLog("vxe.error.scrollErrProp", ["column.type=expand"]);
         }
-        return $xeTable.recalculate();
+        return tableMethods.recalculate();
       });
     });
     const staticColumnFlag = vue.ref(0);
@@ -12333,7 +12249,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       staticColumnFlag.value++;
     });
     vue.watch(staticColumnFlag, () => {
-      vue.nextTick(() => handleInitColumn(ctor.default.clone(reactData.staticColumns)));
+      vue.nextTick(() => handleInitColumn(index.default.clone(reactData.staticColumns)));
     });
     const tableColumnFlag = vue.ref(0);
     vue.watch(() => reactData.tableColumn.length, () => {
@@ -12343,16 +12259,16 @@ const VxeTableComponent = comp.defineVxeComponent({
       tableColumnFlag.value++;
     });
     vue.watch(tableColumnFlag, () => {
-      $xeTable.analyColumnWidth();
+      tablePrivateMethods.analyColumnWidth();
     });
     vue.watch(() => reactData.upDataFlag, () => {
       vue.nextTick(() => {
-        $xeTable.updateData();
+        tableMethods.updateData();
       });
     });
     vue.watch(() => reactData.reColumnFlag, () => {
       vue.nextTick(() => {
-        $xeTable.refreshColumn();
+        tableMethods.refreshColumn();
       });
     });
     const reLayoutFlag = vue.ref(0);
@@ -12365,16 +12281,6 @@ const VxeTableComponent = comp.defineVxeComponent({
     vue.watch(() => props$1.showFooter, () => {
       reLayoutFlag.value++;
     });
-    vue.watch(() => props$1.showHeaderOverflow, () => {
-      reLayoutFlag.value++;
-    });
-    vue.watch(() => props$1.showOverflow, () => {
-      updateColumnAllOverflow();
-      reLayoutFlag.value++;
-    });
-    vue.watch(() => props$1.showFooterOverflow, () => {
-      reLayoutFlag.value++;
-    });
     vue.watch(() => reactData.overflowX, () => {
       reLayoutFlag.value++;
     });
@@ -12481,21 +12387,6 @@ const VxeTableComponent = comp.defineVxeComponent({
         });
       }
     });
-    const kfFlag = vue.ref(0);
-    vue.watch(() => reactData.updateColFlag, () => {
-      kfFlag.value++;
-    });
-    vue.watch(computeKeepFields, () => {
-      kfFlag.value++;
-    });
-    vue.watch(kfFlag, () => {
-      const keepFields = computeKeepFields.value;
-      const kpfMaps = {};
-      keepFields.forEach((field) => {
-        kpfMaps[field] = 1;
-      });
-      internalData.keepUpdateFieldMaps = kpfMaps;
-    });
     if ($xeTabs) {
       vue.watch(() => $xeTabs ? $xeTabs.reactData.resizeFlag : null, () => {
         handleGlobalResizeEvent();
@@ -12506,16 +12397,16 @@ const VxeTableComponent = comp.defineVxeComponent({
       const { setupTable } = options;
       if (setupTable) {
         const hookRest = setupTable($xeTable);
-        if (hookRest && ctor.default.isObject(hookRest)) {
+        if (hookRest && index.default.isObject(hookRest)) {
           Object.assign($xeTable, hookRest);
         }
       }
     });
-    $xeTable.preventEvent(null, "created", { $table: $xeTable });
+    tablePrivateMethods.preventEvent(null, "created", { $table: $xeTable });
     let resizeObserver;
     vue.onActivated(() => {
-      $xeTable.recalculate().then(() => $xeTable.refreshScroll());
-      $xeTable.preventEvent(null, "activated", { $table: $xeTable });
+      tableMethods.recalculate().then(() => tableMethods.refreshScroll());
+      tablePrivateMethods.preventEvent(null, "activated", { $table: $xeTable });
     });
     vue.onDeactivated(() => {
       const { filterStore } = reactData;
@@ -12524,7 +12415,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       }
       $xeTable.closeTooltip();
       internalData.isActivated = false;
-      $xeTable.preventEvent(null, "deactivated", { $table: $xeTable });
+      tablePrivateMethods.preventEvent(null, "deactivated", { $table: $xeTable });
     });
     vue.onMounted(() => {
       const { exportConfig, importConfig, treeConfig, minHeight } = props$1;
@@ -12545,8 +12436,6 @@ const VxeTableComponent = comp.defineVxeComponent({
       const importOpts = computeImportOpts.value;
       const rowDragOpts = computeRowDragOpts.value;
       const areaOpts = computeAreaOpts.value;
-      const sortOpts = computeSortOpts.value;
-      const filterOpts = computeFilterOpts.value;
       const { groupFields } = aggregateOpts;
       if ($xeGantt) {
         const { refClassifyWrapperElem } = $xeGantt.getRefMaps();
@@ -12583,14 +12472,6 @@ const VxeTableComponent = comp.defineVxeComponent({
       if (treeConfig && !treeOpts.transform && props$1.stripe) {
         log.warnLog("vxe.error.noTree", ["stripe"]);
       }
-      if (treeConfig && !treeOpts.transform) {
-        if (sortOpts.isDeep) {
-          log.warnLog("vxe.error.reqSupportProp", ["transform=false", "sort-config.isDeep=false"]);
-        }
-        if (filterOpts.isDeep) {
-          log.warnLog("vxe.error.reqSupportProp", ["transform=false", "filter-config.isDeep=false"]);
-        }
-      }
       if (props$1.showFooter && !(props$1.footerMethod || props$1.footerData)) {
         log.warnLog("vxe.error.reqProp", ["footer-data | footer-method"]);
       }
@@ -12615,11 +12496,11 @@ const VxeTableComponent = comp.defineVxeComponent({
       if (props$1.aggregateConfig && props$1.rowGroupConfig) {
         log.warnLog("vxe.error.notSupportProp", ["aggregate-config", "row-group-config", "row-group-config=null"]);
       }
-      if (importConfig && importOpts.types && !importOpts.importMethod && !ctor.default.includeArrays(ctor.default.keys(importOpts._typeMaps), importOpts.types)) {
-        log.warnLog("vxe.error.errProp", [`export-config.types=${importOpts.types.join(",")}`, importOpts.types.filter((type) => ctor.default.includes(ctor.default.keys(importOpts._typeMaps), type)).join(",") || ctor.default.keys(importOpts._typeMaps).join(",")]);
+      if (importConfig && importOpts.types && !importOpts.importMethod && !index.default.includeArrays(index.default.keys(importOpts._typeMaps), importOpts.types)) {
+        log.warnLog("vxe.error.errProp", [`export-config.types=${importOpts.types.join(",")}`, importOpts.types.filter((type) => index.default.includes(index.default.keys(importOpts._typeMaps), type)).join(",") || index.default.keys(importOpts._typeMaps).join(",")]);
       }
-      if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !ctor.default.includeArrays(ctor.default.keys(exportOpts._typeMaps), exportOpts.types)) {
-        log.warnLog("vxe.error.errProp", [`export-config.types=${exportOpts.types.join(",")}`, exportOpts.types.filter((type) => ctor.default.includes(ctor.default.keys(exportOpts._typeMaps), type)).join(",") || ctor.default.keys(exportOpts._typeMaps).join(",")]);
+      if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !index.default.includeArrays(index.default.keys(exportOpts._typeMaps), exportOpts.types)) {
+        log.warnLog("vxe.error.errProp", [`export-config.types=${exportOpts.types.join(",")}`, exportOpts.types.filter((type) => index.default.includes(index.default.keys(exportOpts._typeMaps), type)).join(",") || index.default.keys(exportOpts._typeMaps).join(",")]);
       }
       if (!props$1.id) {
         if ((props$1.customConfig ? utils.isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
@@ -12632,7 +12513,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       if (rowOpts.height && !props$1.showOverflow) {
         log.warnLog("vxe.error.notProp", ["table.show-overflow"]);
       }
-      if (!$xeTable.triggerClAreaModnEvent) {
+      if (!$xeTable.triggerCellAreaModnEvent) {
         if (props$1.areaConfig) {
           log.warnLog("vxe.error.notProp", ["area-config"]);
         }
@@ -12706,7 +12587,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         log.warnLog("vxe.error.reqSupportProp", ["edit-config & edit-rules", "min-height"]);
       }
       if (treeConfig) {
-        ctor.default.arrayEach(["rowField", "parentField", "childrenField", "hasChildField", "mapChildrenField"], (key) => {
+        index.default.arrayEach(["rowField", "parentField", "childrenField", "hasChildField", "mapChildrenField"], (key) => {
           const val = treeOpts[key];
           if (val && val.indexOf(".") > -1) {
             log.errLog("vxe.error.errProp", [`${key}=${val}`, `${key}=${val.split(".")[0]}`]);
@@ -12734,7 +12615,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       vue.nextTick(() => {
         if (props$1.autoResize) {
           const el = refElem.value;
-          const parentEl = $xeTable.getParentElem();
+          const parentEl = tablePrivateMethods.getParentElem();
           resizeObserver = globalResize.create(() => {
             if (props$1.autoResize) {
               handleResizeEvent();
@@ -12766,10 +12647,6 @@ const VxeTableComponent = comp.defineVxeComponent({
       $xeTable.preventEvent(null, "mounted", { $table: $xeTable });
     });
     vue.onBeforeUnmount(() => {
-      const { _sToTime } = internalData;
-      if (_sToTime) {
-        clearTimeout(_sToTime);
-      }
       const tableViewportEl = refTableViewportElem.value;
       if (tableViewportEl) {
         tableViewportEl.removeEventListener("wheel", $xeTable.triggerBodyWheelEvent);
@@ -12781,7 +12658,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         resizeObserver.disconnect();
       }
       $xeTable.closeTooltip();
-      $xeTable.closeFilter();
+      tableMethods.closeFilter();
       if ($xeTable.closeMenu) {
         $xeTable.closeMenu();
       }
@@ -12794,12 +12671,11 @@ const VxeTableComponent = comp.defineVxeComponent({
       globalEvents.off($xeTable, "keydown");
       globalEvents.off($xeTable, "resize");
       globalEvents.off($xeTable, "contextmenu");
-      $xeTable.preventEvent(null, "beforeUnmount", { $table: $xeTable });
-      ctor.default.assign(reactData, util.createReactData());
-      ctor.default.assign(internalData, util.createInternalData());
+      tablePrivateMethods.preventEvent(null, "beforeUnmount", { $table: $xeTable });
     });
     vue.onUnmounted(() => {
-      $xeTable.preventEvent(null, "unmounted", { $table: $xeTable });
+      tablePrivateMethods.preventEvent(null, "unmounted", { $table: $xeTable });
+      index.default.assign(internalData, util.createInternalData());
     });
     vue.nextTick(() => {
       if (props$1.loading) {