vxe-table 4.12.0-beta.8 → 4.12.0

package/lib/table/src/table.js

@@ -39,6 +39,7 @@ const {
   useFns,
   renderEmptyElement
 } = _ui.VxeUI;
+const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
 const maxYHeight = 5e6;
 const maxXWidth = 5e6;
@@ -93,8 +94,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       isAllSelected: false,
       // 复选框属性，有选中且非全选状态
       isIndeterminate: false,
-      // 复选框属性，已选中的行集合
-      selectCheckboxMaps: {},
       // 当前行
       currentRow: null,
       // 单选框属性，选中列
@@ -108,16 +107,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       // 树节点列信息
       treeNodeColumn: null,
       hasFixedColumn: false,
-      // 已展开的行集合
-      rowExpandedMaps: {},
-      // 懒加载中的展开行的集合
-      rowExpandLazyLoadedMaps: {},
-      // 已展开树节点集合
-      treeExpandedMaps: {},
-      // 懒加载中的树节点的集合
-      treeExpandLazyLoadedMaps: {},
-      // 树节点不确定状态的集合
-      treeIndeterminateMaps: {},
       // 合并单元格的对象集
       mergeList: [],
       // 合并表尾数据的对象集
@@ -126,8 +115,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       upDataFlag: 0,
       // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
       reColumnFlag: 0,
-      // 已标记的对象集
-      pendingRowMaps: {},
       // 初始化标识
       initStore: {
         filter: false,
@@ -271,6 +258,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
         isHeader: false,
         isFooter: false
       },
+      rowExpandedFlag: 1,
+      treeExpandedFlag: 1,
+      updateCheckboxFlag: 1,
+      pendingRowFlag: 1,
       rowHeightStore: {
         default: 48,
         medium: 44,
@@ -287,6 +278,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       rowExpandHeightFlag: 1,
       calcCellHeightFlag: 1,
       resizeHeightFlag: 1,
+      resizeWidthFlag: 1,
       isCustomStatus: false,
       isDragRowMove: false,
       dragRow: null,
@@ -370,6 +362,18 @@ var _default = exports.default = (0, _vue.defineComponent)({
       fullColumnIdData: {},
       fullColumnFieldData: {},
       // prevDragRow: null,
+      // 已展开的行集合
+      rowExpandedMaps: {},
+      // 懒加载中的展开行的集合
+      rowExpandLazyLoadedMaps: {},
+      // 已展开树节点集合
+      treeExpandedMaps: {},
+      // 懒加载中的树节点的集合
+      treeExpandLazyLoadedMaps: {},
+      // 复选框属性，已选中的行集合
+      selectCheckboxMaps: {},
+      // 已标记的对象集
+      pendingRowMaps: {},
       inited: false,
       tooltipTimeout: null,
       initStatus: false,
@@ -499,18 +503,36 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const computeColumnOpts = (0, _vue.computed)(() => {
       return Object.assign({}, getConfig().table.columnConfig, props.columnConfig);
     });
+    const computeCurrentColumnOpts = (0, _vue.computed)(() => {
+      return Object.assign({}, getConfig().table.currentColumnConfig, props.currentColumnConfig);
+    });
     const computeCellOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, getConfig().table.cellConfig, props.cellConfig);
+      const cellOpts = Object.assign({}, getConfig().table.cellConfig, props.cellConfig);
+      if (cellOpts.height) {
+        cellOpts.height = _xeUtils.default.toNumber(cellOpts.height);
+      }
+      return cellOpts;
     });
     const computeHeaderCellOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, getConfig().table.headerCellConfig, props.headerCellConfig);
+      const headerCellOpts = Object.assign({}, getConfig().table.headerCellConfig, props.headerCellConfig);
+      if (headerCellOpts.height) {
+        headerCellOpts.height = _xeUtils.default.toNumber(headerCellOpts.height);
+      }
+      return headerCellOpts;
     });
     const computeFooterCellOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, getConfig().table.footerCellConfig, props.footerCellConfig);
+      const footerCellOpts = Object.assign({}, getConfig().table.footerCellConfig, props.footerCellConfig);
+      if (footerCellOpts.height) {
+        footerCellOpts.height = _xeUtils.default.toNumber(footerCellOpts.height);
+      }
+      return footerCellOpts;
     });
     const computeRowOpts = (0, _vue.computed)(() => {
       return Object.assign({}, getConfig().table.rowConfig, props.rowConfig);
     });
+    const computeCurrentRowOpts = (0, _vue.computed)(() => {
+      return Object.assign({}, getConfig().table.currentRowConfig, props.currentRowConfig);
+    });
     const computeRowDragOpts = (0, _vue.computed)(() => {
       return Object.assign({}, getConfig().table.rowDragConfig, props.rowDragConfig);
     });
