@fecp/designer 5.4.106 → 5.4.108

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

@@ -55,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 = {};
@@ -117,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 (index.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;
@@ -250,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);
     });
@@ -298,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);
     });
@@ -364,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;
           }
         }
@@ -477,38 +704,6 @@ 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;
@@ -549,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) {
@@ -682,7 +851,6 @@ const VxeTableComponent = comp.defineVxeComponent({
       computeFooterCellOpts,
       computeRowOpts,
       computeAggregateOpts,
-      computeAggregateAccuracyOpts,
       computeRowGroupOpts,
       computeCurrentRowOpts,
       computeRowDragOpts,
@@ -696,7 +864,6 @@ const VxeTableComponent = comp.defineVxeComponent({
       computeHeaderTooltipOpts,
       computeFooterTooltipOpts,
       computeEditOpts,
-      computeEditDirtyOpts,
       computeSortOpts,
       computeFilterOpts,
       computeFloatingFilterOpts,
@@ -721,13 +888,11 @@ const VxeTableComponent = comp.defineVxeComponent({
       computeLoadingOpts,
       computeCellOffsetWidth,
       computeCustomOpts,
-      computeCustomSimpleMode,
       computeLeftFixedWidth,
       computeRightFixedWidth,
       computeBodyMergeCoverFixed,
       computeFixedColumnSize,
       computeIsMaxFixedColumn,
-      computeKeepFields,
       computeIsAllCheckboxDisabled,
       computeIsHeaderRenderOptimize,
       computeIsBodyRenderOptimize,
@@ -939,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
               } : {
@@ -987,14 +1140,12 @@ 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) => {
@@ -1106,8 +1257,6 @@ const VxeTableComponent = comp.defineVxeComponent({
       internalData.mergeHeaderList = [];
       internalData.mergeHeaderMaps = {};
       internalData.mergeHeaderCellMaps = {};
-      internalData.mergeHeaderRowMaps = {};
-      internalData.mergeBodyColMaps = {};
       $xeTable.setMergeHeaderCells(merges);
     };
     const handleHeaderMerge = (merges) => {
@@ -1206,8 +1355,6 @@ const VxeTableComponent = comp.defineVxeComponent({
       internalData.mergeFooterList = [];
       internalData.mergeFooterMaps = {};
       internalData.mergeFooterCellMaps = {};
-      internalData.mergeFooterRowMaps = {};
-      internalData.mergeFooterColMaps = {};
       $xeTable.setMergeFooterCells(merges);
     };
     const handleFooterMerge = (merges) => {
@@ -1478,7 +1625,6 @@ const VxeTableComponent = comp.defineVxeComponent({
           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 {
@@ -1516,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) {
-        index.default.eachTree(collectColumn, handleFunc);
-      } else {
-        tableFullColumn.forEach(handleFunc);
-      }
-      index.default.each(fullAllDataRowIdData, (rowRest) => {
-        rowRest.height = 0;
-      });
-      reactData.isAllOverflow = isAllOverflow;
-    };
     const cacheColumnMap = () => {
       const { treeConfig, showOverflow } = props$1;
       const { tableFullColumn, collectColumn } = internalData;
@@ -1875,7 +2001,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         if (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 : index.default.toNumber(cellValue);
@@ -1890,7 +2016,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         if (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 : index.default.toNumber(cellValue);
@@ -2025,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) {
@@ -2082,7 +2208,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               mapChildren: aggregateOpts.childrenField
             });
             tableData = tableTree;
-          } else if (treeConfig && transform && isFilterDeep !== false) {
+          } else if (treeConfig && transform) {
             tableTree = index.default.searchTree(tableFullTreeData, handleFilter, {
               original: true,
               isEvery,
@@ -2103,7 +2229,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               mapChildren: aggregateOpts.childrenField
             });
             tableData = tableTree;
-          } else if (treeConfig && transform && isFilterDeep !== false) {
+          } else if (treeConfig && transform) {
             tableTree = index.default.searchTree(tableFullTreeData, () => true, {
               original: true,
               isEvery,
@@ -2135,7 +2261,7 @@ 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 = index.default.isArray(sortRests) ? sortRests : tableTree;
@@ -2170,7 +2296,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             mapChildren: aggregateOpts.childrenField
           });
           tableData = tableTree;
-        } else if (treeConfig && transform && isSortDeep !== false) {
+        } else if (treeConfig && transform) {
           tableTree = index.default.searchTree(tableFullTreeData, () => true, {
             original: true,
             isEvery,
@@ -3165,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;
@@ -3201,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;
             }
@@ -3350,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)) {
@@ -3453,14 +3578,13 @@ const VxeTableComponent = comp.defineVxeComponent({
     const handleUpdateColumn = () => {
       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 = {
@@ -3469,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) {
@@ -3609,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(() => {
@@ -3828,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();
@@ -3838,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) {
@@ -3941,7 +4064,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       return Promise.all([
         xRest,
         yRest,
-        scrollXLoad || scrollYLoad ? $xeTable.updateCellAreas() : null
+        $xeTable.updateCellAreas()
       ]);
     };
     const checkLastSyncScroll = (isRollX, isRollY) => {
@@ -3981,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) {
@@ -3995,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();
     };
@@ -4086,7 +4235,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             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) {
@@ -4383,7 +4532,7 @@ 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 = index.default.findTree(tableSourceData, (item) => rowid === util.getRowid($xeTable, item), { children: childrenField });
@@ -4438,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);
         });
       },
       /**
@@ -4530,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));
         });
       },
       /**
@@ -4543,7 +4692,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         if (!isArr) {
           records = [records || {}];
         }
-        return $xeTable.createData(records).then((rows) => isArr ? rows : rows[0]);
+        return tableMethods.createData(records).then((rows) => isArr ? rows : rows[0]);
       },
       /**
        * 还原数据
@@ -4727,7 +4876,7 @@ const VxeTableComponent = comp.defineVxeComponent({
               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);
@@ -4738,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;
-        index.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) {
@@ -4839,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;
-        index.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();
-      },
       /**
        * 检查是否为临时行数据
        */
@@ -4897,8 +4974,7 @@ const VxeTableComponent = comp.defineVxeComponent({
        */
       isUpdateByRow(rowidOrRow, field) {
         const { keepSource } = props$1;
-        const { fullDataRowIdData, sourceDataRowIdData } = internalData;
-        const keepFields = computeKeepFields.value;
+        const { tableFullColumn, fullDataRowIdData, sourceDataRowIdData } = internalData;
         if (keepSource) {
           const rowid = index.default.isString(rowidOrRow) || index.default.isNumber(rowidOrRow) ? rowidOrRow : util.getRowid($xeTable, rowidOrRow);
           const rowRest = fullDataRowIdData[rowid];
@@ -4911,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;
               }
             }
@@ -5244,14 +5321,14 @@ const VxeTableComponent = comp.defineVxeComponent({
               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();
       },
@@ -5269,14 +5346,14 @@ const VxeTableComponent = comp.defineVxeComponent({
               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();
       },
@@ -5632,8 +5709,8 @@ const VxeTableComponent = comp.defineVxeComponent({
         const checkboxOpts = computeCheckboxOpts.value;
         const { checkField } = checkboxOpts;
         const checked = checkField ? !index.default.get(row, checkField) : !selectCheckboxMaps[util.getRowid($xeTable, row)];
-        $xeTable.handleBatchSelectRows([row], checked, true);
-        $xeTable.checkSelectionStatus();
+        tablePrivateMethods.handleBatchSelectRows([row], checked, true);
+        tablePrivateMethods.checkSelectionStatus();
         return vue.nextTick();
       },
       /**
@@ -5770,7 +5847,7 @@ 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) {
@@ -5952,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;
@@ -5995,7 +6072,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             let { field, order } = confs;
             let column = field;
             if (index.default.isString(field)) {
-              column = $xeTable.getColumnByField(field);
+              column = tableMethods.getColumnByField(field);
             }
             if (column && column.sortable) {
               if (orders && orders.indexOf(order) === -1) {
@@ -6008,11 +6085,11 @@ const VxeTableComponent = comp.defineVxeComponent({
             }
           });
           if (!remote) {
-            $xeTable.handleTableData(true);
+            tablePrivateMethods.handleTableData(true);
           }
           return vue.nextTick().then(() => {
             updateRowOffsetTop();
-            $xeTable.updateCellAreas();
+            tableMethods.updateCellAreas();
             return updateStyle();
           });
         }
@@ -6091,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;
@@ -6151,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;
@@ -6282,7 +6359,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         } else {
           expandedRows = tableFullData;
         }
-        return $xeTable.setRowExpand(expandedRows, expanded);
+        return tableMethods.setRowExpand(expandedRows, expanded);
       },
       /**
        * 设置展开行，二个参数设置这一行展开与否
@@ -6355,7 +6432,7 @@ const VxeTableComponent = comp.defineVxeComponent({
       },
       isExpandByRow(row) {
         log.warnLog("vxe.error.delFunc", ["isExpandByRow", "isRowExpandByRow"]);
-        return $xeTable.isRowExpandByRow(row);
+        return tableMethods.isRowExpandByRow(row);
       },
       /**
        * 手动清空展开行状态，数据会恢复成未展开的状态
@@ -6777,45 +6854,37 @@ const VxeTableComponent = comp.defineVxeComponent({
           dom.setScrollLeft(bodyScrollElem, scrollLeft);
           dom.setScrollLeft(headerScrollElem, scrollLeft);
           dom.setScrollLeft(footerScrollElem, scrollLeft);
-          if (reactData.scrollXLoad) {
-            loadScrollXData();
-          }
+          loadScrollXData();
         }
         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 (index.default.isString(rowOrRowid) || index.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));
@@ -6824,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();
           }
@@ -6855,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]);
       },
       /**
        * 手动清除滚动相关信息，还原到初始状态
@@ -6949,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);
           }
         });
@@ -7002,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();
@@ -7040,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();
@@ -7090,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();
@@ -7270,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);
           }
         }
       }
@@ -7280,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);
               });
@@ -7295,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;
@@ -7340,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);
@@ -7355,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();
       }
@@ -7383,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);
@@ -7392,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;
@@ -7416,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;
@@ -7426,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;
@@ -7475,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) {
@@ -7493,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;
@@ -7505,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) {
@@ -7515,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),
@@ -7560,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 }) => {
@@ -7575,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);
                       }
                     }
                   }
@@ -7615,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
@@ -7676,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);
               }
             }
@@ -7756,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);
@@ -7772,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);
@@ -7810,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);
@@ -8148,7 +8121,6 @@ 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);
@@ -8181,7 +8153,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             record[childrenField] = null;
           }
           if (utils.eqEmptyValue(index.default.get(record, rowkey))) {
-            index.default.set(record, rowkey, util.createRowId(rowOpts, record, rowkey));
+            index.default.set(record, rowkey, util.getRowUniqueId());
           }
           return record;
         });
@@ -8194,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 = {};
@@ -8715,7 +8681,7 @@ const VxeTableComponent = comp.defineVxeComponent({
             fixedData: {},
             aggGroupData: {},
             aggFuncData: {}
-          } : $xeTable.getCustomStoreData();
+          } : tableMethods.getCustomStoreData();
           if (updateStore) {
             return updateStore({
               $table: $xeTable,
@@ -8740,8 +8706,8 @@ const VxeTableComponent = comp.defineVxeComponent({
             $xeTable.clearCopyCellArea();
           }
         }
-        $xeTable.analyColumnWidth();
-        return $xeTable.refreshColumn(true);
+        tablePrivateMethods.analyColumnWidth();
+        return tableMethods.refreshColumn(true);
       },
       handleUpdateDataQueue() {
         reactData.upDataFlag++;
@@ -9090,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() {
@@ -9254,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);
@@ -9363,10 +9316,6 @@ const VxeTableComponent = comp.defineVxeComponent({
             }
           }
         }
-        if ($xeGantt) {
-          const ganttReactData = $xeGantt.reactData;
-          ganttReactData.activeBarRowid = null;
-        }
         dispatchEvent("cell-click", params, evnt);
       },
       /**
@@ -9396,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;
@@ -9491,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;
         }
@@ -9499,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);
           }
         }
       },
@@ -9523,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);
@@ -9556,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 {
@@ -9670,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);
           }
@@ -9921,7 +9825,6 @@ const VxeTableComponent = comp.defineVxeComponent({
               if (transform) {
                 if (oldRest && newRest) {
                   const fullList = index.default.toTreeArray(internalData.afterTreeFullData, {
-                    updated: false,
                     key: rowField,
                     parentKey: parentField,
                     children: mapChildrenField
@@ -10854,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,
@@ -11093,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;
@@ -11141,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);
@@ -11155,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);
@@ -11172,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) {
@@ -11552,13 +11487,13 @@ 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) {
           index.default.arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), (elem) => dom.addClass(elem, "row--hover"));
         }
@@ -11583,7 +11518,7 @@ const VxeTableComponent = comp.defineVxeComponent({
        * @deprecated
        */
       getCell(row, column) {
-        return $xeTable.getCellElement(row, column);
+        return tableMethods.getCellElement(row, column);
       },
       findRowIndexOf(list, row) {
         return row ? index.default.findIndexOf(list, (item) => $xeTable.eqRow(item, row)) : -1;
@@ -11825,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", {
@@ -11984,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;
@@ -12005,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,
@@ -12049,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), [
         /**
          * 隐藏列
          */
@@ -12144,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
@@ -12182,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),
               /**
                * 筛选
                */
@@ -12253,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;
@@ -12283,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: [{
@@ -12321,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);
@@ -12342,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);
@@ -12364,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++;
     });
@@ -12480,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();
@@ -12510,11 +12402,11 @@ const VxeTableComponent = comp.defineVxeComponent({
         }
       }
     });
-    $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;
@@ -12523,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;
@@ -12544,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();
@@ -12582,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"]);
       }
@@ -12631,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"]);
         }
@@ -12733,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();
@@ -12765,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);
@@ -12780,7 +12658,7 @@ const VxeTableComponent = comp.defineVxeComponent({
         resizeObserver.disconnect();
       }
       $xeTable.closeTooltip();
-      $xeTable.closeFilter();
+      tableMethods.closeFilter();
       if ($xeTable.closeMenu) {
         $xeTable.closeMenu();
       }
@@ -12793,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 });
-      index.default.assign(reactData, util.createReactData());
-      index.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) {