vxe-table 3.14.0-beta.20 → 3.14.0-beta.21

package/es/table/src/methods.js

@@ -318,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) {
@@ -352,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) {
@@ -380,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) {
@@ -814,8 +815,7 @@ 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;
@@ -832,7 +832,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);
             }
@@ -931,10 +931,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();
@@ -945,8 +945,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;
@@ -963,7 +963,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);
@@ -972,17 +973,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;
@@ -1045,12 +1190,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;
@@ -1062,7 +1208,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) {
@@ -1092,9 +1238,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];
         }
@@ -1140,10 +1289,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];
         }
@@ -1350,8 +1502,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);
@@ -1998,6 +2151,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;
@@ -2155,7 +2337,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);
@@ -2167,7 +2349,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);
@@ -2188,16 +2370,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;
@@ -2210,47 +2393,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;
@@ -2261,6 +2440,9 @@ function updateRowExpandStyle($xeTable) {
             });
             if (isUpdateHeight) {
                 reactData.rowExpandHeightFlag++;
+                $xeTable.$nextTick(() => {
+                    updateRowOffsetTop($xeTable);
+                });
             }
         }
     }
@@ -2654,15 +2836,13 @@ 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 { lazy } = treeOpts;
         const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
         const fullDataRowIdMaps = {};
-        const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
         const { handleUpdateRowId } = createHandleUpdateRowId($xeTable);
         const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
             let rowRest = fullAllDataRowIdMaps[rowid];
