vxe-table 4.12.0-beta.8 → 4.12.0

package/es/table/src/table.js

@@ -9,7 +9,7 @@ import TableHeaderComponent from './header';
 import TableFooterComponent from './footer';
 import tableProps from './props';
 import tableEmits from './emits';
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, updateDeepRowKey, updateFastRowKey } from './util';
+import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 import TableCustomPanelComponent from '../module/custom/panel';
@@ -18,6 +18,7 @@ import TableImportPanelComponent from '../module/export/import-panel';
 import TableExportPanelComponent from '../module/export/export-panel';
 import TableMenuPanelComponent from '../module/menu/panel';
 const { getConfig, getIcon, getI18n, renderer, formats, createEvent, globalResize, interceptor, hooks, globalEvents, GLOBAL_EVENT_KEYS, useFns, renderEmptyElement } = VxeUI;
+const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;
 const maxXWidth = 5e6;
@@ -67,8 +68,6 @@ export default defineComponent({
             isAllSelected: false,
             // 复选框属性，有选中且非全选状态
             isIndeterminate: false,
-            // 复选框属性，已选中的行集合
-            selectCheckboxMaps: {},
             // 当前行
             currentRow: null,
             // 单选框属性，选中列
@@ -82,16 +81,6 @@ export default defineComponent({
             // 树节点列信息
             treeNodeColumn: null,
             hasFixedColumn: false,
-            // 已展开的行集合
-            rowExpandedMaps: {},
-            // 懒加载中的展开行的集合
-            rowExpandLazyLoadedMaps: {},
-            // 已展开树节点集合
-            treeExpandedMaps: {},
-            // 懒加载中的树节点的集合
-            treeExpandLazyLoadedMaps: {},
-            // 树节点不确定状态的集合
-            treeIndeterminateMaps: {},
             // 合并单元格的对象集
             mergeList: [],
             // 合并表尾数据的对象集
@@ -100,8 +89,6 @@ export default defineComponent({
             upDataFlag: 0,
             // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
             reColumnFlag: 0,
-            // 已标记的对象集
-            pendingRowMaps: {},
             // 初始化标识
             initStore: {
                 filter: false,
@@ -245,6 +232,10 @@ export default defineComponent({
                 isHeader: false,
                 isFooter: false
             },
+            rowExpandedFlag: 1,
+            treeExpandedFlag: 1,
+            updateCheckboxFlag: 1,
+            pendingRowFlag: 1,
             rowHeightStore: {
                 default: 48,
                 medium: 44,
@@ -261,6 +252,7 @@ export default defineComponent({
             rowExpandHeightFlag: 1,
             calcCellHeightFlag: 1,
             resizeHeightFlag: 1,
+            resizeWidthFlag: 1,
             isCustomStatus: false,
             isDragRowMove: false,
             dragRow: null,
@@ -344,6 +336,18 @@ export default defineComponent({
             fullColumnIdData: {},
             fullColumnFieldData: {},
             // prevDragRow: null,
+            // 已展开的行集合
+            rowExpandedMaps: {},
+            // 懒加载中的展开行的集合
+            rowExpandLazyLoadedMaps: {},
+            // 已展开树节点集合
+            treeExpandedMaps: {},
+            // 懒加载中的树节点的集合
+            treeExpandLazyLoadedMaps: {},
+            // 复选框属性，已选中的行集合
+            selectCheckboxMaps: {},
+            // 已标记的对象集
+            pendingRowMaps: {},
             inited: false,
             tooltipTimeout: null,
             initStatus: false,
@@ -464,18 +468,36 @@ export default defineComponent({
         const computeColumnOpts = computed(() => {
             return Object.assign({}, getConfig().table.columnConfig, props.columnConfig);
         });
+        const computeCurrentColumnOpts = computed(() => {
+            return Object.assign({}, getConfig().table.currentColumnConfig, props.currentColumnConfig);
+        });
         const computeCellOpts = computed(() => {
-            return Object.assign({}, getConfig().table.cellConfig, props.cellConfig);
+            const cellOpts = Object.assign({}, getConfig().table.cellConfig, props.cellConfig);
+            if (cellOpts.height) {
+                cellOpts.height = XEUtils.toNumber(cellOpts.height);
+            }
+            return cellOpts;
         });
         const computeHeaderCellOpts = computed(() => {
-            return Object.assign({}, getConfig().table.headerCellConfig, props.headerCellConfig);
+            const headerCellOpts = Object.assign({}, getConfig().table.headerCellConfig, props.headerCellConfig);
+            if (headerCellOpts.height) {
+                headerCellOpts.height = XEUtils.toNumber(headerCellOpts.height);
+            }
+            return headerCellOpts;
         });
         const computeFooterCellOpts = computed(() => {
-            return Object.assign({}, getConfig().table.footerCellConfig, props.footerCellConfig);
+            const footerCellOpts = Object.assign({}, getConfig().table.footerCellConfig, props.footerCellConfig);
+            if (footerCellOpts.height) {
+                footerCellOpts.height = XEUtils.toNumber(footerCellOpts.height);
+            }
+            return footerCellOpts;
         });
         const computeRowOpts = computed(() => {
             return Object.assign({}, getConfig().table.rowConfig, props.rowConfig);
         });
+        const computeCurrentRowOpts = computed(() => {
+            return Object.assign({}, getConfig().table.currentRowConfig, props.currentRowConfig);
+        });
         const computeRowDragOpts = computed(() => {
             return Object.assign({}, getConfig().table.rowDragConfig, props.rowDragConfig);
         });
@@ -616,12 +638,14 @@ export default defineComponent({
             return Object.assign({}, getConfig().table.customConfig, props.customConfig);
         });
         const computeTableRowExpandedList = computed(() => {
-            const { rowExpandedMaps, tableData, expandColumn } = reactData;
+            const { rowExpandedFlag, tableData, expandColumn } = reactData;
+            const { rowExpandedMaps } = internalData;
+            const { handleGetRowId } = createHandleGetRowId($xeTable);
             const expandList = [];
-            if (expandColumn) {
+            if (expandColumn && rowExpandedFlag) {
                 const rowKeys = {};
                 tableData.forEach(row => {
-                    rowKeys[getRowid($xeTable, row)] = true;
+                    rowKeys[handleGetRowId(row)] = true;
                 });
                 XEUtils.each(rowExpandedMaps, (row, rowid) => {
                     if (rowKeys[rowid]) {
@@ -734,13 +758,16 @@ export default defineComponent({
             computeScrollbarXToTop,
             computeScrollbarYToLeft,
             computeColumnOpts,
+            computeCurrentColumnOpts,
             computeScrollXThreshold,
             computeScrollYThreshold,
+            computeRowHeightMaps,
             computeDefaultRowHeight,
             computeCellOpts,
             computeHeaderCellOpts,
             computeFooterCellOpts,
             computeRowOpts,
+            computeCurrentRowOpts,
             computeRowDragOpts,
             computeColumnDragOpts,
             computeResizeOpts,
@@ -788,6 +815,7 @@ export default defineComponent({
             internalData,
             getRefMaps: () => refMaps,
             getComputeMaps: () => computeMaps,
+            xeGrid: $xeGrid,
             xegrid: $xeGrid
         };
         const eqCellValue = (row1, row2, field) => {
@@ -942,12 +970,13 @@ export default defineComponent({
                     visibleSize = Math.ceil(clientHeight / defaultRowHeight) + 1;
                 }
                 else {
+                    const { handleGetRowId } = createHandleGetRowId($xeTable);
                     let leftIndex = 0;
                     let rightIndex = afterFullData.length;
                     while (leftIndex < rightIndex) {
                         const rIndex = Math.floor((leftIndex + rightIndex) / 2);
                         const row = afterFullData[rIndex];
-                        const rowid = getRowid($xeTable, row);
+                        const rowid = handleGetRowId(row);
                         const rowRest = fullAllDataRowIdData[rowid] || {};
                         if (rowRest.oTop <= startTop) {
                             leftIndex = rIndex + 1;
@@ -959,7 +988,7 @@ export default defineComponent({
                     toVisibleIndex = Math.max(0, leftIndex < afterFullData.length ? leftIndex - 2 : 0);
                     for (let rIndex = toVisibleIndex, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
                         const row = afterFullData[rIndex];
-                        const rowid = getRowid($xeTable, row);
+                        const rowid = handleGetRowId(row);
                         const rowRest = fullAllDataRowIdData[rowid] || {};
                         visibleSize++;
                         if (rowRest.oTop > endTop || visibleSize >= 100) {
@@ -1198,7 +1227,7 @@ export default defineComponent({
                 }
                 else {
                     if ((storage && !type) || (columnOpts.drag && (isCrossDrag || isSelfToChildDrag))) {
-                        errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
+                        errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`]);
                     }
                 }
                 if (!hasFixed && fixed) {
@@ -1442,6 +1471,7 @@ export default defineComponent({
             internalData.headerHeight = headerHeight;
             internalData.footerHeight = footerHeight;
             reactData.overflowX = overflowX;
+            reactData.resizeWidthFlag++;
             updateColumnOffsetLeft();
             updateHeight();
             reactData.parentHeight = Math.max(internalData.headerHeight + footerHeight + 20, $xeTable.getParentHeight());
@@ -1467,9 +1497,10 @@ export default defineComponent({
             const defaultRowHeight = computeDefaultRowHeight.value;
             const el = refElem.value;
             if (!isAllOverflow && scrollYLoad && el) {
+                const { handleGetRowId } = createHandleGetRowId($xeTable);
                 el.setAttribute('data-calc-row', 'Y');
                 tableData.forEach(row => {
-                    const rowid = getRowid($xeTable, row);
+                    const rowid = handleGetRowId(row);
                     const rowRest = fullAllDataRowIdData[rowid];
                     if (rowRest) {
                         const reHeight = calcCellAutoHeight(rowRest, el);
@@ -1505,9 +1536,10 @@ export default defineComponent({
         const updateAfterListIndex = () => {
             const { treeConfig } = props;
             const { afterFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData;
+            const { handleGetRowId } = createHandleGetRowId($xeTable);
             const fullMaps = {};
             afterFullData.forEach((row, index) => {
-                const rowid = getRowid($xeTable, row);
+                const rowid = handleGetRowId(row);
                 const rowRest = fullAllDataRowIdData[rowid];
                 const seq = index + 1;
                 if (rowRest) {
@@ -1537,8 +1569,9 @@ export default defineComponent({
             const childrenField = treeOpts.children || treeOpts.childrenField;
             const fullMaps = {};
             if (treeConfig) {
+                const { handleGetRowId } = createHandleGetRowId($xeTable);
                 XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
-                    const rowid = getRowid($xeTable, row);
+                    const rowid = handleGetRowId(row);
                     const rowRest = fullAllDataRowIdData[rowid];
                     const seq = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
                     if (rowRest) {
@@ -1565,16 +1598,16 @@ export default defineComponent({
          */
         const handleVirtualTreeToList = () => {
             const { treeConfig } = props;
-            const { treeExpandedMaps } = reactData;
-            const { fullAllDataRowIdData } = internalData;
+            const { fullAllDataRowIdData, treeExpandedMaps } = internalData;
             const treeOpts = computeTreeOpts.value;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             if (treeConfig && treeOpts.transform) {
+                const { handleGetRowId } = createHandleGetRowId($xeTable);
                 const fullData = [];
                 const expandMaps = {};
                 XEUtils.eachTree(internalData.afterTreeFullData, (row, index, items, path, parentRow) => {
-                    const rowid = getRowid($xeTable, row);
-                    const parentRowid = getRowid($xeTable, parentRow);
+                    const rowid = handleGetRowId(row);
+                    const parentRowid = handleGetRowId(parentRow);
                     if (!parentRow || (expandMaps[parentRowid] && treeExpandedMaps[parentRowid])) {
                         const rowRest = fullAllDataRowIdData[rowid];
                         if (rowRest) {
@@ -1602,7 +1635,7 @@ export default defineComponent({
             const treeOpts = computeTreeOpts.value;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             const { transform, rowField, parentField, mapChildrenField } = treeOpts;
-            const { remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts;
+            const { isEvery, remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts;
             const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological } = sortOpts;
             let tableData = [];
             let tableTree = [];
@@ -1661,7 +1694,7 @@ export default defineComponent({
                         // 筛选虚拟树
                         tableTree = XEUtils.searchTree(tableFullTreeData, handleFilter, {
                             original: true,
-                            isEvery: true,
+                            isEvery,
                             children: mapChildrenField,
                             mapChildren: childrenField
                         });
@@ -1677,7 +1710,7 @@ export default defineComponent({
                         // 还原虚拟树
                         tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
                             original: true,
-                            isEvery: true,
+                            isEvery,
                             children: mapChildrenField,
                             mapChildren: childrenField
                         });
@@ -1727,7 +1760,7 @@ export default defineComponent({
                     // 还原虚拟树
                     tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
                         original: true,
-                        isEvery: true,
+                        isEvery,
                         children: treeOpts.mapChildrenField,
                         mapChildren: childrenField
                     });
@@ -1745,7 +1778,7 @@ export default defineComponent({
         const updateStyle = () => {
             const { border, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props;
             const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn } = reactData;
-            const { visibleColumn, fullColumnIdData, tableHeight, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData;
+            const { visibleColumn, tableHeight, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData;
             const el = refElem.value;
             if (!el) {
                 return;
@@ -1754,7 +1787,6 @@ export default defineComponent({
             const osbWidth = overflowY ? scrollbarWidth : 0;
             const osbHeight = overflowX ? scrollbarHeight : 0;
             const emptyPlaceholderElem = refEmptyPlaceholder.value;
-            const cellOffsetWidth = computeCellOffsetWidth.value;
             const mouseOpts = computeMouseOpts.value;
             const expandOpts = computeExpandOpts.value;
             const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
@@ -2022,56 +2054,6 @@ export default defineComponent({
                             tableElem.style.width = tWidth ? `${tWidth}px` : '';
                         }
                     }
-                    const colgroupElem = getRefElem(elemStore[`${name}-${layout}-colgroup`]);
-                    if (colgroupElem) {
-                        XEUtils.arrayEach(colgroupElem.children, (colElem) => {
-                            const colid = colElem.getAttribute('name');
-                            if (fullColumnIdData[colid]) {
-                                const colRest = fullColumnIdData[colid];
-                                const column = colRest.column;
-                                const { showHeaderOverflow, showFooterOverflow, showOverflow } = column;
-                                let cellOverflow;
-                                colElem.style.width = `${column.renderWidth}px`;
-                                if (layout === 'header') {
-                                    cellOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
-                                }
-                                else if (layout === 'footer') {
-                                    cellOverflow = XEUtils.isUndefined(showFooterOverflow) || XEUtils.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
-                                }
-                                else {
-                                    cellOverflow = XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow) ? isAllOverflow : showOverflow;
-                                }
-                                const showEllipsis = cellOverflow === 'ellipsis';
-                                const showTitle = cellOverflow === 'title';
-                                const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
-                                let hasEllipsis = showTitle || showTooltip || showEllipsis;
-                                const listElem = getRefElem(elemStore[`${name}-${layout}-list`]);
-                                // 纵向虚拟滚动不支持动态行高
-                                if (scrollYLoad && !hasEllipsis) {
-                                    hasEllipsis = true;
-                                }
-                                if (listElem) {
-                                    XEUtils.arrayEach(listElem.querySelectorAll(`.${column.id}`), (elem) => {
-                                        const colspan = parseInt(elem.getAttribute('colspan') || 1);
-                                        const cellElem = elem.querySelector('.vxe-cell');
-                                        let colWidth = column.renderWidth;
-                                        if (cellElem) {
-                                            if (colspan > 1) {
-                                                const columnIndex = $xeTable.getColumnIndex(column);
-                                                for (let index = 1; index < colspan; index++) {
-                                                    const nextColumn = $xeTable.getColumns(columnIndex + index);
-                                                    if (nextColumn) {
-                                                        colWidth += nextColumn.renderWidth;
-                                                    }
-                                                }
-                                            }
-                                            cellElem.style.width = hasEllipsis ? `${colWidth - (cellOffsetWidth * colspan)}px` : '';
-                                        }
-                                    });
-                                }
-                            }
-                        });
-                    }
                 });
             });
             if (currentRow) {
@@ -2232,12 +2214,12 @@ export default defineComponent({
         };
         const handleCheckedAllCheckboxRow = (checked, isForce) => {
             const { treeConfig } = props;
-            const { selectCheckboxMaps } = reactData;
-            const { afterFullData, checkboxReserveRowMap } = internalData;
+            const { afterFullData, checkboxReserveRowMap, selectCheckboxMaps } = internalData;
             const treeOpts = computeTreeOpts.value;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             const checkboxOpts = computeCheckboxOpts.value;
             const { checkField, reserve, checkMethod } = checkboxOpts;
+            const { handleGetRowId } = createHandleGetRowId($xeTable);
             // indeterminateField 仅支持读取
             const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
             const selectRowMaps = {};
@@ -2249,7 +2231,7 @@ export default defineComponent({
                 const checkValFn = (row) => {
                     if (isForce || (!checkMethod || checkMethod({ row }))) {
                         if (checked) {
-                            selectRowMaps[getRowid($xeTable, row)] = row;
+                            selectRowMaps[handleGetRowId(row)] = row;
                         }
                         XEUtils.set(row, checkField, checked);
                     }
@@ -2279,7 +2261,8 @@ export default defineComponent({
                            */
                         XEUtils.eachTree(afterFullData, (row) => {
                             if (isForce || (!checkMethod || checkMethod({ row }))) {
-                                selectRowMaps[getRowid($xeTable, row)] = row;
+                                const rowid = handleGetRowId(row);
+                                selectRowMaps[rowid] = row;
                             }
                         }, { children: childrenField });
                     }
@@ -2290,7 +2273,7 @@ export default defineComponent({
                            */
                         if (!isForce && checkMethod) {
                             XEUtils.eachTree(afterFullData, (row) => {
-                                const rowid = getRowid($xeTable, row);
+                                const rowid = handleGetRowId(row);
                                 if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
                                     selectRowMaps[rowid] = row;
                                 }
@@ -2307,7 +2290,7 @@ export default defineComponent({
                            */
                         if (!isForce && checkMethod) {
                             afterFullData.forEach((row) => {
-                                const rowid = getRowid($xeTable, row);
+                                const rowid = handleGetRowId(row);
                                 if (selectCheckboxMaps[rowid] || checkMethod({ row })) {
                                     selectRowMaps[rowid] = row;
                                 }
@@ -2315,7 +2298,8 @@ export default defineComponent({
                         }
                         else {
                             afterFullData.forEach(row => {
-                                selectRowMaps[getRowid($xeTable, row)] = row;
+                                const rowid = handleGetRowId(row);
+                                selectRowMaps[rowid] = row;
                             });
                         }
                     }
@@ -2327,7 +2311,7 @@ export default defineComponent({
                            */
                         if (!isForce && checkMethod) {
                             afterFullData.forEach((row) => {
-                                const rowid = getRowid($xeTable, row);
+                                const rowid = handleGetRowId(row);
                                 if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
                                     selectRowMaps[rowid] = row;
                                 }
@@ -2346,10 +2330,10 @@ export default defineComponent({
                     afterFullData.forEach((row) => handleCheckboxReserveRow(row, false));
                 }
             }
-            reactData.selectCheckboxMaps = checkField ? {} : selectRowMaps;
+            reactData.updateCheckboxFlag++;
+            internalData.selectCheckboxMaps = checkField ? {} : selectRowMaps;
             reactData.isAllSelected = checked;
             reactData.isIndeterminate = false;
-            reactData.treeIndeterminateMaps = {};
             internalData.treeIndeterminateRowMaps = {};
             $xeTable.checkSelectionStatus();
             return nextTick();
@@ -2357,8 +2341,8 @@ export default defineComponent({
         // 还原展开、选中等相关状态
         const handleReserveStatus = () => {
             const { treeConfig } = props;
-            const { expandColumn, currentRow, selectCheckboxMaps, selectRadioRow, rowExpandedMaps, treeExpandedMaps } = reactData;
-            const { fullDataRowIdData, fullAllDataRowIdData, radioReserveRow } = internalData;
+            const { expandColumn, currentRow, selectRadioRow } = reactData;
+            const { fullDataRowIdData, fullAllDataRowIdData, radioReserveRow, selectCheckboxMaps, treeExpandedMaps, rowExpandedMaps } = internalData;
             const expandOpts = computeExpandOpts.value;
             const treeOpts = computeTreeOpts.value;
             const radioOpts = computeRadioOpts.value;
@@ -2375,7 +2359,8 @@ export default defineComponent({
                 }
             }
             // 复选框
-            reactData.selectCheckboxMaps = getRecoverRowMaps(selectCheckboxMaps); // 刷新多选行状态
+            internalData.selectCheckboxMaps = getRecoverRowMaps(selectCheckboxMaps); // 刷新多选行状态
+            reactData.updateCheckboxFlag++;
             // 还原保留选中状态
             if (checkboxOpts.reserve) {
                 handleCheckedCheckboxRow(handleReserveRow(internalData.checkboxReserveRowMap), true, true);
@@ -2384,13 +2369,15 @@ export default defineComponent({
                 reactData.currentRow = null; // 刷新当前行状态
             }
             // 行展开
-            reactData.rowExpandedMaps = expandColumn ? getRecoverRowMaps(rowExpandedMaps) : {}; // 刷新行展开状态
+            internalData.rowExpandedMaps = expandColumn ? getRecoverRowMaps(rowExpandedMaps) : {}; // 刷新行展开状态
+            reactData.rowExpandedFlag++;
             // 还原保留状态
             if (expandColumn && expandOpts.reserve) {
                 $xeTable.setRowExpand(handleReserveRow(internalData.rowExpandedReserveRowMap), true);
             }
             // 树展开
-            reactData.treeExpandedMaps = treeConfig ? getRecoverRowMaps(treeExpandedMaps) : {}; // 刷新树展开状态
+            internalData.treeExpandedMaps = treeConfig ? getRecoverRowMaps(treeExpandedMaps) : {}; // 刷新树展开状态
+            reactData.treeExpandedFlag++;
             if (treeConfig && treeOpts.reserve) {
                 $xeTable.setTreeExpand(handleReserveRow(internalData.treeExpandedReserveRowMap), true);
             }
@@ -2406,7 +2393,7 @@ export default defineComponent({
                 const { expandAll, expandRowKeys } = treeOpts;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 if (expandAll) {
-                    tableMethods.setAllTreeExpand(true);
+                    $xeTable.setAllTreeExpand(true);
                 }
                 else if (expandRowKeys) {
                     const defExpandeds = [];
@@ -2417,7 +2404,7 @@ export default defineComponent({
                             defExpandeds.push(matchObj.item);
                         }
                     });
-                    tableMethods.setTreeExpand(defExpandeds, true);
+                    $xeTable.setTreeExpand(defExpandeds, true);
                 }
             }
         };
@@ -2428,8 +2415,7 @@ export default defineComponent({
             const { checkStrictly } = checkboxOpts;
             return new Promise(resolve => {
                 if (loadMethod) {
-                    const { treeExpandLazyLoadedMaps } = reactData;
-                    const { fullAllDataRowIdData } = internalData;
+                    const { fullAllDataRowIdData, treeExpandLazyLoadedMaps } = internalData;
                     const rowid = getRowid($xeTable, row);
                     const rowRest = fullAllDataRowIdData[rowid];
                     treeExpandLazyLoadedMaps[rowid] = row;
@@ -2444,18 +2430,19 @@ export default defineComponent({
                             childRecords = [];
                         }
                         if (childRecords) {
-                            return tableMethods.loadTreeChildren(row, childRecords).then(childRows => {
-                                const { treeExpandedMaps } = reactData;
+                            return $xeTable.loadTreeChildren(row, childRecords).then(childRows => {
+                                const { treeExpandedMaps } = internalData;
                                 if (childRows.length && !treeExpandedMaps[rowid]) {
                                     treeExpandedMaps[rowid] = row;
                                 }
+                                reactData.treeExpandedFlag++;
                                 // 如果当前节点已选中，则展开后子节点也被选中
-                                if (!checkStrictly && tableMethods.isCheckedByCheckboxRow(row)) {
+                                if (!checkStrictly && $xeTable.isCheckedByCheckboxRow(row)) {
                                     handleCheckedCheckboxRow(childRows, true);
                                 }
                                 return nextTick().then(() => {
                                     if (transform) {
-                                        tablePrivateMethods.handleTableData();
+                                        $xeTable.handleTableData();
                                         updateAfterDataIndex();
                                         return nextTick();
                                     }
@@ -2463,7 +2450,7 @@ export default defineComponent({
                             });
                         }
                     }).catch(() => {
-                        const { treeExpandLazyLoadedMaps } = reactData;
+                        const { treeExpandLazyLoadedMaps } = internalData;
                         if (rowRest) {
                             rowRest.treeLoaded = false;
                         }
@@ -2471,7 +2458,8 @@ export default defineComponent({
                             delete treeExpandLazyLoadedMaps[rowid];
                         }
                     }).finally(() => {
-                        nextTick().then(() => tableMethods.recalculate()).then(() => resolve());
+                        reactData.treeExpandedFlag++;
+                        nextTick().then(() => $xeTable.recalculate()).then(() => resolve());
                     });
                 }
                 else {
@@ -2497,29 +2485,27 @@ export default defineComponent({
                 const expandOpts = computeExpandOpts.value;
                 const { loadMethod } = expandOpts;
                 if (loadMethod) {
-                    const { fullAllDataRowIdData } = internalData;
-                    const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
+                    const { fullAllDataRowIdData, rowExpandLazyLoadedMaps } = internalData;
                     const rowid = getRowid($xeTable, row);
                     const rowRest = fullAllDataRowIdData[rowid];
-                    rExpandLazyLoadedMaps[rowid] = row;
-                    reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
-                    loadMethod({ $table: $xeTable, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) }).then(() => {
-                        const rowTempExpandedMaps = Object.assign({}, reactData.rowExpandedMaps);
+                    rowExpandLazyLoadedMaps[rowid] = row;
+                    loadMethod({ $table: $xeTable, row, rowIndex: $xeTable.getRowIndex(row), $rowIndex: $xeTable.getVMRowIndex(row) }).then(() => {
+                        const { rowExpandedMaps } = internalData;
                         if (rowRest) {
                             rowRest.expandLoaded = true;
                         }
-                        rowTempExpandedMaps[rowid] = row;
-                        reactData.rowExpandedMaps = rowTempExpandedMaps;
+                        rowExpandedMaps[rowid] = row;
+                        reactData.rowExpandedFlag++;
                     }).catch(() => {
                         if (rowRest) {
                             rowRest.expandLoaded = false;
                         }
                     }).finally(() => {
-                        const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
-                        if (rExpandLazyLoadedMaps[rowid]) {
-                            delete rExpandLazyLoadedMaps[rowid];
+                        const { rowExpandLazyLoadedMaps } = internalData;
+                        if (rowExpandLazyLoadedMaps[rowid]) {
+                            delete rowExpandLazyLoadedMaps[rowid];
                         }
-                        reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
+                        reactData.rowExpandedFlag++;
                         nextTick()
                             .then(() => $xeTable.recalculate())
                             .then(() => $xeTable.updateCellAreas())
@@ -2622,9 +2608,6 @@ export default defineComponent({
             calcCellWidth();
             autoCellWidth();
             updateStyle();
-            if (reFull) {
-                updateRowOffsetTop();
-            }
             updateRowExpandStyle();
             return computeScrollLoad().then(() => {
                 if (reFull === true) {
@@ -2653,6 +2636,9 @@ export default defineComponent({
             const childrenField = treeOpts.children || treeOpts.childrenField;
             let treeData = [];
             let fullData = reactive(datas ? datas.slice(0) : []); // 转为响应式数据
+            if (fullData.length > supportMaxRow) {
+                errLog('vxe.error.errMaxRow', [supportMaxRow]);
+            }
             if (treeConfig) {
                 if (transform) {
                     // 树结构自动转换
@@ -2860,8 +2846,8 @@ export default defineComponent({
             return result;
         };
         const parseColumns = (isReset) => {
-            const { showOverflow } = props;
-            const rowOpts = computeRowOpts.value;
+            // const { showOverflow } = props
+            // const rowOpts = computeRowOpts.value
             const leftList = [];
             const centerList = [];
             const rightList = [];
@@ -2934,28 +2920,28 @@ export default defineComponent({
             reactData.hasFixedColumn = leftList.length > 0 || rightList.length > 0;
             Object.assign(columnStore, { leftList, centerList, rightList });
             if (scrollXLoad) {
-                if (showOverflow) {
-                    if (!rowOpts.height) {
-                        const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false);
-                        if (errColumn) {
-                            errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
-                        }
-                    }
+                // if (showOverflow) {
+                //   if (!rowOpts.height) {
+                //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+                //     if (errColumn) {
+                //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+                //     }
+                //   }
+                // }
+                // if (process.env.NODE_ENV === 'development') {
+                // if (props.showHeader && !props.showHeaderOverflow) {
+                //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
+                // }
+                // if (props.showFooter && !props.showFooterOverflow) {
+                //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
+                // }
+                if (props.spanMethod) {
+                    warnLog('vxe.error.scrollErrProp', ['span-method']);
                 }
-                if (process.env.NODE_ENV === 'development') {
-                    // if (props.showHeader && !props.showHeaderOverflow) {
-                    //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
-                    // }
-                    // if (props.showFooter && !props.showFooterOverflow) {
-                    //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
-                    // }
-                    if (props.spanMethod) {
-                        warnLog('vxe.error.scrollErrProp', ['span-method']);
-                    }
-                    if (props.footerSpanMethod) {
-                        warnLog('vxe.error.scrollErrProp', ['footer-span-method']);
-                    }
+                if (props.footerSpanMethod) {
+                    warnLog('vxe.error.scrollErrProp', ['footer-span-method']);
                 }
+                // }
                 if (isReset) {
                     const { visibleSize } = handleVirtualXVisible();
                     scrollXStore.startIndex = 0;
@@ -3055,9 +3041,8 @@ export default defineComponent({
          * @returns
          */
         const handleBaseTreeExpand = (rows, expanded) => {
-            const { treeExpandedMaps, treeExpandLazyLoadedMaps, treeNodeColumn } = reactData;
-            const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
-            const { fullAllDataRowIdData, tableFullData } = internalData;
+            const { treeNodeColumn } = reactData;
+            const { fullAllDataRowIdData, tableFullData, treeExpandedMaps, treeExpandLazyLoadedMaps } = internalData;
             const treeOpts = computeTreeOpts.value;
             const { reserve, lazy, accordion, toggleMethod } = treeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -3065,6 +3050,7 @@ export default defineComponent({
             const result = [];
             const columnIndex = tableMethods.getColumnIndex(treeNodeColumn);
             const $columnIndex = tableMethods.getVMColumnIndex(treeNodeColumn);
+            const { handleGetRowId } = createHandleGetRowId($xeTable);
             let validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows;
             if (accordion) {
                 validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
@@ -3072,17 +3058,17 @@ export default defineComponent({
                 const matchObj = XEUtils.findTree(tableFullData, item => item === validRows[0], { children: childrenField });
                 if (matchObj) {
                     matchObj.items.forEach(item => {
-                        const rowid = getRowid($xeTable, item);
-                        if (treeTempExpandedMaps[rowid]) {
-                            delete treeTempExpandedMaps[rowid];
+                        const rowid = handleGetRowId(item);
+                        if (treeExpandedMaps[rowid]) {
+                            delete treeExpandedMaps[rowid];
                         }
                     });
                 }
             }
             if (expanded) {
                 validRows.forEach((row) => {
-                    const rowid = getRowid($xeTable, row);
-                    if (!treeTempExpandedMaps[rowid]) {
+                    const rowid = handleGetRowId(row);
+                    if (!treeExpandedMaps[rowid]) {
                         const rowRest = fullAllDataRowIdData[rowid];
                         if (rowRest) {
                             const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
@@ -3092,7 +3078,7 @@ export default defineComponent({
                             }
                             else {
                                 if (row[childrenField] && row[childrenField].length) {
-                                    treeTempExpandedMaps[rowid] = row;
+                                    treeExpandedMaps[rowid] = row;
                                 }
                             }
                         }
@@ -3101,16 +3087,16 @@ export default defineComponent({
             }
             else {
                 validRows.forEach(item => {
-                    const rowid = getRowid($xeTable, item);
-                    if (treeTempExpandedMaps[rowid]) {
-                        delete treeTempExpandedMaps[rowid];
+                    const rowid = handleGetRowId(item);
+                    if (treeExpandedMaps[rowid]) {
+                        delete treeExpandedMaps[rowid];
                     }
                 });
             }
             if (reserve) {
                 validRows.forEach((row) => handleTreeExpandReserve(row, expanded));
             }
-            reactData.treeExpandedMaps = treeTempExpandedMaps;
+            reactData.treeExpandedFlag++;
             return Promise.all(result).then(() => {
                 return tableMethods.recalculate();
             });
@@ -3139,9 +3125,9 @@ export default defineComponent({
             handleCheckedAllCheckboxRow(value);
             if (evnt) {
                 dispatchEvent('checkbox-all', {
-                    records: $xeTable.getCheckboxRecords(),
-                    reserves: $xeTable.getCheckboxReserveRecords(),
-                    indeterminates: $xeTable.getCheckboxIndeterminateRecords(),
+                    records: () => $xeTable.getCheckboxRecords(),
+                    reserves: () => $xeTable.getCheckboxReserveRecords(),
+                    indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
                     checked: value
                 }, evnt);
             }
@@ -3172,10 +3158,11 @@ export default defineComponent({
             }
         };
         const createGetRowCacheProp = (prop) => {
+            const { handleGetRowId } = createHandleGetRowId($xeTable);
             return function (row) {
                 const { fullAllDataRowIdData } = internalData;
                 if (row) {
-                    const rowid = getRowid($xeTable, row);
+                    const rowid = handleGetRowId(row);
                     const rowRest = fullAllDataRowIdData[rowid];
                     if (rowRest) {
                         return rowRest[prop];
@@ -3326,7 +3313,7 @@ export default defineComponent({
         };
         const handleUpdateColResize = (evnt, params) => {
             $xeTable.analyColumnWidth();
-            $xeTable.recalculate(true).then(() => {
+            $xeTable.recalculate().then(() => {
                 $xeTable.saveCustomStore('update:width');
                 $xeTable.updateCellAreas();
                 $xeTable.dispatchEvent('column-resizable-change', params, evnt);
@@ -3337,7 +3324,7 @@ export default defineComponent({
         };
         const handleUpdateRowResize = (evnt, params) => {
             reactData.resizeHeightFlag++;
-            $xeTable.recalculate(true).then(() => {
+            $xeTable.recalculate().then(() => {
                 $xeTable.updateCellAreas();
                 $xeTable.dispatchEvent('row-resizable-change', params, evnt);
                 setTimeout(() => $xeTable.recalculate(true), 300);
@@ -3355,16 +3342,17 @@ export default defineComponent({
             }
         };
         const updateRowOffsetTop = () => {
-            const { expandColumn, rowExpandedMaps } = reactData;
-            const { afterFullData, fullAllDataRowIdData } = internalData;
+            const { expandColumn } = reactData;
+            const { afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData;
             const expandOpts = computeExpandOpts.value;
             const rowOpts = computeRowOpts.value;
             const cellOpts = computeCellOpts.value;
             const defaultRowHeight = computeDefaultRowHeight.value;
+            const { handleGetRowId } = createHandleGetRowId($xeTable);
             let offsetTop = 0;
             for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
                 const row = afterFullData[rIndex];
-                const rowid = getRowid($xeTable, row);
+                const rowid = handleGetRowId(row);
                 const rowRest = fullAllDataRowIdData[rowid] || {};
                 rowRest.oTop = offsetTop;
                 offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
@@ -3744,9 +3732,12 @@ export default defineComponent({
              */
             revertData(rows, field) {
                 const { keepSource, treeConfig } = props;
+                const { editStore } = reactData;
                 const { fullAllDataRowIdData, fullDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
+                const removeTempMaps = Object.assign({}, editStore.removeMaps);
                 const treeOpts = computeTreeOpts.value;
                 const { transform } = treeOpts;
+                const { handleGetRowId } = createHandleGetRowId($xeTable);
                 if (!keepSource) {
                     if (process.env.NODE_ENV === 'development') {
                         errLog('vxe.error.reqProp', ['keep-source']);
@@ -3765,7 +3756,7 @@ export default defineComponent({
                 let reDelFlag = false;
                 if (targetRows.length) {
                     targetRows.forEach((item) => {
-                        const rowid = getRowid($xeTable, item);
+                        const rowid = handleGetRowId(item);
                         const rowRest = fullAllDataRowIdData[rowid];
                         if (rowRest) {
                             const row = rowRest.row;
@@ -3779,6 +3770,7 @@ export default defineComponent({
                                         XEUtils.destructuring(row, XEUtils.clone(oRow, true));
                                     }
                                     if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                                        delete removeTempMaps[rowid];
                                         tableFullData.unshift(row);
                                         afterFullData.unshift(row);
                                         reDelFlag = true;
@@ -3790,6 +3782,7 @@ export default defineComponent({
                 }
                 if (rows) {
                     if (reDelFlag) {
+                        editStore.removeMaps = removeTempMaps;
                         $xeTable.updateFooter();
                         $xeTable.cacheRowMap(false);
                         $xeTable.handleTableData(treeConfig && transform);
@@ -3942,14 +3935,14 @@ export default defineComponent({
             },
             /**
              * 检查行或列数据是否发生改变
-             * @param {Row} rowOrId 行对象、行主键
+             * @param {Row} rowidOrRow 行对象、行主键
              * @param {String} field 字段名
              */
-            isUpdateByRow(rowOrId, field) {
+            isUpdateByRow(rowidOrRow, field) {
                 const { keepSource } = props;
                 const { tableFullColumn, fullDataRowIdData, sourceDataRowIdData } = internalData;
                 if (keepSource) {
-                    const rowid = XEUtils.isString(rowOrId) || XEUtils.isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
+                    const rowid = XEUtils.isString(rowidOrRow) || XEUtils.isNumber(rowidOrRow) ? rowidOrRow : getRowid($xeTable, rowidOrRow);
                     const rowRest = fullDataRowIdData[rowid];
                     // 新增的数据不需要检测
                     if (!rowRest) {
@@ -4126,8 +4119,7 @@ export default defineComponent({
              */
             getCheckboxRecords(isFull) {
                 const { treeConfig } = props;
-                const { selectCheckboxMaps } = reactData;
-                const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps } = internalData;
+                const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps, selectCheckboxMaps } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const { transform, mapChildrenField } = treeOpts;
@@ -4457,12 +4449,13 @@ export default defineComponent({
             },
             getRowHeightConf(isFull) {
                 const { fullAllDataRowIdData, afterFullData } = internalData;
+                const { handleGetRowId } = createHandleGetRowId($xeTable);
                 const rowOpts = computeRowOpts.value;
                 const cellOpts = computeCellOpts.value;
                 const defaultRowHeight = computeDefaultRowHeight.value;
                 const rest = {};
                 afterFullData.forEach(row => {
-                    const rowid = getRowid($xeTable, row);
+                    const rowid = handleGetRowId(row);
                     const rowRest = fullAllDataRowIdData[rowid];
                     if (rowRest) {
                         const resizeHeight = rowRest.resizeHeight;
@@ -4486,8 +4479,9 @@ export default defineComponent({
                     rHeight = Math.floor(rHeight * bodyHeight);
                 }
                 if (rHeight) {
+                    const { handleGetRowId } = createHandleGetRowId($xeTable);
                     rows.forEach(row => {
-                        const rowid = XEUtils.isString(row) || XEUtils.isNumber(row) ? row : getRowid($xeTable, row);
+                        const rowid = XEUtils.isString(row) || XEUtils.isNumber(row) ? row : handleGetRowId(row);
                         const rowRest = fullAllDataRowIdData[rowid];
                         if (rowRest) {
                             rowRest.resizeHeight = rHeight;
@@ -4636,12 +4630,11 @@ export default defineComponent({
              */
             getCheckboxIndeterminateRecords(isFull) {
                 const { treeConfig } = props;
-                const { fullDataRowIdData } = internalData;
-                const { treeIndeterminateMaps } = reactData;
+                const { fullDataRowIdData, treeIndeterminateRowMaps } = internalData;
                 if (treeConfig) {
                     const fullRest = [];
                     const defRest = [];
-                    XEUtils.each(treeIndeterminateMaps, (item, rowid) => {
+                    XEUtils.each(treeIndeterminateRowMaps, (item, rowid) => {
                         if (item) {
                             fullRest.push(item);
                             if (fullDataRowIdData[rowid]) {
@@ -4682,17 +4675,18 @@ export default defineComponent({
                 return handleCheckedCheckboxRow(rows, checked, true);
             },
             isCheckedByCheckboxRow(row) {
-                const { selectCheckboxMaps } = reactData;
+                const { updateCheckboxFlag } = reactData;
+                const { selectCheckboxMaps } = internalData;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const { checkField } = checkboxOpts;
                 if (checkField) {
                     return XEUtils.get(row, checkField);
                 }
-                return !!selectCheckboxMaps[getRowid($xeTable, row)];
+                return !!updateCheckboxFlag && !!selectCheckboxMaps[getRowid($xeTable, row)];
             },
             isCheckedByCheckboxRowKey(rowid) {
-                const { selectCheckboxMaps } = reactData;
-                const { fullAllDataRowIdData } = internalData;
+                const { updateCheckboxFlag } = reactData;
+                const { fullAllDataRowIdData, selectCheckboxMaps } = internalData;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const { checkField } = checkboxOpts;
                 if (checkField) {
@@ -4702,21 +4696,21 @@ export default defineComponent({
                     }
                     return false;
                 }
-                return !!selectCheckboxMaps[rowid];
+                return !!updateCheckboxFlag && !!selectCheckboxMaps[rowid];
             },
             isIndeterminateByCheckboxRow(row) {
-                const { treeIndeterminateMaps } = reactData;
-                return !!treeIndeterminateMaps[getRowid($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row);
+                const { treeIndeterminateRowMaps } = internalData;
+                return !!treeIndeterminateRowMaps[getRowid($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row);
             },
             isIndeterminateByCheckboxRowKey(rowid) {
-                const { treeIndeterminateMaps } = reactData;
-                return !!treeIndeterminateMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid);
+                const { treeIndeterminateRowMaps } = internalData;
+                return !!treeIndeterminateRowMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid);
             },
             /**
              * 多选，切换某一行的选中状态
              */
             toggleCheckboxRow(row) {
-                const { selectCheckboxMaps } = reactData;
+                const { selectCheckboxMaps } = internalData;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const { checkField } = checkboxOpts;
                 const checked = checkField ? !XEUtils.get(row, checkField) : !selectCheckboxMaps[getRowid($xeTable, row)];
@@ -4779,15 +4773,16 @@ export default defineComponent({
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 const reserveSelection = [];
                 if (checkboxOpts.reserve) {
+                    const { handleGetRowId } = createHandleGetRowId($xeTable);
                     const afterFullIdMaps = {};
                     if (treeConfig) {
                         XEUtils.eachTree(afterFullData, row => {
-                            afterFullIdMaps[getRowid($xeTable, row)] = 1;
+                            afterFullIdMaps[handleGetRowId(row)] = 1;
                         }, { children: childrenField });
                     }
                     else {
                         afterFullData.forEach(row => {
-                            afterFullIdMaps[getRowid($xeTable, row)] = 1;
+                            afterFullIdMaps[handleGetRowId(row)] = 1;
                         });
                     }
                     XEUtils.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
@@ -4850,8 +4845,9 @@ export default defineComponent({
                 }
                 reactData.isAllSelected = false;
                 reactData.isIndeterminate = false;
-                reactData.selectCheckboxMaps = {};
-                reactData.treeIndeterminateMaps = {};
+                internalData.selectCheckboxMaps = {};
+                internalData.treeIndeterminateRowMaps = {};
+                reactData.updateCheckboxFlag++;
                 return nextTick();
             },
             /**
@@ -4959,13 +4955,20 @@ export default defineComponent({
              * 用于当前列，设置某列行为高亮状态
              */
             setCurrentColumn(fieldOrColumn) {
+                const { mouseConfig } = props;
+                const mouseOpts = computeMouseOpts.value;
+                const isMouseSelected = mouseConfig && mouseOpts.selected;
                 const column = handleFieldOrColumn($xeTable, fieldOrColumn);
                 if (column) {
-                    // tableMethods.clearCurrentRow()
-                    tableMethods.clearCurrentColumn();
+                    $xeTable.clearCurrentColumn();
                     reactData.currentColumn = column;
                 }
-                return nextTick();
+                return nextTick().then(() => {
+                    // 更新状选中态
+                    if (isMouseSelected) {
+                        $xeTable.addCellSelectedClass();
+                    }
+                });
             },
             /**
              * 用于当前列，手动清空当前高亮的状态
@@ -4975,59 +4978,60 @@ export default defineComponent({
                 return nextTick();
             },
             setPendingRow(rows, status) {
-                const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
+                const { handleGetRowId } = createHandleGetRowId($xeTable);
+                const { pendingRowMaps } = internalData;
                 if (rows && !XEUtils.isArray(rows)) {
                     rows = [rows];
                 }
                 if (status) {
                     rows.forEach((row) => {
-                        const rowid = getRowid($xeTable, row);
-                        if (rowid && !pendingMaps[rowid]) {
-                            pendingMaps[rowid] = row;
+                        const rowid = handleGetRowId(row);
+                        if (rowid && !pendingRowMaps[rowid]) {
+                            pendingRowMaps[rowid] = row;
                         }
                     });
                 }
                 else {
                     rows.forEach((row) => {
-                        const rowid = getRowid($xeTable, row);
-                        if (rowid && pendingMaps[rowid]) {
-                            delete pendingMaps[rowid];
+                        const rowid = handleGetRowId(row);
+                        if (rowid && pendingRowMaps[rowid]) {
+                            delete pendingRowMaps[rowid];
                         }
                     });
                 }
-                reactData.pendingRowMaps = pendingMaps;
+                reactData.pendingRowFlag++;
                 return nextTick();
             },
             togglePendingRow(rows) {
-                const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
+                const { handleGetRowId } = createHandleGetRowId($xeTable);
+                const { pendingRowMaps } = internalData;
                 if (rows && !XEUtils.isArray(rows)) {
                     rows = [rows];
                 }
                 rows.forEach((row) => {
-                    const rowid = getRowid($xeTable, row);
+                    const rowid = handleGetRowId(row);
                     if (rowid) {
-                        if (pendingMaps[rowid]) {
-                            delete pendingMaps[rowid];
+                        if (pendingRowMaps[rowid]) {
+                            delete pendingRowMaps[rowid];
                         }
                         else {
-                            pendingMaps[rowid] = row;
+                            pendingRowMaps[rowid] = row;
                         }
                     }
                 });
-                reactData.pendingRowMaps = pendingMaps;
+                reactData.pendingRowFlag++;
                 return nextTick();
             },
             hasPendingByRow(row) {
                 return tableMethods.isPendingByRow(row);
             },
             isPendingByRow(row) {
-                const { pendingRowMaps } = reactData;
+                const { pendingRowMaps } = internalData;
                 const rowid = getRowid($xeTable, row);
                 return !!pendingRowMaps[rowid];
             },
             getPendingRecords() {
-                const { pendingRowMaps } = reactData;
-                const { fullAllDataRowIdData } = internalData;
+                const { fullAllDataRowIdData, pendingRowMaps } = internalData;
                 const insertRecords = [];
                 XEUtils.each(pendingRowMaps, (row, rowid) => {
                     if (fullAllDataRowIdData[rowid]) {
@@ -5037,7 +5041,8 @@ export default defineComponent({
                 return insertRecords;
             },
             clearPendingRow() {
-                reactData.pendingRowMaps = {};
+                internalData.pendingRowMaps = {};
+                reactData.pendingRowFlag++;
                 return nextTick();
             },
             sort(sortConfs, sortOrder) {
@@ -5186,7 +5191,13 @@ export default defineComponent({
                     visible: false
                 });
                 if (visible) {
-                    dispatchEvent('filter-visible', { column, property: column.field, field: column.field, filterList: $xeTable.getCheckedFilters(), visible: false }, null);
+                    dispatchEvent('filter-visible', {
+                        column,
+                        property: column.field,
+                        field: column.field,
+                        filterList: () => $xeTable.getCheckedFilters(),
+                        visible: false
+                    }, null);
                 }
                 return nextTick();
             },
@@ -5214,17 +5225,16 @@ export default defineComponent({
                 return rowRest && !!rowRest.expandLoaded;
             },
             clearRowExpandLoaded(row) {
-                const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
-                const { fullAllDataRowIdData } = internalData;
+                const { fullAllDataRowIdData, rowExpandLazyLoadedMaps } = internalData;
                 const expandOpts = computeExpandOpts.value;
                 const { lazy } = expandOpts;
                 const rowid = getRowid($xeTable, row);
                 const rowRest = fullAllDataRowIdData[rowid];
                 if (lazy && rowRest) {
                     rowRest.expandLoaded = false;
-                    delete rExpandLazyLoadedMaps[rowid];
+                    delete rowExpandLazyLoadedMaps[rowid];
                 }
-                reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
+                reactData.rowExpandedFlag++;
                 return nextTick();
             },
             /**
@@ -5232,12 +5242,12 @@ export default defineComponent({
              * @param {Row} row 行对象
              */
             reloadRowExpand(row) {
-                const { rowExpandLazyLoadedMaps } = reactData;
+                const { rowExpandLazyLoadedMaps } = internalData;
                 const expandOpts = computeExpandOpts.value;
                 const { lazy } = expandOpts;
                 const rowid = getRowid($xeTable, row);
                 if (lazy && !rowExpandLazyLoadedMaps[rowid]) {
-                    tableMethods.clearRowExpandLoaded(row)
+                    $xeTable.clearRowExpandLoaded(row)
                         .then(() => handleAsyncRowExpand(row));
                 }
                 return nextTick();
@@ -5247,13 +5257,13 @@ export default defineComponent({
                     warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
                 }
                 // 即将废弃
-                return tableMethods.reloadRowExpand(row);
+                return $xeTable.reloadRowExpand(row);
             },
             /**
              * 切换展开行
              */
             toggleRowExpand(row) {
-                return tableMethods.setRowExpand(row, !tableMethods.isRowExpandByRow(row));
+                return $xeTable.setRowExpand(row, !$xeTable.isRowExpandByRow(row));
             },
             /**
              * 设置所有行的展开与否
@@ -5282,9 +5292,9 @@ export default defineComponent({
              * @param {Boolean} expanded 是否展开
              */
             setRowExpand(rows, expanded) {
-                const { rowExpandedMaps, rowExpandLazyLoadedMaps, expandColumn } = reactData;
-                const { fullAllDataRowIdData } = internalData;
-                let rExpandedMaps = Object.assign({}, rowExpandedMaps);
+                const { expandColumn } = reactData;
+                let { fullAllDataRowIdData, rowExpandedMaps, rowExpandLazyLoadedMaps } = internalData;
+                const { handleGetRowId } = createHandleGetRowId($xeTable);
                 const expandOpts = computeExpandOpts.value;
                 const { reserve, lazy, accordion, toggleMethod } = expandOpts;
                 const lazyRests = [];
@@ -5296,30 +5306,31 @@ export default defineComponent({
                     }
                     if (accordion) {
                         // 只能同时展开一个
-                        rExpandedMaps = {};
+                        rowExpandedMaps = {};
+                        internalData.rowExpandedMaps = rowExpandedMaps;
                         rows = rows.slice(rows.length - 1, rows.length);
                     }
                     const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) })) : rows;
                     if (expanded) {
                         validRows.forEach((row) => {
-                            const rowid = getRowid($xeTable, row);
-                            if (!rExpandedMaps[rowid]) {
+                            const rowid = handleGetRowId(row);
+                            if (!rowExpandedMaps[rowid]) {
                                 const rowRest = fullAllDataRowIdData[rowid];
                                 const isLoad = lazy && !rowRest.expandLoaded && !rowExpandLazyLoadedMaps[rowid];
                                 if (isLoad) {
                                     lazyRests.push(handleAsyncRowExpand(row));
                                 }
                                 else {
-                                    rExpandedMaps[rowid] = row;
+                                    rowExpandedMaps[rowid] = row;
                                 }
                             }
                         });
                     }
                     else {
                         validRows.forEach(item => {
-                            const rowid = getRowid($xeTable, item);
-                            if (rExpandedMaps[rowid]) {
-                                delete rExpandedMaps[rowid];
+                            const rowid = handleGetRowId(item);
+                            if (rowExpandedMaps[rowid]) {
+                                delete rowExpandedMaps[rowid];
                             }
                         });
                     }
@@ -5327,7 +5338,7 @@ export default defineComponent({
                         validRows.forEach((row) => handleRowExpandReserve(row, expanded));
                     }
                 }
-                reactData.rowExpandedMaps = rExpandedMaps;
+                reactData.rowExpandedFlag++;
                 return Promise.all(lazyRests)
                     .then(() => nextTick())
                     .then(() => $xeTable.recalculate(true))
@@ -5343,9 +5354,10 @@ export default defineComponent({
              * @param {Row} row 行对象
              */
             isRowExpandByRow(row) {
-                const { rowExpandedMaps } = reactData;
+                const { rowExpandedFlag } = reactData;
+                const { rowExpandedMaps } = internalData;
                 const rowid = getRowid($xeTable, row);
-                return !!rowExpandedMaps[rowid];
+                return !!rowExpandedFlag && !!rowExpandedMaps[rowid];
             },
             isExpandByRow(row) {
                 // 已废弃
@@ -5362,7 +5374,8 @@ export default defineComponent({
                 const expandOpts = computeExpandOpts.value;
                 const { reserve } = expandOpts;
                 const expList = $xeTable.getRowExpandRecords();
-                reactData.rowExpandedMaps = {};
+                internalData.rowExpandedMaps = {};
+                reactData.rowExpandedFlag++;
                 if (reserve) {
                     tableFullData.forEach((row) => handleRowExpandReserve(row, false));
                 }
@@ -5383,7 +5396,7 @@ export default defineComponent({
             },
             getRowExpandRecords() {
                 const rest = [];
-                XEUtils.each(reactData.rowExpandedMaps, item => {
+                XEUtils.each(internalData.rowExpandedMaps, item => {
                     if (item) {
                         rest.push(item);
                     }
@@ -5392,7 +5405,7 @@ export default defineComponent({
             },
             getTreeExpandRecords() {
                 const rest = [];
-                XEUtils.each(reactData.treeExpandedMaps, item => {
+                XEUtils.each(internalData.treeExpandedMaps, item => {
                     if (item) {
                         rest.push(item);
                     }
@@ -5409,12 +5422,10 @@ export default defineComponent({
                 return rowRest && !!rowRest.treeLoaded;
             },
             clearTreeExpandLoaded(rows) {
-                const { fullAllDataRowIdData } = internalData;
+                const { fullAllDataRowIdData, treeExpandedMaps } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const { transform } = treeOpts;
-                let tExpandedMaps = {};
                 if (rows) {
-                    tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
                     if (!XEUtils.isArray(rows)) {
                         rows = [rows];
                     }
@@ -5423,8 +5434,8 @@ export default defineComponent({
                         const rowRest = fullAllDataRowIdData[rowid];
                         if (rowRest) {
                             rowRest.treeLoaded = false;
-                            if (tExpandedMaps[rowid]) {
-                                delete tExpandedMaps[rowid];
+                            if (treeExpandedMaps[rowid]) {
+                                delete treeExpandedMaps[rowid];
                             }
                         }
                     });
@@ -5434,7 +5445,8 @@ export default defineComponent({
                         rowRest.treeLoaded = false;
                     });
                 }
-                reactData.treeExpandedMaps = {};
+                internalData.treeExpandedMaps = {};
+                reactData.treeExpandedFlag++;
                 if (transform) {
                     handleVirtualTreeToList();
                     return $xeTable.handleTableData();
@@ -5446,7 +5458,7 @@ export default defineComponent({
              * @param {Row} row 行对象
              */
             reloadTreeExpand(row) {
-                const { treeExpandLazyLoadedMaps } = reactData;
+                const { treeExpandLazyLoadedMaps } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
                 const { transform, lazy } = treeOpts;
@@ -5532,8 +5544,9 @@ export default defineComponent({
              * @param {Row} row 行对象
              */
             isTreeExpandByRow(row) {
-                const { treeExpandedMaps } = reactData;
-                return !!treeExpandedMaps[getRowid($xeTable, row)];
+                const { treeExpandedFlag } = reactData;
+                const { treeExpandedMaps } = internalData;
+                return !!treeExpandedFlag && !!treeExpandedMaps[getRowid($xeTable, row)];
             },
             /**
              * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
@@ -5543,19 +5556,20 @@ export default defineComponent({
                 const treeOpts = computeTreeOpts.value;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 const { transform, reserve } = treeOpts;
-                const expList = tableMethods.getTreeExpandRecords();
-                reactData.treeExpandedMaps = {};
+                const expList = $xeTable.getTreeExpandRecords();
+                internalData.treeExpandedMaps = {};
+                reactData.treeExpandedFlag++;
                 if (reserve) {
                     XEUtils.eachTree(tableFullTreeData, row => handleTreeExpandReserve(row, false), { children: childrenField });
                 }
-                return tablePrivateMethods.handleTableData().then(() => {
+                return $xeTable.handleTableData().then(() => {
                     if (transform) {
                         handleVirtualTreeToList();
-                        return tablePrivateMethods.handleTableData();
+                        return $xeTable.handleTableData();
                     }
                 }).then(() => {
                     if (expList.length) {
-                        return tableMethods.recalculate();
+                        return $xeTable.recalculate();
                     }
                 });
             },
@@ -5810,7 +5824,13 @@ export default defineComponent({
                 const { id } = props;
                 const customOpts = computeCustomOpts.value;
                 const { collectColumn } = internalData;
-                const { checkMethod } = customOpts;
+                const { storage, checkMethod } = customOpts;
+                const isAllCustom = storage === true;
+                const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
+                const isCustomResizable = isAllCustom || storageOpts.resizable;
+                const isCustomVisible = isAllCustom || storageOpts.visible;
+                const isCustomFixed = isAllCustom || storageOpts.fixed;
+                const isCustomSort = isAllCustom || storageOpts.sort;
                 const resizableData = {};
                 const sortData = {};
                 const visibleData = {};
@@ -5830,44 +5850,34 @@ export default defineComponent({
                 let hasFixed = 0;
                 let hasVisible = 0;
                 XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+                    const colKey = column.getKey();
+                    if (!colKey) {
+                        errLog('vxe.error.reqProp', [`${column.getTitle() || column.type || ''} -> column.field=?`]);
+                        return;
+                    }
                     // 只支持一级
                     if (!parentColumn) {
-                        collectColumn.forEach((column) => {
-                            const colKey = column.getKey();
-                            if (colKey) {
-                                hasSort = 1;
-                                sortData[colKey] = column.renderSortNumber;
-                            }
-                        });
-                        if (column.fixed !== column.defaultFixed) {
-                            const colKey = column.getKey();
-                            if (colKey) {
-                                hasFixed = 1;
-                                fixedData[colKey] = column.fixed;
-                            }
+                        if (isCustomSort) {
+                            hasSort = 1;
+                            sortData[colKey] = column.renderSortNumber;
                         }
-                    }
-                    if (column.resizeWidth) {
-                        const colKey = column.getKey();
-                        if (colKey) {
-                            hasResizable = 1;
-                            resizableData[colKey] = column.renderWidth;
+                        if (isCustomFixed && column.fixed !== column.defaultFixed) {
+                            hasFixed = 1;
+                            fixedData[colKey] = column.fixed;
                         }
                     }
-                    if (!checkMethod || checkMethod({ column })) {
+                    if (isCustomResizable && column.resizeWidth) {
+                        hasResizable = 1;
+                        resizableData[colKey] = column.renderWidth;
+                    }
+                    if (isCustomVisible && (!checkMethod || checkMethod({ column }))) {
                         if (!column.visible && column.defaultVisible) {
-                            const colKey = column.getKey();
-                            if (colKey) {
-                                hasVisible = 1;
-                                visibleData[colKey] = false;
-                            }
+                            hasVisible = 1;
+                            visibleData[colKey] = false;
                         }
                         else if (column.visible && !column.defaultVisible) {
-                            const colKey = column.getKey();
-                            if (colKey) {
-                                hasVisible = 1;
-                                visibleData[colKey] = true;
-                            }
+                            hasVisible = 1;
+                            visibleData[colKey] = true;
                         }
                     }
                 });
@@ -6228,7 +6238,7 @@ export default defineComponent({
                                         $xeTable.moveTabSelected(activeParams, hasShiftKey, evnt);
                                     }
                                     else {
-                                        $xeTable.moveSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
+                                        $xeTable.moveEnterSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
                                     }
                                 }
                                 else {
@@ -6262,7 +6272,7 @@ export default defineComponent({
                                                     return;
                                                 }
                                             }
-                                            $xeTable.moveSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
+                                            $xeTable.moveEnterSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
                                             if (enterMethod) {
                                                 enterMethod(etrParams);
                                             }
@@ -6293,11 +6303,7 @@ export default defineComponent({
                         if (!isEditStatus) {
                             // 如果按下了方向键
                             if (selected.row && selected.column) {
-                                $xeTable.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
-                            }
-                            else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-                                // 当前行按键上下移动
-                                $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+                                $xeTable.moveArrowSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
                             }
                         }
                     }
@@ -6676,8 +6682,9 @@ export default defineComponent({
          * @param {Event} evnt 事件
          * @param {Row} row 行对象
          */
-        const handleTooltip = (evnt, tdEl, overflowElem, tipElem, params) => {
-            if (!overflowElem) {
+        const handleTooltip = (evnt, tdEl, overflowElem, params) => {
+            const tipOverEl = overflowElem || tdEl;
+            if (!tipOverEl) {
                 return nextTick();
             }
             params.cell = tdEl;
@@ -6687,9 +6694,8 @@ export default defineComponent({
             const { showAll, contentMethod } = tooltipOpts;
             const customContent = contentMethod ? contentMethod(params) : null;
             const useCustom = contentMethod && !XEUtils.eqNull(customContent);
-            const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim();
-            const isCellOverflow = overflowElem.scrollWidth > overflowElem.clientWidth;
-            if (content && (showAll || useCustom || isCellOverflow)) {
+            const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
+            if (content && (showAll || useCustom || (tipOverEl.scrollWidth > tipOverEl.clientWidth))) {
                 Object.assign(tooltipStore, {
                     row,
                     column,
@@ -6699,7 +6705,7 @@ export default defineComponent({
                 nextTick(() => {
                     const $tooltip = refTooltip.value;
                     if ($tooltip && $tooltip.open) {
-                        $tooltip.open(isCellOverflow ? overflowElem : (tipElem || overflowElem), formatText(content));
+                        $tooltip.open(tipOverEl, formatText(content));
                     }
                 });
             }
@@ -6841,18 +6847,14 @@ export default defineComponent({
              */
             cacheRowMap() {
                 const { treeConfig } = props;
-                const { treeExpandedMaps } = reactData;
-                const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData;
+                const { fullAllDataRowIdData, tableFullData, tableFullTreeData, treeExpandedMaps } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
                 const { lazy } = treeOpts;
-                const rowkey = getRowkey($xeTable);
-                const isDeepKey = rowkey.indexOf('.') > -1;
                 const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
                 const fullDataRowIdMaps = {};
-                const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
-                const handleRowId = isDeepKey ? updateDeepRowKey : updateFastRowKey;
+                const { handleUpdateRowId } = createHandleUpdateRowId($xeTable);
                 const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
                     let rowRest = fullAllDataRowIdMaps[rowid];
                     if (!rowRest) {
@@ -6868,18 +6870,19 @@ export default defineComponent({
                     rowRest.level = level;
                     rowRest.index = currIndex;
                     rowRest.treeIndex = index;
+                    fullDataRowIdMaps[rowid] = rowRest;
+                    fullAllDataRowIdMaps[rowid] = rowRest;
                 };
                 if (treeConfig) {
                     XEUtils.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
-                        const rowid = handleRowId(row, rowkey);
+                        const rowid = handleUpdateRowId(row);
                         if (treeConfig && lazy) {
-                            const treeExpRest = treeTempExpandedMaps[rowid];
                             if (row[hasChildField] && row[childrenField] === undefined) {
                                 row[childrenField] = null;
                             }
-                            if (treeExpRest) {
+                            if (treeExpandedMaps[rowid]) {
                                 if (!row[childrenField] || !row[childrenField].length) {
-                                    delete treeTempExpandedMaps[rowid];
+                                    delete treeExpandedMaps[rowid];
                                 }
                             }
                         }
@@ -6888,27 +6891,22 @@ export default defineComponent({
                 }
                 else {
                     tableFullData.forEach((row, index, items) => {
-                        handleRowCache(row, index, items, index, null, handleRowId(row, rowkey), 0, index + 1);
+                        handleRowCache(row, index, items, index, null, handleUpdateRowId(row), 0, index + 1);
                     });
                 }
                 internalData.fullDataRowIdData = fullDataRowIdMaps;
                 internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
-                reactData.treeExpandedMaps = treeTempExpandedMaps;
+                reactData.treeExpandedFlag++;
             },
             cacheSourceMap(fullData) {
                 const { treeConfig } = props;
                 const treeOpts = computeTreeOpts.value;
-                let { sourceDataRowIdData } = internalData;
                 const sourceData = XEUtils.clone(fullData, true);
-                const rowkey = getRowkey($xeTable);
-                sourceDataRowIdData = internalData.sourceDataRowIdData = {};
+                const { handleUpdateRowId } = createHandleUpdateRowId($xeTable);
+                const sourceRowIdData = {};
                 const handleSourceRow = (row) => {
-                    let rowid = getRowid($xeTable, row);
-                    if (eqEmptyValue(rowid)) {
-                        rowid = getRowUniqueId();
-                        XEUtils.set(row, rowkey, rowid);
-                    }
-                    sourceDataRowIdData[rowid] = row;
+                    const rowid = handleUpdateRowId(row);
+                    sourceRowIdData[rowid] = row;
                 };
                 // 源数据缓存
                 if (treeConfig) {
@@ -6918,6 +6916,7 @@ export default defineComponent({
                 else {
                     sourceData.forEach(handleSourceRow);
                 }
+                internalData.sourceDataRowIdData = sourceRowIdData;
                 internalData.tableSourceData = sourceData;
             },
             /**
@@ -7369,8 +7368,22 @@ export default defineComponent({
                     }
                 }
                 // 兼容老版本
-                let rest;
-                if (!evntList.some((func) => func(Object.assign({ $grid: $xeGrid, $table: $xeTable, $event: evnt }, args)) === false)) {
+                let rest = null;
+                let isStop = false;
+                for (let i = 0; i < evntList.length; i++) {
+                    const func = evntList[i];
+                    const fnRest = func(Object.assign({ $grid: $xeGrid, $table: $xeTable, $event: evnt }, args));
+                    if (fnRest === false) {
+                        isStop = true;
+                        break;
+                    }
+                    else if (fnRest && fnRest.status === false) {
+                        rest = fnRest.result;
+                        isStop = true;
+                        break;
+                    }
+                }
+                if (!isStop) {
                     if (next) {
                         rest = next();
                     }
@@ -7382,9 +7395,7 @@ export default defineComponent({
             },
             updateCheckboxStatus() {
                 const { treeConfig } = props;
-                const { selectCheckboxMaps, treeIndeterminateMaps } = reactData;
-                const selectRowMaps = Object.assign({}, selectCheckboxMaps);
-                const halfRowMaps = Object.assign({}, treeIndeterminateMaps);
+                const { selectCheckboxMaps, treeIndeterminateRowMaps } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const { transform, mapChildrenField } = treeOpts;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -7396,10 +7407,11 @@ export default defineComponent({
                 }
                 // 树结构
                 if (treeConfig) {
+                    const { handleGetRowId } = createHandleGetRowId($xeTable);
                     const childRowMaps = {};
                     const childRowList = [];
                     XEUtils.eachTree(afterTreeFullData, (row) => {
-                        const rowid = getRowid($xeTable, row);
+                        const rowid = handleGetRowId(row);
                         const childList = row[transform ? mapChildrenField : childrenField];
                         if (childList && childList.length && !childRowMaps[rowid]) {
                             childRowMaps[rowid] = 1;
@@ -7415,13 +7427,13 @@ export default defineComponent({
                         let vLen = 0; // 有效行
                         childList.forEach(checkMethod
                             ? (item) => {
-                                const childRowid = getRowid($xeTable, item);
-                                const isSelect = checkField ? XEUtils.get(item, checkField) : selectRowMaps[childRowid];
+                                const childRowid = handleGetRowId(item);
+                                const isSelect = checkField ? XEUtils.get(item, checkField) : selectCheckboxMaps[childRowid];
                                 if (checkMethod({ row: item })) {
                                     if (isSelect) {
                                         sLen++;
                                     }
-                                    else if (halfRowMaps[childRowid]) {
+                                    else if (treeIndeterminateRowMaps[childRowid]) {
                                         hLen++;
                                     }
                                     vLen++;
@@ -7430,18 +7442,18 @@ export default defineComponent({
                                     if (isSelect) {
                                         sLen++;
                                     }
-                                    else if (halfRowMaps[childRowid]) {
+                                    else if (treeIndeterminateRowMaps[childRowid]) {
                                         hLen++;
                                     }
                                 }
                             }
                             : item => {
-                                const childRowid = getRowid($xeTable, item);
-                                const isSelect = checkField ? XEUtils.get(item, checkField) : selectRowMaps[childRowid];
+                                const childRowid = handleGetRowId(item);
+                                const isSelect = checkField ? XEUtils.get(item, checkField) : selectCheckboxMaps[childRowid];
                                 if (isSelect) {
                                     sLen++;
                                 }
-                                else if (halfRowMaps[childRowid]) {
+                                else if (treeIndeterminateRowMaps[childRowid]) {
                                     hLen++;
                                 }
                                 vLen++;
@@ -7453,51 +7465,50 @@ export default defineComponent({
                         }
                         if (isSelected) {
                             if (!checkField) {
-                                selectRowMaps[rowid] = row;
+                                selectCheckboxMaps[rowid] = row;
                             }
-                            if (halfRowMaps[rowid]) {
-                                delete halfRowMaps[rowid];
+                            if (treeIndeterminateRowMaps[rowid]) {
+                                delete treeIndeterminateRowMaps[rowid];
                             }
                         }
                         else {
                             if (!checkField) {
-                                if (selectRowMaps[rowid]) {
-                                    delete selectRowMaps[rowid];
+                                if (selectCheckboxMaps[rowid]) {
+                                    delete selectCheckboxMaps[rowid];
                                 }
                             }
                             if (halfSelect) {
-                                halfRowMaps[rowid] = row;
+                                treeIndeterminateRowMaps[rowid] = row;
                             }
                             else {
-                                if (halfRowMaps[rowid]) {
-                                    delete halfRowMaps[rowid];
+                                if (treeIndeterminateRowMaps[rowid]) {
+                                    delete treeIndeterminateRowMaps[rowid];
                                 }
                             }
                         }
                     });
                 }
-                reactData.selectCheckboxMaps = selectRowMaps;
-                reactData.treeIndeterminateMaps = halfRowMaps;
+                reactData.updateCheckboxFlag++;
             },
             updateAllCheckboxStatus() {
                 const { treeConfig } = props;
-                const { selectCheckboxMaps, treeIndeterminateMaps } = reactData;
+                const { afterFullData, afterTreeFullData, checkboxReserveRowMap, selectCheckboxMaps, treeIndeterminateRowMaps } = internalData;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const { checkField, checkMethod, showReserveStatus } = checkboxOpts;
-                const { afterFullData, afterTreeFullData, checkboxReserveRowMap } = internalData;
+                const { handleGetRowId } = createHandleGetRowId($xeTable);
                 let sLen = 0; // 已选
                 let hLen = 0; // 半选
                 let vLen = 0; // 有效行
                 const rootList = (treeConfig ? afterTreeFullData : afterFullData);
                 rootList.forEach(checkMethod
                     ? row => {
-                        const childRowid = getRowid($xeTable, row);
+                        const childRowid = handleGetRowId(row);
                         const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid];
                         if (checkMethod({ row })) {
                             if (selected) {
                                 sLen++;
                             }
-                            else if (treeIndeterminateMaps[childRowid]) {
+                            else if (treeIndeterminateRowMaps[childRowid]) {
                                 hLen++;
                             }
                             vLen++;
@@ -7506,18 +7517,18 @@ export default defineComponent({
                             if (selected) {
                                 sLen++;
                             }
-                            else if (treeIndeterminateMaps[childRowid]) {
+                            else if (treeIndeterminateRowMaps[childRowid]) {
                                 hLen++;
                             }
                         }
                     }
                     : row => {
-                        const childRowid = getRowid($xeTable, row);
+                        const childRowid = handleGetRowId(row);
                         const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid];
                         if (selected) {
                             sLen++;
                         }
-                        else if (treeIndeterminateMaps[childRowid]) {
+                        else if (treeIndeterminateRowMaps[childRowid]) {
                             hLen++;
                         }
                         vLen++;
@@ -7541,13 +7552,13 @@ export default defineComponent({
              */
             handleBatchSelectRows(rows, checked, isForce) {
                 const { treeConfig } = props;
-                const { selectCheckboxMaps } = reactData;
-                const selectRowMaps = Object.assign({}, selectCheckboxMaps);
+                const { selectCheckboxMaps } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const { transform, mapChildrenField } = treeOpts;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const { checkField, checkStrictly, checkMethod } = checkboxOpts;
+                const { handleGetRowId } = createHandleGetRowId($xeTable);
                 // indeterminateField 仅支持读取
                 const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
                 if (checkField) {
@@ -7563,59 +7574,57 @@ export default defineComponent({
                                 handleCheckboxReserveRow(row, checked);
                             }
                         }, { children: transform ? mapChildrenField : childrenField });
-                        reactData.selectCheckboxMaps = selectRowMaps;
+                        reactData.updateCheckboxFlag++;
                         return;
                     }
-                    else {
-                        // 列表
-                        rows.forEach(row => {
-                            if (isForce || (!checkMethod || checkMethod({ row }))) {
-                                XEUtils.set(row, checkField, checked);
-                                handleCheckboxReserveRow(row, checked);
-                            }
-                        });
-                    }
-                    reactData.selectCheckboxMaps = selectRowMaps;
+                    // 列表
+                    rows.forEach(row => {
+                        if (isForce || (!checkMethod || checkMethod({ row }))) {
+                            XEUtils.set(row, checkField, checked);
+                            handleCheckboxReserveRow(row, checked);
+                        }
+                    });
+                    reactData.updateCheckboxFlag++;
                     return;
                 }
                 // 树结构
                 if (treeConfig && !checkStrictly) {
                     // 更新子节点状态
                     XEUtils.eachTree(rows, (row) => {
-                        const rowid = getRowid($xeTable, row);
+                        const rowid = handleGetRowId(row);
                         if (isForce || (!checkMethod || checkMethod({ row }))) {
                             if (checked) {
-                                selectRowMaps[rowid] = row;
+                                selectCheckboxMaps[rowid] = row;
                             }
                             else {
-                                if (selectRowMaps[rowid]) {
-                                    delete selectRowMaps[rowid];
+                                if (selectCheckboxMaps[rowid]) {
+                                    delete selectCheckboxMaps[rowid];
                                 }
                             }
                             handleCheckboxReserveRow(row, checked);
                         }
                     }, { children: transform ? mapChildrenField : childrenField });
-                    reactData.selectCheckboxMaps = selectRowMaps;
+                    reactData.updateCheckboxFlag++;
                     return;
                 }
                 // 列表
                 rows.forEach(row => {
-                    const rowid = getRowid($xeTable, row);
+                    const rowid = handleGetRowId(row);
                     if (isForce || (!checkMethod || checkMethod({ row }))) {
                         if (checked) {
-                            if (!selectRowMaps[rowid]) {
-                                selectRowMaps[rowid] = row;
+                            if (!selectCheckboxMaps[rowid]) {
+                                selectCheckboxMaps[rowid] = row;
                             }
                         }
                         else {
-                            if (selectRowMaps[rowid]) {
-                                delete selectRowMaps[rowid];
+                            if (selectCheckboxMaps[rowid]) {
+                                delete selectCheckboxMaps[rowid];
                             }
                         }
                         handleCheckboxReserveRow(row, checked);
+                        reactData.updateCheckboxFlag++;
                     }
                 });
-                reactData.selectCheckboxMaps = selectRowMaps;
             },
             /**
              * 即将移除
@@ -7663,7 +7672,7 @@ export default defineComponent({
                     return;
                 }
                 if (tooltipStore.column !== column || !tooltipStore.visible) {
-                    handleTooltip(evnt, thEl, cellEl, null, params);
+                    handleTooltip(evnt, thEl, thEl.querySelector('.vxe-cell--title') || cellEl, params);
                 }
             },
             /**
@@ -7690,7 +7699,7 @@ export default defineComponent({
                     }
                 }
                 if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-                    handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), null, params);
+                    handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
                 }
             },
             /**
@@ -7699,10 +7708,10 @@ export default defineComponent({
             triggerFooterTooltipEvent(evnt, params) {
                 const { column } = params;
                 const { tooltipStore } = reactData;
-                const cell = evnt.currentTarget;
+                const tdEl = evnt.currentTarget;
                 handleTargetEnterEvent(tooltipStore.column !== column || !!tooltipStore.row);
                 if (tooltipStore.column !== column || !tooltipStore.visible) {
-                    handleTooltip(evnt, cell, cell.querySelector('.vxe-cell--wrapper') || cell.children[0], null, params);
+                    handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
                 }
             },
             handleTargetLeaveEvent() {
@@ -7727,17 +7736,18 @@ export default defineComponent({
                 const { _lastResizeTime } = internalData;
                 const sortOpts = computeSortOpts.value;
                 const columnOpts = computeColumnOpts.value;
+                const currentColumnOpts = computeCurrentColumnOpts.value;
                 const { column } = params;
                 const cell = evnt.currentTarget;
                 const triggerResizable = _lastResizeTime && _lastResizeTime > Date.now() - 300;
                 const triggerSort = getEventTargetNode(evnt, cell, 'vxe-cell--sort').flag;
                 const triggerFilter = getEventTargetNode(evnt, cell, 'vxe-cell--filter').flag;
                 if (sortOpts.trigger === 'cell' && !(triggerResizable || triggerSort || triggerFilter)) {
-                    tablePrivateMethods.triggerSortEvent(evnt, column, getNextSortOrder(column));
+                    $xeTable.triggerSortEvent(evnt, column, getNextSortOrder(column));
                 }
                 dispatchEvent('header-cell-click', Object.assign({ triggerResizable, triggerSort, triggerFilter, cell }, params), evnt);
-                if (columnOpts.isCurrent || props.highlightCurrentColumn) {
-                    tablePrivateMethods.triggerCurrentColumnEvent(evnt, params);
+                if ((columnOpts.isCurrent || props.highlightCurrentColumn) && (!currentColumnOpts.trigger || ['header', 'default'].includes(currentColumnOpts.trigger))) {
+                    $xeTable.triggerCurrentColumnEvent(evnt, params);
                 }
             },
             triggerHeaderCellDblclickEvent(evnt, params) {
@@ -7749,7 +7759,7 @@ export default defineComponent({
              * 如果是双击模式，则单击后选中状态
              */
             triggerCellClickEvent(evnt, params) {
-                const { highlightCurrentRow, editConfig } = props;
+                const { highlightCurrentRow, highlightCurrentColumn, editConfig } = props;
                 const { editStore, isDragResize } = reactData;
                 if (isDragResize) {
                     return;
@@ -7761,6 +7771,8 @@ export default defineComponent({
                 const checkboxOpts = computeCheckboxOpts.value;
                 const keyboardOpts = computeKeyboardOpts.value;
                 const rowOpts = computeRowOpts.value;
+                const columnOpts = computeColumnOpts.value;
+                const currentColumnOpts = computeCurrentColumnOpts.value;
                 const { actived, focused } = editStore;
                 const { row, column } = params;
                 const { type, treeNode } = column;
@@ -7776,29 +7788,35 @@ export default defineComponent({
                 if (!triggerCheckbox && !triggerRadio) {
                     // 如果是展开行
                     if (!triggerExpandNode && (expandOpts.trigger === 'row' || (isExpandType && expandOpts.trigger === 'cell'))) {
-                        tablePrivateMethods.triggerRowExpandEvent(evnt, params);
+                        $xeTable.triggerRowExpandEvent(evnt, params);
                     }
                     // 如果是树形表格
                     if ((treeOpts.trigger === 'row' || (treeNode && treeOpts.trigger === 'cell'))) {
-                        tablePrivateMethods.triggerTreeExpandEvent(evnt, params);
+                        $xeTable.triggerTreeExpandEvent(evnt, params);
                     }
                 }
                 // 如果点击了树节点
                 if (!triggerTreeNode) {
                     if (!triggerExpandNode) {
-                        // 如果是高亮行
+                        // 如果是当前行
                         if (rowOpts.isCurrent || highlightCurrentRow) {
                             if (!triggerCheckbox && !triggerRadio) {
-                                tablePrivateMethods.triggerCurrentRowEvent(evnt, params);
+                                $xeTable.triggerCurrentRowEvent(evnt, params);
+                            }
+                        }
+                        // 如果是当前列
+                        if ((columnOpts.isCurrent || highlightCurrentColumn) && (!currentColumnOpts.trigger || ['cell', 'default'].includes(currentColumnOpts.trigger))) {
+                            if (!triggerCheckbox && !triggerRadio) {
+                                $xeTable.triggerCurrentColumnEvent(evnt, params);
                             }
                         }
                         // 如果是单选框
                         if (!triggerRadio && (radioOpts.trigger === 'row' || (isRadioType && radioOpts.trigger === 'cell'))) {
-                            tablePrivateMethods.triggerRadioRowEvent(evnt, params);
+                            $xeTable.triggerRadioRowEvent(evnt, params);
                         }
                         // 如果是复选框
                         if (!triggerCheckbox && (checkboxOpts.trigger === 'row' || (isCheckboxType && checkboxOpts.trigger === 'cell'))) {
-                            tablePrivateMethods.handleToggleCheckRowEvent(evnt, params);
+                            $xeTable.handleToggleCheckRowEvent(evnt, params);
                         }
                     }
                     // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
@@ -7877,7 +7895,7 @@ export default defineComponent({
                 dispatchEvent('cell-dblclick', params, evnt);
             },
             handleToggleCheckRowEvent(evnt, params) {
-                const { selectCheckboxMaps } = reactData;
+                const { selectCheckboxMaps } = internalData;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const { checkField, trigger } = checkboxOpts;
                 const { row } = params;
@@ -7892,44 +7910,46 @@ export default defineComponent({
                     checked = !selectCheckboxMaps[getRowid($xeTable, row)];
                 }
                 if (evnt) {
-                    tablePrivateMethods.triggerCheckRowEvent(evnt, params, checked);
+                    $xeTable.triggerCheckRowEvent(evnt, params, checked);
                 }
                 else {
-                    tablePrivateMethods.handleBatchSelectRows([row], checked);
-                    tablePrivateMethods.checkSelectionStatus();
+                    $xeTable.handleBatchSelectRows([row], checked);
+                    $xeTable.checkSelectionStatus();
                 }
             },
             triggerCheckRowEvent(evnt, params, checked) {
-                const checkboxOpts = computeCheckboxOpts.value;
                 const { row } = params;
                 const { afterFullData } = internalData;
+                const checkboxOpts = computeCheckboxOpts.value;
                 const { checkMethod, trigger } = checkboxOpts;
                 if (trigger === 'manual') {
                     return;
                 }
                 evnt.stopPropagation();
                 if (checkboxOpts.isShiftKey && evnt.shiftKey && !props.treeConfig) {
-                    const checkboxRecords = tableMethods.getCheckboxRecords();
+                    const checkboxRecords = $xeTable.getCheckboxRecords();
                     if (checkboxRecords.length) {
                         const firstRow = checkboxRecords[0];
-                        const _rowIndex = tableMethods.getVTRowIndex(row);
-                        const _firstRowIndex = tableMethods.getVTRowIndex(firstRow);
+                        const _rowIndex = $xeTable.getVTRowIndex(row);
+                        const _firstRowIndex = $xeTable.getVTRowIndex(firstRow);
                         if (_rowIndex !== _firstRowIndex) {
-                            tableMethods.setAllCheckboxRow(false);
+                            $xeTable.setAllCheckboxRow(false);
                             const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1);
-                            handleCheckedCheckboxRow(rangeRows, true, false);
+                            nextTick(() => {
+                                handleCheckedCheckboxRow(rangeRows, true, false);
+                            });
                             dispatchEvent('checkbox-range-select', Object.assign({ rangeRecords: rangeRows }, params), evnt);
                             return;
                         }
                     }
                 }
                 if (!checkMethod || checkMethod({ row })) {
-                    tablePrivateMethods.handleBatchSelectRows([row], checked);
-                    tablePrivateMethods.checkSelectionStatus();
+                    $xeTable.handleBatchSelectRows([row], checked);
+                    $xeTable.checkSelectionStatus();
                     dispatchEvent('checkbox-change', Object.assign({
-                        records: tableMethods.getCheckboxRecords(),
-                        reserves: tableMethods.getCheckboxReserveRecords(),
-                        indeterminates: tableMethods.getCheckboxIndeterminateRecords(),
+                        records: () => $xeTable.getCheckboxRecords(),
+                        reserves: () => $xeTable.getCheckboxReserveRecords(),
+                        indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
                         checked
                     }, params), evnt);
                 }
@@ -8001,7 +8021,8 @@ export default defineComponent({
              * 展开行事件
              */
             triggerRowExpandEvent(evnt, params) {
-                const { rowExpandLazyLoadedMaps, expandColumn: column } = reactData;
+                const { expandColumn: column } = reactData;
+                const { rowExpandLazyLoadedMaps } = internalData;
                 const expandOpts = computeExpandOpts.value;
                 const { row } = params;
                 const { lazy, trigger } = expandOpts;
@@ -8011,18 +8032,18 @@ export default defineComponent({
                 evnt.stopPropagation();
                 const rowid = getRowid($xeTable, row);
                 if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
-                    const expanded = !tableMethods.isRowExpandByRow(row);
-                    const columnIndex = tableMethods.getColumnIndex(column);
-                    const $columnIndex = tableMethods.getVMColumnIndex(column);
-                    tableMethods.setRowExpand(row, expanded);
+                    const expanded = !$xeTable.isRowExpandByRow(row);
+                    const columnIndex = $xeTable.getColumnIndex(column);
+                    const $columnIndex = $xeTable.getVMColumnIndex(column);
+                    $xeTable.setRowExpand(row, expanded);
                     dispatchEvent('toggle-row-expand', {
                         expanded,
                         column,
                         columnIndex,
                         $columnIndex,
                         row,
-                        rowIndex: tableMethods.getRowIndex(row),
-                        $rowIndex: tableMethods.getVMRowIndex(row)
+                        rowIndex: $xeTable.getRowIndex(row),
+                        $rowIndex: $xeTable.getVMRowIndex(row)
                     }, evnt);
                 }
             },
@@ -8030,7 +8051,7 @@ export default defineComponent({
              * 展开树节点事件
              */
             triggerTreeExpandEvent(evnt, params) {
-                const { treeExpandLazyLoadedMaps } = reactData;
+                const { treeExpandLazyLoadedMaps } = internalData;
                 const treeOpts = computeTreeOpts.value;
                 const { row, column } = params;
                 const { lazy, trigger } = treeOpts;
@@ -8040,10 +8061,10 @@ export default defineComponent({
                 evnt.stopPropagation();
                 const rowid = getRowid($xeTable, row);
                 if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
-                    const expanded = !tableMethods.isTreeExpandByRow(row);
-                    const columnIndex = tableMethods.getColumnIndex(column);
-                    const $columnIndex = tableMethods.getVMColumnIndex(column);
-                    tableMethods.setTreeExpand(row, expanded);
+                    const expanded = !$xeTable.isTreeExpandByRow(row);
+                    const columnIndex = $xeTable.getColumnIndex(column);
+                    const $columnIndex = $xeTable.getVMColumnIndex(column);
+                    $xeTable.setTreeExpand(row, expanded);
                     dispatchEvent('toggle-tree-expand', { expanded, column, columnIndex, $columnIndex, row }, evnt);
                 }
             },
@@ -8188,12 +8209,11 @@ export default defineComponent({
             handleRowDragSwapEvent(evnt, isSyncRow, dragRow, prevDragRow, prevDragPos, prevDragToChild) {
                 const { treeConfig, dragConfig } = props;
                 const rowDragOpts = computeRowDragOpts.value;
-                const { fullAllDataRowIdData } = internalData;
+                const { afterFullData, tableFullData, fullAllDataRowIdData } = internalData;
                 const { isPeerDrag, isCrossDrag, isSelfToChildDrag, dragEndMethod, dragToChildMethod } = rowDragOpts;
                 const treeOpts = computeTreeOpts.value;
                 const { transform, rowField, mapChildrenField, parentField } = treeOpts;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
-                const { afterFullData, tableFullData } = internalData;
                 const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
                 const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
                 const errRest = {
@@ -9047,10 +9067,10 @@ export default defineComponent({
                     return;
                 }
                 const { highlightHoverRow } = tableProps;
-                const { scrollXLoad, scrollYLoad } = reactData;
+                const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
                 const leftFixedWidth = computeLeftFixedWidth.value;
                 const rightFixedWidth = computeRightFixedWidth.value;
-                if (!(scrollYLoad || leftFixedWidth || rightFixedWidth)) {
+                if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
                     return;
                 }
                 const { elemStore, lastScrollTop, lastScrollLeft } = internalData;
@@ -9292,8 +9312,8 @@ export default defineComponent({
             },
             // 更新纵向 Y 可视渲染上下剩余空间大小
             updateScrollYSpace() {
-                const { isAllOverflow, scrollYLoad, expandColumn, rowExpandedMaps } = reactData;
-                const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData } = internalData;
+                const { isAllOverflow, scrollYLoad, expandColumn } = reactData;
+                const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData;
                 const { startIndex } = scrollYStore;
                 const expandOpts = computeExpandOpts.value;
                 const rowOpts = computeRowOpts.value;
@@ -9638,6 +9658,7 @@ export default defineComponent({
                 })
             ];
             if (expandColumn) {
+                const { handleGetRowId } = createHandleGetRowId($xeTable);
                 tableRowExpandedList.forEach((row) => {
                     const expandOpts = computeExpandOpts.value;
                     const { height: expandHeight, padding } = expandOpts;
@@ -9645,7 +9666,7 @@ export default defineComponent({
                     const treeOpts = computeTreeOpts.value;
                     const { transform, seqMode } = treeOpts;
                     const cellStyle = {};
-                    const rowid = getRowid($xeTable, row);
+                    const rowid = handleGetRowId(row);
                     const rest = fullAllDataRowIdData[rowid];
                     let rowLevel = 0;
                     let seq = -1;