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

package/lib/table/src/table.js

@@ -94,8 +94,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       isAllSelected: false,
       // 复选框属性，有选中且非全选状态
       isIndeterminate: false,
-      // 复选框属性，已选中的行集合
-      selectCheckboxMaps: {},
       // 当前行
       currentRow: null,
       // 单选框属性，选中列
@@ -109,16 +107,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       // 树节点列信息
       treeNodeColumn: null,
       hasFixedColumn: false,
-      // 已展开的行集合
-      rowExpandedMaps: {},
-      // 懒加载中的展开行的集合
-      rowExpandLazyLoadedMaps: {},
-      // 已展开树节点集合
-      treeExpandedMaps: {},
-      // 懒加载中的树节点的集合
-      treeExpandLazyLoadedMaps: {},
-      // 树节点不确定状态的集合
-      treeIndeterminateMaps: {},
       // 合并单元格的对象集
       mergeList: [],
       // 合并表尾数据的对象集
@@ -127,8 +115,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       upDataFlag: 0,
       // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
       reColumnFlag: 0,
-      // 已标记的对象集
-      pendingRowMaps: {},
       // 初始化标识
       initStore: {
         filter: false,
@@ -272,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,
@@ -371,6 +361,18 @@ var _default = exports.default = (0, _vue.defineComponent)({
       fullColumnIdData: {},
       fullColumnFieldData: {},
       // prevDragRow: null,
+      // 已展开的行集合
+      rowExpandedMaps: {},
+      // 懒加载中的展开行的集合
+      rowExpandLazyLoadedMaps: {},
+      // 已展开树节点集合
+      treeExpandedMaps: {},
+      // 懒加载中的树节点的集合
+      treeExpandLazyLoadedMaps: {},
+      // 复选框属性，已选中的行集合
+      selectCheckboxMaps: {},
+      // 已标记的对象集
+      pendingRowMaps: {},
       inited: false,
       tooltipTimeout: null,
       initStatus: false,
@@ -504,13 +506,25 @@ var _default = exports.default = (0, _vue.defineComponent)({
       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);
@@ -675,15 +689,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]) {
@@ -827,6 +847,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       computeCurrentColumnOpts,
       computeScrollXThreshold,
       computeScrollYThreshold,
+      computeRowHeightMaps,
       computeDefaultRowHeight,
       computeCellOpts,
       computeHeaderCellOpts,
@@ -1066,12 +1087,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;
@@ -1082,7 +1106,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) {
@@ -1673,9 +1697,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);
@@ -1720,9 +1747,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) {
@@ -1774,8 +1804,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) {
@@ -1820,19 +1853,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) {
@@ -2622,12 +2656,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;
@@ -2653,7 +2685,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);
           }
@@ -2759,10 +2791,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)();
@@ -2775,15 +2807,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;
@@ -2801,7 +2833,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);
@@ -2810,13 +2843,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);
       }
@@ -2839,7 +2874,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);
@@ -2851,7 +2886,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
               defExpandeds.push(matchObj.item);
             }
           });
-          tableMethods.setTreeExpand(defExpandeds, true);
+          $xeTable.setTreeExpand(defExpandeds, true);
         }
       }
     };
@@ -2868,10 +2903,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];
@@ -2890,20 +2923,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)();
                   }
@@ -2913,7 +2947,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }).catch(() => {
             const {
               treeExpandLazyLoadedMaps
-            } = reactData;
+            } = internalData;
             if (rowRest) {
               rowRest.treeLoaded = false;
             }
@@ -2921,7 +2955,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();
@@ -2950,35 +2985,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 {
@@ -3092,9 +3130,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       calcCellWidth();
       autoCellWidth();
       updateStyle();
-      if (reFull) {
-        updateRowOffsetTop();
-      }
       updateRowExpandStyle();
       return computeScrollLoad().then(() => {
         if (reFull === true) {
@@ -3577,14 +3612,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 {
@@ -3598,6 +3632,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,
@@ -3614,17 +3651,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];
@@ -3633,7 +3670,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;
                 }
               }
             }
@@ -3641,16 +3678,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();
       });