@@ -2684,13 +2864,12 @@ const Methods = {
             XEUtils.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
                 const rowid = handleUpdateRowId(row);
                 if (treeConfig && lazy) {
-                    const treeExpRest = treeTempExpandedMaps[rowid];
                     if (row[hasChildField] && row[childrenField] === undefined) {
                         row[childrenField] = null;
                     }
-                    if (treeExpRest) {
+                    if (treeExpandedMaps[rowid]) {
                         if (!row[childrenField] || !row[childrenField].length) {
-                            delete treeTempExpandedMaps[rowid];
+                            delete treeExpandedMaps[rowid];
                         }
                     }
                 }
@@ -2704,7 +2883,7 @@ const Methods = {
         }
         internalData.fullDataRowIdData = fullDataRowIdMaps;
         internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
-        reactData.treeExpandedMaps = treeTempExpandedMaps;
+        reactData.treeExpandedFlag++;
     },
     cacheSourceMap(fullData) {
         const $xeTable = this;
@@ -2815,47 +2994,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') {
@@ -2863,21 +3017,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') {
@@ -2889,30 +3028,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') {
@@ -2920,20 +3046,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') {
@@ -3032,6 +3144,7 @@ const Methods = {
         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') {
                 errLog('vxe.error.reqProp', ['keep-source']);
@@ -3050,7 +3163,7 @@ const Methods = {
         let reDelFlag = false;
         if (targetRows.length) {
             targetRows.forEach((item) => {
-                const rowid = getRowid($xeTable, item);
+                const rowid = handleGetRowId(item);
                 const rowRest = fullAllDataRowIdData[rowid];
                 if (rowRest) {
                     const row = rowRest.row;
@@ -3434,11 +3547,9 @@ const Methods = {
     getCheckboxRecords(isFull) {
         const $xeTable = this;
         const props = $xeTable;
-        const reactData = $xeTable;
         const internalData = $xeTable;
         const { treeConfig } = props;
-        const { selectCheckboxMaps } = reactData;
-        const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps } = internalData;
+        const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps, selectCheckboxMaps } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const checkboxOpts = $xeTable.computeCheckboxOpts;
         const { transform, mapChildrenField } = treeOpts;
@@ -3771,6 +3882,7 @@ const Methods = {
      * 默认执行一次，除非被重置
      */
     handleLoadDefaults() {
+        const $xeTable = this;
         if (this.checkboxConfig) {
             this.handleDefaultSelectionChecked();
         }
@@ -3781,7 +3893,7 @@ const Methods = {
             this.handleDefaultRowExpand();
         }
         if (this.treeConfig) {
-            this.handleDefaultTreeExpand();
+            handleDefaultTreeExpand($xeTable);
         }
         if (this.mergeCells) {
             this.handleDefaultMergeCells();
@@ -4597,12 +4709,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;
@@ -4629,8 +4742,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;
@@ -5477,11 +5591,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]) {
@@ -5551,20 +5669,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) {
@@ -5574,19 +5694,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);
     },
     /**
      * 切换选中
@@ -5596,9 +5716,9 @@ 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;
@@ -5620,19 +5740,17 @@ 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;
         }
         // 树结构
@@ -5642,17 +5760,17 @@ const Methods = {
                 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;
         }
         // 列表
@@ -5660,19 +5778,19 @@ const Methods = {
             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;
     },
     /**
      * 即将移除
@@ -5684,8 +5802,8 @@ const Methods = {
     },
     handleToggleCheckRowEvent(evnt, params) {
         const $xeTable = this;
-        const reactData = $xeTable;
-        const { selectCheckboxMaps } = reactData;
+        const internalData = $xeTable;
+        const { selectCheckboxMaps } = internalData;
         const checkboxOpts = $xeTable.computeCheckboxOpts;
         const { checkField, trigger } = checkboxOpts;
         const { row } = params;
@@ -5697,18 +5815,19 @@ const Methods = {
             checked = !XEUtils.get(row, checkField);
         }
         else {
-            checked = !selectCheckboxMaps[getRowid(this, row)];
+            checked = !selectCheckboxMaps[getRowid($xeTable, row)];
         }
         if (evnt) {
             $xeTable.triggerCheckRowEvent(evnt, params, checked);
         }
         else {
-            $xeTable.handleBatchSelectRows(params, checked);
+            $xeTable.handleBatchSelectRows([row], checked);
             $xeTable.checkSelectionStatus();
         }
     },
     triggerCheckRowEvent(evnt, params, checked) {
         const $xeTable = this;
+        const props = $xeTable;
         const internalData = $xeTable;
         const { row } = params;
         const { afterFullData } = internalData;
@@ -5718,7 +5837,7 @@ const Methods = {
             return;
         }
         evnt.stopPropagation();
-        if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
+        if (checkboxOpts.isShiftKey && evnt.shiftKey && !props.treeConfig) {
             const checkboxRecords = $xeTable.getCheckboxRecords();
             if (checkboxRecords.length) {
                 const firstRow = checkboxRecords[0];
@@ -5727,14 +5846,16 @@ const Methods = {
                 if (_rowIndex !== _firstRowIndex) {
                     $xeTable.setAllCheckboxRow(false);
                     const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1);
-                    handleCheckedCheckboxRow($xeTable, rangeRows, true, false);
+                    $xeTable.$nextTick(() => {
+                        handleCheckedCheckboxRow($xeTable, rangeRows, true, false);
+                    });
                     $xeTable.dispatchEvent('checkbox-range-select', Object.assign({ rangeRecords: rangeRows }, params), evnt);
                     return;
                 }
             }
         }
         if (!checkMethod || checkMethod({ row })) {
-            $xeTable.handleBatchSelectRows(params, checked);
+            $xeTable.handleBatchSelectRows([row], checked);
             $xeTable.checkSelectionStatus();
             $xeTable.dispatchEvent('checkbox-change', Object.assign({
                 records: () => $xeTable.getCheckboxRecords(),
@@ -5749,7 +5870,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);
@@ -5770,9 +5893,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;
@@ -5805,12 +5926,12 @@ const Methods = {
                 childList.forEach(checkMethod
                     ? (item) => {
                         const childRowid = handleGetRowId(item);
-                        const isSelect = checkField ? XEUtils.get(item, checkField) : selectRowMaps[childRowid];
+                        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++;
@@ -5819,18 +5940,18 @@ const Methods = {
                             if (isSelect) {
                                 sLen++;
                             }
-                            else if (halfRowMaps[childRowid]) {
+                            else if (treeIndeterminateRowMaps[childRowid]) {
                                 hLen++;
                             }
                         }
                     }
                     : item => {
                         const childRowid = handleGetRowId(item);
-                        const isSelect = checkField ? XEUtils.get(item, checkField) : selectRowMaps[childRowid];
+                        const isSelect = checkField ? XEUtils.get(item, checkField) : selectCheckboxMaps[childRowid];
                         if (isSelect) {
                             sLen++;
                         }
-                        else if (halfRowMaps[childRowid]) {
+                        else if (treeIndeterminateRowMaps[childRowid]) {
                             hLen++;
                         }
                         vLen++;
@@ -5842,31 +5963,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;
@@ -5874,10 +5994,9 @@ 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; // 半选
@@ -5891,7 +6010,7 @@ const Methods = {
                     if (selected) {
                         sLen++;
                     }
-                    else if (treeIndeterminateMaps[childRowid]) {
+                    else if (treeIndeterminateRowMaps[childRowid]) {
                         hLen++;
                     }
                     vLen++;
@@ -5900,7 +6019,7 @@ const Methods = {
                     if (selected) {
                         sLen++;
                     }
-                    else if (treeIndeterminateMaps[childRowid]) {
+                    else if (treeIndeterminateRowMaps[childRowid]) {
                         hLen++;
                     }
                 }
@@ -5911,7 +6030,7 @@ const Methods = {
                 if (selected) {
                     sLen++;
                 }
-                else if (treeIndeterminateMaps[childRowid]) {
+                else if (treeIndeterminateRowMaps[childRowid]) {
                     hLen++;
                 }
                 vLen++;
@@ -5968,19 +6087,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) => {
@@ -6055,9 +6181,16 @@ 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) {
@@ -6077,10 +6210,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();
     },
     /**
@@ -6659,12 +6793,11 @@ 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 = {
@@ -7268,48 +7401,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) {
@@ -7325,10 +7462,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]) {
@@ -7338,8 +7473,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;
@@ -7540,17 +7679,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();
     },
     /**
@@ -7558,14 +7696,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') {
@@ -7578,20 +7719,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);
         }
     },
     /**
@@ -7637,48 +7791,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();
-            }
-        });
-    },
     /**
      * 设置展开行，二个参数设置这一行展开与否
      * 支持单行
@@ -7688,8 +7800,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);
@@ -7700,30 +7816,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];
                     }
                 });
             }
@@ -7731,7 +7848,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))
@@ -7747,9 +7864,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') {
@@ -7769,7 +7890,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));
         }
@@ -7789,8 +7911,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);
             }
@@ -7798,8 +7922,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);
             }
@@ -7832,12 +7958,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];
             }
@@ -7846,8 +7970,8 @@ const Methods = {
                 const rowRest = fullAllDataRowIdData[rowid];
                 if (rowRest) {
                     rowRest.treeLoaded = false;
-                    if (tExpandedMaps[rowid]) {
-                        delete tExpandedMaps[rowid];
+                    if (treeExpandedMaps[rowid]) {
+                        delete treeExpandedMaps[rowid];
                     }
                 }
             });
@@ -7857,7 +7981,8 @@ const Methods = {
                 rowRest.treeLoaded = false;
             });
         }
-        reactData.treeExpandedMaps = {};
+        internalData.treeExpandedMaps = {};
+        reactData.treeExpandedFlag++;
         if (transform) {
             handleVirtualTreeToList($xeTable);
             return $xeTable.handleTableData();
@@ -7870,36 +7995,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') {
@@ -7908,11 +8039,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);
         }
     },
     /**
@@ -7921,87 +8052,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 是否展开
@@ -8026,42 +8076,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;
                             }
                         }
                     }
@@ -8070,18 +8125,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();
         });
     },
     /**
@@ -8135,30 +8190,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();
             }
         });
     },
@@ -8166,18 +8229,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];
-            }
-        }
-    },
     /**
      * 获取表格的滚动状态
      */
@@ -8750,8 +8801,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;
@@ -9078,7 +9129,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);