vxe-table 4.12.0-beta.2 → 4.12.0-beta.21

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, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth } 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,
@@ -344,6 +335,18 @@ export default defineComponent({
             fullColumnIdData: {},
             fullColumnFieldData: {},
             // prevDragRow: null,
+            // 已展开的行集合
+            rowExpandedMaps: {},
+            // 懒加载中的展开行的集合
+            rowExpandLazyLoadedMaps: {},
+            // 已展开树节点集合
+            treeExpandedMaps: {},
+            // 懒加载中的树节点的集合
+            treeExpandLazyLoadedMaps: {},
+            // 复选框属性，已选中的行集合
+            selectCheckboxMaps: {},
+            // 已标记的对象集
+            pendingRowMaps: {},
             inited: false,
             tooltipTimeout: null,
             initStatus: false,
@@ -464,18 +467,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 +637,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 +757,16 @@ export default defineComponent({
             computeScrollbarXToTop,
             computeScrollbarYToLeft,
             computeColumnOpts,
+            computeCurrentColumnOpts,
             computeScrollXThreshold,
             computeScrollYThreshold,
+            computeRowHeightMaps,
             computeDefaultRowHeight,
             computeCellOpts,
             computeHeaderCellOpts,
             computeFooterCellOpts,
             computeRowOpts,
+            computeCurrentRowOpts,
             computeRowDragOpts,
             computeColumnDragOpts,
             computeResizeOpts,
@@ -942,12 +968,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 +986,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 +1225,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) {
@@ -1467,9 +1494,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 +1533,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 +1566,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 +1595,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) {
@@ -2232,12 +2262,13 @@ 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 = {};
             /**
@@ -2248,7 +2279,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);
                     }
@@ -2278,7 +2309,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 });
                     }
@@ -2289,7 +2321,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;
                                 }
@@ -2306,7 +2338,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;
                                 }
@@ -2314,7 +2346,8 @@ export default defineComponent({
                         }
                         else {
                             afterFullData.forEach(row => {
-                                selectRowMaps[getRowid($xeTable, row)] = row;
+                                const rowid = handleGetRowId(row);
+                                selectRowMaps[rowid] = row;
                             });
                         }
                     }
@@ -2326,7 +2359,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;
                                 }
@@ -2345,10 +2378,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();
@@ -2356,8 +2389,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;
@@ -2374,7 +2407,8 @@ export default defineComponent({
                 }
             }
             // 复选框
-            reactData.selectCheckboxMaps = getRecoverRowMaps(selectCheckboxMaps); // 刷新多选行状态
+            internalData.selectCheckboxMaps = getRecoverRowMaps(selectCheckboxMaps); // 刷新多选行状态
+            reactData.updateCheckboxFlag++;
             // 还原保留选中状态
             if (checkboxOpts.reserve) {
                 handleCheckedCheckboxRow(handleReserveRow(internalData.checkboxReserveRowMap), true, true);
@@ -2383,13 +2417,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);
             }
@@ -2405,7 +2441,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 = [];
@@ -2416,7 +2452,7 @@ export default defineComponent({
                             defExpandeds.push(matchObj.item);
                         }
                     });
-                    tableMethods.setTreeExpand(defExpandeds, true);
+                    $xeTable.setTreeExpand(defExpandeds, true);
                 }
             }
         };
@@ -2427,8 +2463,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;
@@ -2443,18 +2478,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();
                                     }
@@ -2462,7 +2498,7 @@ export default defineComponent({
                             });
                         }
                     }).catch(() => {
-                        const { treeExpandLazyLoadedMaps } = reactData;
+                        const { treeExpandLazyLoadedMaps } = internalData;
                         if (rowRest) {
                             rowRest.treeLoaded = false;
                         }
@@ -2470,7 +2506,8 @@ export default defineComponent({
                             delete treeExpandLazyLoadedMaps[rowid];
                         }
                     }).finally(() => {
-                        nextTick().then(() => tableMethods.recalculate()).then(() => resolve());
+                        reactData.treeExpandedFlag++;
+                        nextTick().then(() => $xeTable.recalculate()).then(() => resolve());
                     });
                 }
                 else {
@@ -2496,29 +2533,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())
@@ -2621,9 +2656,6 @@ export default defineComponent({
             calcCellWidth();
             autoCellWidth();
             updateStyle();
-            if (reFull) {
-                updateRowOffsetTop();
-            }
             updateRowExpandStyle();
             return computeScrollLoad().then(() => {
                 if (reFull === true) {
@@ -2651,7 +2683,10 @@ export default defineComponent({
             const { transform } = treeOpts;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             let treeData = [];
-            let fullData = reactive(datas ? datas.slice(0) : []); // 转为响应式
+            let fullData = reactive(datas ? datas.slice(0) : []); // 转为响应式数据
+            if (fullData.length > supportMaxRow) {
+                errLog('vxe.error.errMaxRow', [supportMaxRow]);
+            }
             if (treeConfig) {
                 if (transform) {
                     // 树结构自动转换
@@ -2746,7 +2781,7 @@ export default defineComponent({
                     //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
                     // }
                     if (props.spanMethod) {
-                        warnLog('vxe.error.scrollErrProp', ['table.span-method']);
+                        errLog('vxe.error.scrollErrProp', ['table.span-method']);
                     }
                 }
                 handleReserveStatus();
@@ -3054,9 +3089,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;
@@ -3064,6 +3098,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]] : [];
@@ -3071,17 +3106,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];
@@ -3091,7 +3126,7 @@ export default defineComponent({
                             }
                             else {
                                 if (row[childrenField] && row[childrenField].length) {
-                                    treeTempExpandedMaps[rowid] = row;
+                                    treeExpandedMaps[rowid] = row;
                                 }
                             }
                         }
@@ -3100,16 +3135,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();
             });
@@ -3138,9 +3173,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);
             }
@@ -3171,10 +3206,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];
@@ -3325,7 +3361,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);
@@ -3336,7 +3372,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);
@@ -3354,16 +3390,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;
@@ -3438,6 +3475,9 @@ export default defineComponent({
         };
         tableMethods = {
             dispatchEvent,
+            getEl() {
+                return refElem.value;
+            },
             /**
              * 重置表格的一切数据状态
              */
@@ -3740,12 +3780,15 @@ export default defineComponent({
              */
             revertData(rows, field) {
                 const { keepSource, treeConfig } = props;
-                const { fullAllDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData;
+                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') {
-                        warnLog('vxe.error.reqProp', ['keep-source']);
+                        errLog('vxe.error.reqProp', ['keep-source']);
                     }
                     return nextTick();
                 }
@@ -3760,23 +3803,24 @@ export default defineComponent({
                 }
                 let reDelFlag = false;
                 if (targetRows.length) {
-                    targetRows.forEach((row) => {
-                        if (!$xeTable.isInsertByRow(row)) {
-                            const rowid = getRowid($xeTable, row);
-                            const oRow = sourceDataRowIdData[rowid];
-                            if (oRow && row) {
-                                if (field) {
-                                    XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true));
-                                }
-                                else {
-                                    XEUtils.destructuring(row, XEUtils.clone(oRow, true));
-                                }
-                                if ($xeTable.isRemoveByRow(row)) {
-                                    const rowRest = fullAllDataRowIdData[rowid];
-                                    if (rowRest) {
-                                        const reRow = rowRest.row;
-                                        tableFullData.unshift(reRow);
-                                        afterFullData.unshift(reRow);
+                    targetRows.forEach((item) => {
+                        const rowid = handleGetRowId(item);
+                        const rowRest = fullAllDataRowIdData[rowid];
+                        if (rowRest) {
+                            const row = rowRest.row;
+                            if (!$xeTable.isInsertByRow(row)) {
+                                const oRow = sourceDataRowIdData[rowid];
+                                if (oRow && row) {
+                                    if (field) {
+                                        XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true));
+                                    }
+                                    else {
+                                        XEUtils.destructuring(row, XEUtils.clone(oRow, true));
+                                    }
+                                    if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                                        delete removeTempMaps[rowid];
+                                        tableFullData.unshift(row);
+                                        afterFullData.unshift(row);
                                         reDelFlag = true;
                                     }
                                 }
@@ -3786,6 +3830,7 @@ export default defineComponent({
                 }
                 if (rows) {
                     if (reDelFlag) {
+                        editStore.removeMaps = removeTempMaps;
                         $xeTable.updateFooter();
                         $xeTable.cacheRowMap(false);
                         $xeTable.handleTableData(treeConfig && transform);
@@ -3938,18 +3983,20 @@ export default defineComponent({
             },
             /**
              * 检查行或列数据是否发生改变
-             * @param {Row} row 行对象
+             * @param {Row} rowidOrRow 行对象、行主键
              * @param {String} field 字段名
              */
-            isUpdateByRow(row, field) {
+            isUpdateByRow(rowidOrRow, field) {
                 const { keepSource } = props;
                 const { tableFullColumn, fullDataRowIdData, sourceDataRowIdData } = internalData;
                 if (keepSource) {
-                    const rowid = getRowid($xeTable, row);
+                    const rowid = XEUtils.isString(rowidOrRow) || XEUtils.isNumber(rowidOrRow) ? rowidOrRow : getRowid($xeTable, rowidOrRow);
+                    const rowRest = fullDataRowIdData[rowid];
                     // 新增的数据不需要检测
-                    if (!fullDataRowIdData[rowid]) {
+                    if (!rowRest) {
                         return false;
                     }
+                    const row = rowRest.row;
                     const oRow = sourceDataRowIdData[rowid];
                     if (oRow) {
                         if (arguments.length > 1) {
@@ -4013,6 +4060,94 @@ export default defineComponent({
                     tableColumn: reactData.tableColumn.slice(0)
                 };
             },
+            /**
+             * 移动列到指定列的位置
+             * @param fieldOrColumn
+             * @param targetFieldOrColumn
+             * @param options
+             */
+            moveColumnTo(fieldOrColumn, targetFieldOrColumn, options) {
+                const { fullColumnIdData, visibleColumn } = internalData;
+                const { dragToChild, dragPos, isCrossDrag } = Object.assign({}, options);
+                const dragCol = handleFieldOrColumn($xeTable, fieldOrColumn);
+                let prevDragCol = null;
+                const colRest = dragCol ? fullColumnIdData[dragCol.id] : null;
+                let defPos = 'left';
+                if (XEUtils.isNumber(targetFieldOrColumn)) {
+                    if (colRest && targetFieldOrColumn) {
+                        let currList = colRest.items;
+                        let offsetIndex = colRest._index + targetFieldOrColumn;
+                        if (isCrossDrag) {
+                            currList = visibleColumn;
+                            offsetIndex = colRest._index + targetFieldOrColumn;
+                        }
+                        if (offsetIndex > 0 && offsetIndex < currList.length - 1) {
+                            prevDragCol = currList[offsetIndex];
+                        }
+                        if (targetFieldOrColumn > 0) {
+                            defPos = 'right';
+                        }
+                    }
+                }
+                else {
+                    prevDragCol = handleFieldOrColumn($xeTable, targetFieldOrColumn);
+                    const targetColRest = prevDragCol ? fullColumnIdData[prevDragCol.id] : null;
+                    if (colRest && targetColRest) {
+                        if (targetColRest._index > colRest._index) {
+                            defPos = 'right';
+                        }
+                    }
+                }
+                return $xeTable.handleColDragSwapEvent(null, true, dragCol, prevDragCol, dragPos || defPos, dragToChild === true);
+            },
+            /**
+             * 移动行到指定行的位置
+             * @param rowidOrRow
+             * @param targetRowidOrRow
+             * @param options
+             */
+            moveRowTo(rowidOrRow, targetRowidOrRow, options) {
+                const { treeConfig } = props;
+                const { fullAllDataRowIdData, afterFullData } = internalData;
+                const { dragToChild, dragPos, isCrossDrag } = Object.assign({}, options);
+                const treeOpts = computeTreeOpts.value;
+                const dragRow = handleRowidOrRow($xeTable, rowidOrRow);
+                let prevDragRow = null;
+                let defPos = 'top';
+                const rowRest = dragRow ? fullAllDataRowIdData[getRowid($xeTable, dragRow)] : null;
+                if (XEUtils.isNumber(targetRowidOrRow)) {
+                    if (rowRest && targetRowidOrRow) {
+                        let currList = afterFullData;
+                        let offsetIndex = rowRest._index + targetRowidOrRow;
+                        if (treeConfig) {
+                            currList = rowRest.items;
+                            if (treeOpts.transform) {
+                                offsetIndex = rowRest.treeIndex + targetRowidOrRow;
+                                if (isCrossDrag) {
+                                    currList = afterFullData;
+                                    offsetIndex = rowRest._index + targetRowidOrRow;
+                                }
+                            }
+                        }
+                        if (offsetIndex >= 0 && offsetIndex <= currList.length - 1) {
+                            prevDragRow = currList[offsetIndex];
+                        }
+                        if (targetRowidOrRow > 0) {
+                            defPos = 'bottom';
+                        }
+                    }
+                }
+                else {
+                    prevDragRow = handleRowidOrRow($xeTable, targetRowidOrRow);
+                    const targetRowRest = prevDragRow ? fullAllDataRowIdData[getRowid($xeTable, prevDragRow)] : null;
+                    if (rowRest && targetRowRest) {
+                        if (targetRowRest._index > rowRest._index) {
+                            defPos = 'bottom';
+                        }
+                    }
+                }
+                return $xeTable.handleRowDragSwapEvent(null, true, dragRow, prevDragRow, dragPos || defPos, dragToChild === true);
+            },
             /**
              * 获取表格的全量列
              */
@@ -4032,24 +4167,24 @@ export default defineComponent({
              */
             getCheckboxRecords(isFull) {
                 const { treeConfig } = props;
-                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;
                 const { checkField } = checkboxOpts;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 let rowList = [];
-                const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData);
                 if (checkField) {
                     if (treeConfig) {
+                        const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData);
                         rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, checkField), { children: transform ? mapChildrenField : childrenField });
                     }
                     else {
+                        const currTableData = isFull ? tableFullData : afterFullData;
                         rowList = currTableData.filter((row) => XEUtils.get(row, checkField));
                     }
                 }
                 else {
-                    const { selectCheckboxMaps } = reactData;
                     XEUtils.each(selectCheckboxMaps, (row, rowid) => {
                         if (isFull) {
                             if (fullDataRowIdData[rowid]) {
@@ -4362,12 +4497,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;
@@ -4391,8 +4527,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;
@@ -4541,12 +4678,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]) {
@@ -4587,17 +4723,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) {
@@ -4607,21 +4744,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)];
@@ -4684,15 +4821,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) => {
@@ -4734,6 +4872,7 @@ export default defineComponent({
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 const checkboxOpts = computeCheckboxOpts.value;
                 const { checkField, reserve } = checkboxOpts;
+                // indeterminateField 仅支持读取
                 const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
                 if (checkField) {
                     const handleClearChecked = (item) => {
@@ -4754,8 +4893,9 @@ export default defineComponent({
                 }
                 reactData.isAllSelected = false;
                 reactData.isIndeterminate = false;
-                reactData.selectCheckboxMaps = {};
-                reactData.treeIndeterminateMaps = {};
+                internalData.selectCheckboxMaps = {};
+                internalData.treeIndeterminateRowMaps = {};
+                reactData.updateCheckboxFlag++;
                 return nextTick();
             },
             /**
@@ -4863,13 +5003,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();
+                    }
+                });
             },
             /**
              * 用于当前列，手动清空当前高亮的状态
@@ -4879,59 +5026,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]) {
@@ -4941,7 +5089,8 @@ export default defineComponent({
                 return insertRecords;
             },
             clearPendingRow() {
-                reactData.pendingRowMaps = {};
+                internalData.pendingRowMaps = {};
+                reactData.pendingRowFlag++;
                 return nextTick();
             },
             sort(sortConfs, sortOrder) {
@@ -5090,7 +5239,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();
             },
@@ -5118,17 +5273,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();
             },
             /**
@@ -5136,12 +5290,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();
@@ -5151,13 +5305,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));
             },
             /**
              * 设置所有行的展开与否
@@ -5186,9 +5340,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 = [];
@@ -5200,30 +5354,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];
                             }
                         });
                     }
@@ -5231,7 +5386,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))
@@ -5247,9 +5402,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) {
                 // 已废弃
@@ -5266,7 +5422,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));
                 }
@@ -5287,7 +5444,7 @@ export default defineComponent({
             },
             getRowExpandRecords() {
                 const rest = [];
-                XEUtils.each(reactData.rowExpandedMaps, item => {
+                XEUtils.each(internalData.rowExpandedMaps, item => {
                     if (item) {
                         rest.push(item);
                     }
@@ -5296,7 +5453,7 @@ export default defineComponent({
             },
             getTreeExpandRecords() {
                 const rest = [];
-                XEUtils.each(reactData.treeExpandedMaps, item => {
+                XEUtils.each(internalData.treeExpandedMaps, item => {
                     if (item) {
                         rest.push(item);
                     }
@@ -5313,12 +5470,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];
                     }
@@ -5327,8 +5482,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];
                             }
                         }
                     });
@@ -5338,7 +5493,8 @@ export default defineComponent({
                         rowRest.treeLoaded = false;
                     });
                 }
-                reactData.treeExpandedMaps = {};
+                internalData.treeExpandedMaps = {};
+                reactData.treeExpandedFlag++;
                 if (transform) {
                     handleVirtualTreeToList();
                     return $xeTable.handleTableData();
@@ -5350,7 +5506,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;
@@ -5436,8 +5592,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)];
             },
             /**
              * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
@@ -5447,19 +5604,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();
                     }
                 });
             },
@@ -5714,7 +5872,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 = {};
@@ -5734,44 +5898,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;
                         }
                     }
                 });
@@ -6015,7 +6169,7 @@ export default defineComponent({
             // 该行为只对当前激活的表格有效
             if (internalData.isActivated) {
                 tablePrivateMethods.preventEvent(evnt, 'event.keydown', null, () => {
-                    const { mouseConfig, keyboardConfig, treeConfig, editConfig, highlightCurrentRow } = props;
+                    const { mouseConfig, keyboardConfig, treeConfig, editConfig, highlightCurrentRow, highlightCurrentColumn } = props;
                     const { ctxMenuStore, editStore, currentRow } = reactData;
                     const { afterFullData } = internalData;
                     const isMenu = computeIsMenu.value;
@@ -6026,6 +6180,7 @@ export default defineComponent({
                     const treeOpts = computeTreeOpts.value;
                     const menuList = computeMenuList.value;
                     const rowOpts = computeRowOpts.value;
+                    const columnOpts = computeColumnOpts.value;
                     const { selected, actived } = editStore;
                     const childrenField = treeOpts.children || treeOpts.childrenField;
                     const keyCode = evnt.keyCode;
@@ -6199,10 +6354,14 @@ export default defineComponent({
                             if (selected.row && selected.column) {
                                 $xeTable.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
                             }
-                            else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-                                // 当前行按键上下移动
+                            // 当前行按键上下移动
+                            if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
                                 $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
                             }
+                            // 当前行按键左右移动
+                            if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
+                                $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt);
+                            }
                         }
                     }
                     else if (isTab && keyboardConfig && keyboardOpts.isTab) {
@@ -6649,7 +6808,16 @@ export default defineComponent({
                 if (el) {
                     const parentElem = el.parentNode;
                     const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
-                    return Math.floor($xeGrid ? $xeGrid.getParentHeight() : XEUtils.toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
+                    let parentWrapperHeight = 0;
+                    if (parentElem) {
+                        if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+                            parentWrapperHeight = $xeGrid.getParentHeight();
+                        }
+                        else {
+                            parentWrapperHeight = parentElem.clientHeight;
+                        }
+                    }
+                    return Math.floor(parentWrapperHeight - parentPaddingSize);
                 }
                 return 0;
             },
@@ -6736,37 +6904,20 @@ 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 rowkey = getRowkey($xeTable);
+                const { lazy } = treeOpts;
                 const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
                 const fullDataRowIdMaps = {};
-                const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
-                const handleRow = (row, index, items, path, parentRow, nodes) => {
-                    let rowid = getRowid($xeTable, row);
-                    const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
-                    const level = nodes ? nodes.length - 1 : 0;
-                    if (eqEmptyValue(rowid)) {
-                        rowid = getRowUniqueId();
-                        XEUtils.set(row, rowkey, rowid);
-                    }
-                    if (treeConfig && treeOpts.lazy) {
-                        const treeExpRest = treeExpandedMaps[rowid];
-                        if (row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
-                            row[childrenField] = null;
-                        }
-                        if (treeExpRest) {
-                            if (!row[childrenField] || !row[childrenField].length) {
-                                delete treeTempExpandedMaps[rowid];
-                            }
-                        }
-                    }
-                    let rowRest = fullAllDataRowIdData[rowid];
+                const { handleUpdateRowId } = createHandleUpdateRowId($xeTable);
+                const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
+                    let rowRest = fullAllDataRowIdMaps[rowid];
                     if (!rowRest) {
                         rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                        fullDataRowIdMaps[rowid] = rowRest;
+                        fullAllDataRowIdMaps[rowid] = rowRest;
                     }
                     rowRest.treeLoaded = false;
                     rowRest.expandLoaded = false;
@@ -6774,34 +6925,45 @@ export default defineComponent({
                     rowRest.items = items;
                     rowRest.parent = parentRow;
                     rowRest.level = level;
-                    rowRest.index = treeConfig && parentRow ? -1 : index;
+                    rowRest.index = currIndex;
+                    rowRest.treeIndex = index;
                     fullDataRowIdMaps[rowid] = rowRest;
                     fullAllDataRowIdMaps[rowid] = rowRest;
                 };
                 if (treeConfig) {
-                    XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField });
+                    XEUtils.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
+                        const rowid = handleUpdateRowId(row);
+                        if (treeConfig && lazy) {
+                            if (row[hasChildField] && row[childrenField] === undefined) {
+                                row[childrenField] = null;
+                            }
+                            if (treeExpandedMaps[rowid]) {
+                                if (!row[childrenField] || !row[childrenField].length) {
+                                    delete treeExpandedMaps[rowid];
+                                }
+                            }
+                        }
+                        handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, toTreePathSeq(path));
+                    }, { children: childrenField });
                 }
                 else {
-                    tableFullData.forEach(handleRow);
+                    tableFullData.forEach((row, index, items) => {
+                        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) {
@@ -6811,6 +6973,7 @@ export default defineComponent({
                 else {
                     sourceData.forEach(handleSourceRow);
                 }
+                internalData.sourceDataRowIdData = sourceRowIdData;
                 internalData.tableSourceData = sourceData;
             },
             /**
@@ -7262,8 +7425,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();
                     }
@@ -7275,9 +7452,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;
@@ -7289,10 +7464,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;
@@ -7308,13 +7484,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++;
@@ -7323,18 +7499,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++;
@@ -7346,51 +7522,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++;
@@ -7399,18 +7574,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++;
@@ -7434,13 +7609,14 @@ 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) {
                     // 树结构
@@ -7455,59 +7631,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;
             },
             /**
              * 即将移除
@@ -7619,17 +7793,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) {
@@ -7641,7 +7816,7 @@ export default defineComponent({
              * 如果是双击模式，则单击后选中状态
              */
             triggerCellClickEvent(evnt, params) {
-                const { highlightCurrentRow, editConfig } = props;
+                const { highlightCurrentRow, highlightCurrentColumn, editConfig } = props;
                 const { editStore, isDragResize } = reactData;
                 if (isDragResize) {
                     return;
@@ -7653,6 +7828,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;
@@ -7668,29 +7845,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);
                         }
                     }
                     // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
@@ -7769,7 +7952,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;
@@ -7784,44 +7967,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);
                 }
@@ -7893,7 +8078,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;
@@ -7903,18 +8089,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);
                 }
             },
@@ -7922,7 +8108,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;
@@ -7932,10 +8118,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);
                 }
             },
@@ -8080,14 +8266,16 @@ 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 = {
+                    status: false
+                };
                 if (prevDragRow && dragRow) {
                     // 判断是否有拖动
                     if (prevDragRow !== dragRow) {
@@ -8102,7 +8290,7 @@ export default defineComponent({
                         const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
                         return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
                             if (!status) {
-                                return;
+                                return errRest;
                             }
                             let oafIndex = -1;
                             let nafIndex = -1;
@@ -8127,12 +8315,12 @@ export default defineComponent({
                                             if (isPeerDrag && !isCrossDrag) {
                                                 if (oldRest.row[parentField] !== newRest.row[parentField]) {
                                                     // 非同级
-                                                    return;
+                                                    return errRest;
                                                 }
                                             }
                                             else {
                                                 if (!isCrossDrag) {
-                                                    return;
+                                                    return errRest;
                                                 }
                                                 if (oldAllMaps[newRowid]) {
                                                     isSelfToChildStatus = true;
@@ -8143,7 +8331,7 @@ export default defineComponent({
                                                                 content: getI18n('vxe.error.treeDragChild')
                                                             });
                                                         }
-                                                        return;
+                                                        return errRest;
                                                     }
                                                 }
                                             }
@@ -8151,13 +8339,13 @@ export default defineComponent({
                                         else if (oldLevel) {
                                             // 子到根
                                             if (!isCrossDrag) {
-                                                return;
+                                                return errRest;
                                             }
                                         }
                                         else if (newLevel) {
                                             // 根到子
                                             if (!isCrossDrag) {
-                                                return;
+                                                return errRest;
                                             }
                                             if (oldAllMaps[newRowid]) {
                                                 isSelfToChildStatus = true;
@@ -8168,7 +8356,7 @@ export default defineComponent({
                                                             content: getI18n('vxe.error.treeDragChild')
                                                         });
                                                     }
-                                                    return;
+                                                    return errRest;
                                                 }
                                             }
                                         }
@@ -8228,27 +8416,34 @@ export default defineComponent({
                             if (reactData.scrollYLoad) {
                                 $xeTable.updateScrollYSpace();
                             }
-                            nextTick().then(() => {
+                            if (evnt) {
+                                dispatchEvent('row-dragend', {
+                                    oldRow: dragRow,
+                                    newRow: prevDragRow,
+                                    dragRow,
+                                    dragPos: prevDragPos,
+                                    dragToChild: isDragToChildFlag,
+                                    offsetIndex: dragOffsetIndex,
+                                    _index: {
+                                        newIndex: nafIndex,
+                                        oldIndex: oafIndex
+                                    }
+                                }, evnt);
+                            }
+                            return nextTick().then(() => {
                                 $xeTable.updateCellAreas();
                                 $xeTable.recalculate();
+                            }).then(() => {
+                                return {
+                                    status: true
+                                };
                             });
-                            dispatchEvent('row-dragend', {
-                                oldRow: dragRow,
-                                newRow: prevDragRow,
-                                dragRow,
-                                dragPos: prevDragPos,
-                                dragToChild: isDragToChildFlag,
-                                offsetIndex: dragOffsetIndex,
-                                _index: {
-                                    newIndex: nafIndex,
-                                    oldIndex: oafIndex
-                                }
-                            }, evnt);
                         }).catch(() => {
+                            return errRest;
                         });
                     }
                 }
-                return Promise.resolve();
+                return Promise.resolve(errRest);
             },
             handleRowDragDragendEvent(evnt) {
                 const { treeConfig } = props;
@@ -8375,6 +8570,9 @@ export default defineComponent({
                 const { isPeerDrag, isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod, dragToChildMethod } = columnDragOpts;
                 const { collectColumn } = internalData;
                 const dragOffsetIndex = prevDragPos === 'right' ? 1 : 0;
+                const errRest = {
+                    status: false
+                };
                 if (prevDragCol && dragCol) {
                     // 判断是否有拖动
                     if (prevDragCol !== dragCol) {
@@ -8391,7 +8589,7 @@ export default defineComponent({
                         const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
                         return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
                             if (!status) {
-                                return;
+                                return errRest;
                             }
                             let oafIndex = -1;
                             let nafIndex = -1;
@@ -8405,12 +8603,12 @@ export default defineComponent({
                                 if (isPeerDrag && !isCrossDrag) {
                                     if (dragColumn.parentId !== newColumn.parentId) {
                                         // 非同级
-                                        return;
+                                        return errRest;
                                     }
                                 }
                                 else {
                                     if (!isCrossDrag) {
-                                        return;
+                                        return errRest;
                                     }
                                     if (oldAllMaps[newColumn.id]) {
                                         isSelfToChildStatus = true;
@@ -8421,7 +8619,7 @@ export default defineComponent({
                                                     content: getI18n('vxe.error.treeDragChild')
                                                 });
                                             }
-                                            return;
+                                            return errRest;
                                         }
                                     }
                                 }
@@ -8429,13 +8627,13 @@ export default defineComponent({
                             else if (dragColumn.parentId) {
                                 // 子到根
                                 if (!isCrossDrag) {
-                                    return;
+                                    return errRest;
                                 }
                             }
                             else if (newColumn.parentId) {
                                 // 根到子
                                 if (!isCrossDrag) {
-                                    return;
+                                    return errRest;
                                 }
                                 if (oldAllMaps[newColumn.id]) {
                                     isSelfToChildStatus = true;
@@ -8446,7 +8644,7 @@ export default defineComponent({
                                                 content: getI18n('vxe.error.treeDragChild')
                                             });
                                         }
-                                        return;
+                                        return errRest;
                                     }
                                 }
                             }
@@ -8507,26 +8705,32 @@ export default defineComponent({
                                     $xeTable.clearCopyCellArea();
                                 }
                             }
-                            dispatchEvent('column-dragend', {
-                                oldColumn: dragColumn,
-                                newColumn,
-                                dragColumn,
-                                dragPos: prevDragPos,
-                                dragToChild: isDragToChildFlag,
-                                offsetIndex: dragOffsetIndex,
-                                _index: {
-                                    newIndex: nafIndex,
-                                    oldIndex: oafIndex
-                                }
-                            }, evnt);
+                            if (evnt) {
+                                dispatchEvent('column-dragend', {
+                                    oldColumn: dragColumn,
+                                    newColumn,
+                                    dragColumn,
+                                    dragPos: prevDragPos,
+                                    dragToChild: isDragToChildFlag,
+                                    offsetIndex: dragOffsetIndex,
+                                    _index: {
+                                        newIndex: nafIndex,
+                                        oldIndex: oafIndex
+                                    }
+                                }, evnt);
+                            }
                             if (isSyncColumn) {
                                 $xeTable.handleColDragSwapColumn();
                             }
+                            return {
+                                status: true
+                            };
                         }).catch(() => {
+                            return errRest;
                         });
                     }
                 }
-                return Promise.resolve();
+                return Promise.resolve(errRest);
             },
             handleHeaderCellDragDragendEvent(evnt) {
                 const { dragCol } = reactData;
@@ -8920,10 +9124,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 (!(scrollYLoad || leftFixedWidth || rightFixedWidth || expandColumn)) {
                     return;
                 }
                 const { elemStore, lastScrollTop, lastScrollLeft } = internalData;
@@ -9165,8 +9369,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;
@@ -9511,6 +9715,7 @@ export default defineComponent({
                 })
             ];
             if (expandColumn) {
+                const { handleGetRowId } = createHandleGetRowId($xeTable);
                 tableRowExpandedList.forEach((row) => {
                     const expandOpts = computeExpandOpts.value;
                     const { height: expandHeight, padding } = expandOpts;
@@ -9518,7 +9723,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;