@@ -3729,12 +3766,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];
@@ -3904,7 +3944,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);
@@ -3915,7 +3955,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);
@@ -3937,21 +3977,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;
@@ -4401,6 +4444,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         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']);
@@ -4418,7 +4464,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;
@@ -4821,16 +4867,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;
@@ -5206,12 +5250,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;
@@ -5237,8 +5284,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;
@@ -5401,15 +5451,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]) {
@@ -5453,8 +5501,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       isCheckedByCheckboxRow(row) {
         const {
-          selectCheckboxMaps
+          updateCheckboxFlag
         } = reactData;
+        const {
+          selectCheckboxMaps
+        } = internalData;
         const checkboxOpts = computeCheckboxOpts.value;
         const {
           checkField
@@ -5462,14 +5513,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 {
@@ -5482,19 +5534,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);
       },
       /**
        * 多选，切换某一行的选中状态
@@ -5502,7 +5554,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       toggleCheckboxRow(row) {
         const {
           selectCheckboxMaps
-        } = reactData;
+        } = internalData;
         const checkboxOpts = computeCheckboxOpts.value;
         const {
           checkField
@@ -5579,16 +5631,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) => {
@@ -5658,8 +5713,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)();
       },
       /**
@@ -5802,44 +5858,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) {
@@ -5848,16 +5914,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) => {
@@ -5868,7 +5932,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         return insertRecords;
       },
       clearPendingRow() {
-        reactData.pendingRowMaps = {};
+        internalData.pendingRowMaps = {};
+        reactData.pendingRowFlag++;
         return (0, _vue.nextTick)();
       },
       sort(sortConfs, sortOrder) {
@@ -6086,9 +6151,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 {
@@ -6098,9 +6163,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)();
       },
       /**
@@ -6110,14 +6175,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)();
       },
@@ -6126,13 +6191,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));
       },
       /**
        * 设置所有行的展开与否
@@ -6166,14 +6231,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,
@@ -6190,7 +6257,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({
@@ -6205,22 +6273,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];
               }
             });
           }
@@ -6228,7 +6296,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();
@@ -6242,10 +6310,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) {
         // 已废弃
@@ -6266,7 +6337,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));
         }
@@ -6287,7 +6359,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);
           }
@@ -6296,7 +6368,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);
           }
@@ -6316,15 +6388,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];
           }
@@ -6333,8 +6404,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];
               }
             }
           });
@@ -6343,7 +6414,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
             rowRest.treeLoaded = false;
           });
         }
-        reactData.treeExpandedMaps = {};
+        internalData.treeExpandedMaps = {};
+        reactData.treeExpandedFlag++;
         if (transform) {
           handleVirtualTreeToList();
           return $xeTable.handleTableData();
@@ -6357,7 +6429,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 {
@@ -6455,9 +6527,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)];
       },
       /**
        * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
@@ -6472,21 +6547,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();
           }
         });
       },
@@ -7905,13 +7981,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;
@@ -7921,7 +7995,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = treeOpts;
         const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
         const fullDataRowIdMaps = {};
-        const treeTempExpandedMaps = Object.assign({}, treeExpandedMaps);
         const {
           handleUpdateRowId
         } = (0, _util.createHandleUpdateRowId)($xeTable);
@@ -7962,13 +8035,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
           _xeUtils.default.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
             const rowid = handleUpdateRowId(row);
             if (treeConfig && lazy) {
-              const treeExpRest = treeTempExpandedMaps[rowid];
               if (row[hasChildField] && row[childrenField] === undefined) {
                 row[childrenField] = null;
               }
-              if (treeExpRest) {
+              if (treeExpandedMaps[rowid]) {
                 if (!row[childrenField] || !row[childrenField].length) {
-                  delete treeTempExpandedMaps[rowid];
+                  delete treeExpandedMaps[rowid];
                 }
               }
             }
@@ -7983,7 +8055,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         internalData.fullDataRowIdData = fullDataRowIdMaps;
         internalData.fullAllDataRowIdData = fullAllDataRowIdMaps;
-        reactData.treeExpandedMaps = treeTempExpandedMaps;
+        reactData.treeExpandedFlag++;
       },
       cacheSourceMap(fullData) {
         const {
@@ -8549,10 +8621,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,
@@ -8597,29 +8667,29 @@ var _default = exports.default = (0, _vue.defineComponent)({
             let vLen = 0; // 有效行
             childList.forEach(checkMethod ? item => {
               const childRowid = handleGetRowId(item);
-              const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectRowMaps[childRowid];
+              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 = handleGetRowId(item);
-              const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectRowMaps[childRowid];
+              const isSelect = checkField ? _xeUtils.default.get(item, checkField) : selectCheckboxMaps[childRowid];
               if (isSelect) {
                 sLen++;
-              } else if (halfRowMaps[childRowid]) {
+              } else if (treeIndeterminateRowMaps[childRowid]) {
                 hLen++;
               }
               vLen++;
@@ -8631,49 +8701,46 @@ 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,
           checkMethod,
           showReserveStatus
         } = checkboxOpts;
-        const {
-          afterFullData,
-          afterTreeFullData,
-          checkboxReserveRowMap
-        } = internalData;
         const {
           handleGetRowId
         } = (0, _util.createHandleGetRowId)($xeTable);
@@ -8689,14 +8756,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
           })) {
             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++;
             }
           }
@@ -8705,7 +8772,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           const selected = checkField ? _xeUtils.default.get(row, checkField) : selectCheckboxMaps[childRowid];
           if (selected) {
             sLen++;
-          } else if (treeIndeterminateMaps[childRowid]) {
+          } else if (treeIndeterminateRowMaps[childRowid]) {
             hLen++;
           }
           vLen++;
@@ -8733,8 +8800,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = props;
         const {
           selectCheckboxMaps
-        } = reactData;
-        const selectRowMaps = Object.assign({}, selectCheckboxMaps);
+        } = internalData;
         const treeOpts = computeTreeOpts.value;
         const {
           transform,
@@ -8769,20 +8835,19 @@ 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;
         }
         // 树结构
@@ -8794,10 +8859,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
               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);
@@ -8805,7 +8870,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }, {
             children: transform ? mapChildrenField : childrenField
           });
-          reactData.selectCheckboxMaps = selectRowMaps;
+          reactData.updateCheckboxFlag++;
           return;
         }
         // 列表
@@ -8815,18 +8880,18 @@ var _default = exports.default = (0, _vue.defineComponent)({
             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;
       },
       /**
        * 即将移除
@@ -9155,7 +9220,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       handleToggleCheckRowEvent(evnt, params) {
         const {
           selectCheckboxMaps
-        } = reactData;
+        } = internalData;
         const checkboxOpts = computeCheckboxOpts.value;
         const {
           checkField,
@@ -9174,10 +9239,10 @@ 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) {
@@ -9323,9 +9388,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
@@ -9340,18 +9407,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);
         }
       },
@@ -9361,7 +9428,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       triggerTreeExpandEvent(evnt, params) {
         const {
           treeExpandLazyLoadedMaps
-        } = reactData;
+        } = internalData;
         const treeOpts = computeTreeOpts.value;
         const {
           row,
@@ -9377,10 +9444,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,
@@ -9590,6 +9657,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = props;
         const rowDragOpts = computeRowDragOpts.value;
         const {
+          afterFullData,
+          tableFullData,
           fullAllDataRowIdData
         } = internalData;
         const {
@@ -9607,10 +9676,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 = {
@@ -10862,15 +10927,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
@@ -11222,6 +11287,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 {
@@ -11237,7 +11305,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;