@@ -668,15 +690,21 @@ var _default = exports.default = (0, _vue.defineComponent)({
     });
     const computeTableRowExpandedList = (0, _vue.computed)(() => {
       const {
-        rowExpandedMaps,
+        rowExpandedFlag,
         tableData,
         expandColumn
       } = reactData;
+      const {
+        rowExpandedMaps
+      } = internalData;
+      const {
+        handleGetRowId
+      } = (0, _util.createHandleGetRowId)($xeTable);
       const expandList = [];
-      if (expandColumn) {
+      if (expandColumn && rowExpandedFlag) {
         const rowKeys = {};
         tableData.forEach(row => {
-          rowKeys[(0, _util.getRowid)($xeTable, row)] = true;
+          rowKeys[handleGetRowId(row)] = true;
         });
         _xeUtils.default.each(rowExpandedMaps, (row, rowid) => {
           if (rowKeys[rowid]) {
@@ -817,13 +845,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
       computeScrollbarXToTop,
       computeScrollbarYToLeft,
       computeColumnOpts,
+      computeCurrentColumnOpts,
       computeScrollXThreshold,
       computeScrollYThreshold,
+      computeRowHeightMaps,
       computeDefaultRowHeight,
       computeCellOpts,
       computeHeaderCellOpts,
       computeFooterCellOpts,
       computeRowOpts,
+      computeCurrentRowOpts,
       computeRowDragOpts,
       computeColumnDragOpts,
       computeResizeOpts,
@@ -871,6 +902,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       internalData,
       getRefMaps: () => refMaps,
       getComputeMaps: () => computeMaps,
+      xeGrid: $xeGrid,
       xegrid: $xeGrid
     };
     const eqCellValue = (row1, row2, field) => {
@@ -1057,12 +1089,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
           toVisibleIndex = Math.floor(startTop / defaultRowHeight) - 1;
           visibleSize = Math.ceil(clientHeight / defaultRowHeight) + 1;
         } else {
+          const {
+            handleGetRowId
+          } = (0, _util.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 = (0, _util.getRowid)($xeTable, row);
+            const rowid = handleGetRowId(row);
             const rowRest = fullAllDataRowIdData[rowid] || {};
             if (rowRest.oTop <= startTop) {
               leftIndex = rIndex + 1;
@@ -1073,7 +1108,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           toVisibleIndex = Math.max(0, leftIndex < afterFullData.length ? leftIndex - 2 : 0);
           for (let rIndex = toVisibleIndex, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
             const row = afterFullData[rIndex];
-            const rowid = (0, _util.getRowid)($xeTable, row);
+            const rowid = handleGetRowId(row);
             const rowRest = fullAllDataRowIdData[rowid] || {};
             visibleSize++;
             if (rowRest.oTop > endTop || visibleSize >= 100) {
@@ -1375,7 +1410,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           fullColumnFieldData[field] = rest;
         } else {
           if (storage && !type || columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
-            (0, _log.errLog)('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
+            (0, _log.errLog)('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`]);
           }
         }
         if (!hasFixed && fixed) {
@@ -1632,6 +1667,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       internalData.headerHeight = headerHeight;
       internalData.footerHeight = footerHeight;
       reactData.overflowX = overflowX;
+      reactData.resizeWidthFlag++;
       updateColumnOffsetLeft();
       updateHeight();
       reactData.parentHeight = Math.max(internalData.headerHeight + footerHeight + 20, $xeTable.getParentHeight());
@@ -1664,9 +1700,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const defaultRowHeight = computeDefaultRowHeight.value;
       const el = refElem.value;
       if (!isAllOverflow && scrollYLoad && el) {
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
         el.setAttribute('data-calc-row', 'Y');
         tableData.forEach(row => {
-          const rowid = (0, _util.getRowid)($xeTable, row);
+          const rowid = handleGetRowId(row);
           const rowRest = fullAllDataRowIdData[rowid];
           if (rowRest) {
             const reHeight = calcCellAutoHeight(rowRest, el);
@@ -1711,9 +1750,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
         fullDataRowIdData,
         fullAllDataRowIdData
       } = internalData;
+      const {
+        handleGetRowId
+      } = (0, _util.createHandleGetRowId)($xeTable);
       const fullMaps = {};
       afterFullData.forEach((row, index) => {
-        const rowid = (0, _util.getRowid)($xeTable, row);
+        const rowid = handleGetRowId(row);
         const rowRest = fullAllDataRowIdData[rowid];
         const seq = index + 1;
         if (rowRest) {
@@ -1765,8 +1807,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const childrenField = treeOpts.children || treeOpts.childrenField;
       const fullMaps = {};
       if (treeConfig) {
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
         _xeUtils.default.eachTree(afterTreeFullData, (row, index, items, path) => {
-          const rowid = (0, _util.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) {
@@ -1811,19 +1856,20 @@ var _default = exports.default = (0, _vue.defineComponent)({
         treeConfig
       } = props;
       const {
+        fullAllDataRowIdData,
         treeExpandedMaps
-      } = reactData;
-      const {
-        fullAllDataRowIdData
       } = internalData;
       const treeOpts = computeTreeOpts.value;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       if (treeConfig && treeOpts.transform) {
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
         const fullData = [];
         const expandMaps = {};
         _xeUtils.default.eachTree(internalData.afterTreeFullData, (row, index, items, path, parentRow) => {
-          const rowid = (0, _util.getRowid)($xeTable, row);
-          const parentRowid = (0, _util.getRowid)($xeTable, parentRow);
+          const rowid = handleGetRowId(row);
+          const parentRowid = handleGetRowId(parentRow);
           if (!parentRow || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
             const rowRest = fullAllDataRowIdData[rowid];
             if (rowRest) {
@@ -1865,6 +1911,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         mapChildrenField
       } = treeOpts;
       const {
+        isEvery,
         remote: allRemoteFilter,
         filterMethod: allFilterMethod
       } = filterOpts;
@@ -1977,7 +2024,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             // 筛选虚拟树
             tableTree = _xeUtils.default.searchTree(tableFullTreeData, handleFilter, {
               original: true,
-              isEvery: true,
+              isEvery,
               children: mapChildrenField,
               mapChildren: childrenField
             });
@@ -1991,7 +2038,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             // 还原虚拟树
             tableTree = _xeUtils.default.searchTree(tableFullTreeData, () => true, {
               original: true,
-              isEvery: true,
+              isEvery,
               children: mapChildrenField,
               mapChildren: childrenField
             });
@@ -2050,7 +2097,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           // 还原虚拟树
           tableTree = _xeUtils.default.searchTree(tableFullTreeData, () => true, {
             original: true,
-            isEvery: true,
+            isEvery,
             children: treeOpts.mapChildrenField,
             mapChildren: childrenField
           });
@@ -2091,7 +2138,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } = reactData;
       const {
         visibleColumn,
-        fullColumnIdData,
         tableHeight,
         headerHeight,
         footerHeight,
@@ -2108,7 +2154,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const osbWidth = overflowY ? scrollbarWidth : 0;
       const osbHeight = overflowX ? scrollbarHeight : 0;
       const emptyPlaceholderElem = refEmptyPlaceholder.value;
-      const cellOffsetWidth = computeCellOffsetWidth.value;
       const mouseOpts = computeMouseOpts.value;
       const expandOpts = computeExpandOpts.value;
       const bodyWrapperElem = (0, _util.getRefElem)(elemStore['main-body-wrapper']);
@@ -2370,58 +2415,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
               tableElem.style.width = tWidth ? `${tWidth}px` : '';
             }
           }
-          const colgroupElem = (0, _util.getRefElem)(elemStore[`${name}-${layout}-colgroup`]);
-          if (colgroupElem) {
-            _xeUtils.default.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.default.isUndefined(showHeaderOverflow) || _xeUtils.default.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
-                } else if (layout === 'footer') {
-                  cellOverflow = _xeUtils.default.isUndefined(showFooterOverflow) || _xeUtils.default.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
-                } else {
-                  cellOverflow = _xeUtils.default.isUndefined(showOverflow) || _xeUtils.default.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 = (0, _util.getRefElem)(elemStore[`${name}-${layout}-list`]);
-                // 纵向虚拟滚动不支持动态行高
-                if (scrollYLoad && !hasEllipsis) {
-                  hasEllipsis = true;
-                }
-                if (listElem) {
-                  _xeUtils.default.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) {
@@ -2613,12 +2606,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const {
         treeConfig
       } = props;
-      const {
-        selectCheckboxMaps
-      } = reactData;
       const {
         afterFullData,
-        checkboxReserveRowMap
+        checkboxReserveRowMap,
+        selectCheckboxMaps
       } = internalData;
       const treeOpts = computeTreeOpts.value;
       const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -2628,6 +2619,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         reserve,
         checkMethod
       } = checkboxOpts;
+      const {
+        handleGetRowId
+      } = (0, _util.createHandleGetRowId)($xeTable);
       // indeterminateField 仅支持读取
       const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
       const selectRowMaps = {};
@@ -2641,7 +2635,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             row
           })) {
             if (checked) {
-              selectRowMaps[(0, _util.getRowid)($xeTable, row)] = row;
+              selectRowMaps[handleGetRowId(row)] = row;
             }
             _xeUtils.default.set(row, checkField, checked);
           }
@@ -2673,7 +2667,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
               if (isForce || !checkMethod || checkMethod({
                 row
               })) {
-                selectRowMaps[(0, _util.getRowid)($xeTable, row)] = row;
+                const rowid = handleGetRowId(row);
+                selectRowMaps[rowid] = row;
               }
             }, {
               children: childrenField
@@ -2685,7 +2680,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                */
             if (!isForce && checkMethod) {
               _xeUtils.default.eachTree(afterFullData, row => {
-                const rowid = (0, _util.getRowid)($xeTable, row);
+                const rowid = handleGetRowId(row);
                 if (checkMethod({
                   row
                 }) ? 0 : selectCheckboxMaps[rowid]) {
@@ -2705,7 +2700,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                */
             if (!isForce && checkMethod) {
               afterFullData.forEach(row => {
-                const rowid = (0, _util.getRowid)($xeTable, row);
+                const rowid = handleGetRowId(row);
                 if (selectCheckboxMaps[rowid] || checkMethod({
                   row
                 })) {
@@ -2714,7 +2709,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
               });
             } else {
               afterFullData.forEach(row => {
-                selectRowMaps[(0, _util.getRowid)($xeTable, row)] = row;
+                const rowid = handleGetRowId(row);
+                selectRowMaps[rowid] = row;
               });
             }
           } else {
@@ -2725,7 +2721,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                */
             if (!isForce && checkMethod) {
               afterFullData.forEach(row => {
-                const rowid = (0, _util.getRowid)($xeTable, row);
+                const rowid = handleGetRowId(row);
                 if (checkMethod({
                   row
                 }) ? 0 : selectCheckboxMaps[rowid]) {
@@ -2745,10 +2741,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
           afterFullData.forEach(row => handleCheckboxReserveRow(row, false));
         }
       }
-      reactData.selectCheckboxMaps = checkField ? {} : selectRowMaps;
+      reactData.updateCheckboxFlag++;
+      internalData.selectCheckboxMaps = checkField ? {} : selectRowMaps;
       reactData.isAllSelected = checked;
       reactData.isIndeterminate = false;
-      reactData.treeIndeterminateMaps = {};
       internalData.treeIndeterminateRowMaps = {};
       $xeTable.checkSelectionStatus();
       return (0, _vue.nextTick)();
@@ -2761,15 +2757,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const {
         expandColumn,
         currentRow,
-        selectCheckboxMaps,
-        selectRadioRow,
-        rowExpandedMaps,
-        treeExpandedMaps
+        selectRadioRow
       } = reactData;
       const {
         fullDataRowIdData,
         fullAllDataRowIdData,
-        radioReserveRow
+        radioReserveRow,
+        selectCheckboxMaps,
+        treeExpandedMaps,
+        rowExpandedMaps
       } = internalData;
       const expandOpts = computeExpandOpts.value;
       const treeOpts = computeTreeOpts.value;
@@ -2787,7 +2783,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
       }
       // 复选框
-      reactData.selectCheckboxMaps = getRecoverRowMaps(selectCheckboxMaps); // 刷新多选行状态
+      internalData.selectCheckboxMaps = getRecoverRowMaps(selectCheckboxMaps); // 刷新多选行状态
+      reactData.updateCheckboxFlag++;
       // 还原保留选中状态
       if (checkboxOpts.reserve) {
         handleCheckedCheckboxRow(handleReserveRow(internalData.checkboxReserveRowMap), true, true);
@@ -2796,13 +2793,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
         reactData.currentRow = null; // 刷新当前行状态
       }
       // 行展开
-      reactData.rowExpandedMaps = expandColumn ? getRecoverRowMaps(rowExpandedMaps) : {}; // 刷新行展开状态
+      internalData.rowExpandedMaps = expandColumn ? getRecoverRowMaps(rowExpandedMaps) : {}; // 刷新行展开状态
+      reactData.rowExpandedFlag++;
       // 还原保留状态
       if (expandColumn && expandOpts.reserve) {
         $xeTable.setRowExpand(handleReserveRow(internalData.rowExpandedReserveRowMap), true);
       }
       // 树展开
-      reactData.treeExpandedMaps = treeConfig ? getRecoverRowMaps(treeExpandedMaps) : {}; // 刷新树展开状态
+      internalData.treeExpandedMaps = treeConfig ? getRecoverRowMaps(treeExpandedMaps) : {}; // 刷新树展开状态
+      reactData.treeExpandedFlag++;
       if (treeConfig && treeOpts.reserve) {
         $xeTable.setTreeExpand(handleReserveRow(internalData.treeExpandedReserveRowMap), true);
       }
@@ -2825,7 +2824,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = treeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         if (expandAll) {
-          tableMethods.setAllTreeExpand(true);
+          $xeTable.setAllTreeExpand(true);
         } else if (expandRowKeys) {
           const defExpandeds = [];
           const rowkey = (0, _util.getRowkey)($xeTable);
@@ -2837,7 +2836,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
               defExpandeds.push(matchObj.item);
             }
           });
-          tableMethods.setTreeExpand(defExpandeds, true);
+          $xeTable.setTreeExpand(defExpandeds, true);
         }
       }
     };
@@ -2854,10 +2853,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
       return new Promise(resolve => {
         if (loadMethod) {
           const {
+            fullAllDataRowIdData,
             treeExpandLazyLoadedMaps
-          } = reactData;
-          const {
-            fullAllDataRowIdData
           } = internalData;
           const rowid = (0, _util.getRowid)($xeTable, row);
           const rowRest = fullAllDataRowIdData[rowid];
@@ -2876,20 +2873,21 @@ var _default = exports.default = (0, _vue.defineComponent)({
               childRecords = [];
             }
             if (childRecords) {
-              return tableMethods.loadTreeChildren(row, childRecords).then(childRows => {
+              return $xeTable.loadTreeChildren(row, childRecords).then(childRows => {
                 const {
                   treeExpandedMaps
-                } = reactData;
+                } = internalData;
                 if (childRows.length && !treeExpandedMaps[rowid]) {
                   treeExpandedMaps[rowid] = row;
                 }
+                reactData.treeExpandedFlag++;
                 // 如果当前节点已选中，则展开后子节点也被选中
-                if (!checkStrictly && tableMethods.isCheckedByCheckboxRow(row)) {
+                if (!checkStrictly && $xeTable.isCheckedByCheckboxRow(row)) {
                   handleCheckedCheckboxRow(childRows, true);
                 }
                 return (0, _vue.nextTick)().then(() => {
                   if (transform) {
-                    tablePrivateMethods.handleTableData();
+                    $xeTable.handleTableData();
                     updateAfterDataIndex();
                     return (0, _vue.nextTick)();
                   }
@@ -2899,7 +2897,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }).catch(() => {
             const {
               treeExpandLazyLoadedMaps
-            } = reactData;
+            } = internalData;
             if (rowRest) {
               rowRest.treeLoaded = false;
             }
@@ -2907,7 +2905,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
               delete treeExpandLazyLoadedMaps[rowid];
             }
           }).finally(() => {
-            (0, _vue.nextTick)().then(() => tableMethods.recalculate()).then(() => resolve());
+            reactData.treeExpandedFlag++;
+            (0, _vue.nextTick)().then(() => $xeTable.recalculate()).then(() => resolve());
           });
         } else {
           resolve();
@@ -2936,35 +2935,38 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = expandOpts;
         if (loadMethod) {
           const {
-            fullAllDataRowIdData
+            fullAllDataRowIdData,
+            rowExpandLazyLoadedMaps
           } = internalData;
-          const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
           const rowid = (0, _util.getRowid)($xeTable, row);
           const rowRest = fullAllDataRowIdData[rowid];
-          rExpandLazyLoadedMaps[rowid] = row;
-          reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
+          rowExpandLazyLoadedMaps[rowid] = row;
           loadMethod({
             $table: $xeTable,
             row,
-            rowIndex: tableMethods.getRowIndex(row),
-            $rowIndex: tableMethods.getVMRowIndex(row)
+            rowIndex: $xeTable.getRowIndex(row),
+            $rowIndex: $xeTable.getVMRowIndex(row)
           }).then(() => {
-            const rowTempExpandedMaps = Object.assign({}, reactData.rowExpandedMaps);
+            const {
+              rowExpandedMaps
+            } = internalData;
             if (rowRest) {
               rowRest.expandLoaded = true;
             }
-            rowTempExpandedMaps[rowid] = row;
-            reactData.rowExpandedMaps = rowTempExpandedMaps;
+            rowExpandedMaps[rowid] = row;
+            reactData.rowExpandedFlag++;
           }).catch(() => {
             if (rowRest) {
               rowRest.expandLoaded = false;
             }
           }).finally(() => {
-            const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
-            if (rExpandLazyLoadedMaps[rowid]) {
-              delete rExpandLazyLoadedMaps[rowid];
+            const {
+              rowExpandLazyLoadedMaps
+            } = internalData;
+            if (rowExpandLazyLoadedMaps[rowid]) {
+              delete rowExpandLazyLoadedMaps[rowid];
             }
-            reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
+            reactData.rowExpandedFlag++;
             (0, _vue.nextTick)().then(() => $xeTable.recalculate()).then(() => $xeTable.updateCellAreas()).then(() => resolve());
           });
         } else {
@@ -3078,9 +3080,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       calcCellWidth();
       autoCellWidth();
       updateStyle();
-      if (reFull) {
-        updateRowOffsetTop();
-      }
       updateRowExpandStyle();
       return computeScrollLoad().then(() => {
         if (reFull === true) {
@@ -3122,6 +3121,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const childrenField = treeOpts.children || treeOpts.childrenField;
       let treeData = [];
       let fullData = (0, _vue.reactive)(datas ? datas.slice(0) : []); // 转为响应式数据
+      if (fullData.length > supportMaxRow) {
+        (0, _log.errLog)('vxe.error.errMaxRow', [supportMaxRow]);
+      }
       if (treeConfig) {
         if (transform) {
           // 树结构自动转换
@@ -3346,10 +3348,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
       return result;
     };
     const parseColumns = isReset => {
-      const {
-        showOverflow
-      } = props;
-      const rowOpts = computeRowOpts.value;
+      // const { showOverflow } = props
+      // const rowOpts = computeRowOpts.value
       const leftList = [];
       const centerList = [];
       const rightList = [];
@@ -3426,28 +3426,28 @@ var _default = exports.default = (0, _vue.defineComponent)({
         rightList
       });
       if (scrollXLoad) {
-        if (showOverflow) {
-          if (!rowOpts.height) {
-            const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false);
-            if (errColumn) {
-              (0, _log.errLog)('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
-            }
-          }
+        // if (showOverflow) {
+        //   if (!rowOpts.height) {
+        //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+        //     if (errColumn) {
+        //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+        //     }
+        //   }
+        // }
+        // if (process.env.NODE_ENV === 'development') {
+        // if (props.showHeader && !props.showHeaderOverflow) {
+        //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
+        // }
+        // if (props.showFooter && !props.showFooterOverflow) {
+        //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
+        // }
+        if (props.spanMethod) {
+          (0, _log.warnLog)('vxe.error.scrollErrProp', ['span-method']);
         }
-        if (process.env.NODE_ENV === 'development') {
-          // if (props.showHeader && !props.showHeaderOverflow) {
-          //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
-          // }
-          // if (props.showFooter && !props.showFooterOverflow) {
-          //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
-          // }
-          if (props.spanMethod) {
-            (0, _log.warnLog)('vxe.error.scrollErrProp', ['span-method']);
-          }
-          if (props.footerSpanMethod) {
-            (0, _log.warnLog)('vxe.error.scrollErrProp', ['footer-span-method']);
-          }
+        if (props.footerSpanMethod) {
+          (0, _log.warnLog)('vxe.error.scrollErrProp', ['footer-span-method']);
         }
+        // }
         if (isReset) {
           const {
             visibleSize
@@ -3560,14 +3560,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
      */
     const handleBaseTreeExpand = (rows, expanded) => {
       const {
-        treeExpandedMaps,
-        treeExpandLazyLoadedMaps,
         treeNodeColumn
       } = reactData;
-      const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
       const {
         fullAllDataRowIdData,
-        tableFullData
+        tableFullData,
+        treeExpandedMaps,
+        treeExpandLazyLoadedMaps
       } = internalData;
       const treeOpts = computeTreeOpts.value;
       const {
@@ -3581,6 +3580,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const result = [];
       const columnIndex = tableMethods.getColumnIndex(treeNodeColumn);
       const $columnIndex = tableMethods.getVMColumnIndex(treeNodeColumn);
+      const {
+        handleGetRowId
+      } = (0, _util.createHandleGetRowId)($xeTable);
       let validRows = toggleMethod ? rows.filter(row => toggleMethod({
         $table: $xeTable,
         expanded,
@@ -3597,17 +3599,17 @@ var _default = exports.default = (0, _vue.defineComponent)({
         });
         if (matchObj) {
           matchObj.items.forEach(item => {
-            const rowid = (0, _util.getRowid)($xeTable, item);
-            if (treeTempExpandedMaps[rowid]) {
-              delete treeTempExpandedMaps[rowid];
+            const rowid = handleGetRowId(item);
+            if (treeExpandedMaps[rowid]) {
+              delete treeExpandedMaps[rowid];
             }
           });
         }
       }
       if (expanded) {
         validRows.forEach(row => {
-          const rowid = (0, _util.getRowid)($xeTable, row);
-          if (!treeTempExpandedMaps[rowid]) {
+          const rowid = handleGetRowId(row);
+          if (!treeExpandedMaps[rowid]) {
             const rowRest = fullAllDataRowIdData[rowid];
             if (rowRest) {
               const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid];
@@ -3616,7 +3618,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 result.push(handleAsyncTreeExpandChilds(row));
               } else {
                 if (row[childrenField] && row[childrenField].length) {
-                  treeTempExpandedMaps[rowid] = row;
+                  treeExpandedMaps[rowid] = row;
                 }
               }
             }
@@ -3624,16 +3626,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
         });
       } else {
         validRows.forEach(item => {
-          const rowid = (0, _util.getRowid)($xeTable, item);
-          if (treeTempExpandedMaps[rowid]) {
-            delete treeTempExpandedMaps[rowid];
+          const rowid = handleGetRowId(item);
+          if (treeExpandedMaps[rowid]) {
+            delete treeExpandedMaps[rowid];
           }
         });
       }
       if (reserve) {
         validRows.forEach(row => handleTreeExpandReserve(row, expanded));
       }
-      reactData.treeExpandedMaps = treeTempExpandedMaps;
+      reactData.treeExpandedFlag++;
       return Promise.all(result).then(() => {
         return tableMethods.recalculate();
       });
@@ -3662,9 +3664,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
       handleCheckedAllCheckboxRow(value);
       if (evnt) {
         dispatchEvent('checkbox-all', {
-          records: $xeTable.getCheckboxRecords(),
-          reserves: $xeTable.getCheckboxReserveRecords(),
-          indeterminates: $xeTable.getCheckboxIndeterminateRecords(),
+          records: () => $xeTable.getCheckboxRecords(),
+          reserves: () => $xeTable.getCheckboxReserveRecords(),
+          indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
           checked: value
         }, evnt);
       }
@@ -3712,12 +3714,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
       }
     };
     const createGetRowCacheProp = prop => {
+      const {
+        handleGetRowId
+      } = (0, _util.createHandleGetRowId)($xeTable);
       return function (row) {
         const {
           fullAllDataRowIdData
         } = internalData;
         if (row) {
-          const rowid = (0, _util.getRowid)($xeTable, row);
+          const rowid = handleGetRowId(row);
           const rowRest = fullAllDataRowIdData[rowid];
           if (rowRest) {
             return rowRest[prop];
@@ -3887,7 +3892,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const handleUpdateColResize = (evnt, params) => {
       $xeTable.analyColumnWidth();
-      $xeTable.recalculate(true).then(() => {
+      $xeTable.recalculate().then(() => {
         $xeTable.saveCustomStore('update:width');
         $xeTable.updateCellAreas();
         $xeTable.dispatchEvent('column-resizable-change', params, evnt);
@@ -3898,7 +3903,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const handleUpdateRowResize = (evnt, params) => {
       reactData.resizeHeightFlag++;
-      $xeTable.recalculate(true).then(() => {
+      $xeTable.recalculate().then(() => {
         $xeTable.updateCellAreas();
         $xeTable.dispatchEvent('row-resizable-change', params, evnt);
         setTimeout(() => $xeTable.recalculate(true), 300);
@@ -3920,21 +3925,24 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const updateRowOffsetTop = () => {
       const {
-        expandColumn,
-        rowExpandedMaps
+        expandColumn
       } = reactData;
       const {
         afterFullData,
-        fullAllDataRowIdData
+        fullAllDataRowIdData,
+        rowExpandedMaps
       } = internalData;
       const expandOpts = computeExpandOpts.value;
       const rowOpts = computeRowOpts.value;
       const cellOpts = computeCellOpts.value;
       const defaultRowHeight = computeDefaultRowHeight.value;
+      const {
+        handleGetRowId
+      } = (0, _util.createHandleGetRowId)($xeTable);
       let offsetTop = 0;
       for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
         const row = afterFullData[rIndex];
-        const rowid = (0, _util.getRowid)($xeTable, row);
+        const rowid = handleGetRowId(row);
         const rowRest = fullAllDataRowIdData[rowid] || {};
         rowRest.oTop = offsetTop;
         offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight;
@@ -4368,6 +4376,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
           keepSource,
           treeConfig
         } = props;
+        const {
+          editStore
+        } = reactData;
         const {
           fullAllDataRowIdData,
           fullDataRowIdData,
@@ -4376,10 +4387,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
           tableFullData,
           afterFullData
         } = internalData;
+        const removeTempMaps = Object.assign({}, editStore.removeMaps);
         const treeOpts = computeTreeOpts.value;
         const {
           transform
         } = treeOpts;
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
         if (!keepSource) {
           if (process.env.NODE_ENV === 'development') {
             (0, _log.errLog)('vxe.error.reqProp', ['keep-source']);
@@ -4397,7 +4412,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         let reDelFlag = false;
         if (targetRows.length) {
           targetRows.forEach(item => {
-            const rowid = (0, _util.getRowid)($xeTable, item);
+            const rowid = handleGetRowId(item);
             const rowRest = fullAllDataRowIdData[rowid];
             if (rowRest) {
               const row = rowRest.row;
@@ -4410,6 +4425,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                     _xeUtils.default.destructuring(row, _xeUtils.default.clone(oRow, true));
                   }
                   if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                    delete removeTempMaps[rowid];
                     tableFullData.unshift(row);
                     afterFullData.unshift(row);
                     reDelFlag = true;
@@ -4421,6 +4437,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         if (rows) {
           if (reDelFlag) {
+            editStore.removeMaps = removeTempMaps;
             $xeTable.updateFooter();
             $xeTable.cacheRowMap(false);
             $xeTable.handleTableData(treeConfig && transform);
@@ -4590,10 +4607,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       /**
        * 检查行或列数据是否发生改变
-       * @param {Row} rowOrId 行对象、行主键
+       * @param {Row} rowidOrRow 行对象、行主键
        * @param {String} field 字段名
        */
-      isUpdateByRow(rowOrId, field) {
+      isUpdateByRow(rowidOrRow, field) {
         const {
           keepSource
         } = props;
@@ -4603,7 +4620,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           sourceDataRowIdData
         } = internalData;
         if (keepSource) {
-          const rowid = _xeUtils.default.isString(rowOrId) || _xeUtils.default.isNumber(rowOrId) ? rowOrId : (0, _util.getRowid)($xeTable, rowOrId);
+          const rowid = _xeUtils.default.isString(rowidOrRow) || _xeUtils.default.isNumber(rowidOrRow) ? rowidOrRow : (0, _util.getRowid)($xeTable, rowidOrRow);
           const rowRest = fullDataRowIdData[rowid];
           // 新增的数据不需要检测
           if (!rowRest) {
@@ -4798,16 +4815,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           treeConfig
         } = props;
-        const {
-          selectCheckboxMaps
-        } = reactData;
         const {
           tableFullData,
           afterFullData,
           afterTreeFullData,
           tableFullTreeData,
           fullDataRowIdData,
-          afterFullRowMaps
+          afterFullRowMaps,
+          selectCheckboxMaps
         } = internalData;
         const treeOpts = computeTreeOpts.value;
         const checkboxOpts = computeCheckboxOpts.value;
@@ -5183,12 +5198,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
           fullAllDataRowIdData,
           afterFullData
         } = internalData;
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
         const rowOpts = computeRowOpts.value;
         const cellOpts = computeCellOpts.value;
         const defaultRowHeight = computeDefaultRowHeight.value;
         const rest = {};
         afterFullData.forEach(row => {
-          const rowid = (0, _util.getRowid)($xeTable, row);
+          const rowid = handleGetRowId(row);
           const rowRest = fullAllDataRowIdData[rowid];
           if (rowRest) {
             const resizeHeight = rowRest.resizeHeight;
@@ -5214,8 +5232,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
           rHeight = Math.floor(rHeight * bodyHeight);
         }
         if (rHeight) {
+          const {
+            handleGetRowId
+          } = (0, _util.createHandleGetRowId)($xeTable);
           rows.forEach(row => {
-            const rowid = _xeUtils.default.isString(row) || _xeUtils.default.isNumber(row) ? row : (0, _util.getRowid)($xeTable, row);
+            const rowid = _xeUtils.default.isString(row) || _xeUtils.default.isNumber(row) ? row : handleGetRowId(row);
             const rowRest = fullAllDataRowIdData[rowid];
             if (rowRest) {
               rowRest.resizeHeight = rHeight;
@@ -5378,15 +5399,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
           treeConfig
         } = props;
         const {
-          fullDataRowIdData
+          fullDataRowIdData,
+          treeIndeterminateRowMaps
         } = internalData;
-        const {
-          treeIndeterminateMaps
-        } = reactData;
         if (treeConfig) {
           const fullRest = [];
           const defRest = [];
-          _xeUtils.default.each(treeIndeterminateMaps, (item, rowid) => {
+          _xeUtils.default.each(treeIndeterminateRowMaps, (item, rowid) => {
             if (item) {
               fullRest.push(item);
               if (fullDataRowIdData[rowid]) {
@@ -5430,8 +5449,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       isCheckedByCheckboxRow(row) {
         const {
-          selectCheckboxMaps
+          updateCheckboxFlag
         } = reactData;
+        const {
+          selectCheckboxMaps
+        } = internalData;
         const checkboxOpts = computeCheckboxOpts.value;
         const {
           checkField
@@ -5439,14 +5461,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (checkField) {
           return _xeUtils.default.get(row, checkField);
         }
-        return !!selectCheckboxMaps[(0, _util.getRowid)($xeTable, row)];
+        return !!updateCheckboxFlag && !!selectCheckboxMaps[(0, _util.getRowid)($xeTable, row)];
       },
       isCheckedByCheckboxRowKey(rowid) {
         const {
-          selectCheckboxMaps
+          updateCheckboxFlag
         } = reactData;
         const {
-          fullAllDataRowIdData
+          fullAllDataRowIdData,
+          selectCheckboxMaps
         } = internalData;
         const checkboxOpts = computeCheckboxOpts.value;
         const {
@@ -5459,19 +5482,19 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }
           return false;
         }
-        return !!selectCheckboxMaps[rowid];
+        return !!updateCheckboxFlag && !!selectCheckboxMaps[rowid];
       },
       isIndeterminateByCheckboxRow(row) {
         const {
-          treeIndeterminateMaps
-        } = reactData;
-        return !!treeIndeterminateMaps[(0, _util.getRowid)($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row);
+          treeIndeterminateRowMaps
+        } = internalData;
+        return !!treeIndeterminateRowMaps[(0, _util.getRowid)($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row);
       },
       isIndeterminateByCheckboxRowKey(rowid) {
         const {
-          treeIndeterminateMaps
-        } = reactData;
-        return !!treeIndeterminateMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid);
+          treeIndeterminateRowMaps
+        } = internalData;
+        return !!treeIndeterminateRowMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid);
       },
       /**
        * 多选，切换某一行的选中状态
@@ -5479,7 +5502,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       toggleCheckboxRow(row) {
         const {
           selectCheckboxMaps
-        } = reactData;
+        } = internalData;
         const checkboxOpts = computeCheckboxOpts.value;
         const {
           checkField
@@ -5556,16 +5579,19 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const reserveSelection = [];
         if (checkboxOpts.reserve) {
+          const {
+            handleGetRowId
+          } = (0, _util.createHandleGetRowId)($xeTable);
           const afterFullIdMaps = {};
           if (treeConfig) {
             _xeUtils.default.eachTree(afterFullData, row => {
-              afterFullIdMaps[(0, _util.getRowid)($xeTable, row)] = 1;
+              afterFullIdMaps[handleGetRowId(row)] = 1;
             }, {
               children: childrenField
             });
           } else {
             afterFullData.forEach(row => {
-              afterFullIdMaps[(0, _util.getRowid)($xeTable, row)] = 1;
+              afterFullIdMaps[handleGetRowId(row)] = 1;
             });
           }
           _xeUtils.default.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
@@ -5635,8 +5661,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         reactData.isAllSelected = false;
         reactData.isIndeterminate = false;
-        reactData.selectCheckboxMaps = {};
-        reactData.treeIndeterminateMaps = {};
+        internalData.selectCheckboxMaps = {};
+        internalData.treeIndeterminateRowMaps = {};
+        reactData.updateCheckboxFlag++;
         return (0, _vue.nextTick)();
       },
       /**
@@ -5754,13 +5781,22 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 用于当前列，设置某列行为高亮状态
        */
       setCurrentColumn(fieldOrColumn) {
+        const {
+          mouseConfig
+        } = props;
+        const mouseOpts = computeMouseOpts.value;
+        const isMouseSelected = mouseConfig && mouseOpts.selected;
         const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
         if (column) {
-          // tableMethods.clearCurrentRow()
-          tableMethods.clearCurrentColumn();
+          $xeTable.clearCurrentColumn();
           reactData.currentColumn = column;
         }
-        return (0, _vue.nextTick)();
+        return (0, _vue.nextTick)().then(() => {
+          // 更新状选中态
+          if (isMouseSelected) {
+            $xeTable.addCellSelectedClass();
+          }
+        });
       },
       /**
        * 用于当前列，手动清空当前高亮的状态
@@ -5770,44 +5806,54 @@ var _default = exports.default = (0, _vue.defineComponent)({
         return (0, _vue.nextTick)();
       },
       setPendingRow(rows, status) {
-        const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
+        const {
+          pendingRowMaps
+        } = internalData;
         if (rows && !_xeUtils.default.isArray(rows)) {
           rows = [rows];
         }
         if (status) {
           rows.forEach(row => {
-            const rowid = (0, _util.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 = (0, _util.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 (0, _vue.nextTick)();
       },
       togglePendingRow(rows) {
-        const pendingMaps = Object.assign({}, reactData.pendingRowMaps);
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
+        const {
+          pendingRowMaps
+        } = internalData;
         if (rows && !_xeUtils.default.isArray(rows)) {
           rows = [rows];
         }
         rows.forEach(row => {
-          const rowid = (0, _util.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 (0, _vue.nextTick)();
       },
       hasPendingByRow(row) {
@@ -5816,16 +5862,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
       isPendingByRow(row) {
         const {
           pendingRowMaps
-        } = reactData;
+        } = internalData;
         const rowid = (0, _util.getRowid)($xeTable, row);
         return !!pendingRowMaps[rowid];
       },
       getPendingRecords() {
         const {
+          fullAllDataRowIdData,
           pendingRowMaps
-        } = reactData;
-        const {
-          fullAllDataRowIdData
         } = internalData;
         const insertRecords = [];
         _xeUtils.default.each(pendingRowMaps, (row, rowid) => {
@@ -5836,7 +5880,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         return insertRecords;
       },
       clearPendingRow() {
-        reactData.pendingRowMaps = {};
+        internalData.pendingRowMaps = {};
+        reactData.pendingRowFlag++;
         return (0, _vue.nextTick)();
       },
       sort(sortConfs, sortOrder) {
@@ -6022,7 +6067,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             column,
             property: column.field,
             field: column.field,
-            filterList: $xeTable.getCheckedFilters(),
+            filterList: () => $xeTable.getCheckedFilters(),
             visible: false
           }, null);
         }
@@ -6054,9 +6099,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         return rowRest && !!rowRest.expandLoaded;
       },
       clearRowExpandLoaded(row) {
-        const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
         const {
-          fullAllDataRowIdData
+          fullAllDataRowIdData,
+          rowExpandLazyLoadedMaps
         } = internalData;
         const expandOpts = computeExpandOpts.value;
         const {
@@ -6066,9 +6111,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const rowRest = fullAllDataRowIdData[rowid];
         if (lazy && rowRest) {
           rowRest.expandLoaded = false;
-          delete rExpandLazyLoadedMaps[rowid];
+          delete rowExpandLazyLoadedMaps[rowid];
         }
-        reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
+        reactData.rowExpandedFlag++;
         return (0, _vue.nextTick)();
       },
       /**
@@ -6078,14 +6123,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
       reloadRowExpand(row) {
         const {
           rowExpandLazyLoadedMaps
-        } = reactData;
+        } = internalData;
         const expandOpts = computeExpandOpts.value;
         const {
           lazy
         } = expandOpts;
         const rowid = (0, _util.getRowid)($xeTable, row);
         if (lazy && !rowExpandLazyLoadedMaps[rowid]) {
-          tableMethods.clearRowExpandLoaded(row).then(() => handleAsyncRowExpand(row));
+          $xeTable.clearRowExpandLoaded(row).then(() => handleAsyncRowExpand(row));
         }
         return (0, _vue.nextTick)();
       },
@@ -6094,13 +6139,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
           (0, _log.warnLog)('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
         }
         // 即将废弃
-        return tableMethods.reloadRowExpand(row);
+        return $xeTable.reloadRowExpand(row);
       },
       /**
        * 切换展开行
        */
       toggleRowExpand(row) {
-        return tableMethods.setRowExpand(row, !tableMethods.isRowExpandByRow(row));
+        return $xeTable.setRowExpand(row, !$xeTable.isRowExpandByRow(row));
       },
       /**
        * 设置所有行的展开与否
@@ -6134,14 +6179,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
        */
       setRowExpand(rows, expanded) {
         const {
-          rowExpandedMaps,
-          rowExpandLazyLoadedMaps,
           expandColumn
         } = reactData;
-        const {
-          fullAllDataRowIdData
+        let {
+          fullAllDataRowIdData,
+          rowExpandedMaps,
+          rowExpandLazyLoadedMaps
         } = internalData;
-        let rExpandedMaps = Object.assign({}, rowExpandedMaps);
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
         const expandOpts = computeExpandOpts.value;
         const {
           reserve,
@@ -6158,7 +6205,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }
           if (accordion) {
             // 只能同时展开一个
-            rExpandedMaps = {};
+            rowExpandedMaps = {};
+            internalData.rowExpandedMaps = rowExpandedMaps;
             rows = rows.slice(rows.length - 1, rows.length);
           }
           const validRows = toggleMethod ? rows.filter(row => toggleMethod({
@@ -6173,22 +6221,22 @@ var _default = exports.default = (0, _vue.defineComponent)({
           })) : rows;
           if (expanded) {
             validRows.forEach(row => {
-              const rowid = (0, _util.getRowid)($xeTable, row);
-              if (!rExpandedMaps[rowid]) {
+              const rowid = handleGetRowId(row);
+              if (!rowExpandedMaps[rowid]) {
                 const rowRest = fullAllDataRowIdData[rowid];
                 const isLoad = lazy && !rowRest.expandLoaded && !rowExpandLazyLoadedMaps[rowid];
                 if (isLoad) {
                   lazyRests.push(handleAsyncRowExpand(row));
                 } else {
-                  rExpandedMaps[rowid] = row;
+                  rowExpandedMaps[rowid] = row;
                 }
               }
             });
           } else {
             validRows.forEach(item => {
-              const rowid = (0, _util.getRowid)($xeTable, item);
-              if (rExpandedMaps[rowid]) {
-                delete rExpandedMaps[rowid];
+              const rowid = handleGetRowId(item);
+              if (rowExpandedMaps[rowid]) {
+                delete rowExpandedMaps[rowid];
               }
             });
           }
@@ -6196,7 +6244,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             validRows.forEach(row => handleRowExpandReserve(row, expanded));
           }
         }
-        reactData.rowExpandedMaps = rExpandedMaps;
+        reactData.rowExpandedFlag++;
         return Promise.all(lazyRests).then(() => (0, _vue.nextTick)()).then(() => $xeTable.recalculate(true)).then(() => {
           updateRowOffsetTop();
           updateRowExpandStyle();
@@ -6210,10 +6258,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
        */
       isRowExpandByRow(row) {
         const {
-          rowExpandedMaps
+          rowExpandedFlag
         } = reactData;
+        const {
+          rowExpandedMaps
+        } = internalData;
         const rowid = (0, _util.getRowid)($xeTable, row);
-        return !!rowExpandedMaps[rowid];
+        return !!rowExpandedFlag && !!rowExpandedMaps[rowid];
       },
       isExpandByRow(row) {
         // 已废弃
@@ -6234,7 +6285,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           reserve
         } = expandOpts;
         const expList = $xeTable.getRowExpandRecords();
-        reactData.rowExpandedMaps = {};
+        internalData.rowExpandedMaps = {};
+        reactData.rowExpandedFlag++;
         if (reserve) {
           tableFullData.forEach(row => handleRowExpandReserve(row, false));
         }
@@ -6255,7 +6307,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       getRowExpandRecords() {
         const rest = [];
-        _xeUtils.default.each(reactData.rowExpandedMaps, item => {
+        _xeUtils.default.each(internalData.rowExpandedMaps, item => {
           if (item) {
             rest.push(item);
           }
@@ -6264,7 +6316,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       getTreeExpandRecords() {
         const rest = [];
-        _xeUtils.default.each(reactData.treeExpandedMaps, item => {
+        _xeUtils.default.each(internalData.treeExpandedMaps, item => {
           if (item) {
             rest.push(item);
           }
@@ -6284,15 +6336,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       clearTreeExpandLoaded(rows) {
         const {
-          fullAllDataRowIdData
+          fullAllDataRowIdData,
+          treeExpandedMaps
         } = internalData;
         const treeOpts = computeTreeOpts.value;
         const {
           transform
         } = treeOpts;
-        let tExpandedMaps = {};
         if (rows) {
-          tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
           if (!_xeUtils.default.isArray(rows)) {
             rows = [rows];
           }
@@ -6301,8 +6352,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
             const rowRest = fullAllDataRowIdData[rowid];
             if (rowRest) {
               rowRest.treeLoaded = false;
-              if (tExpandedMaps[rowid]) {
-                delete tExpandedMaps[rowid];
+              if (treeExpandedMaps[rowid]) {
+                delete treeExpandedMaps[rowid];
               }
             }
           });
@@ -6311,7 +6362,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
             rowRest.treeLoaded = false;
           });
         }
-        reactData.treeExpandedMaps = {};
+        internalData.treeExpandedMaps = {};
+        reactData.treeExpandedFlag++;
         if (transform) {
           handleVirtualTreeToList();
           return $xeTable.handleTableData();
@@ -6325,7 +6377,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       reloadTreeExpand(row) {
         const {
           treeExpandLazyLoadedMaps
-        } = reactData;
+        } = internalData;
         const treeOpts = computeTreeOpts.value;
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
         const {
@@ -6423,9 +6475,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
        */
       isTreeExpandByRow(row) {
         const {
-          treeExpandedMaps
+          treeExpandedFlag
         } = reactData;
-        return !!treeExpandedMaps[(0, _util.getRowid)($xeTable, row)];
+        const {
+          treeExpandedMaps
+        } = internalData;
+        return !!treeExpandedFlag && !!treeExpandedMaps[(0, _util.getRowid)($xeTable, row)];
       },
       /**
        * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
@@ -6440,21 +6495,22 @@ var _default = exports.default = (0, _vue.defineComponent)({
           transform,
           reserve
         } = treeOpts;
-        const expList = tableMethods.getTreeExpandRecords();
-        reactData.treeExpandedMaps = {};
+        const expList = $xeTable.getTreeExpandRecords();
+        internalData.treeExpandedMaps = {};
+        reactData.treeExpandedFlag++;
         if (reserve) {
           _xeUtils.default.eachTree(tableFullTreeData, row => handleTreeExpandReserve(row, false), {
             children: childrenField
           });
         }
-        return tablePrivateMethods.handleTableData().then(() => {
+        return $xeTable.handleTableData().then(() => {
           if (transform) {
             handleVirtualTreeToList();
-            return tablePrivateMethods.handleTableData();
+            return $xeTable.handleTableData();
           }
         }).then(() => {
           if (expList.length) {
-            return tableMethods.recalculate();
+            return $xeTable.recalculate();
           }
         });
       },
@@ -6745,8 +6801,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
           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 = {};
@@ -6766,45 +6829,35 @@ var _default = exports.default = (0, _vue.defineComponent)({
         let hasFixed = 0;
         let hasVisible = 0;
         _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+          const colKey = column.getKey();
+          if (!colKey) {
+            (0, _log.errLog)('vxe.error.reqProp', [`${column.getTitle() || column.type || ''} -> column.field=?`]);
+            return;
+          }
           // 只支持一级
           if (!parentColumn) {
-            collectColumn.forEach(column => {
-              const colKey = column.getKey();
-              if (colKey) {
-                hasSort = 1;
-                sortData[colKey] = column.renderSortNumber;
-              }
-            });
-            if (column.fixed !== column.defaultFixed) {
-              const colKey = column.getKey();
-              if (colKey) {
-                hasFixed = 1;
-                fixedData[colKey] = column.fixed;
-              }
+            if (isCustomSort) {
+              hasSort = 1;
+              sortData[colKey] = column.renderSortNumber;
             }
-          }
-          if (column.resizeWidth) {
-            const colKey = column.getKey();
-            if (colKey) {
-              hasResizable = 1;
-              resizableData[colKey] = column.renderWidth;
+            if (isCustomFixed && column.fixed !== column.defaultFixed) {
+              hasFixed = 1;
+              fixedData[colKey] = column.fixed;
             }
           }
-          if (!checkMethod || checkMethod({
+          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;
             }
           }
         });
@@ -7189,7 +7242,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                   if (keyboardOpts.enterToTab) {
                     $xeTable.moveTabSelected(activeParams, hasShiftKey, evnt);
                   } else {
-                    $xeTable.moveSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
+                    $xeTable.moveEnterSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
                   }
                 } else {
                   if (keyboardOpts.enterToTab) {
@@ -7225,7 +7278,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                           return;
                         }
                       }
-                      $xeTable.moveSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
+                      $xeTable.moveEnterSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
                       if (enterMethod) {
                         enterMethod(etrParams);
                       }
@@ -7252,10 +7305,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             if (!isEditStatus) {
               // 如果按下了方向键
               if (selected.row && selected.column) {
-                $xeTable.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
-              } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-                // 当前行按键上下移动
-                $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+                $xeTable.moveArrowSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
               }
             }
           } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
@@ -7680,8 +7730,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
      * @param {Event} evnt 事件
      * @param {Row} row 行对象
      */
-    const handleTooltip = (evnt, tdEl, overflowElem, tipElem, params) => {
-      if (!overflowElem) {
+    const handleTooltip = (evnt, tdEl, overflowElem, params) => {
+      const tipOverEl = overflowElem || tdEl;
+      if (!tipOverEl) {
         return (0, _vue.nextTick)();
       }
       params.cell = tdEl;
@@ -7699,9 +7750,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } = tooltipOpts;
       const customContent = contentMethod ? contentMethod(params) : null;
       const useCustom = contentMethod && !_xeUtils.default.eqNull(customContent);
-      const content = useCustom ? customContent : _xeUtils.default.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.default.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
+      if (content && (showAll || useCustom || tipOverEl.scrollWidth > tipOverEl.clientWidth)) {
         Object.assign(tooltipStore, {
           row,
           column,
@@ -7711,7 +7761,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         (0, _vue.nextTick)(() => {
           const $tooltip = refTooltip.value;
           if ($tooltip && $tooltip.open) {
-            $tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, (0, _utils.formatText)(content));
+            $tooltip.open(tipOverEl, (0, _utils.formatText)(content));
           }
         });
       }
@@ -7869,13 +7919,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           treeConfig
         } = props;
-        const {
-          treeExpandedMaps
-        } = reactData;
         const {
           fullAllDataRowIdData,
           tableFullData,
-          tableFullTreeData
+          tableFullTreeData,
+          treeExpandedMaps
         } = internalData;
         const treeOpts = computeTreeOpts.value;
         const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -7883,12 +7931,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           lazy
         } = treeOpts;
-        const rowkey = (0, _util.getRowkey)($xeTable);
-        const isDeepKey = rowkey.indexOf('.') > -1;
         const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
         const fullDataRowIdMaps = {};
-        const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
-        const handleRowId = isDeepKey ? _util.updateDeepRowKey : _util.updateFastRowKey;
+        const {
+          handleUpdateRowId
+        } = (0, _util.createHandleUpdateRowId)($xeTable);
         const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
           let rowRest = fullAllDataRowIdMaps[rowid];
           if (!rowRest) {
@@ -7919,18 +7966,19 @@ var _default = exports.default = (0, _vue.defineComponent)({
           rowRest.level = level;
           rowRest.index = currIndex;
           rowRest.treeIndex = index;
+          fullDataRowIdMaps[rowid] = rowRest;
+          fullAllDataRowIdMaps[rowid] = rowRest;
         };
         if (treeConfig) {
           _xeUtils.default.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
-            const rowid = handleRowId(row, rowkey);
+            const rowid = handleUpdateRowId(row);
             if (treeConfig && lazy) {
-              const treeExpRest = treeTempExpandedMaps[rowid];
               if (row[hasChildField] && row[childrenField] === undefined) {
                 row[childrenField] = null;
               }
-              if (treeExpRest) {
+              if (treeExpandedMaps[rowid]) {
                 if (!row[childrenField] || !row[childrenField].length) {
-                  delete treeTempExpandedMaps[rowid];
+                  delete treeExpandedMaps[rowid];
                 }
               }
             }
@@ -7940,31 +7988,26 @@ var _default = exports.default = (0, _vue.defineComponent)({
           });
         } else {
           tableFullData.forEach((row, index, items) => {
-            handleRowCache(row, index, items, index, null, handleRowId(row, rowkey), 0, index + 1);
+            handleRowCache(row, index, items, index, null, handleUpdateRowId(row), 0, index + 1);
           });
         }
         internalData.fullDataRowIdData = fullDataRowIdMaps;
         internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
-        reactData.treeExpandedMaps = treeTempExpandedMaps;
+        reactData.treeExpandedFlag++;
       },
       cacheSourceMap(fullData) {
         const {
           treeConfig
         } = props;
         const treeOpts = computeTreeOpts.value;
-        let {
-          sourceDataRowIdData
-        } = internalData;
         const sourceData = _xeUtils.default.clone(fullData, true);
-        const rowkey = (0, _util.getRowkey)($xeTable);
-        sourceDataRowIdData = internalData.sourceDataRowIdData = {};
+        const {
+          handleUpdateRowId
+        } = (0, _util.createHandleUpdateRowId)($xeTable);
+        const sourceRowIdData = {};
         const handleSourceRow = row => {
-          let rowid = (0, _util.getRowid)($xeTable, row);
-          if ((0, _utils.eqEmptyValue)(rowid)) {
-            rowid = (0, _util.getRowUniqueId)();
-            _xeUtils.default.set(row, rowkey, rowid);
-          }
-          sourceDataRowIdData[rowid] = row;
+          const rowid = handleUpdateRowId(row);
+          sourceRowIdData[rowid] = row;
         };
         // 源数据缓存
         if (treeConfig) {
@@ -7975,6 +8018,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } else {
           sourceData.forEach(handleSourceRow);
         }
+        internalData.sourceDataRowIdData = sourceRowIdData;
         internalData.tableSourceData = sourceData;
       },
       /**
@@ -8481,12 +8525,25 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }
         }
         // 兼容老版本
-        let rest;
-        if (!evntList.some(func => func(Object.assign({
-          $grid: $xeGrid,
-          $table: $xeTable,
-          $event: evnt
-        }, args)) === false)) {
+        let rest = null;
+        let isStop = false;
+        for (let i = 0; i < evntList.length; i++) {
+          const func = evntList[i];
+          const fnRest = func(Object.assign({
+            $grid: $xeGrid,
+            $table: $xeTable,
+            $event: evnt
+          }, args));
+          if (fnRest === false) {
+            isStop = true;
+            break;
+          } else if (fnRest && fnRest.status === false) {
+            rest = fnRest.result;
+            isStop = true;
+            break;
+          }
+        }
+        if (!isStop) {
           if (next) {
             rest = next();
           }
@@ -8502,10 +8559,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = props;
         const {
           selectCheckboxMaps,
-          treeIndeterminateMaps
-        } = reactData;
-        const selectRowMaps = Object.assign({}, selectCheckboxMaps);
-        const halfRowMaps = Object.assign({}, treeIndeterminateMaps);
+          treeIndeterminateRowMaps
+        } = internalData;
         const treeOpts = computeTreeOpts.value;
         const {
           transform,
@@ -8526,10 +8581,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         // 树结构
         if (treeConfig) {
+          const {
+            handleGetRowId
+          } = (0, _util.createHandleGetRowId)($xeTable);
           const childRowMaps = {};
           const childRowList = [];
           _xeUtils.default.eachTree(afterTreeFullData, row => {
-            const rowid = (0, _util.getRowid)($xeTable, row);
+            const rowid = handleGetRowId(row);
             const childList = row[transform ? mapChildrenField : childrenField];
             if (childList && childList.length && !childRowMaps[rowid]) {
               childRowMaps[rowid] = 1;
@@ -8546,30 +8604,30 @@ var _default = exports.default = (0, _vue.defineComponent)({
             let hLen = 0; // 半选
             let vLen = 0; // 有效行
             childList.forEach(checkMethod ? item => {
-              const childRowid = (0, _util.getRowid)($xeTable, item);
-              const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectRowMaps[childRowid];
+              const childRowid = handleGetRowId(item);
+              const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectCheckboxMaps[childRowid];
               if (checkMethod({
                 row: item
               })) {
                 if (isSelect) {
                   sLen++;
-                } else if (halfRowMaps[childRowid]) {
+                } else if (treeIndeterminateRowMaps[childRowid]) {
                   hLen++;
                 }
                 vLen++;
               } else {
                 if (isSelect) {
                   sLen++;
-                } else if (halfRowMaps[childRowid]) {
+                } else if (treeIndeterminateRowMaps[childRowid]) {
                   hLen++;
                 }
               }
             } : item => {
-              const childRowid = (0, _util.getRowid)($xeTable, item);
-              const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectRowMaps[childRowid];
+              const childRowid = handleGetRowId(item);
+              const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectCheckboxMaps[childRowid];
               if (isSelect) {
                 sLen++;
-              } else if (halfRowMaps[childRowid]) {
+              } else if (treeIndeterminateRowMaps[childRowid]) {
                 hLen++;
               }
               vLen++;
@@ -8581,38 +8639,40 @@ var _default = exports.default = (0, _vue.defineComponent)({
             }
             if (isSelected) {
               if (!checkField) {
-                selectRowMaps[rowid] = row;
+                selectCheckboxMaps[rowid] = row;
               }
-              if (halfRowMaps[rowid]) {
-                delete halfRowMaps[rowid];
+              if (treeIndeterminateRowMaps[rowid]) {
+                delete treeIndeterminateRowMaps[rowid];
               }
             } else {
               if (!checkField) {
-                if (selectRowMaps[rowid]) {
-                  delete selectRowMaps[rowid];
+                if (selectCheckboxMaps[rowid]) {
+                  delete selectCheckboxMaps[rowid];
                 }
               }
               if (halfSelect) {
-                halfRowMaps[rowid] = row;
+                treeIndeterminateRowMaps[rowid] = row;
               } else {
-                if (halfRowMaps[rowid]) {
-                  delete halfRowMaps[rowid];
+                if (treeIndeterminateRowMaps[rowid]) {
+                  delete treeIndeterminateRowMaps[rowid];
                 }
               }
             }
           });
         }
-        reactData.selectCheckboxMaps = selectRowMaps;
-        reactData.treeIndeterminateMaps = halfRowMaps;
+        reactData.updateCheckboxFlag++;
       },
       updateAllCheckboxStatus() {
         const {
           treeConfig
         } = props;
         const {
+          afterFullData,
+          afterTreeFullData,
+          checkboxReserveRowMap,
           selectCheckboxMaps,
-          treeIndeterminateMaps
-        } = reactData;
+          treeIndeterminateRowMaps
+        } = internalData;
         const checkboxOpts = computeCheckboxOpts.value;
         const {
           checkField,
@@ -8620,39 +8680,37 @@ var _default = exports.default = (0, _vue.defineComponent)({
           showReserveStatus
         } = checkboxOpts;
         const {
-          afterFullData,
-          afterTreeFullData,
-          checkboxReserveRowMap
-        } = internalData;
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
         let sLen = 0; // 已选
         let hLen = 0; // 半选
         let vLen = 0; // 有效行
         const rootList = treeConfig ? afterTreeFullData : afterFullData;
         rootList.forEach(checkMethod ? row => {
-          const childRowid = (0, _util.getRowid)($xeTable, row);
+          const childRowid = handleGetRowId(row);
           const selected = checkField ? _xeUtils.default.get(row, checkField) : selectCheckboxMaps[childRowid];
           if (checkMethod({
             row
           })) {
             if (selected) {
               sLen++;
-            } else if (treeIndeterminateMaps[childRowid]) {
+            } else if (treeIndeterminateRowMaps[childRowid]) {
               hLen++;
             }
             vLen++;
           } else {
             if (selected) {
               sLen++;
-            } else if (treeIndeterminateMaps[childRowid]) {
+            } else if (treeIndeterminateRowMaps[childRowid]) {
               hLen++;
             }
           }
         } : row => {
-          const childRowid = (0, _util.getRowid)($xeTable, row);
+          const childRowid = handleGetRowId(row);
           const selected = checkField ? _xeUtils.default.get(row, checkField) : selectCheckboxMaps[childRowid];
           if (selected) {
             sLen++;
-          } else if (treeIndeterminateMaps[childRowid]) {
+          } else if (treeIndeterminateRowMaps[childRowid]) {
             hLen++;
           }
           vLen++;
@@ -8680,8 +8738,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = props;
         const {
           selectCheckboxMaps
-        } = reactData;
-        const selectRowMaps = Object.assign({}, selectCheckboxMaps);
+        } = internalData;
         const treeOpts = computeTreeOpts.value;
         const {
           transform,
@@ -8694,6 +8751,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
           checkStrictly,
           checkMethod
         } = checkboxOpts;
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
         // indeterminateField 仅支持读取
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
         if (checkField) {
@@ -8713,35 +8773,34 @@ var _default = exports.default = (0, _vue.defineComponent)({
             }, {
               children: transform ? mapChildrenField : childrenField
             });
-            reactData.selectCheckboxMaps = selectRowMaps;
+            reactData.updateCheckboxFlag++;
             return;
-          } else {
-            // 列表
-            rows.forEach(row => {
-              if (isForce || !checkMethod || checkMethod({
-                row
-              })) {
-                _xeUtils.default.set(row, checkField, checked);
-                handleCheckboxReserveRow(row, checked);
-              }
-            });
           }
-          reactData.selectCheckboxMaps = selectRowMaps;
+          // 列表
+          rows.forEach(row => {
+            if (isForce || !checkMethod || checkMethod({
+              row
+            })) {
+              _xeUtils.default.set(row, checkField, checked);
+              handleCheckboxReserveRow(row, checked);
+            }
+          });
+          reactData.updateCheckboxFlag++;
           return;
         }
         // 树结构
         if (treeConfig && !checkStrictly) {
           // 更新子节点状态
           _xeUtils.default.eachTree(rows, row => {
-            const rowid = (0, _util.getRowid)($xeTable, row);
+            const rowid = handleGetRowId(row);
             if (isForce || !checkMethod || checkMethod({
               row
             })) {
               if (checked) {
-                selectRowMaps[rowid] = row;
+                selectCheckboxMaps[rowid] = row;
               } else {
-                if (selectRowMaps[rowid]) {
-                  delete selectRowMaps[rowid];
+                if (selectCheckboxMaps[rowid]) {
+                  delete selectCheckboxMaps[rowid];
                 }
               }
               handleCheckboxReserveRow(row, checked);
@@ -8749,28 +8808,28 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }, {
             children: transform ? mapChildrenField : childrenField
           });
-          reactData.selectCheckboxMaps = selectRowMaps;
+          reactData.updateCheckboxFlag++;
           return;
         }
         // 列表
         rows.forEach(row => {
-          const rowid = (0, _util.getRowid)($xeTable, row);
+          const rowid = handleGetRowId(row);
           if (isForce || !checkMethod || checkMethod({
             row
           })) {
             if (checked) {
-              if (!selectRowMaps[rowid]) {
-                selectRowMaps[rowid] = row;
+              if (!selectCheckboxMaps[rowid]) {
+                selectCheckboxMaps[rowid] = row;
               }
             } else {
-              if (selectRowMaps[rowid]) {
-                delete selectRowMaps[rowid];
+              if (selectCheckboxMaps[rowid]) {
+                delete selectCheckboxMaps[rowid];
               }
             }
             handleCheckboxReserveRow(row, checked);
+            reactData.updateCheckboxFlag++;
           }
         });
-        reactData.selectCheckboxMaps = selectRowMaps;
       },
       /**
        * 即将移除
@@ -8828,7 +8887,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           return;
         }
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-          handleTooltip(evnt, thEl, cellEl, null, params);
+          handleTooltip(evnt, thEl, thEl.querySelector('.vxe-cell--title') || cellEl, params);
         }
       },
       /**
@@ -8866,7 +8925,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }
         }
         if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-          handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper'), null, params);
+          handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
         }
       },
       /**
@@ -8879,10 +8938,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           tooltipStore
         } = reactData;
-        const cell = evnt.currentTarget;
+        const tdEl = evnt.currentTarget;
         handleTargetEnterEvent(tooltipStore.column !== column || !!tooltipStore.row);
         if (tooltipStore.column !== column || !tooltipStore.visible) {
-          handleTooltip(evnt, cell, cell.querySelector('.vxe-cell--wrapper') || cell.children[0], null, params);
+          handleTooltip(evnt, tdEl, tdEl.querySelector('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper'), params);
         }
       },
       handleTargetLeaveEvent() {
@@ -8908,6 +8967,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = internalData;
         const sortOpts = computeSortOpts.value;
         const columnOpts = computeColumnOpts.value;
+        const currentColumnOpts = computeCurrentColumnOpts.value;
         const {
           column
         } = params;
@@ -8916,7 +8976,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const triggerSort = (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--sort').flag;
         const triggerFilter = (0, _dom.getEventTargetNode)(evnt, cell, 'vxe-cell--filter').flag;
         if (sortOpts.trigger === 'cell' && !(triggerResizable || triggerSort || triggerFilter)) {
-          tablePrivateMethods.triggerSortEvent(evnt, column, getNextSortOrder(column));
+          $xeTable.triggerSortEvent(evnt, column, getNextSortOrder(column));
         }
         dispatchEvent('header-cell-click', Object.assign({
           triggerResizable,
@@ -8924,8 +8984,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           triggerFilter,
           cell
         }, params), evnt);
-        if (columnOpts.isCurrent || props.highlightCurrentColumn) {
-          tablePrivateMethods.triggerCurrentColumnEvent(evnt, params);
+        if ((columnOpts.isCurrent || props.highlightCurrentColumn) && (!currentColumnOpts.trigger || ['header', 'default'].includes(currentColumnOpts.trigger))) {
+          $xeTable.triggerCurrentColumnEvent(evnt, params);
         }
       },
       triggerHeaderCellDblclickEvent(evnt, params) {
@@ -8941,6 +9001,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       triggerCellClickEvent(evnt, params) {
         const {
           highlightCurrentRow,
+          highlightCurrentColumn,
           editConfig
         } = props;
         const {
@@ -8957,6 +9018,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const checkboxOpts = computeCheckboxOpts.value;
         const keyboardOpts = computeKeyboardOpts.value;
         const rowOpts = computeRowOpts.value;
+        const columnOpts = computeColumnOpts.value;
+        const currentColumnOpts = computeCurrentColumnOpts.value;
         const {
           actived,
           focused
@@ -8987,29 +9050,35 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (!triggerCheckbox && !triggerRadio) {
           // 如果是展开行
           if (!triggerExpandNode && (expandOpts.trigger === 'row' || isExpandType && expandOpts.trigger === 'cell')) {
-            tablePrivateMethods.triggerRowExpandEvent(evnt, params);
+            $xeTable.triggerRowExpandEvent(evnt, params);
           }
           // 如果是树形表格
           if (treeOpts.trigger === 'row' || treeNode && treeOpts.trigger === 'cell') {
-            tablePrivateMethods.triggerTreeExpandEvent(evnt, params);
+            $xeTable.triggerTreeExpandEvent(evnt, params);
           }
         }
         // 如果点击了树节点
         if (!triggerTreeNode) {
           if (!triggerExpandNode) {
-            // 如果是高亮行
+            // 如果是当前行
             if (rowOpts.isCurrent || highlightCurrentRow) {
               if (!triggerCheckbox && !triggerRadio) {
-                tablePrivateMethods.triggerCurrentRowEvent(evnt, params);
+                $xeTable.triggerCurrentRowEvent(evnt, params);
+              }
+            }
+            // 如果是当前列
+            if ((columnOpts.isCurrent || highlightCurrentColumn) && (!currentColumnOpts.trigger || ['cell', 'default'].includes(currentColumnOpts.trigger))) {
+              if (!triggerCheckbox && !triggerRadio) {
+                $xeTable.triggerCurrentColumnEvent(evnt, params);
               }
             }
             // 如果是单选框
             if (!triggerRadio && (radioOpts.trigger === 'row' || isRadioType && radioOpts.trigger === 'cell')) {
-              tablePrivateMethods.triggerRadioRowEvent(evnt, params);
+              $xeTable.triggerRadioRowEvent(evnt, params);
             }
             // 如果是复选框
             if (!triggerCheckbox && (checkboxOpts.trigger === 'row' || isCheckboxType && checkboxOpts.trigger === 'cell')) {
-              tablePrivateMethods.handleToggleCheckRowEvent(evnt, params);
+              $xeTable.handleToggleCheckRowEvent(evnt, params);
             }
           }
           // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
@@ -9089,7 +9158,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       handleToggleCheckRowEvent(evnt, params) {
         const {
           selectCheckboxMaps
-        } = reactData;
+        } = internalData;
         const checkboxOpts = computeCheckboxOpts.value;
         const {
           checkField,
@@ -9108,20 +9177,20 @@ var _default = exports.default = (0, _vue.defineComponent)({
           checked = !selectCheckboxMaps[(0, _util.getRowid)($xeTable, row)];
         }
         if (evnt) {
-          tablePrivateMethods.triggerCheckRowEvent(evnt, params, checked);
+          $xeTable.triggerCheckRowEvent(evnt, params, checked);
         } else {
-          tablePrivateMethods.handleBatchSelectRows([row], checked);
-          tablePrivateMethods.checkSelectionStatus();
+          $xeTable.handleBatchSelectRows([row], checked);
+          $xeTable.checkSelectionStatus();
         }
       },
       triggerCheckRowEvent(evnt, params, checked) {
-        const checkboxOpts = computeCheckboxOpts.value;
         const {
           row
         } = params;
         const {
           afterFullData
         } = internalData;
+        const checkboxOpts = computeCheckboxOpts.value;
         const {
           checkMethod,
           trigger
@@ -9131,15 +9200,17 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         evnt.stopPropagation();
         if (checkboxOpts.isShiftKey && evnt.shiftKey && !props.treeConfig) {
-          const checkboxRecords = tableMethods.getCheckboxRecords();
+          const checkboxRecords = $xeTable.getCheckboxRecords();
           if (checkboxRecords.length) {
             const firstRow = checkboxRecords[0];
-            const _rowIndex = tableMethods.getVTRowIndex(row);
-            const _firstRowIndex = tableMethods.getVTRowIndex(firstRow);
+            const _rowIndex = $xeTable.getVTRowIndex(row);
+            const _firstRowIndex = $xeTable.getVTRowIndex(firstRow);
             if (_rowIndex !== _firstRowIndex) {
-              tableMethods.setAllCheckboxRow(false);
+              $xeTable.setAllCheckboxRow(false);
               const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1);
-              handleCheckedCheckboxRow(rangeRows, true, false);
+              (0, _vue.nextTick)(() => {
+                handleCheckedCheckboxRow(rangeRows, true, false);
+              });
               dispatchEvent('checkbox-range-select', Object.assign({
                 rangeRecords: rangeRows
               }, params), evnt);
@@ -9150,12 +9221,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (!checkMethod || checkMethod({
           row
         })) {
-          tablePrivateMethods.handleBatchSelectRows([row], checked);
-          tablePrivateMethods.checkSelectionStatus();
+          $xeTable.handleBatchSelectRows([row], checked);
+          $xeTable.checkSelectionStatus();
           dispatchEvent('checkbox-change', Object.assign({
-            records: tableMethods.getCheckboxRecords(),
-            reserves: tableMethods.getCheckboxReserveRecords(),
-            indeterminates: tableMethods.getCheckboxIndeterminateRecords(),
+            records: () => $xeTable.getCheckboxRecords(),
+            reserves: () => $xeTable.getCheckboxReserveRecords(),
+            indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
             checked
           }, params), evnt);
         }
@@ -9255,9 +9326,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
        */
       triggerRowExpandEvent(evnt, params) {
         const {
-          rowExpandLazyLoadedMaps,
           expandColumn: column
         } = reactData;
+        const {
+          rowExpandLazyLoadedMaps
+        } = internalData;
         const expandOpts = computeExpandOpts.value;
         const {
           row
@@ -9272,18 +9345,18 @@ var _default = exports.default = (0, _vue.defineComponent)({
         evnt.stopPropagation();
         const rowid = (0, _util.getRowid)($xeTable, row);
         if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
-          const expanded = !tableMethods.isRowExpandByRow(row);
-          const columnIndex = tableMethods.getColumnIndex(column);
-          const $columnIndex = tableMethods.getVMColumnIndex(column);
-          tableMethods.setRowExpand(row, expanded);
+          const expanded = !$xeTable.isRowExpandByRow(row);
+          const columnIndex = $xeTable.getColumnIndex(column);
+          const $columnIndex = $xeTable.getVMColumnIndex(column);
+          $xeTable.setRowExpand(row, expanded);
           dispatchEvent('toggle-row-expand', {
             expanded,
             column,
             columnIndex,
             $columnIndex,
             row,
-            rowIndex: tableMethods.getRowIndex(row),
-            $rowIndex: tableMethods.getVMRowIndex(row)
+            rowIndex: $xeTable.getRowIndex(row),
+            $rowIndex: $xeTable.getVMRowIndex(row)
           }, evnt);
         }
       },
@@ -9293,7 +9366,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       triggerTreeExpandEvent(evnt, params) {
         const {
           treeExpandLazyLoadedMaps
-        } = reactData;
+        } = internalData;
         const treeOpts = computeTreeOpts.value;
         const {
           row,
@@ -9309,10 +9382,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
         evnt.stopPropagation();
         const rowid = (0, _util.getRowid)($xeTable, row);
         if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
-          const expanded = !tableMethods.isTreeExpandByRow(row);
-          const columnIndex = tableMethods.getColumnIndex(column);
-          const $columnIndex = tableMethods.getVMColumnIndex(column);
-          tableMethods.setTreeExpand(row, expanded);
+          const expanded = !$xeTable.isTreeExpandByRow(row);
+          const columnIndex = $xeTable.getColumnIndex(column);
+          const $columnIndex = $xeTable.getVMColumnIndex(column);
+          $xeTable.setTreeExpand(row, expanded);
           dispatchEvent('toggle-tree-expand', {
             expanded,
             column,
@@ -9522,6 +9595,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = props;
         const rowDragOpts = computeRowDragOpts.value;
         const {
+          afterFullData,
+          tableFullData,
           fullAllDataRowIdData
         } = internalData;
         const {
@@ -9539,10 +9614,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
           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 = {
@@ -10503,11 +10574,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = _props.default;
         const {
           scrollXLoad,
-          scrollYLoad
+          scrollYLoad,
+          expandColumn
         } = reactData;
         const leftFixedWidth = computeLeftFixedWidth.value;
         const rightFixedWidth = computeRightFixedWidth.value;
-        if (!(scrollYLoad || leftFixedWidth || rightFixedWidth)) {
+        if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
           return;
         }
         const {
@@ -10793,15 +10865,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           isAllOverflow,
           scrollYLoad,
-          expandColumn,
-          rowExpandedMaps
+          expandColumn
         } = reactData;
         const {
           scrollYStore,
           elemStore,
           isResizeCellHeight,
           afterFullData,
-          fullAllDataRowIdData
+          fullAllDataRowIdData,
+          rowExpandedMaps
         } = internalData;
         const {
           startIndex
@@ -11153,6 +11225,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         ref: refRowExpandYSpaceElem
       })];
       if (expandColumn) {
+        const {
+          handleGetRowId
+        } = (0, _util.createHandleGetRowId)($xeTable);
         tableRowExpandedList.forEach(row => {
           const expandOpts = computeExpandOpts.value;
           const {
@@ -11168,7 +11243,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             seqMode
           } = treeOpts;
           const cellStyle = {};
-          const rowid = (0, _util.getRowid)($xeTable, row);
+          const rowid = handleGetRowId(row);
           const rest = fullAllDataRowIdData[rowid];
           let rowLevel = 0;
           let seq = -1;