vxe-table 3.14.0-beta.3 → 3.14.0-beta.30

package/es/table/src/methods.js

@@ -3,10 +3,11 @@ import { browse, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEv
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import Cell from './cell';
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, getRefElem } from './util';
+import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeUI;
+const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;
 const maxXWidth = 5e6;
@@ -218,7 +219,7 @@ function cacheColumnMap($xeTable) {
         }
         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) {
@@ -317,9 +318,10 @@ function updateAfterListIndex($xeTable) {
     const internalData = $xeTable;
     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) {
@@ -351,8 +353,9 @@ function updateAfterDataIndex($xeTable) {
     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) {
@@ -379,19 +382,18 @@ function updateAfterDataIndex($xeTable) {
  */
 function handleVirtualTreeToList($xeTable) {
     const props = $xeTable;
-    const reactData = $xeTable;
     const internalData = $xeTable;
     const { treeConfig } = props;
-    const { treeExpandedMaps } = reactData;
-    const { fullAllDataRowIdData } = internalData;
+    const { fullAllDataRowIdData, treeExpandedMaps } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     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) {
@@ -413,7 +415,7 @@ function updateStyle($xeTable) {
     const internalData = $xeTable;
     const { border, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props;
     const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn } = reactData;
-    const { visibleColumn, fullColumnIdData, tableHeight, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData;
+    const { visibleColumn, tableHeight, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData;
     const el = $xeTable.$refs.refElem;
     if (!el) {
         return;
@@ -422,7 +424,6 @@ function updateStyle($xeTable) {
     const osbWidth = overflowY ? scrollbarWidth : 0;
     const osbHeight = overflowX ? scrollbarHeight : 0;
     const emptyPlaceholderElem = $xeTable.$refs.refEmptyPlaceholder;
-    const cellOffsetWidth = $xeTable.computeCellOffsetWidth;
     const mouseOpts = $xeTable.computeMouseOpts;
     const expandOpts = $xeTable.computeExpandOpts;
     const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
@@ -690,56 +691,6 @@ function updateStyle($xeTable) {
                     tableElem.style.width = tWidth ? `${tWidth}px` : '';
                 }
             }
-            const colgroupElem = getRefElem(elemStore[`${name}-${layout}-colgroup`]);
-            if (colgroupElem) {
-                XEUtils.arrayEach(colgroupElem.children, (colElem) => {
-                    const colid = colElem.getAttribute('name');
-                    if (fullColumnIdData[colid]) {
-                        const colRest = fullColumnIdData[colid];
-                        const column = colRest.column;
-                        const { showHeaderOverflow, showFooterOverflow, showOverflow } = column;
-                        let cellOverflow;
-                        colElem.style.width = `${column.renderWidth}px`;
-                        if (layout === 'header') {
-                            cellOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
-                        }
-                        else if (layout === 'footer') {
-                            cellOverflow = XEUtils.isUndefined(showFooterOverflow) || XEUtils.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
-                        }
-                        else {
-                            cellOverflow = XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow) ? isAllOverflow : showOverflow;
-                        }
-                        const showEllipsis = cellOverflow === 'ellipsis';
-                        const showTitle = cellOverflow === 'title';
-                        const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
-                        let hasEllipsis = showTitle || showTooltip || showEllipsis;
-                        const listElem = getRefElem(elemStore[`${name}-${layout}-list`]);
-                        // 纵向虚拟滚动不支持动态行高
-                        if (scrollYLoad && !hasEllipsis) {
-                            hasEllipsis = true;
-                        }
-                        if (listElem) {
-                            XEUtils.arrayEach(listElem.querySelectorAll(`.${column.id}`), (elem) => {
-                                const colspan = parseInt(elem.getAttribute('colspan') || 1);
-                                const cellElem = elem.querySelector('.vxe-cell');
-                                let colWidth = column.renderWidth;
-                                if (cellElem) {
-                                    if (colspan > 1) {
-                                        const columnIndex = $xeTable.getColumnIndex(column);
-                                        for (let index = 1; index < colspan; index++) {
-                                            const nextColumn = $xeTable.getColumns(columnIndex + index);
-                                            if (nextColumn) {
-                                                colWidth += nextColumn.renderWidth;
-                                            }
-                                        }
-                                    }
-                                    cellElem.style.width = hasEllipsis ? `${colWidth - (cellOffsetWidth * colspan)}px` : '';
-                                }
-                            });
-                        }
-                    }
-                });
-            }
         });
     });
     if (currentRow) {
@@ -750,6 +701,25 @@ function updateStyle($xeTable) {
     }
     return $xeTable.$nextTick();
 }
+function checkValidate($xeTable, type) {
+    if ($xeTable.triggerValidate) {
+        return $xeTable.triggerValidate(type);
+    }
+    return $xeTable.$nextTick();
+}
+/**
+ * 当单元格发生改变时
+ * 如果存在规则，则校验
+ */
+function handleChangeCell($xeTable, evnt, params) {
+    checkValidate($xeTable, 'blur')
+        .catch((e) => e)
+        .then(() => {
+        $xeTable.handleEdit(params, evnt)
+            .then(() => checkValidate($xeTable, 'change'))
+            .catch((e) => e);
+    });
+}
 function handleRadioReserveRow($xeTable, row) {
     const internalData = $xeTable;
     const radioOpts = $xeTable.computeRadioOpts;
@@ -794,12 +764,13 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { treeConfig } = props;
-    const { selectCheckboxMaps } = reactData;
-    const { afterFullData, checkboxReserveRowMap } = internalData;
+    const { afterFullData, checkboxReserveRowMap, selectCheckboxMaps } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const checkboxOpts = $xeTable.computeCheckboxOpts;
     const { checkField, reserve, checkMethod } = checkboxOpts;
+    const { handleGetRowId } = createHandleGetRowId($xeTable);
+    // indeterminateField 仅支持读取
     const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     const selectRowMaps = {};
     /**
@@ -810,7 +781,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
         const checkValFn = (row) => {
             if (isForce || (!checkMethod || checkMethod({ row }))) {
                 if (checked) {
-                    selectRowMaps[getRowid($xeTable, row)] = row;
+                    selectRowMaps[handleGetRowId(row)] = row;
                 }
                 XEUtils.set(row, checkField, checked);
             }
@@ -840,7 +811,8 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
                    */
                 XEUtils.eachTree(afterFullData, (row) => {
                     if (isForce || (!checkMethod || checkMethod({ row }))) {
-                        selectRowMaps[getRowid($xeTable, row)] = row;
+                        const rowid = handleGetRowId(row);
+                        selectRowMaps[rowid] = row;
                     }
                 }, { children: childrenField });
             }
@@ -851,7 +823,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
                    */
                 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;
                         }
@@ -868,7 +840,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
                    */
                 if (!isForce && checkMethod) {
                     afterFullData.forEach((row) => {
-                        const rowid = getRowid($xeTable, row);
+                        const rowid = handleGetRowId(row);
                         if (selectCheckboxMaps[rowid] || checkMethod({ row })) {
                             selectRowMaps[rowid] = row;
                         }
@@ -876,7 +848,8 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
                 }
                 else {
                     afterFullData.forEach(row => {
-                        selectRowMaps[getRowid($xeTable, row)] = row;
+                        const rowid = handleGetRowId(row);
+                        selectRowMaps[rowid] = row;
                     });
                 }
             }
@@ -888,7 +861,7 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
                    */
                 if (!isForce && checkMethod) {
                     afterFullData.forEach((row) => {
-                        const rowid = getRowid($xeTable, row);
+                        const rowid = handleGetRowId(row);
                         if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
                             selectRowMaps[rowid] = row;
                         }
@@ -907,10 +880,10 @@ function handleCheckedAllCheckboxRow($xeTable, checked, isForce) {
             afterFullData.forEach((row) => handleCheckboxReserveRow($xeTable, 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 $xeTable.$nextTick();
@@ -921,8 +894,8 @@ function handleReserveStatus($xeTable) {
     const reactData = $xeTable;
     const internalData = $xeTable;
     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 = $xeTable.computeExpandOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const radioOpts = $xeTable.computeRadioOpts;
@@ -939,7 +912,8 @@ function handleReserveStatus($xeTable) {
         }
     }
     // 复选框
-    reactData.selectCheckboxMaps = getRecoverRowMaps($xeTable, selectCheckboxMaps); // 刷新多选行状态
+    internalData.selectCheckboxMaps = getRecoverRowMaps($xeTable, selectCheckboxMaps); // 刷新多选行状态
+    reactData.updateCheckboxFlag++;
     // 还原保留选中状态
     if (checkboxOpts.reserve) {
         handleCheckedCheckboxRow($xeTable, handleReserveRow($xeTable, internalData.checkboxReserveRowMap), true, true);
@@ -948,17 +922,161 @@ function handleReserveStatus($xeTable) {
         reactData.currentRow = null; // 刷新当前行状态
     }
     // 行展开
-    reactData.rowExpandedMaps = expandColumn ? getRecoverRowMaps($xeTable, rowExpandedMaps) : {}; // 刷新行展开状态
+    internalData.rowExpandedMaps = expandColumn ? getRecoverRowMaps($xeTable, rowExpandedMaps) : {}; // 刷新行展开状态
+    reactData.rowExpandedFlag++;
     // 还原保留状态
     if (expandColumn && expandOpts.reserve) {
         $xeTable.setRowExpand(handleReserveRow($xeTable, internalData.rowExpandedReserveRowMap), true);
     }
     // 树展开
-    reactData.treeExpandedMaps = treeConfig ? getRecoverRowMaps($xeTable, treeExpandedMaps) : {}; // 刷新树展开状态
+    internalData.treeExpandedMaps = treeConfig ? getRecoverRowMaps($xeTable, treeExpandedMaps) : {}; // 刷新树展开状态
+    reactData.treeExpandedFlag++;
     if (treeConfig && treeOpts.reserve) {
         $xeTable.setTreeExpand(handleReserveRow($xeTable, internalData.treeExpandedReserveRowMap), true);
     }
 }
+/**
+ * 处理默认展开树节点
+ */
+const handleDefaultTreeExpand = ($xeTable) => {
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const { treeConfig } = props;
+    if (treeConfig) {
+        const { tableFullData } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
+        const { expandAll, expandRowKeys } = treeOpts;
+        const childrenField = treeOpts.children || treeOpts.childrenField;
+        if (expandAll) {
+            $xeTable.setAllTreeExpand(true);
+        }
+        else if (expandRowKeys) {
+            const defExpandeds = [];
+            const rowkey = getRowkey($xeTable);
+            expandRowKeys.forEach((rowid) => {
+                const matchObj = XEUtils.findTree(tableFullData, item => rowid === XEUtils.get(item, rowkey), { children: childrenField });
+                if (matchObj) {
+                    defExpandeds.push(matchObj.item);
+                }
+            });
+            $xeTable.setTreeExpand(defExpandeds, true);
+        }
+    }
+};
+const handleAsyncTreeExpandChilds = ($xeTable, row) => {
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
+    const { transform, loadMethod } = treeOpts;
+    const { checkStrictly } = checkboxOpts;
+    return new Promise(resolve => {
+        if (loadMethod) {
+            const { fullAllDataRowIdData, treeExpandLazyLoadedMaps } = internalData;
+            const rowid = getRowid($xeTable, row);
+            const rowRest = fullAllDataRowIdData[rowid];
+            treeExpandLazyLoadedMaps[rowid] = row;
+            Promise.resolve(loadMethod({ $table: $xeTable, row })).then((childRecords) => {
+                if (rowRest) {
+                    rowRest.treeLoaded = true;
+                }
+                if (treeExpandLazyLoadedMaps[rowid]) {
+                    delete treeExpandLazyLoadedMaps[rowid];
+                }
+                if (!XEUtils.isArray(childRecords)) {
+                    childRecords = [];
+                }
+                if (childRecords) {
+                    return $xeTable.loadTreeChildren(row, childRecords).then(childRows => {
+                        const { treeExpandedMaps } = internalData;
+                        if (childRows.length && !treeExpandedMaps[rowid]) {
+                            treeExpandedMaps[rowid] = row;
+                        }
+                        reactData.treeExpandedFlag++;
+                        // 如果当前节点已选中，则展开后子节点也被选中
+                        if (!checkStrictly && $xeTable.isCheckedByCheckboxRow(row)) {
+                            handleCheckedCheckboxRow($xeTable, childRows, true);
+                        }
+                        return $xeTable.$nextTick().then(() => {
+                            if (transform) {
+                                $xeTable.handleTableData();
+                                updateAfterDataIndex($xeTable);
+                                return $xeTable.$nextTick();
+                            }
+                        });
+                    });
+                }
+            }).catch(() => {
+                const { treeExpandLazyLoadedMaps } = internalData;
+                if (rowRest) {
+                    rowRest.treeLoaded = false;
+                }
+                if (treeExpandLazyLoadedMaps[rowid]) {
+                    delete treeExpandLazyLoadedMaps[rowid];
+                }
+            }).finally(() => {
+                reactData.treeExpandedFlag++;
+                $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => resolve());
+            });
+        }
+        else {
+            resolve();
+        }
+    });
+};
+const handleTreeExpandReserve = ($xeTable, row, expanded) => {
+    const internalData = $xeTable;
+    const { treeExpandedReserveRowMap } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    if (treeOpts.reserve) {
+        const rowid = getRowid($xeTable, row);
+        if (expanded) {
+            treeExpandedReserveRowMap[rowid] = row;
+        }
+        else if (treeExpandedReserveRowMap[rowid]) {
+            delete treeExpandedReserveRowMap[rowid];
+        }
+    }
+};
+const handleAsyncRowExpand = ($xeTable, row) => {
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    return new Promise(resolve => {
+        const expandOpts = $xeTable.computeExpandOpts;
+        const { loadMethod } = expandOpts;
+        if (loadMethod) {
+            const { fullAllDataRowIdData, rowExpandLazyLoadedMaps } = internalData;
+            const rowid = getRowid($xeTable, row);
+            const rowRest = fullAllDataRowIdData[rowid];
+            rowExpandLazyLoadedMaps[rowid] = row;
+            loadMethod({ $table: $xeTable, row, rowIndex: $xeTable.getRowIndex(row), $rowIndex: $xeTable.getVMRowIndex(row) }).then(() => {
+                const { rowExpandedMaps } = internalData;
+                if (rowRest) {
+                    rowRest.expandLoaded = true;
+                }
+                rowExpandedMaps[rowid] = row;
+                reactData.rowExpandedFlag++;
+            }).catch(() => {
+                if (rowRest) {
+                    rowRest.expandLoaded = false;
+                }
+            }).finally(() => {
+                const { rowExpandLazyLoadedMaps } = internalData;
+                if (rowExpandLazyLoadedMaps[rowid]) {
+                    delete rowExpandLazyLoadedMaps[rowid];
+                }
+                reactData.rowExpandedFlag++;
+                $xeTable.$nextTick()
+                    .then(() => $xeTable.recalculate())
+                    .then(() => $xeTable.updateCellAreas())
+                    .then(() => resolve());
+            });
+        }
+        else {
+            resolve();
+        }
+    });
+};
 function calcVarRowHeightConfig($xeTable, sizeKey, sizeEl) {
     const reactData = $xeTable;
     const { rowHeightStore } = reactData;
@@ -1021,12 +1139,13 @@ function handleVirtualYVisible($xeTable) {
             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;
@@ -1038,7 +1157,7 @@ function handleVirtualYVisible($xeTable) {
             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) {
@@ -1068,9 +1187,12 @@ function calculateMergerOffsetIndex(list, offsetItem, type) {
         }
     }
 }
-function setMerges(_vm, merges, mList, rowList) {
+function setMerges($xeTable, merges, mList, rowList) {
+    const props = $xeTable;
+    const internalData = $xeTable;
     if (merges) {
-        const { treeConfig, visibleColumn } = _vm;
+        const { treeConfig } = props;
+        const { visibleColumn } = internalData;
         if (!XEUtils.isArray(merges)) {
             merges = [merges];
         }
@@ -1116,10 +1238,13 @@ function setMerges(_vm, merges, mList, rowList) {
         });
     }
 }
-function removeMerges(_vm, merges, mList, rowList) {
+function removeMerges($xeTable, merges, mList, rowList) {
+    const props = $xeTable;
+    const internalData = $xeTable;
     const rest = [];
     if (merges) {
-        const { treeConfig, visibleColumn } = _vm;
+        const { treeConfig } = props;
+        const { visibleColumn } = internalData;
         if (!XEUtils.isArray(merges)) {
             merges = [merges];
         }
@@ -1299,6 +1424,7 @@ function autoCellWidth($xeTable) {
     internalData.headerHeight = headerHeight;
     internalData.footerHeight = footerHeight;
     reactData.overflowX = overflowX;
+    reactData.resizeWidthFlag++;
     updateColumnOffsetLeft($xeTable);
     updateHeight($xeTable);
     reactData.parentHeight = Math.max(internalData.headerHeight + footerHeight + 20, $xeTable.getParentHeight());
@@ -1326,8 +1452,9 @@ const calcCellHeight = ($xeTable) => {
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
     const el = $xeTable.$refs.refElem;
     if (!isAllOverflow && scrollYLoad && el) {
+        const { handleGetRowId } = createHandleGetRowId($xeTable);
         tableData.forEach(row => {
-            const rowid = getRowid($xeTable, row);
+            const rowid = handleGetRowId(row);
             const rowRest = fullAllDataRowIdData[rowid];
             if (rowRest) {
                 const height = calcCellAutoHeight(rowRest, el);
@@ -1568,9 +1695,10 @@ function hideDropTip($xeTable) {
  * @param {Event} evnt 事件
  * @param {Row} row 行对象
  */
-function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
+function handleTooltip($xeTable, evnt, tdEl, overflowElem, params) {
     const reactData = $xeTable;
-    if (!overflowElem) {
+    const tipOverEl = overflowElem || tdEl;
+    if (!tipOverEl) {
         return $xeTable.$nextTick();
     }
     params.cell = tdEl;
@@ -1580,9 +1708,8 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
     const { showAll, contentMethod } = tooltipOpts;
     const customContent = contentMethod ? contentMethod(params) : null;
     const useCustom = contentMethod && !XEUtils.eqNull(customContent);
-    const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim();
-    const isCellOverflow = overflowElem.scrollWidth > overflowElem.clientWidth;
-    if (content && (showAll || useCustom || isCellOverflow)) {
+    const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
+    if (content && (showAll || useCustom || (tipOverEl.scrollWidth > tipOverEl.clientWidth))) {
         Object.assign(tooltipStore, {
             row,
             column,
@@ -1592,7 +1719,7 @@ function handleTooltip($xeTable, evnt, tdEl, overflowElem, tipElem, params) {
         $xeTable.$nextTick(() => {
             const $tooltip = $xeTable.$refs.refTooltip;
             if ($tooltip && $tooltip.open) {
-                $tooltip.open(isCellOverflow ? overflowElem : (tipElem || overflowElem), formatText(content));
+                $tooltip.open(tipOverEl, formatText(content));
             }
         });
     }
@@ -1767,8 +1894,8 @@ function parseColumns($xeTable, isReset) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const { showOverflow } = props;
-    const rowOpts = $xeTable.computeRowOpts;
+    // const { showOverflow } = props
+    // const rowOpts = $xeTable.computeRowOpts
     const leftList = [];
     const centerList = [];
     const rightList = [];
@@ -1841,28 +1968,28 @@ function parseColumns($xeTable, isReset) {
     reactData.hasFixedColumn = leftList.length > 0 || rightList.length > 0;
     Object.assign(columnStore, { leftList, centerList, rightList });
     if (scrollXLoad) {
-        if (showOverflow) {
-            if (!rowOpts.height) {
-                const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false);
-                if (errColumn) {
-                    errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
-                }
-            }
-        }
-        if (process.env.NODE_ENV === 'development') {
-            // if (props.showHeader && !props.showHeaderOverflow) {
-            //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
-            // }
-            // if (props.showFooter && !props.showFooterOverflow) {
-            //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
-            // }
-            if (props.spanMethod) {
-                warnLog('vxe.error.scrollErrProp', ['span-method']);
-            }
-            if (props.footerSpanMethod) {
-                warnLog('vxe.error.scrollErrProp', ['footer-span-method']);
-            }
-        }
+        // if (showOverflow) {
+        //   if (!rowOpts.height) {
+        //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+        //     if (errColumn) {
+        //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+        //     }
+        //   }
+        // }
+        // if (process.env.NODE_ENV === 'development') {
+        // if (props.showHeader && !props.showHeaderOverflow) {
+        //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
+        // }
+        // if (props.showFooter && !props.showFooterOverflow) {
+        //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
+        // }
+        if (props.spanMethod) {
+            warnLog('vxe.error.scrollErrProp', ['span-method']);
+        }
+        if (props.footerSpanMethod) {
+            warnLog('vxe.error.scrollErrProp', ['footer-span-method']);
+        }
+        // }
         if (isReset) {
             const { visibleSize } = handleVirtualXVisible($xeTable);
             scrollXStore.startIndex = 0;
@@ -1974,6 +2101,35 @@ function loadScrollYData($xeTable) {
         }
     }
 }
+const createGetRowCacheProp = (prop) => {
+    return function (row) {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const { fullAllDataRowIdData } = internalData;
+        if (row) {
+            const rowid = getRowid($xeTable, row);
+            const rowRest = fullAllDataRowIdData[rowid];
+            if (rowRest) {
+                return rowRest[prop];
+            }
+        }
+        return -1;
+    };
+};
+const createGetColumnCacheProp = (prop) => {
+    return function (column) {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const { fullColumnIdData } = internalData;
+        if (column) {
+            const colRest = fullColumnIdData[column.id];
+            if (colRest) {
+                return colRest[prop];
+            }
+        }
+        return -1;
+    };
+};
 function lazyScrollXData($xeTable) {
     const internalData = $xeTable;
     const { lxTimeout, lxRunTime, scrollXStore } = internalData;
@@ -2131,7 +2287,7 @@ function calcCellWidth($xeTable) {
 }
 function handleUpdateColResize($xeTable, evnt, params) {
     $xeTable.analyColumnWidth();
-    $xeTable.recalculate(true).then(() => {
+    $xeTable.recalculate().then(() => {
         $xeTable.saveCustomStore('update:width');
         $xeTable.updateCellAreas();
         $xeTable.dispatchEvent('column-resizable-change', params, evnt);
@@ -2143,7 +2299,7 @@ function handleUpdateColResize($xeTable, evnt, params) {
 function handleUpdateRowResize($xeTable, evnt, params) {
     const reactData = $xeTable;
     reactData.resizeHeightFlag++;
-    $xeTable.recalculate(true).then(() => {
+    $xeTable.recalculate().then(() => {
         $xeTable.updateCellAreas();
         $xeTable.dispatchEvent('row-resizable-change', params, evnt);
         setTimeout(() => $xeTable.recalculate(true), 300);
@@ -2164,16 +2320,17 @@ function updateColumnOffsetLeft($xeTable) {
 function updateRowOffsetTop($xeTable) {
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const { expandColumn, rowExpandedMaps } = reactData;
-    const { afterFullData, fullAllDataRowIdData } = internalData;
+    const { expandColumn } = reactData;
+    const { afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData;
     const expandOpts = $xeTable.computeExpandOpts;
     const rowOpts = $xeTable.computeRowOpts;
     const cellOpts = $xeTable.computeCellOpts;
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
+    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;
@@ -2186,47 +2343,43 @@ function updateRowOffsetTop($xeTable) {
 function updateRowExpandStyle($xeTable) {
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const { expandColumn, scrollYLoad, rowExpandedMaps } = reactData;
+    const { expandColumn, scrollYLoad, scrollYTop, isScrollYBig } = reactData;
     const expandOpts = $xeTable.computeExpandOpts;
     const rowOpts = $xeTable.computeRowOpts;
     const cellOpts = $xeTable.computeCellOpts;
     const defaultRowHeight = $xeTable.computeDefaultRowHeight;
     const { mode } = expandOpts;
     if (expandColumn && mode === 'fixed') {
-        const { elemStore, afterFullData, fullAllDataRowIdData } = internalData;
+        const { elemStore, fullAllDataRowIdData } = internalData;
         const rowExpandEl = $xeTable.$refs.refRowExpandElem;
         const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
         if (rowExpandEl && bodyScrollElem) {
             let isUpdateHeight = false;
-            if (scrollYLoad) {
-                let offsetTop = 0;
-                for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
-                    const row = afterFullData[rIndex];
-                    const rowid = getRowid($xeTable, row);
-                    const rowRest = fullAllDataRowIdData[rowid] || {};
-                    rowRest.oTop = offsetTop;
-                    offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
-                    // 是否展开行
-                    if (expandColumn && rowExpandedMaps[rowid]) {
-                        offsetTop += rowRest.expandHeight || expandOpts.height || 0;
-                    }
-                }
-            }
             XEUtils.arrayEach(rowExpandEl.children, reEl => {
                 const expandEl = reEl;
                 const rowid = expandEl.getAttribute('rowid') || '';
                 const rowRest = fullAllDataRowIdData[rowid];
                 if (rowRest) {
                     const expandHeight = expandEl.offsetHeight + 1;
+                    const trEl = bodyScrollElem.querySelector(`.vxe-body--row[rowid="${rowid}"]`);
+                    let offsetTop = 0;
                     if (scrollYLoad) {
-                        expandEl.style.top = toCssUnit(rowRest.oTop + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight));
+                        if (isScrollYBig && trEl) {
+                            offsetTop = trEl.offsetTop + trEl.offsetHeight;
+                        }
+                        else {
+                            offsetTop = rowRest.oTop + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
+                        }
                     }
                     else {
-                        const trEl = bodyScrollElem.querySelector(`.vxe-body--row[rowid="${rowid}"]`);
                         if (trEl) {
-                            expandEl.style.top = toCssUnit(trEl.offsetTop + trEl.offsetHeight);
+                            offsetTop = trEl.offsetTop + trEl.offsetHeight;
                         }
                     }
+                    if (isScrollYBig) {
+                        offsetTop += scrollYTop;
+                    }
+                    expandEl.style.top = toCssUnit(offsetTop);
                     if (!isUpdateHeight) {
                         if (rowRest.expandHeight !== expandHeight) {
                             isUpdateHeight = true;
@@ -2237,6 +2390,9 @@ function updateRowExpandStyle($xeTable) {
             });
             if (isUpdateHeight) {
                 reactData.rowExpandHeightFlag++;
+                $xeTable.$nextTick(() => {
+                    updateRowOffsetTop($xeTable);
+                });
             }
         }
     }
@@ -2252,10 +2408,11 @@ function handleRowExpandScroll($xeTable) {
 }
 const Methods = {
     callSlot(slotFunc, params, h, vNodes) {
+        const $xeTable = this;
+        const $xeGrid = $xeTable.$xeGrid;
         if (slotFunc) {
-            const { $xegrid } = this;
-            if ($xegrid) {
-                return $xegrid.callSlot(slotFunc, params, h, vNodes);
+            if ($xeGrid) {
+                return $xeGrid.callSlot(slotFunc, params, h, vNodes);
             }
             if (XEUtils.isFunction(slotFunc)) {
                 return getSlotVNs(slotFunc.call(this, params, h, vNodes));
@@ -2263,21 +2420,43 @@ const Methods = {
         }
         return [];
     },
+    getEl() {
+        const $xeTable = this;
+        return $xeTable.$refs.refElem;
+    },
     /**
      * 获取父容器元素
      */
     getParentElem() {
-        const { $el, $xegrid } = this;
-        return $xegrid ? $xegrid.$el.parentNode : $el.parentNode;
+        const $xeTable = this;
+        const $xeGrid = $xeTable.$xeGrid;
+        const { $el } = this;
+        return $xeGrid ? $xeGrid.$el.parentNode : $el.parentNode;
     },
     /**
      * 获取父容器的高度
      */
     getParentHeight() {
-        const { $el, $xegrid, height } = this;
-        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);
+        const $xeTable = this;
+        const $xeGrid = $xeTable.$xeGrid;
+        const props = $xeTable;
+        const { height } = props;
+        const el = $xeTable.$refs.refElem;
+        if (el) {
+            const parentElem = el.parentNode;
+            const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
+            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;
     },
     /**
      * 获取需要排除的高度
@@ -2285,8 +2464,9 @@ const Methods = {
      * 如果存在表尾合计滚动条，则需要排除滚动条高度
      */
     getExcludeHeight() {
-        const { $xegrid } = this;
-        return $xegrid ? $xegrid.getExcludeHeight() : 0;
+        const $xeTable = this;
+        const $xeGrid = $xeTable.$xeGrid;
+        return $xeGrid ? $xeGrid.getExcludeHeight() : 0;
     },
     /**
      * 重置表格的一切数据状态
@@ -2365,6 +2545,9 @@ const Methods = {
         const childrenField = treeOpts.children || treeOpts.childrenField;
         let treeData = [];
         let fullData = datas ? datas.slice(0) : [];
+        if (fullData.length > supportMaxRow) {
+            errLog('vxe.error.errMaxRow', [supportMaxRow]);
+        }
         if (treeConfig) {
             // 树结构自动转换
             if (treeOpts.transform) {
@@ -2607,35 +2790,16 @@ const Methods = {
         const reactData = $xeTable;
         const internalData = $xeTable;
         const { treeConfig } = props;
-        const { treeExpandedMaps } = reactData;
-        const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData;
+        const { fullAllDataRowIdData, tableFullData, tableFullTreeData, treeExpandedMaps } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         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 };
             }
@@ -2645,35 +2809,48 @@ const Methods = {
             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) {
-        let { treeConfig, treeOpts, sourceDataRowIdData } = this;
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const treeOpts = $xeTable.computeTreeOpts;
         const sourceData = XEUtils.clone(fullData, true);
-        const rowkey = getRowkey(this);
-        sourceDataRowIdData = this.sourceDataRowIdData = {};
+        const { handleUpdateRowId } = createHandleUpdateRowId($xeTable);
+        const sourceRowIdData = {};
         const handleSourceRow = (row) => {
-            let rowid = getRowid(this, row);
-            if (eqEmptyValue(rowid)) {
-                rowid = getRowUniqueId();
-                XEUtils.set(row, rowkey, rowid);
-            }
-            sourceDataRowIdData[rowid] = {
-                row,
-                rowid
-            };
+            const rowid = handleUpdateRowId(row);
+            sourceRowIdData[rowid] = row;
         };
         // 源数据缓存
         if (treeConfig) {
@@ -2683,7 +2860,8 @@ const Methods = {
         else {
             sourceData.forEach(handleSourceRow);
         }
-        this.tableSourceData = sourceData;
+        internalData.sourceDataRowIdData = sourceRowIdData;
+        internalData.tableSourceData = sourceData;
     },
     getParams() {
         return this.params;
@@ -2770,47 +2948,22 @@ const Methods = {
      * 根据 row 获取序号
      * @param {Row} row 行对象
      */
-    getRowSeq(row) {
-        const { fullAllDataRowIdData } = this;
-        if (row) {
-            const rowid = getRowid(this, row);
-            const rest = fullAllDataRowIdData[rowid];
-            if (rest) {
-                return rest.seq;
-            }
-        }
-        return -1;
-    },
+    getRowSeq: createGetRowCacheProp('seq'),
     /**
      * 根据 row 获取相对于 data 中的索引
      * @param {Row} row 行对象
      */
-    getRowIndex(row) {
-        const { fullAllDataRowIdData } = this;
-        if (row) {
-            const rowid = getRowid(this, row);
-            const rest = fullAllDataRowIdData[rowid];
-            if (rest) {
-                return rest.index;
-            }
-        }
-        return -1;
-    },
+    getRowIndex: createGetRowCacheProp('index'),
     /**
      * 根据 row 获取相对于当前数据中的索引
      * @param {Row} row 行对象
      */
-    getVTRowIndex(row) {
-        const { fullAllDataRowIdData } = this;
-        if (row) {
-            const rowid = getRowid(this, row);
-            const rest = fullAllDataRowIdData[rowid];
-            if (rest) {
-                return rest._index;
-            }
-        }
-        return -1;
-    },
+    getVTRowIndex: createGetRowCacheProp('_index'),
+    /**
+     * 根据 row 获取渲染中的虚拟索引
+     * @param {Row} row 行对象
+     */
+    getVMRowIndex: createGetRowCacheProp('$index'),
     // 在 v3 中废弃
     _getRowIndex(row) {
         if (process.env.NODE_ENV === 'development') {
@@ -2818,21 +2971,6 @@ const Methods = {
         }
         return this.getVTRowIndex(row);
     },
-    /**
-     * 根据 row 获取渲染中的虚拟索引
-     * @param {Row} row 行对象
-     */
-    getVMRowIndex(row) {
-        const { fullAllDataRowIdData } = this;
-        if (row) {
-            const rowid = getRowid(this, row);
-            const rest = fullAllDataRowIdData[rowid];
-            if (rest) {
-                return rest.$index;
-            }
-        }
-        return -1;
-    },
     // 在 v3 中废弃
     $getRowIndex(row) {
         if (process.env.NODE_ENV === 'development') {
@@ -2844,30 +2982,17 @@ const Methods = {
      * 根据 column 获取相对于 columns 中的索引
      * @param {ColumnInfo} column 列配置
      */
-    getColumnIndex(column) {
-        const { fullColumnIdData } = this;
-        if (column) {
-            const rest = fullColumnIdData[column.id];
-            if (rest) {
-                return rest.index;
-            }
-        }
-        return -1;
-    },
+    getColumnIndex: createGetColumnCacheProp('index'),
     /**
      * 根据 column 获取相对于当前表格列中的索引
      * @param {ColumnInfo} column 列配置
      */
-    getVTColumnIndex(column) {
-        const { fullColumnIdData } = this;
-        if (column) {
-            const rest = fullColumnIdData[column.id];
-            if (rest) {
-                return rest._index;
-            }
-        }
-        return -1;
-    },
+    getVTColumnIndex: createGetColumnCacheProp('_index'),
+    /**
+     * 根据 column 获取渲染中的虚拟索引
+     * @param {ColumnInfo} column 列配置
+     */
+    getVMColumnIndex: createGetColumnCacheProp('$index'),
     // 在 v3 中废弃
     _getColumnIndex(column) {
         if (process.env.NODE_ENV === 'development') {
@@ -2875,20 +3000,6 @@ const Methods = {
         }
         return this.getVTColumnIndex(column);
     },
-    /**
-     * 根据 column 获取渲染中的虚拟索引
-     * @param {ColumnInfo} column 列配置
-     */
-    getVMColumnIndex(column) {
-        const { fullColumnIdData } = this;
-        if (column) {
-            const rest = fullColumnIdData[column.id];
-            if (rest) {
-                return rest.$index;
-            }
-        }
-        return -1;
-    },
     // 在 v3 中废弃
     $getColumnIndex(column) {
         if (process.env.NODE_ENV === 'development') {
@@ -2982,12 +3093,15 @@ const Methods = {
         const reactData = $xeTable;
         const internalData = $xeTable;
         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 = $xeTable.computeTreeOpts;
         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 $xeTable.$nextTick();
         }
@@ -3002,23 +3116,24 @@ const Methods = {
         }
         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;
                             }
                         }
@@ -3028,6 +3143,7 @@ const Methods = {
         }
         if (rows) {
             if (reDelFlag) {
+                editStore.removeMaps = removeTempMaps;
                 $xeTable.updateFooter();
                 $xeTable.cacheRowMap(false);
                 $xeTable.handleTableData(treeConfig && transform);
@@ -3190,20 +3306,25 @@ const Methods = {
     },
     /**
      * 检查行或列数据是否发生改变
-     * @param {Row} row 行对象
+     * @param {Row} rowOrId 行对象
      * @param {String} field 字段名
      */
-    isUpdateByRow(row, field) {
-        const { tableFullColumn, keepSource, sourceDataRowIdData, fullDataRowIdData } = this;
+    isUpdateByRow(rowOrId, field) {
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { keepSource } = props;
+        const { tableFullColumn, fullDataRowIdData, sourceDataRowIdData } = internalData;
         if (keepSource) {
-            const rowid = getRowid(this, row);
+            const rowid = XEUtils.isString(rowOrId) || XEUtils.isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId);
+            const rowRest = fullDataRowIdData[rowid];
             // 新增的数据不需要检测
-            if (!fullDataRowIdData[rowid]) {
+            if (!rowRest) {
                 return false;
             }
-            const oldRest = sourceDataRowIdData[rowid];
-            if (oldRest) {
-                const oRow = oldRest.row;
+            const row = rowRest.row;
+            const oRow = sourceDataRowIdData[rowid];
+            if (oRow) {
                 if (arguments.length > 1) {
                     return !eqCellValue(oRow, row, field);
                 }
@@ -3265,6 +3386,99 @@ const Methods = {
             tableColumn: this.tableColumn.slice(0)
         };
     },
+    /**
+     * 移动列到指定列的位置
+     * @param fieldOrColumn
+     * @param targetFieldOrColumn
+     * @param options
+     */
+    moveColumnTo(fieldOrColumn, targetFieldOrColumn, options) {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        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 $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { fullAllDataRowIdData, afterFullData } = internalData;
+        const { dragToChild, dragPos, isCrossDrag } = Object.assign({}, options);
+        const treeOpts = $xeTable.computeTreeOpts;
+        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);
+    },
     /**
      * 获取表格的全量列
      */
@@ -3285,22 +3499,28 @@ const Methods = {
      * 用于多选行，获取已选中的数据
      */
     getCheckboxRecords(isFull) {
-        const { tableFullData, afterFullData, treeConfig, treeOpts, checkboxOpts, tableFullTreeData, afterTreeFullData, afterFullRowMaps } = this;
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps, selectCheckboxMaps } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
+        const checkboxOpts = $xeTable.computeCheckboxOpts;
         const { transform, mapChildrenField } = treeOpts;
         const { checkField } = checkboxOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
-        const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData);
         let rowList = [];
         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, fullDataRowIdData } = this;
             XEUtils.each(selectCheckboxMaps, (row, rowid) => {
                 if (isFull) {
                     if (fullDataRowIdData[rowid]) {
@@ -3331,7 +3551,7 @@ const Methods = {
         const treeOpts = $xeTable.computeTreeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const { transform, rowField, parentField, mapChildrenField } = treeOpts;
-        const { remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts;
+        const { isEvery, remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts;
         const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological } = sortOpts;
         let tableData = [];
         let tableTree = [];
@@ -3390,7 +3610,7 @@ const Methods = {
                     // 筛选虚拟树
                     tableTree = XEUtils.searchTree(tableFullTreeData, handleFilter, {
                         original: true,
-                        isEvery: true,
+                        isEvery,
                         children: mapChildrenField,
                         mapChildren: childrenField
                     });
@@ -3406,7 +3626,7 @@ const Methods = {
                     // 还原虚拟树
                     tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
                         original: true,
-                        isEvery: true,
+                        isEvery,
                         children: mapChildrenField,
                         mapChildren: childrenField
                     });
@@ -3469,7 +3689,7 @@ const Methods = {
                 // 还原虚拟树
                 tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
                     original: true,
-                    isEvery: true,
+                    isEvery,
                     children: treeOpts.mapChildrenField,
                     mapChildren: childrenField
                 });
@@ -3616,6 +3836,7 @@ const Methods = {
      * 默认执行一次，除非被重置
      */
     handleLoadDefaults() {
+        const $xeTable = this;
         if (this.checkboxConfig) {
             this.handleDefaultSelectionChecked();
         }
@@ -3626,7 +3847,7 @@ const Methods = {
             this.handleDefaultRowExpand();
         }
         if (this.treeConfig) {
-            this.handleDefaultTreeExpand();
+            handleDefaultTreeExpand($xeTable);
         }
         if (this.mergeCells) {
             this.handleDefaultMergeCells();
@@ -3814,9 +4035,9 @@ const Methods = {
         return this.refreshColumn(true);
     },
     handleCustomRestore(storeData) {
-        const $xetable = this;
-        const reactData = $xetable;
-        const internalData = $xetable;
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
         let { collectColumn } = internalData;
         const { resizableData, sortData, visibleData, fixedData } = storeData;
         let hasCustomSort = false;
@@ -3885,8 +4106,19 @@ const Methods = {
         }
     },
     getCustomStoreData() {
-        const { id, customOpts, collectColumn } = this;
-        const { checkMethod } = customOpts;
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { id } = props;
+        const customOpts = $xeTable.computeCustomOpts;
+        const { collectColumn } = internalData;
+        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 = {};
@@ -3903,47 +4135,37 @@ const Methods = {
         }
         let hasResizable = 0;
         let hasSort = 0;
-        let hasFixedt = 0;
+        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) {
-                        hasFixedt = 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;
                 }
             }
         });
@@ -3953,7 +4175,7 @@ const Methods = {
         if (hasSort) {
             storeData.sortData = sortData;
         }
-        if (hasFixedt) {
+        if (hasFixed) {
             storeData.fixedData = fixedData;
         }
         if (hasVisible) {
@@ -4441,12 +4663,13 @@ const Methods = {
         const $xeTable = this;
         const internalData = $xeTable;
         const { fullAllDataRowIdData, afterFullData } = internalData;
+        const { handleGetRowId } = createHandleGetRowId($xeTable);
         const rowOpts = $xeTable.computeRowOpts;
         const cellOpts = $xeTable.computeCellOpts;
         const defaultRowHeight = $xeTable.computeDefaultRowHeight;
         const rest = {};
         afterFullData.forEach(row => {
-            const rowid = getRowid($xeTable, row);
+            const rowid = handleGetRowId(row);
             const rowRest = fullAllDataRowIdData[rowid];
             if (rowRest) {
                 const resizeHeight = rowRest.resizeHeight;
@@ -4473,8 +4696,9 @@ const Methods = {
             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;
@@ -4615,6 +4839,8 @@ const Methods = {
         }
     },
     preventEvent(evnt, type, args, next, end) {
+        const $xeTable = this;
+        const $xeGrid = $xeTable.$xeGrid;
         let evntList = interceptor.get(type);
         // 兼容老版本
         if (!evntList.length && type === 'event.clearEdit') {
@@ -4626,8 +4852,22 @@ const Methods = {
             }
         }
         // 兼容老版本
-        let rest;
-        if (!evntList.some(func => func(Object.assign({ $grid: this.$xegrid, $table: this, $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();
             }
@@ -4641,7 +4881,9 @@ const Methods = {
      * 全局按下事件处理
      */
     handleGlobalMousedownEvent(evnt) {
-        const { $el, $refs, $xegrid, $toolbar, mouseConfig, editStore, ctxMenuStore, editRules, editOpts, validOpts, areaOpts, filterStore, customStore, getRowNode } = this;
+        const $xeTable = this;
+        const $xeGrid = $xeTable.$xeGrid;
+        const { $el, $refs, $toolbar, mouseConfig, editStore, ctxMenuStore, editRules, editOpts, validOpts, areaOpts, filterStore, customStore, getRowNode } = this;
         const { actived } = editStore;
         const { customWrapper, refValidTooltip } = $refs;
         const tableFilter = $refs.refTableFilter;
@@ -4731,7 +4973,7 @@ const Methods = {
             }
         }
         else if (mouseConfig) {
-            if (!getEventTargetNode(evnt, $el).flag && !($xegrid && getEventTargetNode(evnt, $xegrid.$el).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.$el).flag) && !($toolbar && getEventTargetNode(evnt, $toolbar.$el).flag)) {
+            if (!getEventTargetNode(evnt, $el).flag && !($xeGrid && getEventTargetNode(evnt, $xeGrid.$el).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.$el).flag) && !($toolbar && getEventTargetNode(evnt, $toolbar.$el).flag)) {
                 if (this.clearSelected) {
                     this.clearSelected();
                 }
@@ -4753,7 +4995,7 @@ const Methods = {
         if (ctxMenuStore.visible && tableMenu && !getEventTargetNode(evnt, tableMenu.$el).flag) {
             this.closeMenu();
         }
-        const isActivated = getEventTargetNode(evnt, ($xegrid || this).$el).flag;
+        const isActivated = getEventTargetNode(evnt, ($xeGrid || this).$el).flag;
         // 如果存在校验，点击了表格之外则清除
         if (!isActivated && editRules && validOpts.autoClear) {
             this.validErrorMaps = {};
@@ -4817,6 +5059,7 @@ const Methods = {
     handleGlobalKeydownEvent(evnt) {
         const $xeTable = this;
         const internalData = $xeTable;
+        const $xeGrid = $xeTable.$xeGrid;
         // 该行为只对当前激活的表格有效
         if (this.isActivated) {
             this.preventEvent(evnt, 'event.keydown', null, () => {
@@ -4915,7 +5158,7 @@ const Methods = {
                                     this.moveTabSelected(activeParams, hasShiftKey, evnt);
                                 }
                                 else {
-                                    this.moveSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
+                                    this.moveEnterSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
                                 }
                             }
                             else {
@@ -4949,7 +5192,7 @@ const Methods = {
                                                 return;
                                             }
                                         }
-                                        this.moveSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
+                                        this.moveEnterSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
                                         if (enterMethod) {
                                             enterMethod(etrParams);
                                         }
@@ -4975,11 +5218,7 @@ const Methods = {
                     if (!isEditStatus) {
                         // 如果按下了方向键
                         if (selected.row && selected.column) {
-                            this.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
-                        }
-                        else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-                            // 当前行按键上下移动
-                            this.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+                            $xeTable.moveArrowSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
                         }
                     }
                 }
@@ -5002,7 +5241,7 @@ const Methods = {
                             column: selected.column,
                             columnIndex: this.getColumnIndex(selected.column),
                             $table: this,
-                            $grid: this.$xegrid
+                            $grid: $xeGrid
                         };
                         // 是否被禁用
                         if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -5029,7 +5268,7 @@ const Methods = {
                                 column: selected.column,
                                 columnIndex: this.getColumnIndex(selected.column),
                                 $table: this,
-                                $grid: this.$xegrid
+                                $grid: $xeGrid
                             };
                             // 是否被禁用
                             if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -5058,7 +5297,7 @@ const Methods = {
                             rowIndex: this.getRowIndex(parentRow),
                             $rowIndex: this.getVMRowIndex(parentRow),
                             $table: this,
-                            $grid: this.$xegrid
+                            $grid: $xeGrid
                         };
                         this.setTreeExpand(parentRow, false)
                             .then(() => this.scrollToRow(parentRow))
@@ -5080,7 +5319,7 @@ const Methods = {
                             column: selected.column,
                             columnIndex: this.getColumnIndex(selected.column),
                             $table: this,
-                            $grid: this.$xegrid
+                            $grid: $xeGrid
                         };
                         if (!beforeEditMethod || beforeEditMethod(params)) {
                             if (editMethod) {
@@ -5201,7 +5440,7 @@ const Methods = {
             return;
         }
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-            handleTooltip($xeTable, evnt, thEl, cellEl, null, params);
+            handleTooltip($xeTable, evnt, thEl, thEl.querySelector('.vxe-cell--title') || cellEl, params);
         }
     },
     /**
@@ -5231,7 +5470,7 @@ const Methods = {
             }
         }
         if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-            handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), null, params);
+            handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
         }
     },
     /**
@@ -5242,10 +5481,10 @@ const Methods = {
         const reactData = $xeTable;
         const { column } = params;
         const { tooltipStore } = reactData;
-        const cell = evnt.currentTarget;
+        const tdEl = evnt.currentTarget;
         handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row);
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-            handleTooltip($xeTable, evnt, cell, cell.querySelector('.vxe-cell--wrapper') || cell.children[0], null, params);
+            handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
         }
     },
     openTooltip(target, content) {
@@ -5302,11 +5541,15 @@ const Methods = {
      * 获取复选框半选状态的行数据
      */
     getCheckboxIndeterminateRecords(isFull) {
-        const { treeConfig, treeIndeterminateMaps, fullDataRowIdData } = this;
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        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]) {
@@ -5376,20 +5619,22 @@ const Methods = {
     isCheckedByCheckboxRow(row) {
         const $xeTable = this;
         const reactData = $xeTable;
-        const { selectCheckboxMaps } = reactData;
+        const internalData = $xeTable;
+        const { updateCheckboxFlag } = reactData;
+        const { selectCheckboxMaps } = internalData;
         const checkboxOpts = $xeTable.computeCheckboxOpts;
         const { checkField } = checkboxOpts;
         if (checkField) {
             return XEUtils.get(row, checkField);
         }
-        return !!selectCheckboxMaps[getRowid($xeTable, row)];
+        return !!updateCheckboxFlag && !!selectCheckboxMaps[getRowid($xeTable, row)];
     },
     isCheckedByCheckboxRowKey(rowid) {
         const $xeTable = this;
         const reactData = $xeTable;
         const internalData = $xeTable;
-        const { selectCheckboxMaps } = reactData;
-        const { fullAllDataRowIdData } = internalData;
+        const { updateCheckboxFlag } = reactData;
+        const { fullAllDataRowIdData, selectCheckboxMaps } = internalData;
         const checkboxOpts = $xeTable.computeCheckboxOpts;
         const { checkField } = checkboxOpts;
         if (checkField) {
@@ -5399,19 +5644,19 @@ const Methods = {
             }
             return false;
         }
-        return !!selectCheckboxMaps[rowid];
+        return !!updateCheckboxFlag && !!selectCheckboxMaps[rowid];
     },
     isIndeterminateByCheckboxRow(row) {
         const $xeTable = this;
-        const reactData = $xeTable;
-        const { treeIndeterminateMaps } = reactData;
-        return !!treeIndeterminateMaps[getRowid($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row);
+        const internalData = $xeTable;
+        const { treeIndeterminateRowMaps } = internalData;
+        return !!treeIndeterminateRowMaps[getRowid($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row);
     },
     isIndeterminateByCheckboxRowKey(rowid) {
         const $xeTable = this;
-        const reactData = $xeTable;
-        const { treeIndeterminateMaps } = reactData;
-        return !!treeIndeterminateMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid);
+        const internalData = $xeTable;
+        const { treeIndeterminateRowMaps } = internalData;
+        return !!treeIndeterminateRowMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid);
     },
     /**
      * 切换选中
@@ -5421,14 +5666,16 @@ const Methods = {
         const $xeTable = this;
         const props = $xeTable;
         const reactData = $xeTable;
+        const internalData = $xeTable;
         const { treeConfig } = props;
-        const { selectCheckboxMaps } = reactData;
-        const selectRowMaps = Object.assign({}, selectCheckboxMaps);
+        const { selectCheckboxMaps } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const { transform, mapChildrenField } = treeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const checkboxOpts = $xeTable.computeCheckboxOpts;
         const { checkField, checkStrictly, checkMethod } = checkboxOpts;
+        const { handleGetRowId } = createHandleGetRowId($xeTable);
+        // indeterminateField 仅支持读取
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
         if (checkField) {
             // 树结构
@@ -5443,59 +5690,57 @@ const Methods = {
                         handleCheckboxReserveRow($xeTable, 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($xeTable, row, checked);
-                    }
-                });
-            }
-            reactData.selectCheckboxMaps = selectRowMaps;
+            // 列表
+            rows.forEach(row => {
+                if (isForce || (!checkMethod || checkMethod({ row }))) {
+                    XEUtils.set(row, checkField, checked);
+                    handleCheckboxReserveRow($xeTable, 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($xeTable, 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($xeTable, row, checked);
+                reactData.updateCheckboxFlag++;
             }
         });
-        reactData.selectCheckboxMaps = selectRowMaps;
     },
     /**
      * 即将移除
@@ -5506,7 +5751,10 @@ const Methods = {
         $xeTable.handleBatchSelectRows([row], checked, isForce);
     },
     handleToggleCheckRowEvent(evnt, params) {
-        const { selectCheckboxMaps, checkboxOpts } = this;
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const { selectCheckboxMaps } = internalData;
+        const checkboxOpts = $xeTable.computeCheckboxOpts;
         const { checkField, trigger } = checkboxOpts;
         const { row } = params;
         if (trigger === 'manual') {
@@ -5517,47 +5765,52 @@ const Methods = {
             checked = !XEUtils.get(row, checkField);
         }
         else {
-            checked = !selectCheckboxMaps[getRowid(this, row)];
+            checked = !selectCheckboxMaps[getRowid($xeTable, row)];
         }
         if (evnt) {
-            this.triggerCheckRowEvent(evnt, params, checked);
+            $xeTable.triggerCheckRowEvent(evnt, params, checked);
         }
         else {
-            this.handleSelectRow(params, checked);
-            this.checkSelectionStatus();
+            $xeTable.handleBatchSelectRows([row], checked);
+            $xeTable.checkSelectionStatus();
         }
     },
     triggerCheckRowEvent(evnt, params, checked) {
         const $xeTable = this;
-        const { checkboxOpts, afterFullData } = this;
-        const { checkMethod, trigger } = checkboxOpts;
+        const props = $xeTable;
+        const internalData = $xeTable;
         const { row } = params;
+        const { afterFullData } = internalData;
+        const checkboxOpts = $xeTable.computeCheckboxOpts;
+        const { checkMethod, trigger } = checkboxOpts;
         if (trigger === 'manual') {
             return;
         }
         evnt.stopPropagation();
-        if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
-            const checkboxRecords = this.getCheckboxRecords();
+        if (checkboxOpts.isShiftKey && evnt.shiftKey && !props.treeConfig) {
+            const checkboxRecords = $xeTable.getCheckboxRecords();
             if (checkboxRecords.length) {
                 const firstRow = checkboxRecords[0];
-                const _rowIndex = this.getVTRowIndex(row);
-                const _firstRowIndex = this.getVTRowIndex(firstRow);
+                const _rowIndex = $xeTable.getVTRowIndex(row);
+                const _firstRowIndex = $xeTable.getVTRowIndex(firstRow);
                 if (_rowIndex !== _firstRowIndex) {
-                    this.setAllCheckboxRow(false);
+                    $xeTable.setAllCheckboxRow(false);
                     const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1);
-                    handleCheckedCheckboxRow($xeTable, rangeRows, true, false);
-                    this.emitEvent('checkbox-range-select', Object.assign({ rangeRecords: rangeRows }, params), evnt);
+                    $xeTable.$nextTick(() => {
+                        handleCheckedCheckboxRow($xeTable, rangeRows, true, false);
+                    });
+                    $xeTable.dispatchEvent('checkbox-range-select', Object.assign({ rangeRecords: rangeRows }, params), evnt);
                     return;
                 }
             }
         }
         if (!checkMethod || checkMethod({ row })) {
-            this.handleSelectRow(params, checked);
-            this.checkSelectionStatus();
-            this.emitEvent('checkbox-change', Object.assign({
-                records: this.getCheckboxRecords(),
-                reserves: this.getCheckboxReserveRecords(),
-                indeterminates: this.getCheckboxIndeterminateRecords(),
+            $xeTable.handleBatchSelectRows([row], checked);
+            $xeTable.checkSelectionStatus();
+            $xeTable.dispatchEvent('checkbox-change', Object.assign({
+                records: () => $xeTable.getCheckboxRecords(),
+                reserves: () => $xeTable.getCheckboxReserveRecords(),
+                indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
                 checked
             }, params), evnt);
         }
@@ -5567,7 +5820,9 @@ const Methods = {
      */
     toggleCheckboxRow(row) {
         const $xeTable = this;
-        const { selectCheckboxMaps, checkboxOpts } = this;
+        const internalData = $xeTable;
+        const { selectCheckboxMaps } = internalData;
+        const checkboxOpts = $xeTable.computeCheckboxOpts;
         const { checkField } = checkboxOpts;
         const checked = checkField ? !XEUtils.get(row, checkField) : !selectCheckboxMaps[getRowid($xeTable, row)];
         $xeTable.handleBatchSelectRows([row], checked, true);
@@ -5588,9 +5843,7 @@ const Methods = {
         const reactData = $xeTable;
         const internalData = $xeTable;
         const { treeConfig } = props;
-        const { selectCheckboxMaps, treeIndeterminateMaps } = reactData;
-        const selectRowMaps = Object.assign({}, selectCheckboxMaps);
-        const halfRowMaps = Object.assign({}, treeIndeterminateMaps);
+        const { selectCheckboxMaps, treeIndeterminateRowMaps } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const { transform, mapChildrenField } = treeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -5602,10 +5855,11 @@ const Methods = {
         }
         // 树结构
         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;
@@ -5621,13 +5875,13 @@ const Methods = {
                 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++;
@@ -5636,18 +5890,18 @@ const Methods = {
                             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++;
@@ -5659,31 +5913,30 @@ const Methods = {
                 }
                 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 $xeTable = this;
@@ -5691,23 +5944,23 @@ const Methods = {
         const reactData = $xeTable;
         const internalData = $xeTable;
         const { treeConfig } = props;
-        const { selectCheckboxMaps, treeIndeterminateMaps } = reactData;
+        const { afterFullData, afterTreeFullData, checkboxReserveRowMap, selectCheckboxMaps, treeIndeterminateRowMaps } = internalData;
         const checkboxOpts = $xeTable.computeCheckboxOpts;
         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++;
@@ -5716,18 +5969,18 @@ const Methods = {
                     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++;
@@ -5784,19 +6037,26 @@ const Methods = {
      * 获取复选框保留选中的行
      */
     getCheckboxReserveRecords(isFull) {
-        const { fullDataRowIdData, afterFullData, checkboxReserveRowMap, checkboxOpts, treeConfig, treeOpts } = this;
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { afterFullData, fullDataRowIdData, checkboxReserveRowMap } = internalData;
+        const checkboxOpts = $xeTable.computeCheckboxOpts;
+        const treeOpts = $xeTable.computeTreeOpts;
         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(this, row)] = 1;
+                    afterFullIdMaps[handleGetRowId(row)] = 1;
                 }, { children: childrenField });
             }
             else {
                 afterFullData.forEach((row) => {
-                    afterFullIdMaps[getRowid(this, row)] = 1;
+                    afterFullIdMaps[handleGetRowId(row)] = 1;
                 });
             }
             XEUtils.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
@@ -5837,9 +6097,9 @@ const Methods = {
         handleCheckedAllCheckboxRow($xeTable, value);
         if (evnt) {
             $xeTable.dispatchEvent('checkbox-all', {
-                records: $xeTable.getCheckboxRecords(),
-                reserves: $xeTable.getCheckboxReserveRecords(),
-                indeterminates: $xeTable.getCheckboxIndeterminateRecords(),
+                records: () => $xeTable.getCheckboxRecords(),
+                reserves: () => $xeTable.getCheckboxReserveRecords(),
+                indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
                 checked: value
             }, evnt);
         }
@@ -5871,9 +6131,17 @@ const Methods = {
      * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
      */
     clearCheckboxRow() {
-        const { tableFullData, treeConfig, treeOpts, checkboxOpts } = this;
-        const { checkField, reserve } = checkboxOpts;
+        const $xeTable = this;
+        const props = $xeTable;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { treeConfig } = props;
+        const { tableFullData } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
+        const checkboxOpts = $xeTable.computeCheckboxOpts;
+        const { checkField, reserve } = checkboxOpts;
+        // indeterminateField 仅支持读取
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
         if (checkField) {
             const handleClearChecked = (item) => {
@@ -5892,10 +6160,11 @@ const Methods = {
         if (reserve) {
             tableFullData.forEach((row) => this.handleCheckboxReserveRow(row, false));
         }
-        this.isAllSelected = false;
-        this.isIndeterminate = false;
-        this.selectCheckboxMaps = {};
-        this.treeIndeterminateMaps = {};
+        reactData.isAllSelected = false;
+        reactData.isIndeterminate = false;
+        internalData.selectCheckboxMaps = {};
+        internalData.treeIndeterminateRowMaps = {};
+        reactData.updateCheckboxFlag++;
         return this.$nextTick();
     },
     /**
@@ -6092,10 +6361,12 @@ const Methods = {
     },
     triggerHeaderCellClickEvent(evnt, params) {
         const $xeTable = this;
+        const props = $xeTable;
         const internalData = $xeTable;
         const { _lastResizeTime } = internalData;
         const sortOpts = $xeTable.computeSortOpts;
         const columnOpts = $xeTable.computeColumnOpts;
+        const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
         const { column } = params;
         const cell = evnt.currentTarget;
         const triggerResizable = _lastResizeTime && _lastResizeTime > Date.now() - 300;
@@ -6105,7 +6376,7 @@ const Methods = {
             $xeTable.triggerSortEvent(evnt, column, getNextSortOrder($xeTable, column));
         }
         $xeTable.dispatchEvent('header-cell-click', Object.assign({ triggerResizable, triggerSort, triggerFilter, cell }, params), evnt);
-        if (columnOpts.isCurrent || $xeTable.highlightCurrentColumn) {
+        if ((columnOpts.isCurrent || props.highlightCurrentColumn) && (!currentColumnOpts.trigger || ['header', 'default'].includes(currentColumnOpts.trigger))) {
             $xeTable.triggerCurrentColumnEvent(evnt, params);
         }
         return $xeTable.$nextTick();
@@ -6121,13 +6392,23 @@ const Methods = {
      * @param {ColumnInfo} fieldOrColumn 列配置
      */
     setCurrentColumn(fieldOrColumn) {
-        const column = handleFieldOrColumn(this, fieldOrColumn);
+        const $xeTable = this;
+        const props = $xeTable;
+        const reactData = $xeTable;
+        const { mouseConfig } = props;
+        const mouseOpts = $xeTable.computeMouseOpts;
+        const isMouseSelected = mouseConfig && mouseOpts.selected;
+        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
         if (column) {
-            // this.clearCurrentRow()
-            this.clearCurrentColumn();
-            this.currentColumn = column;
+            $xeTable.clearCurrentColumn();
+            reactData.currentColumn = column;
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick().then(() => {
+            // 更新状选中态
+            if (isMouseSelected) {
+                $xeTable.addCellSelectedClass();
+            }
+        });
     },
     /**
      * 用于当前列，手动清空当前高亮的状态
@@ -6136,25 +6417,6 @@ const Methods = {
         this.currentColumn = null;
         return this.$nextTick();
     },
-    checkValidate(type) {
-        if (this.triggerValidate) {
-            return this.triggerValidate(type);
-        }
-        return this.$nextTick();
-    },
-    /**
-     * 当单元格发生改变时
-     * 如果存在规则，则校验
-     */
-    handleChangeCell(evnt, params) {
-        this.checkValidate('blur')
-            .catch((e) => e)
-            .then(() => {
-            this.handleEdit(params, evnt)
-                .then(() => this.checkValidate('change'))
-                .catch((e) => e);
-        });
-    },
     /**
      * 列点击事件
      * 如果是单击模式，则激活为编辑状态
@@ -6164,7 +6426,7 @@ const Methods = {
         const $xeTable = this;
         const props = $xeTable;
         const reactData = $xeTable;
-        const { highlightCurrentRow, editConfig } = props;
+        const { highlightCurrentRow, highlightCurrentColumn, editConfig } = props;
         const { editStore, isDragResize } = reactData;
         if (isDragResize) {
             return;
@@ -6176,6 +6438,8 @@ const Methods = {
         const checkboxOpts = $xeTable.computeCheckboxOpts;
         const keyboardOpts = $xeTable.computeKeyboardOpts;
         const rowOpts = $xeTable.computeRowOpts;
+        const columnOpts = $xeTable.computeColumnOpts;
+        const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
         const { actived, focused } = editStore;
         const { row, column } = params;
         const { type, treeNode } = column;
@@ -6191,11 +6455,11 @@ const Methods = {
         if (!triggerCheckbox && !triggerRadio) {
             // 如果是展开行
             if (!triggerExpandNode && (expandOpts.trigger === 'row' || (isExpandType && expandOpts.trigger === 'cell'))) {
-                this.triggerRowExpandEvent(evnt, params);
+                $xeTable.triggerRowExpandEvent(evnt, params);
             }
             // 如果是树形表格
             if ((treeOpts.trigger === 'row' || (treeNode && treeOpts.trigger === 'cell'))) {
-                this.triggerTreeExpandEvent(evnt, params);
+                $xeTable.triggerTreeExpandEvent(evnt, params);
             }
         }
         // 如果点击了树节点
@@ -6204,16 +6468,22 @@ const Methods = {
                 // 如果是高亮行
                 if (rowOpts.isCurrent || highlightCurrentRow) {
                     if (!triggerCheckbox && !triggerRadio) {
-                        this.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'))) {
-                    this.triggerRadioRowEvent(evnt, params);
+                    $xeTable.triggerRadioRowEvent(evnt, params);
                 }
                 // 如果是复选框
                 if (!triggerCheckbox && (checkboxOpts.trigger === 'row' || (isCheckboxType && checkboxOpts.trigger === 'cell'))) {
-                    this.handleToggleCheckRowEvent(evnt, params);
+                    $xeTable.handleToggleCheckRowEvent(evnt, params);
                 }
             }
             // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
@@ -6225,16 +6495,16 @@ const Methods = {
                 }
                 if (editOpts.trigger === 'manual') {
                     if (actived.args && actived.row === row && column !== actived.column) {
-                        this.handleChangeCell(evnt, params);
+                        handleChangeCell($xeTable, evnt, params);
                     }
                 }
                 else if (!actived.args || row !== actived.row || column !== actived.column) {
                     if (editOpts.trigger === 'click') {
-                        this.handleChangeCell(evnt, params);
+                        handleChangeCell($xeTable, evnt, params);
                     }
                     else if (editOpts.trigger === 'dblclick') {
                         if (editOpts.mode === 'row' && actived.row === row) {
-                            this.handleChangeCell(evnt, params);
+                            handleChangeCell($xeTable, evnt, params);
                         }
                     }
                 }
@@ -6255,7 +6525,7 @@ const Methods = {
                 }
             }
         }
-        this.emitEvent('cell-click', params, evnt);
+        $xeTable.dispatchEvent('cell-click', params, evnt);
     },
     /**
      * 列双击点击事件
@@ -6277,17 +6547,17 @@ const Methods = {
         if (isEnableConf(editConfig) && editOpts.trigger === 'dblclick') {
             if (!actived.args || evnt.currentTarget !== actived.args.cell) {
                 if (editOpts.mode === 'row') {
-                    this.checkValidate('blur')
+                    checkValidate($xeTable, 'blur')
                         .catch((e) => e)
                         .then(() => {
                         this.handleEdit(params, evnt)
-                            .then(() => this.checkValidate('change'))
+                            .then(() => checkValidate($xeTable, 'change'))
                             .catch((e) => e);
                     });
                 }
                 else if (editOpts.mode === 'cell') {
                     this.handleEdit(params, evnt)
-                        .then(() => this.checkValidate('change'))
+                        .then(() => checkValidate($xeTable, 'change'))
                         .catch((e) => e);
                 }
             }
@@ -6473,14 +6743,16 @@ const Methods = {
         const internalData = $xeTable;
         const { treeConfig, dragConfig } = props;
         const rowDragOpts = $xeTable.computeRowDragOpts;
-        const { fullAllDataRowIdData } = internalData;
+        const { afterFullData, tableFullData, fullAllDataRowIdData } = internalData;
         const { isPeerDrag, isCrossDrag, isSelfToChildDrag, dragEndMethod, dragToChildMethod } = rowDragOpts;
         const treeOpts = $xeTable.computeTreeOpts;
         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) {
@@ -6495,7 +6767,7 @@ const Methods = {
                 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;
@@ -6520,12 +6792,12 @@ const Methods = {
                                     if (isPeerDrag && !isCrossDrag) {
                                         if (oldRest.row[parentField] !== newRest.row[parentField]) {
                                             // 非同级
-                                            return;
+                                            return errRest;
                                         }
                                     }
                                     else {
                                         if (!isCrossDrag) {
-                                            return;
+                                            return errRest;
                                         }
                                         if (oldAllMaps[newRowid]) {
                                             isSelfToChildStatus = true;
@@ -6536,7 +6808,7 @@ const Methods = {
                                                         content: getI18n('vxe.error.treeDragChild')
                                                     });
                                                 }
-                                                return;
+                                                return errRest;
                                             }
                                         }
                                     }
@@ -6544,13 +6816,13 @@ const Methods = {
                                 else if (oldLevel) {
                                     // 子到根
                                     if (!isCrossDrag) {
-                                        return;
+                                        return errRest;
                                     }
                                 }
                                 else if (newLevel) {
                                     // 根到子
                                     if (!isCrossDrag) {
-                                        return;
+                                        return errRest;
                                     }
                                     if (oldAllMaps[newRowid]) {
                                         isSelfToChildStatus = true;
@@ -6561,7 +6833,7 @@ const Methods = {
                                                     content: getI18n('vxe.error.treeDragChild')
                                                 });
                                             }
-                                            return;
+                                            return errRest;
                                         }
                                     }
                                 }
@@ -6621,27 +6893,34 @@ const Methods = {
                     if (reactData.scrollYLoad) {
                         $xeTable.updateScrollYSpace();
                     }
-                    $xeTable.$nextTick().then(() => {
+                    if (evnt) {
+                        $xeTable.dispatchEvent('row-dragend', {
+                            oldRow: dragRow,
+                            newRow: prevDragRow,
+                            dragRow,
+                            dragPos: prevDragPos,
+                            dragToChild: isDragToChildFlag,
+                            offsetIndex: dragOffsetIndex,
+                            _index: {
+                                newIndex: nafIndex,
+                                oldIndex: oafIndex
+                            }
+                        }, evnt);
+                    }
+                    return $xeTable.$nextTick().then(() => {
                         $xeTable.updateCellAreas();
                         $xeTable.recalculate();
+                    }).then(() => {
+                        return {
+                            status: true
+                        };
                     });
-                    $xeTable.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 $xeTable = this;
@@ -6786,6 +7065,9 @@ const Methods = {
         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) {
@@ -6802,7 +7084,7 @@ const Methods = {
                 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;
@@ -6816,12 +7098,12 @@ const Methods = {
                         if (isPeerDrag && !isCrossDrag) {
                             if (dragColumn.parentId !== newColumn.parentId) {
                                 // 非同级
-                                return;
+                                return errRest;
                             }
                         }
                         else {
                             if (!isCrossDrag) {
-                                return;
+                                return errRest;
                             }
                             if (oldAllMaps[newColumn.id]) {
                                 isSelfToChildStatus = true;
@@ -6832,7 +7114,7 @@ const Methods = {
                                             content: getI18n('vxe.error.treeDragChild')
                                         });
                                     }
-                                    return;
+                                    return errRest;
                                 }
                             }
                         }
@@ -6840,13 +7122,13 @@ const Methods = {
                     else if (dragColumn.parentId) {
                         // 子到根
                         if (!isCrossDrag) {
-                            return;
+                            return errRest;
                         }
                     }
                     else if (newColumn.parentId) {
                         // 根到子
                         if (!isCrossDrag) {
-                            return;
+                            return errRest;
                         }
                         if (oldAllMaps[newColumn.id]) {
                             isSelfToChildStatus = true;
@@ -6857,7 +7139,7 @@ const Methods = {
                                         content: getI18n('vxe.error.treeDragChild')
                                     });
                                 }
-                                return;
+                                return errRest;
                             }
                         }
                     }
@@ -6918,26 +7200,32 @@ const Methods = {
                             $xeTable.clearCopyCellArea();
                         }
                     }
-                    $xeTable.dispatchEvent('column-dragend', {
-                        oldColumn: dragColumn,
-                        newColumn,
-                        dragColumn,
-                        dragPos: prevDragPos,
-                        dragToChild: isDragToChildFlag,
-                        offsetIndex: dragOffsetIndex,
-                        _index: {
-                            newIndex: nafIndex,
-                            oldIndex: oafIndex
-                        }
-                    }, evnt);
+                    if (evnt) {
+                        $xeTable.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 $xeTable = this;
@@ -7063,48 +7351,52 @@ const Methods = {
     setPendingRow(rows, status) {
         const $xeTable = this;
         const reactData = $xeTable;
-        const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
+        const internalData = $xeTable;
+        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 $xeTable.$nextTick();
     },
     togglePendingRow(rows) {
         const $xeTable = this;
         const reactData = $xeTable;
-        const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
+        const internalData = $xeTable;
+        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 $xeTable.$nextTick();
     },
     hasPendingByRow(row) {
@@ -7120,10 +7412,8 @@ const Methods = {
     },
     getPendingRecords() {
         const $xeTable = this;
-        const reactData = $xeTable;
         const internalData = $xeTable;
-        const { pendingRowMaps } = reactData;
-        const { fullAllDataRowIdData } = internalData;
+        const { fullAllDataRowIdData, pendingRowMaps } = internalData;
         const insertRecords = [];
         XEUtils.each(pendingRowMaps, (row, rowid) => {
             if (fullAllDataRowIdData[rowid]) {
@@ -7133,8 +7423,12 @@ const Methods = {
         return insertRecords;
     },
     clearPendingRow() {
-        this.pendingRowMaps = {};
-        return this.$nextTick();
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        internalData.pendingRowMaps = {};
+        reactData.pendingRowFlag++;
+        return $xeTable.$nextTick();
     },
     sort(sortConfs, sortOrder) {
         const $xeTable = this;
@@ -7285,7 +7579,9 @@ const Methods = {
      * @param {Event} evnt 事件
      */
     closeFilter() {
-        const { filterStore } = this;
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const { filterStore } = reactData;
         const { column, visible } = filterStore;
         Object.assign(filterStore, {
             isAllSelected: false,
@@ -7294,9 +7590,15 @@ const Methods = {
             visible: false
         });
         if (visible) {
-            this.emitEvent('filter-visible', { column, field: column.field, property: column.field, filterList: this.getCheckedFilters(), visible: false }, null);
+            $xeTable.dispatchEvent('filter-visible', {
+                column,
+                field: column.field,
+                property: column.field,
+                filterList: () => $xeTable.getCheckedFilters(),
+                visible: false
+            }, null);
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     /**
      * 判断指定列是否为筛选状态，如果为空则判断所有列
@@ -7327,17 +7629,16 @@ const Methods = {
         const $xeTable = this;
         const reactData = $xeTable;
         const internalData = $xeTable;
-        const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
-        const { fullAllDataRowIdData } = internalData;
+        const { fullAllDataRowIdData, rowExpandLazyLoadedMaps } = internalData;
         const expandOpts = $xeTable.computeExpandOpts;
         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 $xeTable.$nextTick();
     },
     /**
@@ -7345,14 +7646,17 @@ const Methods = {
      * @param {Row} row 行对象
      */
     reloadRowExpand(row) {
-        const { expandOpts, rowExpandLazyLoadedMaps } = this;
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const { rowExpandLazyLoadedMaps } = internalData;
+        const expandOpts = $xeTable.computeExpandOpts;
         const { lazy } = expandOpts;
         const rowid = getRowid(this, row);
         if (lazy && !rowExpandLazyLoadedMaps[rowid]) {
-            this.clearRowExpandLoaded(row)
-                .then(() => this.handleAsyncRowExpand(row));
+            $xeTable.clearRowExpandLoaded(row)
+                .then(() => handleAsyncRowExpand($xeTable, row));
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     reloadExpandContent(row) {
         if (process.env.NODE_ENV === 'development') {
@@ -7365,20 +7669,33 @@ const Methods = {
      * 展开行事件
      */
     triggerRowExpandEvent(evnt, params) {
-        const { expandOpts, rowExpandLazyLoadedMaps, expandColumn: column } = this;
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { expandColumn: column } = reactData;
+        const { rowExpandLazyLoadedMaps } = internalData;
+        const expandOpts = $xeTable.computeExpandOpts;
         const { row } = params;
         const { lazy, trigger } = expandOpts;
         if (trigger === 'manual') {
             return;
         }
         evnt.stopPropagation();
-        const rowid = getRowid(this, row);
+        const rowid = getRowid($xeTable, row);
         if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
-            const expanded = !this.isRowExpandByRow(row);
-            const columnIndex = this.getColumnIndex(column);
-            const $columnIndex = this.getVMColumnIndex(column);
-            this.setRowExpand(row, expanded);
-            this.emitEvent('toggle-row-expand', { expanded, column, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) }, evnt);
+            const expanded = !$xeTable.isRowExpandByRow(row);
+            const columnIndex = $xeTable.getColumnIndex(column);
+            const $columnIndex = $xeTable.getVMColumnIndex(column);
+            $xeTable.setRowExpand(row, expanded);
+            $xeTable.dispatchEvent('toggle-row-expand', {
+                expanded,
+                column,
+                columnIndex,
+                $columnIndex,
+                row,
+                rowIndex: $xeTable.getRowIndex(row),
+                $rowIndex: $xeTable.getVMRowIndex(row)
+            }, evnt);
         }
     },
     /**
@@ -7424,48 +7741,6 @@ const Methods = {
         }
         return this.setRowExpand(expandedRows, expanded);
     },
-    handleAsyncRowExpand(row) {
-        const $xeTable = this;
-        const reactData = $xeTable;
-        const internalData = $xeTable;
-        return new Promise(resolve => {
-            const { expandOpts } = this;
-            const { loadMethod } = expandOpts;
-            if (loadMethod) {
-                const { fullAllDataRowIdData } = internalData;
-                const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
-                const rowid = getRowid($xeTable, row);
-                const rowRest = fullAllDataRowIdData[rowid];
-                rExpandLazyLoadedMaps[rowid] = row;
-                reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
-                loadMethod({ $table: $xeTable, row, rowIndex: $xeTable.getRowIndex(row), $rowIndex: $xeTable.getVMRowIndex(row) }).then(() => {
-                    const rExpandedMaps = Object.assign({}, reactData.rowExpandedMaps);
-                    if (rowRest) {
-                        rowRest.expandLoaded = true;
-                    }
-                    rExpandedMaps[rowid] = row;
-                    reactData.rowExpandedMaps = rExpandedMaps;
-                }).catch(() => {
-                    if (rowRest) {
-                        rowRest.expandLoaded = false;
-                    }
-                }).finally(() => {
-                    const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
-                    if (rExpandLazyLoadedMaps[rowid]) {
-                        delete rExpandLazyLoadedMaps[rowid];
-                    }
-                    reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
-                    $xeTable.$nextTick()
-                        .then(() => $xeTable.recalculate())
-                        .then(() => $xeTable.updateCellAreas())
-                        .then(() => resolve());
-                });
-            }
-            else {
-                resolve();
-            }
-        });
-    },
     /**
      * 设置展开行，二个参数设置这一行展开与否
      * 支持单行
@@ -7475,8 +7750,12 @@ const Methods = {
      */
     setRowExpand(rows, expanded) {
         const $xeTable = this;
-        const { rowExpandedMaps, fullAllDataRowIdData, rowExpandLazyLoadedMaps, expandOpts, expandColumn } = this;
-        let rExpandedMaps = Object.assign({}, rowExpandedMaps);
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { expandColumn } = reactData;
+        let { fullAllDataRowIdData, rowExpandedMaps, rowExpandLazyLoadedMaps } = internalData;
+        const { handleGetRowId } = createHandleGetRowId($xeTable);
+        const expandOpts = $xeTable.computeExpandOpts;
         const { reserve, lazy, accordion, toggleMethod } = expandOpts;
         const lazyRests = [];
         const columnIndex = $xeTable.getColumnIndex(expandColumn);
@@ -7487,30 +7766,31 @@ const Methods = {
             }
             if (accordion) {
                 // 只能同时展开一个
-                rExpandedMaps = {};
+                rowExpandedMaps = {};
+                internalData.rowExpandedMaps = rowExpandedMaps;
                 rows = rows.slice(rows.length - 1, rows.length);
             }
-            const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows;
+            const validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows;
             if (expanded) {
                 validRows.forEach((row) => {
-                    const rowid = getRowid(this, 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(this.handleAsyncRowExpand(row));
+                            lazyRests.push(handleAsyncRowExpand($xeTable, row));
                         }
                         else {
-                            rExpandedMaps[rowid] = row;
+                            rowExpandedMaps[rowid] = row;
                         }
                     }
                 });
             }
             else {
                 validRows.forEach((item) => {
-                    const rowid = getRowid(this, item);
-                    if (rExpandedMaps[rowid]) {
-                        delete rExpandedMaps[rowid];
+                    const rowid = handleGetRowId(item);
+                    if (rowExpandedMaps[rowid]) {
+                        delete rowExpandedMaps[rowid];
                     }
                 });
             }
@@ -7518,7 +7798,7 @@ const Methods = {
                 validRows.forEach((row) => handleRowExpandReserve($xeTable, row, expanded));
             }
         }
-        this.rowExpandedMaps = rExpandedMaps;
+        reactData.rowExpandedFlag++;
         return Promise.all(lazyRests)
             .then(() => $xeTable.$nextTick())
             .then(() => $xeTable.recalculate(true))
@@ -7534,9 +7814,13 @@ const Methods = {
      * @param {Row} row 行对象
      */
     isRowExpandByRow(row) {
-        const { rowExpandedMaps } = this;
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { rowExpandedFlag } = reactData;
+        const { rowExpandedMaps } = internalData;
         const rowid = getRowid(this, row);
-        return !!rowExpandedMaps[rowid];
+        return !!rowExpandedFlag && !!rowExpandedMaps[rowid];
     },
     isExpandByRow(row) {
         if (process.env.NODE_ENV === 'development') {
@@ -7556,7 +7840,8 @@ const Methods = {
         const expandOpts = $xeTable.computeExpandOpts;
         const { reserve } = expandOpts;
         const expList = $xeTable.getRowExpandRecords();
-        reactData.rowExpandedMaps = {};
+        internalData.rowExpandedMaps = {};
+        reactData.rowExpandedFlag++;
         if (reserve) {
             tableFullData.forEach((row) => handleRowExpandReserve($xeTable, row, false));
         }
@@ -7576,8 +7861,10 @@ const Methods = {
         return this.$nextTick();
     },
     getRowExpandRecords() {
+        const $xeTable = this;
+        const internalData = $xeTable;
         const rest = [];
-        XEUtils.each(this.rowExpandedMaps, item => {
+        XEUtils.each(internalData.rowExpandedMaps, item => {
             if (item) {
                 rest.push(item);
             }
@@ -7585,8 +7872,10 @@ const Methods = {
         return rest;
     },
     getTreeExpandRecords() {
+        const $xeTable = this;
+        const internalData = $xeTable;
         const rest = [];
-        XEUtils.each(this.treeExpandedMaps, item => {
+        XEUtils.each(internalData.treeExpandedMaps, item => {
             if (item) {
                 rest.push(item);
             }
@@ -7619,12 +7908,10 @@ const Methods = {
         const $xeTable = this;
         const reactData = $xeTable;
         const internalData = $xeTable;
-        const { fullAllDataRowIdData } = internalData;
+        const { fullAllDataRowIdData, treeExpandedMaps } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const { transform } = treeOpts;
-        let tExpandedMaps = {};
         if (rows) {
-            tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
             if (!XEUtils.isArray(rows)) {
                 rows = [rows];
             }
@@ -7633,8 +7920,8 @@ const Methods = {
                 const rowRest = fullAllDataRowIdData[rowid];
                 if (rowRest) {
                     rowRest.treeLoaded = false;
-                    if (tExpandedMaps[rowid]) {
-                        delete tExpandedMaps[rowid];
+                    if (treeExpandedMaps[rowid]) {
+                        delete treeExpandedMaps[rowid];
                     }
                 }
             });
@@ -7644,7 +7931,8 @@ const Methods = {
                 rowRest.treeLoaded = false;
             });
         }
-        reactData.treeExpandedMaps = {};
+        internalData.treeExpandedMaps = {};
+        reactData.treeExpandedFlag++;
         if (transform) {
             handleVirtualTreeToList($xeTable);
             return $xeTable.handleTableData();
@@ -7657,36 +7945,42 @@ const Methods = {
      */
     reloadTreeExpand(row) {
         const $xeTable = this;
-        const { treeOpts, treeExpandLazyLoadedMaps } = this;
+        const internalData = $xeTable;
+        const { treeExpandLazyLoadedMaps } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
         const { transform, lazy } = treeOpts;
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
-        const rowid = getRowid(this, row);
+        const rowid = getRowid($xeTable, row);
         if (lazy && row[hasChildField] && !treeExpandLazyLoadedMaps[rowid]) {
-            return this.clearTreeExpandLoaded(row).then(() => {
-                return this.handleAsyncTreeExpandChilds(row);
+            return $xeTable.clearTreeExpandLoaded(row).then(() => {
+                return handleAsyncTreeExpandChilds($xeTable, row);
             }).then(() => {
                 if (transform) {
                     handleVirtualTreeToList($xeTable);
-                    return this.handleTableData();
+                    return $xeTable.handleTableData();
                 }
             }).then(() => {
-                return this.recalculate();
+                return $xeTable.recalculate();
             });
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     reloadTreeChilds(row) {
+        const $xeTable = this;
         if (process.env.NODE_ENV === 'development') {
             warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
         }
         // 即将废弃
-        return this.reloadTreeExpand(row);
+        return $xeTable.reloadTreeExpand(row);
     },
     /**
      * 展开树节点事件
      */
     triggerTreeExpandEvent(evnt, params) {
-        const { treeOpts, treeExpandLazyLoadedMaps } = this;
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const { treeExpandLazyLoadedMaps } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
         const { row, column } = params;
         const { lazy, trigger } = treeOpts;
         if (trigger === 'manual') {
@@ -7695,11 +7989,11 @@ const Methods = {
         evnt.stopPropagation();
         const rowid = getRowid(this, row);
         if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
-            const expanded = !this.isTreeExpandByRow(row);
-            const columnIndex = this.getColumnIndex(column);
-            const $columnIndex = this.getVMColumnIndex(column);
-            this.setTreeExpand(row, expanded);
-            this.emitEvent('toggle-tree-expand', { expanded, column, columnIndex, $columnIndex, row }, evnt);
+            const expanded = !$xeTable.isTreeExpandByRow(row);
+            const columnIndex = $xeTable.getColumnIndex(column);
+            const $columnIndex = $xeTable.getVMColumnIndex(column);
+            $xeTable.setTreeExpand(row, expanded);
+            $xeTable.dispatchEvent('toggle-tree-expand', { expanded, column, columnIndex, $columnIndex, row }, evnt);
         }
     },
     /**
@@ -7708,87 +8002,6 @@ const Methods = {
     toggleTreeExpand(row) {
         return this.setTreeExpand(row, !this.isTreeExpandByRow(row));
     },
-    /**
-     * 处理默认展开树节点
-     */
-    handleDefaultTreeExpand() {
-        const { treeConfig, treeOpts, tableFullData } = this;
-        if (treeConfig) {
-            const { expandAll, expandRowKeys } = treeOpts;
-            const childrenField = treeOpts.children || treeOpts.childrenField;
-            if (expandAll) {
-                this.setAllTreeExpand(true);
-            }
-            else if (expandRowKeys) {
-                const defExpandeds = [];
-                const rowkey = getRowkey(this);
-                expandRowKeys.forEach((rowid) => {
-                    const matchObj = XEUtils.findTree(tableFullData, item => rowid === XEUtils.get(item, rowkey), { children: childrenField });
-                    if (matchObj) {
-                        defExpandeds.push(matchObj.item);
-                    }
-                });
-                this.setTreeExpand(defExpandeds, true);
-            }
-        }
-    },
-    handleAsyncTreeExpandChilds(row) {
-        const $xeTable = this;
-        const { treeOpts, checkboxOpts } = this;
-        const { transform, loadMethod } = treeOpts;
-        const { checkStrictly } = checkboxOpts;
-        return new Promise(resolve => {
-            if (loadMethod) {
-                const { treeExpandLazyLoadedMaps, fullAllDataRowIdData } = this;
-                const rowid = getRowid($xeTable, row);
-                const rowRest = fullAllDataRowIdData[rowid];
-                treeExpandLazyLoadedMaps[rowid] = row;
-                Promise.resolve(loadMethod({ $table: $xeTable, row })).then((childRecords) => {
-                    if (rowRest) {
-                        rowRest.treeLoaded = true;
-                    }
-                    if (treeExpandLazyLoadedMaps[rowid]) {
-                        delete treeExpandLazyLoadedMaps[rowid];
-                    }
-                    if (!XEUtils.isArray(childRecords)) {
-                        childRecords = [];
-                    }
-                    if (childRecords) {
-                        return this.loadTreeChildren(row, childRecords).then((childRows) => {
-                            const { treeExpandedMaps } = this;
-                            if (childRows.length && !treeExpandedMaps[rowid]) {
-                                treeExpandedMaps[rowid] = row;
-                            }
-                            // 如果当前节点已选中，则展开后子节点也被选中
-                            if (!checkStrictly && this.isCheckedByCheckboxRow(row)) {
-                                handleCheckedCheckboxRow($xeTable, childRows, true);
-                            }
-                            return this.$nextTick().then(() => {
-                                if (transform) {
-                                    this.handleTableData();
-                                    updateAfterDataIndex($xeTable);
-                                    return this.$nextTick();
-                                }
-                            });
-                        });
-                    }
-                }).catch(() => {
-                    const { treeExpandLazyLoadedMaps } = this;
-                    if (rowRest) {
-                        rowRest.treeLoaded = false;
-                    }
-                    if (treeExpandLazyLoadedMaps[rowid]) {
-                        delete treeExpandLazyLoadedMaps[rowid];
-                    }
-                }).finally(() => {
-                    this.$nextTick().then(() => this.recalculate()).then(() => resolve());
-                });
-            }
-            else {
-                resolve();
-            }
-        });
-    },
     /**
      * 设置所有树节点的展开与否
      * @param {Boolean} expanded 是否展开
@@ -7813,42 +8026,47 @@ const Methods = {
      * @returns
      */
     handleBaseTreeExpand(rows, expanded) {
-        const { fullAllDataRowIdData, tableFullData, treeExpandedMaps, treeOpts, treeExpandLazyLoadedMaps, treeNodeColumn } = this;
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { treeNodeColumn } = reactData;
+        const { fullAllDataRowIdData, tableFullData, treeExpandedMaps, treeExpandLazyLoadedMaps } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
         const { reserve, lazy, accordion, toggleMethod } = treeOpts;
-        const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
         const result = [];
-        const columnIndex = this.getColumnIndex(treeNodeColumn);
-        const $columnIndex = this.getVMColumnIndex(treeNodeColumn);
-        let validRows = toggleMethod ? rows.filter((row) => toggleMethod({ expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows;
+        const columnIndex = $xeTable.getColumnIndex(treeNodeColumn);
+        const $columnIndex = $xeTable.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]] : [];
             // 同一级只能展开一个
             const matchObj = XEUtils.findTree(tableFullData, item => item === validRows[0], { children: childrenField });
             if (matchObj) {
                 matchObj.items.forEach(item => {
-                    const rowid = getRowid(this, 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(this, 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];
                         // 是否使用懒加载
                         if (isLoad) {
-                            result.push(this.handleAsyncTreeExpandChilds(row));
+                            result.push(handleAsyncTreeExpandChilds($xeTable, row));
                         }
                         else {
                             if (row[childrenField] && row[childrenField].length) {
-                                treeTempExpandedMaps[rowid] = row;
+                                treeExpandedMaps[rowid] = row;
                             }
                         }
                     }
@@ -7857,18 +8075,18 @@ const Methods = {
         }
         else {
             validRows.forEach((item) => {
-                const rowid = getRowid(this, item);
-                if (treeTempExpandedMaps[rowid]) {
-                    delete treeTempExpandedMaps[rowid];
+                const rowid = handleGetRowId(item);
+                if (treeExpandedMaps[rowid]) {
+                    delete treeExpandedMaps[rowid];
                 }
             });
         }
         if (reserve) {
-            validRows.forEach((row) => this.handleTreeExpandReserve(row, expanded));
+            validRows.forEach((row) => handleTreeExpandReserve($xeTable, row, expanded));
         }
-        this.treeExpandedMaps = treeTempExpandedMaps;
+        reactData.treeExpandedFlag++;
         return Promise.all(result).then(() => {
-            return this.recalculate();
+            return $xeTable.recalculate();
         });
     },
     /**
@@ -7922,30 +8140,38 @@ const Methods = {
      * @param {Row} row 行对象
      */
     isTreeExpandByRow(row) {
-        const { treeExpandedMaps } = this;
-        return !!treeExpandedMaps[getRowid(this, row)];
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { treeExpandedFlag } = reactData;
+        const { treeExpandedMaps } = internalData;
+        return !!treeExpandedFlag && !!treeExpandedMaps[getRowid($xeTable, row)];
     },
     /**
      * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
      */
     clearTreeExpand() {
         const $xeTable = this;
-        const { treeOpts, tableFullData } = this;
-        const { transform, reserve } = treeOpts;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { tableFullTreeData } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
-        const expList = this.getTreeExpandRecords();
-        this.treeExpandedMaps = {};
+        const { transform, reserve } = treeOpts;
+        const expList = $xeTable.getTreeExpandRecords();
+        internalData.treeExpandedMaps = {};
+        reactData.treeExpandedFlag++;
         if (reserve) {
-            XEUtils.eachTree(tableFullData, row => this.handleTreeExpandReserve(row, false), { children: childrenField });
+            XEUtils.eachTree(tableFullTreeData, row => handleTreeExpandReserve($xeTable, row, false), { children: childrenField });
         }
-        return this.handleTableData().then(() => {
+        return $xeTable.handleTableData().then(() => {
             if (transform) {
                 handleVirtualTreeToList($xeTable);
-                return this.handleTableData();
+                return $xeTable.handleTableData();
             }
         }).then(() => {
             if (expList.length) {
-                this.recalculate();
+                $xeTable.recalculate();
             }
         });
     },
@@ -7953,18 +8179,6 @@ const Methods = {
         this.treeExpandedReserveRowMap = {};
         return this.$nextTick();
     },
-    handleTreeExpandReserve(row, expanded) {
-        const { treeExpandedReserveRowMap, treeOpts } = this;
-        if (treeOpts.reserve) {
-            const rowid = getRowid(this, row);
-            if (expanded) {
-                treeExpandedReserveRowMap[rowid] = row;
-            }
-            else if (treeExpandedReserveRowMap[rowid]) {
-                delete treeExpandedReserveRowMap[rowid];
-            }
-        }
-    },
     /**
      * 获取表格的滚动状态
      */
@@ -8282,10 +8496,10 @@ const Methods = {
             return;
         }
         const { highlightHoverRow } = tableProps;
-        const { scrollXLoad, scrollYLoad } = reactData;
+        const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
         const leftFixedWidth = $xeTable.computeLeftFixedWidth;
         const rightFixedWidth = $xeTable.computeRightFixedWidth;
-        if (!(scrollYLoad || leftFixedWidth || rightFixedWidth)) {
+        if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
             return;
         }
         const { elemStore, lastScrollTop, lastScrollLeft } = internalData;
@@ -8537,8 +8751,8 @@ const Methods = {
         const $xeTable = this;
         const reactData = $xeTable;
         const internalData = $xeTable;
-        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 = $xeTable.computeExpandOpts;
         const rowOpts = $xeTable.computeRowOpts;
@@ -8781,13 +8995,15 @@ const Methods = {
      * 更新表尾合计
      */
     updateFooter() {
+        const $xeTable = this;
+        const $xeGrid = $xeTable.$xeGrid;
         const { showFooter, visibleColumn, footerData, footerMethod } = this;
         let footData = [];
         if (showFooter && footerData && footerData.length) {
             footData = footerData.slice(0);
         }
         else if (showFooter && footerMethod) {
-            footData = visibleColumn.length ? footerMethod({ columns: visibleColumn, data: this.afterFullData, $table: this, $grid: this.$xegrid }) : [];
+            footData = visibleColumn.length ? footerMethod({ columns: visibleColumn, data: this.afterFullData, $table: $xeTable, $grid: $xeGrid }) : [];
         }
         this.footerTableData = footData;
         return this.$nextTick();
@@ -8865,7 +9081,7 @@ const Methods = {
         if (this.footerSpanMethod) {
             errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
         }
-        setMerges(this, merges, this.mergeFooterList, null);
+        setMerges(this, merges, this.mergeFooterList);
         return this.$nextTick().then(() => {
             this.updateCellAreas();
             return updateStyle($xeTable);
@@ -8919,11 +9135,14 @@ const Methods = {
     },
     dispatchEvent(type, params, evnt) {
         const $xeTable = this;
-        $xeTable.$emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeTable.$xegrid }, params));
+        const $xeGrid = $xeTable.$xeGrid;
+        $xeTable.$emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeGrid }, params));
     },
     // 已废弃，使用 dispatchEvent
     emitEvent(type, params, evnt) {
-        this.$emit(type, Object.assign({ $table: this, $grid: this.$xegrid, $event: evnt }, params));
+        const $xeTable = this;
+        const $xeGrid = $xeTable.$xeGrid;
+        this.$emit(type, Object.assign({ $table: $xeTable, $grid: $xeGrid, $event: evnt }, params));
     },
     focus() {
         this.isActivated = true;