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

package/packages/table/src/table.ts

@@ -79,8 +79,6 @@ export default defineComponent({
       isAllSelected: false,
       // 复选框属性，有选中且非全选状态
       isIndeterminate: false,
-      // 复选框属性，已选中的行集合
-      selectCheckboxMaps: {},
       // 当前行
       currentRow: null,
       // 单选框属性，选中列
@@ -94,16 +92,6 @@ export default defineComponent({
       // 树节点列信息
       treeNodeColumn: null,
       hasFixedColumn: false,
-      // 已展开的行集合
-      rowExpandedMaps: {},
-      // 懒加载中的展开行的集合
-      rowExpandLazyLoadedMaps: {},
-      // 已展开树节点集合
-      treeExpandedMaps: {},
-      // 懒加载中的树节点的集合
-      treeExpandLazyLoadedMaps: {},
-      // 树节点不确定状态的集合
-      treeIndeterminateMaps: {},
       // 合并单元格的对象集
       mergeList: [],
       // 合并表尾数据的对象集
@@ -112,8 +100,6 @@ export default defineComponent({
       upDataFlag: 0,
       // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
       reColumnFlag: 0,
-      // 已标记的对象集
-      pendingRowMaps: {},
       // 初始化标识
       initStore: {
         filter: false,
@@ -258,6 +244,11 @@ export default defineComponent({
         isFooter: false
       },
 
+      rowExpandedFlag: 1,
+      treeExpandedFlag: 1,
+      updateCheckboxFlag: 1,
+      pendingRowFlag: 1,
+
       rowHeightStore: {
         default: 48,
         medium: 44,
@@ -364,6 +355,19 @@ export default defineComponent({
       fullColumnFieldData: {},
       // prevDragRow: null,
 
+      // 已展开的行集合
+      rowExpandedMaps: {},
+      // 懒加载中的展开行的集合
+      rowExpandLazyLoadedMaps: {},
+      // 已展开树节点集合
+      treeExpandedMaps: {},
+      // 懒加载中的树节点的集合
+      treeExpandLazyLoadedMaps: {},
+      // 复选框属性，已选中的行集合
+      selectCheckboxMaps: {},
+      // 已标记的对象集
+      pendingRowMaps: {},
+
       inited: false,
       tooltipTimeout: null,
       initStatus: false,
@@ -512,15 +516,27 @@ export default defineComponent({
     })
 
     const computeCellOpts = computed(() => {
-      return Object.assign({}, getConfig().table.cellConfig, props.cellConfig)
+      const cellOpts = Object.assign({}, getConfig().table.cellConfig, props.cellConfig)
+      if (cellOpts.height) {
+        cellOpts.height = XEUtils.toNumber(cellOpts.height)
+      }
+      return cellOpts
     })
 
     const computeHeaderCellOpts = computed(() => {
-      return Object.assign({}, getConfig().table.headerCellConfig, props.headerCellConfig)
+      const headerCellOpts = Object.assign({}, getConfig().table.headerCellConfig, props.headerCellConfig)
+      if (headerCellOpts.height) {
+        headerCellOpts.height = XEUtils.toNumber(headerCellOpts.height)
+      }
+      return headerCellOpts
     })
 
     const computeFooterCellOpts = computed(() => {
-      return Object.assign({}, getConfig().table.footerCellConfig, props.footerCellConfig)
+      const footerCellOpts = Object.assign({}, getConfig().table.footerCellConfig, props.footerCellConfig)
+      if (footerCellOpts.height) {
+        footerCellOpts.height = XEUtils.toNumber(footerCellOpts.height)
+      }
+      return footerCellOpts
     })
 
     const computeRowOpts = computed(() => {
@@ -706,12 +722,14 @@ export default defineComponent({
     })
 
     const computeTableRowExpandedList = computed(() => {
-      const { rowExpandedMaps, tableData, expandColumn } = reactData
+      const { rowExpandedFlag, tableData, expandColumn } = reactData
+      const { rowExpandedMaps } = internalData
+      const { handleGetRowId } = createHandleGetRowId($xeTable)
       const expandList: any[] = []
-      if (expandColumn) {
+      if (expandColumn && rowExpandedFlag) {
         const rowKeys: Record<string, boolean> = {}
         tableData.forEach(row => {
-          rowKeys[getRowid($xeTable, row)] = true
+          rowKeys[handleGetRowId(row)] = true
         })
         XEUtils.each(rowExpandedMaps, (row, rowid) => {
           if (rowKeys[rowid]) {
@@ -835,6 +853,7 @@ export default defineComponent({
       computeCurrentColumnOpts,
       computeScrollXThreshold,
       computeScrollYThreshold,
+      computeRowHeightMaps,
       computeDefaultRowHeight,
       computeCellOpts,
       computeHeaderCellOpts,
@@ -891,6 +910,7 @@ export default defineComponent({
       getRefMaps: () => refMaps,
       getComputeMaps: () => computeMaps,
 
+      xeGrid: $xeGrid,
       xegrid: $xeGrid
     } as unknown as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods
 
@@ -1052,12 +1072,13 @@ export default defineComponent({
           toVisibleIndex = Math.floor(startTop / defaultRowHeight) - 1
           visibleSize = Math.ceil(clientHeight / defaultRowHeight) + 1
         } else {
+          const { handleGetRowId } = createHandleGetRowId($xeTable)
           let leftIndex = 0
           let rightIndex = afterFullData.length
           while (leftIndex < rightIndex) {
             const rIndex = Math.floor((leftIndex + rightIndex) / 2)
             const row = afterFullData[rIndex]
-            const rowid = getRowid($xeTable, row)
+            const rowid = handleGetRowId(row)
             const rowRest = fullAllDataRowIdData[rowid] || {}
             if (rowRest.oTop <= startTop) {
               leftIndex = rIndex + 1
@@ -1068,7 +1089,7 @@ export default defineComponent({
           toVisibleIndex = Math.max(0, leftIndex < afterFullData.length ? leftIndex - 2 : 0)
           for (let rIndex = toVisibleIndex, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
             const row = afterFullData[rIndex]
-            const rowid = getRowid($xeTable, row)
+            const rowid = handleGetRowId(row)
             const rowRest = fullAllDataRowIdData[rowid] || {}
             visibleSize++
             if (rowRest.oTop > endTop || visibleSize >= 100) {
@@ -1586,9 +1607,10 @@ export default defineComponent({
       const defaultRowHeight = computeDefaultRowHeight.value
       const el = refElem.value
       if (!isAllOverflow && scrollYLoad && el) {
+        const { handleGetRowId } = createHandleGetRowId($xeTable)
         el.setAttribute('data-calc-row', 'Y')
         tableData.forEach(row => {
-          const rowid = getRowid($xeTable, row)
+          const rowid = handleGetRowId(row)
           const rowRest = fullAllDataRowIdData[rowid]
           if (rowRest) {
             const reHeight = calcCellAutoHeight(rowRest, el)
@@ -1623,9 +1645,10 @@ export default defineComponent({
     const updateAfterListIndex = () => {
       const { treeConfig } = props
       const { afterFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData
+      const { handleGetRowId } = createHandleGetRowId($xeTable)
       const fullMaps: Record<string, any> = {}
       afterFullData.forEach((row, index) => {
-        const rowid = getRowid($xeTable, row)
+        const rowid = handleGetRowId(row)
         const rowRest = fullAllDataRowIdData[rowid]
         const seq = index + 1
         if (rowRest) {
@@ -1655,8 +1678,9 @@ export default defineComponent({
       const childrenField = treeOpts.children || treeOpts.childrenField
       const fullMaps: Record<string, any> = {}
       if (treeConfig) {
+        const { handleGetRowId } = createHandleGetRowId($xeTable)
         XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
-          const rowid = getRowid($xeTable, row)
+          const rowid = handleGetRowId(row)
           const rowRest = fullAllDataRowIdData[rowid]
           const seq = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('')
           if (rowRest) {
@@ -1682,18 +1706,18 @@ export default defineComponent({
      */
     const handleVirtualTreeToList = () => {
       const { treeConfig } = props
-      const { treeExpandedMaps } = reactData
-      const { fullAllDataRowIdData } = internalData
+      const { fullAllDataRowIdData, treeExpandedMaps } = internalData
       const treeOpts = computeTreeOpts.value
       const childrenField = treeOpts.children || treeOpts.childrenField
       if (treeConfig && treeOpts.transform) {
+        const { handleGetRowId } = createHandleGetRowId($xeTable)
         const fullData: any[] = []
         const expandMaps: {
           [key: string]: number
         } = {}
         XEUtils.eachTree(internalData.afterTreeFullData, (row, index, items, path, parentRow) => {
-          const rowid = getRowid($xeTable, row)
-          const parentRowid = getRowid($xeTable, parentRow)
+          const rowid = handleGetRowId(row)
+          const parentRowid = handleGetRowId(parentRow)
           if (!parentRow || (expandMaps[parentRowid] && treeExpandedMaps[parentRowid])) {
             const rowRest = fullAllDataRowIdData[rowid]
             if (rowRest) {
@@ -1722,7 +1746,7 @@ export default defineComponent({
       const treeOpts = computeTreeOpts.value
       const childrenField = treeOpts.children || treeOpts.childrenField
       const { transform, rowField, parentField, mapChildrenField } = treeOpts
-      const { remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts
+      const { isEvery, remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts
       const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological } = sortOpts
       let tableData: any[] = []
       let tableTree: any[] = []
@@ -1784,7 +1808,7 @@ export default defineComponent({
             // 筛选虚拟树
             tableTree = XEUtils.searchTree(tableFullTreeData, handleFilter, {
               original: true,
-              isEvery: true,
+              isEvery,
               children: mapChildrenField,
               mapChildren: childrenField
             })
@@ -1798,7 +1822,7 @@ export default defineComponent({
             // 还原虚拟树
             tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
               original: true,
-              isEvery: true,
+              isEvery,
               children: mapChildrenField,
               mapChildren: childrenField
             })
@@ -1847,7 +1871,7 @@ export default defineComponent({
           // 还原虚拟树
           tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
             original: true,
-            isEvery: true,
+            isEvery,
             children: treeOpts.mapChildrenField,
             mapChildren: childrenField
           })
@@ -2372,8 +2396,7 @@ export default defineComponent({
 
     const handleCheckedAllCheckboxRow = (checked: boolean, isForce?: boolean) => {
       const { treeConfig } = props
-      const { selectCheckboxMaps } = reactData
-      const { afterFullData, checkboxReserveRowMap } = internalData
+      const { afterFullData, checkboxReserveRowMap, selectCheckboxMaps } = internalData
       const treeOpts = computeTreeOpts.value
       const childrenField = treeOpts.children || treeOpts.childrenField
       const checkboxOpts = computeCheckboxOpts.value
@@ -2391,7 +2414,7 @@ export default defineComponent({
         const checkValFn = (row: any) => {
           if (isForce || (!checkMethod || checkMethod({ row }))) {
             if (checked) {
-              selectRowMaps[getRowid($xeTable, row)] = row
+              selectRowMaps[handleGetRowId(row)] = row
             }
             XEUtils.set(row, checkField, checked)
           }
@@ -2483,11 +2506,11 @@ export default defineComponent({
           afterFullData.forEach((row) => handleCheckboxReserveRow(row, false))
         }
       }
-      reactData.selectCheckboxMaps = checkField ? {} : selectRowMaps
+      reactData.updateCheckboxFlag++
+      internalData.selectCheckboxMaps = checkField ? {} : selectRowMaps
 
       reactData.isAllSelected = checked
       reactData.isIndeterminate = false
-      reactData.treeIndeterminateMaps = {}
       internalData.treeIndeterminateRowMaps = {}
       $xeTable.checkSelectionStatus()
       return nextTick()
@@ -2496,8 +2519,8 @@ export default defineComponent({
     // 还原展开、选中等相关状态
     const handleReserveStatus = () => {
       const { treeConfig } = props
-      const { expandColumn, currentRow, selectCheckboxMaps, selectRadioRow, rowExpandedMaps, treeExpandedMaps } = reactData
-      const { fullDataRowIdData, fullAllDataRowIdData, radioReserveRow } = internalData
+      const { expandColumn, currentRow, selectRadioRow } = reactData
+      const { fullDataRowIdData, fullAllDataRowIdData, radioReserveRow, selectCheckboxMaps, treeExpandedMaps, rowExpandedMaps } = internalData
       const expandOpts = computeExpandOpts.value
       const treeOpts = computeTreeOpts.value
       const radioOpts = computeRadioOpts.value
@@ -2514,7 +2537,8 @@ export default defineComponent({
         }
       }
       // 复选框
-      reactData.selectCheckboxMaps = getRecoverRowMaps(selectCheckboxMaps) // 刷新多选行状态
+      internalData.selectCheckboxMaps = getRecoverRowMaps(selectCheckboxMaps) // 刷新多选行状态
+      reactData.updateCheckboxFlag++
       // 还原保留选中状态
       if (checkboxOpts.reserve) {
         handleCheckedCheckboxRow(handleReserveRow(internalData.checkboxReserveRowMap), true, true)
@@ -2523,13 +2547,15 @@ export default defineComponent({
         reactData.currentRow = null // 刷新当前行状态
       }
       // 行展开
-      reactData.rowExpandedMaps = expandColumn ? getRecoverRowMaps(rowExpandedMaps) : {} // 刷新行展开状态
+      internalData.rowExpandedMaps = expandColumn ? getRecoverRowMaps(rowExpandedMaps) : {} // 刷新行展开状态
+      reactData.rowExpandedFlag++
       // 还原保留状态
       if (expandColumn && expandOpts.reserve) {
         $xeTable.setRowExpand(handleReserveRow(internalData.rowExpandedReserveRowMap), true)
       }
       // 树展开
-      reactData.treeExpandedMaps = treeConfig ? getRecoverRowMaps(treeExpandedMaps) : {} // 刷新树展开状态
+      internalData.treeExpandedMaps = treeConfig ? getRecoverRowMaps(treeExpandedMaps) : {} // 刷新树展开状态
+      reactData.treeExpandedFlag++
       if (treeConfig && treeOpts.reserve) {
         $xeTable.setTreeExpand(handleReserveRow(internalData.treeExpandedReserveRowMap), true)
       }
@@ -2546,7 +2572,7 @@ export default defineComponent({
         const { expandAll, expandRowKeys } = treeOpts
         const childrenField = treeOpts.children || treeOpts.childrenField
         if (expandAll) {
-          tableMethods.setAllTreeExpand(true)
+          $xeTable.setAllTreeExpand(true)
         } else if (expandRowKeys) {
           const defExpandeds: any[] = []
           const rowkey = getRowkey($xeTable)
@@ -2556,7 +2582,7 @@ export default defineComponent({
               defExpandeds.push(matchObj.item)
             }
           })
-          tableMethods.setTreeExpand(defExpandeds, true)
+          $xeTable.setTreeExpand(defExpandeds, true)
         }
       }
     }
@@ -2568,8 +2594,7 @@ export default defineComponent({
       const { checkStrictly } = checkboxOpts
       return new Promise<void>(resolve => {
         if (loadMethod) {
-          const { treeExpandLazyLoadedMaps } = reactData
-          const { fullAllDataRowIdData } = internalData
+          const { fullAllDataRowIdData, treeExpandLazyLoadedMaps } = internalData
           const rowid = getRowid($xeTable, row)
           const rowRest = fullAllDataRowIdData[rowid]
           treeExpandLazyLoadedMaps[rowid] = row
@@ -2586,18 +2611,19 @@ export default defineComponent({
               childRecords = []
             }
             if (childRecords) {
-              return tableMethods.loadTreeChildren(row, childRecords).then(childRows => {
-                const { treeExpandedMaps } = reactData
+              return $xeTable.loadTreeChildren(row, childRecords).then(childRows => {
+                const { treeExpandedMaps } = internalData
                 if (childRows.length && !treeExpandedMaps[rowid]) {
                   treeExpandedMaps[rowid] = row
                 }
+                reactData.treeExpandedFlag++
                 // 如果当前节点已选中，则展开后子节点也被选中
-                if (!checkStrictly && tableMethods.isCheckedByCheckboxRow(row)) {
+                if (!checkStrictly && $xeTable.isCheckedByCheckboxRow(row)) {
                   handleCheckedCheckboxRow(childRows, true)
                 }
                 return nextTick().then(() => {
                   if (transform) {
-                    tablePrivateMethods.handleTableData()
+                    $xeTable.handleTableData()
                     updateAfterDataIndex()
                     return nextTick()
                   }
@@ -2605,7 +2631,7 @@ export default defineComponent({
               })
             }
           }).catch(() => {
-            const { treeExpandLazyLoadedMaps } = reactData
+            const { treeExpandLazyLoadedMaps } = internalData
             if (rowRest) {
               rowRest.treeLoaded = false
             }
@@ -2613,7 +2639,8 @@ export default defineComponent({
               delete treeExpandLazyLoadedMaps[rowid]
             }
           }).finally(() => {
-            nextTick().then(() => tableMethods.recalculate()).then(() => resolve())
+            reactData.treeExpandedFlag++
+            nextTick().then(() => $xeTable.recalculate()).then(() => resolve())
           })
         } else {
           resolve()
@@ -2639,29 +2666,27 @@ export default defineComponent({
         const expandOpts = computeExpandOpts.value
         const { loadMethod } = expandOpts
         if (loadMethod) {
-          const { fullAllDataRowIdData } = internalData
-          const rExpandLazyLoadedMaps = { ...reactData.rowExpandLazyLoadedMaps }
+          const { fullAllDataRowIdData, rowExpandLazyLoadedMaps } = internalData
           const rowid = getRowid($xeTable, row)
           const rowRest = fullAllDataRowIdData[rowid]
-          rExpandLazyLoadedMaps[rowid] = row
-          reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps
-          loadMethod({ $table: $xeTable, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) }).then(() => {
-            const rowTempExpandedMaps = { ...reactData.rowExpandedMaps }
+          rowExpandLazyLoadedMaps[rowid] = row
+          loadMethod({ $table: $xeTable, row, rowIndex: $xeTable.getRowIndex(row), $rowIndex: $xeTable.getVMRowIndex(row) }).then(() => {
+            const { rowExpandedMaps } = internalData
             if (rowRest) {
               rowRest.expandLoaded = true
             }
-            rowTempExpandedMaps[rowid] = row
-            reactData.rowExpandedMaps = rowTempExpandedMaps
+            rowExpandedMaps[rowid] = row
+            reactData.rowExpandedFlag++
           }).catch(() => {
             if (rowRest) {
               rowRest.expandLoaded = false
             }
           }).finally(() => {
-            const rExpandLazyLoadedMaps = { ...reactData.rowExpandLazyLoadedMaps }
-            if (rExpandLazyLoadedMaps[rowid]) {
-              delete rExpandLazyLoadedMaps[rowid]
+            const { rowExpandLazyLoadedMaps } = internalData
+            if (rowExpandLazyLoadedMaps[rowid]) {
+              delete rowExpandLazyLoadedMaps[rowid]
             }
-            reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps
+            reactData.rowExpandedFlag++
             nextTick()
               .then(() => $xeTable.recalculate())
               .then(() => $xeTable.updateCellAreas())
@@ -2765,9 +2790,6 @@ export default defineComponent({
       calcCellWidth()
       autoCellWidth()
       updateStyle()
-      if (reFull) {
-        updateRowOffsetTop()
-      }
       updateRowExpandStyle()
       return computeScrollLoad().then(() => {
         if (reFull === true) {
@@ -3210,9 +3232,8 @@ export default defineComponent({
      * @returns
      */
     const handleBaseTreeExpand = (rows: any[], expanded: boolean) => {
-      const { treeExpandedMaps, treeExpandLazyLoadedMaps, treeNodeColumn } = reactData
-      const treeTempExpandedMaps = { ...treeExpandedMaps }
-      const { fullAllDataRowIdData, tableFullData } = internalData
+      const { treeNodeColumn } = reactData
+      const { fullAllDataRowIdData, tableFullData, treeExpandedMaps, treeExpandLazyLoadedMaps } = internalData
       const treeOpts = computeTreeOpts.value
       const { reserve, lazy, accordion, toggleMethod } = treeOpts
       const childrenField = treeOpts.children || treeOpts.childrenField
@@ -3220,6 +3241,7 @@ export default defineComponent({
       const result: any[] = []
       const columnIndex = tableMethods.getColumnIndex(treeNodeColumn)
       const $columnIndex = tableMethods.getVMColumnIndex(treeNodeColumn)
+      const { handleGetRowId } = createHandleGetRowId($xeTable)
       let validRows = toggleMethod ? rows.filter((row: any) => toggleMethod({ $table: $xeTable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows
       if (accordion) {
         validRows = validRows.length ? [validRows[validRows.length - 1]] : []
@@ -3227,17 +3249,17 @@ export default defineComponent({
         const matchObj = XEUtils.findTree(tableFullData, item => item === validRows[0], { children: childrenField })
         if (matchObj) {
           matchObj.items.forEach(item => {
-            const rowid = getRowid($xeTable, item)
-            if (treeTempExpandedMaps[rowid]) {
-              delete treeTempExpandedMaps[rowid]
+            const rowid = handleGetRowId(item)
+            if (treeExpandedMaps[rowid]) {
+              delete treeExpandedMaps[rowid]
             }
           })
         }
       }
       if (expanded) {
         validRows.forEach((row: any) => {
-          const rowid = getRowid($xeTable, row)
-          if (!treeTempExpandedMaps[rowid]) {
+          const rowid = handleGetRowId(row)
+          if (!treeExpandedMaps[rowid]) {
             const rowRest = fullAllDataRowIdData[rowid]
             if (rowRest) {
               const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid]
@@ -3246,7 +3268,7 @@ export default defineComponent({
                 result.push(handleAsyncTreeExpandChilds(row))
               } else {
                 if (row[childrenField] && row[childrenField].length) {
-                  treeTempExpandedMaps[rowid] = row
+                  treeExpandedMaps[rowid] = row
                 }
               }
             }
@@ -3254,16 +3276,16 @@ export default defineComponent({
         })
       } else {
         validRows.forEach(item => {
-          const rowid = getRowid($xeTable, item)
-          if (treeTempExpandedMaps[rowid]) {
-            delete treeTempExpandedMaps[rowid]
+          const rowid = handleGetRowId(item)
+          if (treeExpandedMaps[rowid]) {
+            delete treeExpandedMaps[rowid]
           }
         })
       }
       if (reserve) {
         validRows.forEach((row: any) => handleTreeExpandReserve(row, expanded))
       }
-      reactData.treeExpandedMaps = treeTempExpandedMaps
+      reactData.treeExpandedFlag++
       return Promise.all(result).then(() => {
         return tableMethods.recalculate()
       })
@@ -3329,10 +3351,11 @@ export default defineComponent({
     }
 
     const createGetRowCacheProp = (prop: 'seq' | 'index' | '_index' | '$index') => {
+      const { handleGetRowId } = createHandleGetRowId($xeTable)
       return function (row: any) {
         const { fullAllDataRowIdData } = internalData
         if (row) {
-          const rowid = getRowid($xeTable, row)
+          const rowid = handleGetRowId(row)
           const rowRest = fullAllDataRowIdData[rowid]
           if (rowRest) {
             return rowRest[prop]
@@ -3490,7 +3513,7 @@ export default defineComponent({
 
     const handleUpdateColResize = (evnt: MouseEvent, params: any) => {
       $xeTable.analyColumnWidth()
-      $xeTable.recalculate(true).then(() => {
+      $xeTable.recalculate().then(() => {
         $xeTable.saveCustomStore('update:width')
         $xeTable.updateCellAreas()
         $xeTable.dispatchEvent('column-resizable-change', params, evnt)
@@ -3502,7 +3525,7 @@ export default defineComponent({
 
     const handleUpdateRowResize = (evnt: MouseEvent, params: any) => {
       reactData.resizeHeightFlag++
-      $xeTable.recalculate(true).then(() => {
+      $xeTable.recalculate().then(() => {
         $xeTable.updateCellAreas()
         $xeTable.dispatchEvent('row-resizable-change', params, evnt)
         setTimeout(() => $xeTable.recalculate(true), 300)
@@ -3522,16 +3545,17 @@ export default defineComponent({
     }
 
     const updateRowOffsetTop = () => {
-      const { expandColumn, rowExpandedMaps } = reactData
-      const { afterFullData, fullAllDataRowIdData } = internalData
+      const { expandColumn } = reactData
+      const { afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData
       const expandOpts = computeExpandOpts.value
       const rowOpts = computeRowOpts.value
       const cellOpts = computeCellOpts.value
       const defaultRowHeight = computeDefaultRowHeight.value
+      const { handleGetRowId } = createHandleGetRowId($xeTable)
       let offsetTop = 0
       for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
         const row = afterFullData[rIndex]
-        const rowid = getRowid($xeTable, row)
+        const rowid = handleGetRowId(row)
         const rowRest = fullAllDataRowIdData[rowid] || {}
         rowRest.oTop = offsetTop
         offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight
@@ -3916,6 +3940,7 @@ export default defineComponent({
         const removeTempMaps = { ...editStore.removeMaps }
         const treeOpts = computeTreeOpts.value
         const { transform } = treeOpts
+        const { handleGetRowId } = createHandleGetRowId($xeTable)
         if (!keepSource) {
           if (process.env.VUE_APP_VXE_ENV === 'development') {
             errLog('vxe.error.reqProp', ['keep-source'])
@@ -3933,7 +3958,7 @@ export default defineComponent({
         let reDelFlag = false
         if (targetRows.length) {
           targetRows.forEach((item: any) => {
-            const rowid = getRowid($xeTable, item)
+            const rowid = handleGetRowId(item)
             const rowRest = fullAllDataRowIdData[rowid]
             if (rowRest) {
               const row = rowRest.row
@@ -4288,8 +4313,7 @@ export default defineComponent({
        */
       getCheckboxRecords (isFull) {
         const { treeConfig } = props
-        const { selectCheckboxMaps } = reactData
-        const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps } = internalData
+        const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps, selectCheckboxMaps } = internalData
         const treeOpts = computeTreeOpts.value
         const checkboxOpts = computeCheckboxOpts.value
         const { transform, mapChildrenField } = treeOpts
@@ -4617,12 +4641,13 @@ export default defineComponent({
       },
       getRowHeightConf (isFull) {
         const { fullAllDataRowIdData, afterFullData } = internalData
+        const { handleGetRowId } = createHandleGetRowId($xeTable)
         const rowOpts = computeRowOpts.value
         const cellOpts = computeCellOpts.value
         const defaultRowHeight = computeDefaultRowHeight.value
         const rest: Record<string, number> = {}
         afterFullData.forEach(row => {
-          const rowid = getRowid($xeTable, row)
+          const rowid = handleGetRowId(row)
           const rowRest = fullAllDataRowIdData[rowid]
           if (rowRest) {
             const resizeHeight = rowRest.resizeHeight
@@ -4646,8 +4671,9 @@ export default defineComponent({
           rHeight = Math.floor(rHeight * bodyHeight)
         }
         if (rHeight) {
+          const { handleGetRowId } = createHandleGetRowId($xeTable)
           rows.forEach(row => {
-            const rowid = XEUtils.isString(row) || XEUtils.isNumber(row) ? row : getRowid($xeTable, row)
+            const rowid = XEUtils.isString(row) || XEUtils.isNumber(row) ? row : handleGetRowId(row)
             const rowRest = fullAllDataRowIdData[rowid]
             if (rowRest) {
               rowRest.resizeHeight = rHeight
@@ -4799,12 +4825,11 @@ export default defineComponent({
        */
       getCheckboxIndeterminateRecords (isFull) {
         const { treeConfig } = props
-        const { fullDataRowIdData } = internalData
-        const { treeIndeterminateMaps } = reactData
+        const { fullDataRowIdData, treeIndeterminateRowMaps } = internalData
         if (treeConfig) {
           const fullRest: any[] = []
           const defRest: any[] = []
-          XEUtils.each(treeIndeterminateMaps, (item, rowid) => {
+          XEUtils.each(treeIndeterminateRowMaps, (item, rowid) => {
             if (item) {
               fullRest.push(item)
               if (fullDataRowIdData[rowid]) {
@@ -4845,17 +4870,18 @@ export default defineComponent({
         return handleCheckedCheckboxRow(rows, checked, true)
       },
       isCheckedByCheckboxRow (row) {
-        const { selectCheckboxMaps } = reactData
+        const { updateCheckboxFlag } = reactData
+        const { selectCheckboxMaps } = internalData
         const checkboxOpts = computeCheckboxOpts.value
         const { checkField } = checkboxOpts
         if (checkField) {
           return XEUtils.get(row, checkField)
         }
-        return !!selectCheckboxMaps[getRowid($xeTable, row)]
+        return !!updateCheckboxFlag && !!selectCheckboxMaps[getRowid($xeTable, row)]
       },
       isCheckedByCheckboxRowKey (rowid: any) {
-        const { selectCheckboxMaps } = reactData
-        const { fullAllDataRowIdData } = internalData
+        const { updateCheckboxFlag } = reactData
+        const { fullAllDataRowIdData, selectCheckboxMaps } = internalData
         const checkboxOpts = computeCheckboxOpts.value
         const { checkField } = checkboxOpts
         if (checkField) {
@@ -4865,21 +4891,21 @@ export default defineComponent({
           }
           return false
         }
-        return !!selectCheckboxMaps[rowid]
+        return !!updateCheckboxFlag && !!selectCheckboxMaps[rowid]
       },
       isIndeterminateByCheckboxRow (row) {
-        const { treeIndeterminateMaps } = reactData
-        return !!treeIndeterminateMaps[getRowid($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row)
+        const { treeIndeterminateRowMaps } = internalData
+        return !!treeIndeterminateRowMaps[getRowid($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row)
       },
       isIndeterminateByCheckboxRowKey (rowid: any) {
-        const { treeIndeterminateMaps } = reactData
-        return !!treeIndeterminateMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid)
+        const { treeIndeterminateRowMaps } = internalData
+        return !!treeIndeterminateRowMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid)
       },
       /**
        * 多选，切换某一行的选中状态
        */
       toggleCheckboxRow (row) {
-        const { selectCheckboxMaps } = reactData
+        const { selectCheckboxMaps } = internalData
         const checkboxOpts = computeCheckboxOpts.value
         const { checkField } = checkboxOpts
         const checked = checkField ? !XEUtils.get(row, checkField) : !selectCheckboxMaps[getRowid($xeTable, row)]
@@ -4940,14 +4966,15 @@ export default defineComponent({
         const childrenField = treeOpts.children || treeOpts.childrenField
         const reserveSelection: any[] = []
         if (checkboxOpts.reserve) {
+          const { handleGetRowId } = createHandleGetRowId($xeTable)
           const afterFullIdMaps: { [key: string]: number } = {}
           if (treeConfig) {
             XEUtils.eachTree(afterFullData, row => {
-              afterFullIdMaps[getRowid($xeTable, row)] = 1
+              afterFullIdMaps[handleGetRowId(row)] = 1
             }, { children: childrenField })
           } else {
             afterFullData.forEach(row => {
-              afterFullIdMaps[getRowid($xeTable, row)] = 1
+              afterFullIdMaps[handleGetRowId(row)] = 1
             })
           }
           XEUtils.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
@@ -5008,8 +5035,9 @@ export default defineComponent({
         }
         reactData.isAllSelected = false
         reactData.isIndeterminate = false
-        reactData.selectCheckboxMaps = {}
-        reactData.treeIndeterminateMaps = {}
+        internalData.selectCheckboxMaps = {}
+        internalData.treeIndeterminateRowMaps = {}
+        reactData.updateCheckboxFlag++
         return nextTick()
       },
       /**
@@ -5139,57 +5167,58 @@ export default defineComponent({
         return nextTick()
       },
       setPendingRow (rows: any | any[], status: boolean) {
-        const pendingMaps = Object.assign({}, reactData.pendingRowMaps)
+        const { handleGetRowId } = createHandleGetRowId($xeTable)
+        const { pendingRowMaps } = internalData
         if (rows && !XEUtils.isArray(rows)) {
           rows = [rows]
         }
         if (status) {
           rows.forEach((row: any) => {
-            const rowid = getRowid($xeTable, row)
-            if (rowid && !pendingMaps[rowid]) {
-              pendingMaps[rowid] = row
+            const rowid = handleGetRowId(row)
+            if (rowid && !pendingRowMaps[rowid]) {
+              pendingRowMaps[rowid] = row
             }
           })
         } else {
           rows.forEach((row: any) => {
-            const rowid = getRowid($xeTable, row)
-            if (rowid && pendingMaps[rowid]) {
-              delete pendingMaps[rowid]
+            const rowid = handleGetRowId(row)
+            if (rowid && pendingRowMaps[rowid]) {
+              delete pendingRowMaps[rowid]
             }
           })
         }
-        reactData.pendingRowMaps = pendingMaps
+        reactData.pendingRowFlag++
         return nextTick()
       },
       togglePendingRow (rows: any | any[]) {
-        const pendingMaps = Object.assign({}, reactData.pendingRowMaps)
+        const { handleGetRowId } = createHandleGetRowId($xeTable)
+        const { pendingRowMaps } = internalData
         if (rows && !XEUtils.isArray(rows)) {
           rows = [rows]
         }
         rows.forEach((row: any) => {
-          const rowid = getRowid($xeTable, row)
+          const rowid = handleGetRowId(row)
           if (rowid) {
-            if (pendingMaps[rowid]) {
-              delete pendingMaps[rowid]
+            if (pendingRowMaps[rowid]) {
+              delete pendingRowMaps[rowid]
             } else {
-              pendingMaps[rowid] = row
+              pendingRowMaps[rowid] = row
             }
           }
         })
-        reactData.pendingRowMaps = pendingMaps
+        reactData.pendingRowFlag++
         return nextTick()
       },
       hasPendingByRow (row) {
         return tableMethods.isPendingByRow(row)
       },
       isPendingByRow (row) {
-        const { pendingRowMaps } = reactData
+        const { pendingRowMaps } = internalData
         const rowid = getRowid($xeTable, row)
         return !!pendingRowMaps[rowid]
       },
       getPendingRecords () {
-        const { pendingRowMaps } = reactData
-        const { fullAllDataRowIdData } = internalData
+        const { fullAllDataRowIdData, pendingRowMaps } = internalData
         const insertRecords: any[] = []
         XEUtils.each(pendingRowMaps, (row, rowid) => {
           if (fullAllDataRowIdData[rowid]) {
@@ -5199,7 +5228,8 @@ export default defineComponent({
         return insertRecords
       },
       clearPendingRow () {
-        reactData.pendingRowMaps = {}
+        internalData.pendingRowMaps = {}
+        reactData.pendingRowFlag++
         return nextTick()
       },
       sort (sortConfs: any, sortOrder?: VxeTablePropTypes.SortOrder) {
@@ -5381,17 +5411,16 @@ export default defineComponent({
         return rowRest && !!rowRest.expandLoaded
       },
       clearRowExpandLoaded (row) {
-        const rExpandLazyLoadedMaps = { ...reactData.rowExpandLazyLoadedMaps }
-        const { fullAllDataRowIdData } = internalData
+        const { fullAllDataRowIdData, rowExpandLazyLoadedMaps } = internalData
         const expandOpts = computeExpandOpts.value
         const { lazy } = expandOpts
         const rowid = getRowid($xeTable, row)
         const rowRest = fullAllDataRowIdData[rowid]
         if (lazy && rowRest) {
           rowRest.expandLoaded = false
-          delete rExpandLazyLoadedMaps[rowid]
+          delete rowExpandLazyLoadedMaps[rowid]
         }
-        reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps
+        reactData.rowExpandedFlag++
         return nextTick()
       },
       /**
@@ -5399,12 +5428,12 @@ export default defineComponent({
        * @param {Row} row 行对象
        */
       reloadRowExpand (row) {
-        const { rowExpandLazyLoadedMaps } = reactData
+        const { rowExpandLazyLoadedMaps } = internalData
         const expandOpts = computeExpandOpts.value
         const { lazy } = expandOpts
         const rowid = getRowid($xeTable, row)
         if (lazy && !rowExpandLazyLoadedMaps[rowid]) {
-          tableMethods.clearRowExpandLoaded(row)
+          $xeTable.clearRowExpandLoaded(row)
             .then(() => handleAsyncRowExpand(row))
         }
         return nextTick()
@@ -5414,13 +5443,13 @@ export default defineComponent({
           warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand'])
         }
         // 即将废弃
-        return tableMethods.reloadRowExpand(row)
+        return $xeTable.reloadRowExpand(row)
       },
       /**
        * 切换展开行
        */
       toggleRowExpand (row) {
-        return tableMethods.setRowExpand(row, !tableMethods.isRowExpandByRow(row))
+        return $xeTable.setRowExpand(row, !$xeTable.isRowExpandByRow(row))
       },
       /**
        * 设置所有行的展开与否
@@ -5448,9 +5477,9 @@ export default defineComponent({
        * @param {Boolean} expanded 是否展开
        */
       setRowExpand (rows, expanded) {
-        const { rowExpandedMaps, rowExpandLazyLoadedMaps, expandColumn } = reactData
-        const { fullAllDataRowIdData } = internalData
-        let rExpandedMaps = { ...rowExpandedMaps }
+        const { expandColumn } = reactData
+        let { fullAllDataRowIdData, rowExpandedMaps, rowExpandLazyLoadedMaps } = internalData
+        const { handleGetRowId } = createHandleGetRowId($xeTable)
         const expandOpts = computeExpandOpts.value
         const { reserve, lazy, accordion, toggleMethod } = expandOpts
         const lazyRests: any[] = []
@@ -5462,28 +5491,29 @@ export default defineComponent({
           }
           if (accordion) {
             // 只能同时展开一个
-            rExpandedMaps = {}
+            rowExpandedMaps = {}
+            internalData.rowExpandedMaps = rowExpandedMaps
             rows = rows.slice(rows.length - 1, rows.length)
           }
           const validRows: any[] = toggleMethod ? rows.filter((row: any) => toggleMethod({ $table: $xeTable, expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: tableMethods.getRowIndex(row), $rowIndex: tableMethods.getVMRowIndex(row) })) : rows
           if (expanded) {
             validRows.forEach((row: any) => {
-              const rowid = getRowid($xeTable, row)
-              if (!rExpandedMaps[rowid]) {
+              const rowid = handleGetRowId(row)
+              if (!rowExpandedMaps[rowid]) {
                 const rowRest = fullAllDataRowIdData[rowid]
                 const isLoad = lazy && !rowRest.expandLoaded && !rowExpandLazyLoadedMaps[rowid]
                 if (isLoad) {
                   lazyRests.push(handleAsyncRowExpand(row))
                 } else {
-                  rExpandedMaps[rowid] = row
+                  rowExpandedMaps[rowid] = row
                 }
               }
             })
           } else {
             validRows.forEach(item => {
-              const rowid = getRowid($xeTable, item)
-              if (rExpandedMaps[rowid]) {
-                delete rExpandedMaps[rowid]
+              const rowid = handleGetRowId(item)
+              if (rowExpandedMaps[rowid]) {
+                delete rowExpandedMaps[rowid]
               }
             })
           }
@@ -5491,7 +5521,7 @@ export default defineComponent({
             validRows.forEach((row) => handleRowExpandReserve(row, expanded))
           }
         }
-        reactData.rowExpandedMaps = rExpandedMaps
+        reactData.rowExpandedFlag++
         return Promise.all(lazyRests)
           .then(() => nextTick())
           .then(() => $xeTable.recalculate(true))
@@ -5507,9 +5537,10 @@ export default defineComponent({
        * @param {Row} row 行对象
        */
       isRowExpandByRow (row) {
-        const { rowExpandedMaps } = reactData
+        const { rowExpandedFlag } = reactData
+        const { rowExpandedMaps } = internalData
         const rowid = getRowid($xeTable, row)
-        return !!rowExpandedMaps[rowid]
+        return !!rowExpandedFlag && !!rowExpandedMaps[rowid]
       },
       isExpandByRow (row) {
         // 已废弃
@@ -5526,7 +5557,8 @@ export default defineComponent({
         const expandOpts = computeExpandOpts.value
         const { reserve } = expandOpts
         const expList = $xeTable.getRowExpandRecords()
-        reactData.rowExpandedMaps = {}
+        internalData.rowExpandedMaps = {}
+        reactData.rowExpandedFlag++
         if (reserve) {
           tableFullData.forEach((row) => handleRowExpandReserve(row, false))
         }
@@ -5547,7 +5579,7 @@ export default defineComponent({
       },
       getRowExpandRecords () {
         const rest: any[] = []
-        XEUtils.each(reactData.rowExpandedMaps, item => {
+        XEUtils.each(internalData.rowExpandedMaps, item => {
           if (item) {
             rest.push(item)
           }
@@ -5556,7 +5588,7 @@ export default defineComponent({
       },
       getTreeExpandRecords () {
         const rest: any[] = []
-        XEUtils.each(reactData.treeExpandedMaps, item => {
+        XEUtils.each(internalData.treeExpandedMaps, item => {
           if (item) {
             rest.push(item)
           }
@@ -5573,12 +5605,10 @@ export default defineComponent({
         return rowRest && !!rowRest.treeLoaded
       },
       clearTreeExpandLoaded (rows: any) {
-        const { fullAllDataRowIdData } = internalData
+        const { fullAllDataRowIdData, treeExpandedMaps } = internalData
         const treeOpts = computeTreeOpts.value
         const { transform } = treeOpts
-        let tExpandedMaps: Record<string, any> = {}
         if (rows) {
-          tExpandedMaps = { ...reactData.treeExpandedMaps }
           if (!XEUtils.isArray(rows)) {
             rows = [rows]
           }
@@ -5587,8 +5617,8 @@ export default defineComponent({
             const rowRest = fullAllDataRowIdData[rowid]
             if (rowRest) {
               rowRest.treeLoaded = false
-              if (tExpandedMaps[rowid]) {
-                delete tExpandedMaps[rowid]
+              if (treeExpandedMaps[rowid]) {
+                delete treeExpandedMaps[rowid]
               }
             }
           })
@@ -5597,7 +5627,8 @@ export default defineComponent({
             rowRest.treeLoaded = false
           })
         }
-        reactData.treeExpandedMaps = {}
+        internalData.treeExpandedMaps = {}
+        reactData.treeExpandedFlag++
         if (transform) {
           handleVirtualTreeToList()
           return $xeTable.handleTableData()
@@ -5609,7 +5640,7 @@ export default defineComponent({
        * @param {Row} row 行对象
        */
       reloadTreeExpand (row) {
-        const { treeExpandLazyLoadedMaps } = reactData
+        const { treeExpandLazyLoadedMaps } = internalData
         const treeOpts = computeTreeOpts.value
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
         const { transform, lazy } = treeOpts
@@ -5694,8 +5725,9 @@ export default defineComponent({
        * @param {Row} row 行对象
        */
       isTreeExpandByRow (row) {
-        const { treeExpandedMaps } = reactData
-        return !!treeExpandedMaps[getRowid($xeTable, row)]
+        const { treeExpandedFlag } = reactData
+        const { treeExpandedMaps } = internalData
+        return !!treeExpandedFlag && !!treeExpandedMaps[getRowid($xeTable, row)]
       },
       /**
        * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
@@ -5705,19 +5737,20 @@ export default defineComponent({
         const treeOpts = computeTreeOpts.value
         const childrenField = treeOpts.children || treeOpts.childrenField
         const { transform, reserve } = treeOpts
-        const expList = tableMethods.getTreeExpandRecords()
-        reactData.treeExpandedMaps = {}
+        const expList = $xeTable.getTreeExpandRecords()
+        internalData.treeExpandedMaps = {}
+        reactData.treeExpandedFlag++
         if (reserve) {
           XEUtils.eachTree(tableFullTreeData, row => handleTreeExpandReserve(row, false), { children: childrenField })
         }
-        return tablePrivateMethods.handleTableData().then(() => {
+        return $xeTable.handleTableData().then(() => {
           if (transform) {
             handleVirtualTreeToList()
-            return tablePrivateMethods.handleTableData()
+            return $xeTable.handleTableData()
           }
         }).then(() => {
           if (expList.length) {
-            return tableMethods.recalculate()
+            return $xeTable.recalculate()
           }
         })
       },
@@ -6991,15 +7024,13 @@ export default defineComponent({
        */
       cacheRowMap () {
         const { treeConfig } = props
-        const { treeExpandedMaps } = reactData
-        const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData
+        const { fullAllDataRowIdData, tableFullData, tableFullTreeData, treeExpandedMaps } = internalData
         const treeOpts = computeTreeOpts.value
         const childrenField = treeOpts.children || treeOpts.childrenField
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
         const { lazy } = treeOpts
         const fullAllDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = { ...fullAllDataRowIdData } // 存在已删除数据
         const fullDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
-        const treeTempExpandedMaps = { ...treeExpandedMaps }
 
         const { handleUpdateRowId } = createHandleUpdateRowId($xeTable)
         const handleRowCache = (row: any, index: number, items: any, currIndex: number, parentRow: any, rowid: string, level: number, seq: string | number) => {
@@ -7027,13 +7058,12 @@ export default defineComponent({
           XEUtils.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
             const rowid = handleUpdateRowId(row)
             if (treeConfig && lazy) {
-              const treeExpRest = treeTempExpandedMaps[rowid]
               if (row[hasChildField] && row[childrenField] === undefined) {
                 row[childrenField] = null
               }
-              if (treeExpRest) {
+              if (treeExpandedMaps[rowid]) {
                 if (!row[childrenField] || !row[childrenField].length) {
-                  delete treeTempExpandedMaps[rowid]
+                  delete treeExpandedMaps[rowid]
                 }
               }
             }
@@ -7047,7 +7077,7 @@ export default defineComponent({
 
         internalData.fullDataRowIdData = fullDataRowIdMaps
         internalData.fullAllDataRowIdData = fullAllDataRowIdMaps
-        reactData.treeExpandedMaps = treeTempExpandedMaps
+        reactData.treeExpandedFlag++
       },
       cacheSourceMap (fullData) {
         const { treeConfig } = props
@@ -7539,9 +7569,7 @@ export default defineComponent({
       },
       updateCheckboxStatus () {
         const { treeConfig } = props
-        const { selectCheckboxMaps, treeIndeterminateMaps } = reactData
-        const selectRowMaps = Object.assign({}, selectCheckboxMaps)
-        const halfRowMaps = Object.assign({}, treeIndeterminateMaps)
+        const { selectCheckboxMaps, treeIndeterminateRowMaps } = internalData
         const treeOpts = computeTreeOpts.value
         const { transform, mapChildrenField } = treeOpts
         const childrenField = treeOpts.children || treeOpts.childrenField
@@ -7575,28 +7603,28 @@ export default defineComponent({
               checkMethod
                 ? (item) => {
                     const childRowid = handleGetRowId(item)
-                    const isSelect = checkField ? XEUtils.get(item, checkField) : selectRowMaps[childRowid]
+                    const isSelect = checkField ? XEUtils.get(item, checkField) : selectCheckboxMaps[childRowid]
                     if (checkMethod({ row: item })) {
                       if (isSelect) {
                         sLen++
-                      } else if (halfRowMaps[childRowid]) {
+                      } else if (treeIndeterminateRowMaps[childRowid]) {
                         hLen++
                       }
                       vLen++
                     } else {
                       if (isSelect) {
                         sLen++
-                      } else if (halfRowMaps[childRowid]) {
+                      } else if (treeIndeterminateRowMaps[childRowid]) {
                         hLen++
                       }
                     }
                   }
                 : item => {
                   const childRowid = handleGetRowId(item)
-                  const isSelect = checkField ? XEUtils.get(item, checkField) : selectRowMaps[childRowid]
+                  const isSelect = checkField ? XEUtils.get(item, checkField) : selectCheckboxMaps[childRowid]
                   if (isSelect) {
                     sLen++
-                  } else if (halfRowMaps[childRowid]) {
+                  } else if (treeIndeterminateRowMaps[childRowid]) {
                     hLen++
                   }
                   vLen++
@@ -7609,36 +7637,34 @@ export default defineComponent({
             }
             if (isSelected) {
               if (!checkField) {
-                selectRowMaps[rowid] = row
+                selectCheckboxMaps[rowid] = row
               }
-              if (halfRowMaps[rowid]) {
-                delete halfRowMaps[rowid]
+              if (treeIndeterminateRowMaps[rowid]) {
+                delete treeIndeterminateRowMaps[rowid]
               }
             } else {
               if (!checkField) {
-                if (selectRowMaps[rowid]) {
-                  delete selectRowMaps[rowid]
+                if (selectCheckboxMaps[rowid]) {
+                  delete selectCheckboxMaps[rowid]
                 }
               }
               if (halfSelect) {
-                halfRowMaps[rowid] = row
+                treeIndeterminateRowMaps[rowid] = row
               } else {
-                if (halfRowMaps[rowid]) {
-                  delete halfRowMaps[rowid]
+                if (treeIndeterminateRowMaps[rowid]) {
+                  delete treeIndeterminateRowMaps[rowid]
                 }
               }
             }
           })
         }
-        reactData.selectCheckboxMaps = selectRowMaps
-        reactData.treeIndeterminateMaps = halfRowMaps
+        reactData.updateCheckboxFlag++
       },
       updateAllCheckboxStatus () {
         const { treeConfig } = props
-        const { selectCheckboxMaps, treeIndeterminateMaps } = reactData
+        const { afterFullData, afterTreeFullData, checkboxReserveRowMap, selectCheckboxMaps, treeIndeterminateRowMaps } = internalData
         const checkboxOpts = computeCheckboxOpts.value
         const { checkField, checkMethod, showReserveStatus } = checkboxOpts
-        const { afterFullData, afterTreeFullData, checkboxReserveRowMap } = internalData
         const { handleGetRowId } = createHandleGetRowId($xeTable)
 
         let sLen = 0 // 已选
@@ -7653,14 +7679,14 @@ export default defineComponent({
             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++
               }
             }
@@ -7670,7 +7696,7 @@ export default defineComponent({
             const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid]
             if (selected) {
               sLen++
-            } else if (treeIndeterminateMaps[childRowid]) {
+            } else if (treeIndeterminateRowMaps[childRowid]) {
               hLen++
             }
             vLen++
@@ -7697,8 +7723,7 @@ export default defineComponent({
        */
       handleBatchSelectRows (rows, checked, isForce) {
         const { treeConfig } = props
-        const { selectCheckboxMaps } = reactData
-        const selectRowMaps = Object.assign({}, selectCheckboxMaps)
+        const { selectCheckboxMaps } = internalData
         const treeOpts = computeTreeOpts.value
         const { transform, mapChildrenField } = treeOpts
         const childrenField = treeOpts.children || treeOpts.childrenField
@@ -7720,18 +7745,17 @@ export default defineComponent({
                 handleCheckboxReserveRow(row, checked)
               }
             }, { children: transform ? mapChildrenField : childrenField })
-            reactData.selectCheckboxMaps = selectRowMaps
+            reactData.updateCheckboxFlag++
             return
-          } else {
-            // 列表
-            rows.forEach(row => {
-              if (isForce || (!checkMethod || checkMethod({ row }))) {
-                XEUtils.set(row, checkField, checked)
-                handleCheckboxReserveRow(row, checked)
-              }
-            })
           }
-          reactData.selectCheckboxMaps = selectRowMaps
+          // 列表
+          rows.forEach(row => {
+            if (isForce || (!checkMethod || checkMethod({ row }))) {
+              XEUtils.set(row, checkField, checked)
+              handleCheckboxReserveRow(row, checked)
+            }
+          })
+          reactData.updateCheckboxFlag++
           return
         }
 
@@ -7742,16 +7766,16 @@ export default defineComponent({
             const rowid = handleGetRowId(row)
             if (isForce || (!checkMethod || checkMethod({ row }))) {
               if (checked) {
-                selectRowMaps[rowid] = row
+                selectCheckboxMaps[rowid] = row
               } else {
-                if (selectRowMaps[rowid]) {
-                  delete selectRowMaps[rowid]
+                if (selectCheckboxMaps[rowid]) {
+                  delete selectCheckboxMaps[rowid]
                 }
               }
               handleCheckboxReserveRow(row, checked)
             }
           }, { children: transform ? mapChildrenField : childrenField })
-          reactData.selectCheckboxMaps = selectRowMaps
+          reactData.updateCheckboxFlag++
           return
         }
 
@@ -7760,18 +7784,18 @@ export default defineComponent({
           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
       },
       /**
        * 即将移除
@@ -8037,7 +8061,7 @@ export default defineComponent({
         dispatchEvent('cell-dblclick', params, evnt)
       },
       handleToggleCheckRowEvent (evnt, params) {
-        const { selectCheckboxMaps } = reactData
+        const { selectCheckboxMaps } = internalData
         const checkboxOpts = computeCheckboxOpts.value
         const { checkField, trigger } = checkboxOpts
         const { row } = params
@@ -8051,10 +8075,10 @@ export default defineComponent({
           checked = !selectCheckboxMaps[getRowid($xeTable, row)]
         }
         if (evnt) {
-          tablePrivateMethods.triggerCheckRowEvent(evnt, params, checked)
+          $xeTable.triggerCheckRowEvent(evnt, params, checked)
         } else {
-          tablePrivateMethods.handleBatchSelectRows([row], checked)
-          tablePrivateMethods.checkSelectionStatus()
+          $xeTable.handleBatchSelectRows([row], checked)
+          $xeTable.checkSelectionStatus()
         }
       },
       triggerCheckRowEvent (evnt: MouseEvent, params, checked) {
@@ -8160,7 +8184,8 @@ export default defineComponent({
        * 展开行事件
        */
       triggerRowExpandEvent (evnt, params) {
-        const { rowExpandLazyLoadedMaps, expandColumn: column } = reactData
+        const { expandColumn: column } = reactData
+        const { rowExpandLazyLoadedMaps } = internalData
         const expandOpts = computeExpandOpts.value
         const { row } = params
         const { lazy, trigger } = expandOpts
@@ -8170,18 +8195,18 @@ export default defineComponent({
         evnt.stopPropagation()
         const rowid = getRowid($xeTable, row)
         if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
-          const expanded = !tableMethods.isRowExpandByRow(row)
-          const columnIndex = tableMethods.getColumnIndex(column)
-          const $columnIndex = tableMethods.getVMColumnIndex(column)
-          tableMethods.setRowExpand(row, expanded)
+          const expanded = !$xeTable.isRowExpandByRow(row)
+          const columnIndex = $xeTable.getColumnIndex(column)
+          const $columnIndex = $xeTable.getVMColumnIndex(column)
+          $xeTable.setRowExpand(row, expanded)
           dispatchEvent('toggle-row-expand', {
             expanded,
             column,
             columnIndex,
             $columnIndex,
             row,
-            rowIndex: tableMethods.getRowIndex(row),
-            $rowIndex: tableMethods.getVMRowIndex(row)
+            rowIndex: $xeTable.getRowIndex(row),
+            $rowIndex: $xeTable.getVMRowIndex(row)
           }, evnt)
         }
       },
@@ -8189,7 +8214,7 @@ export default defineComponent({
        * 展开树节点事件
        */
       triggerTreeExpandEvent (evnt, params) {
-        const { treeExpandLazyLoadedMaps } = reactData
+        const { treeExpandLazyLoadedMaps } = internalData
         const treeOpts = computeTreeOpts.value
         const { row, column } = params
         const { lazy, trigger } = treeOpts
@@ -8199,10 +8224,10 @@ export default defineComponent({
         evnt.stopPropagation()
         const rowid = getRowid($xeTable, row)
         if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
-          const expanded = !tableMethods.isTreeExpandByRow(row)
-          const columnIndex = tableMethods.getColumnIndex(column)
-          const $columnIndex = tableMethods.getVMColumnIndex(column)
-          tableMethods.setTreeExpand(row, expanded)
+          const expanded = !$xeTable.isTreeExpandByRow(row)
+          const columnIndex = $xeTable.getColumnIndex(column)
+          const $columnIndex = $xeTable.getVMColumnIndex(column)
+          $xeTable.setTreeExpand(row, expanded)
           dispatchEvent('toggle-tree-expand', { expanded, column, columnIndex, $columnIndex, row }, evnt)
         }
       },
@@ -8346,12 +8371,11 @@ export default defineComponent({
       handleRowDragSwapEvent (evnt, isSyncRow, dragRow, prevDragRow, prevDragPos, prevDragToChild) {
         const { treeConfig, dragConfig } = props
         const rowDragOpts = computeRowDragOpts.value
-        const { fullAllDataRowIdData } = internalData
+        const { afterFullData, tableFullData, fullAllDataRowIdData } = internalData
         const { isPeerDrag, isCrossDrag, isSelfToChildDrag, dragEndMethod, dragToChildMethod } = rowDragOpts
         const treeOpts = computeTreeOpts.value
         const { transform, rowField, mapChildrenField, parentField } = treeOpts
         const childrenField = treeOpts.children || treeOpts.childrenField
-        const { afterFullData, tableFullData } = internalData
         const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null)
         const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0
         const errRest = {
@@ -9479,8 +9503,8 @@ export default defineComponent({
       },
       // 更新纵向 Y 可视渲染上下剩余空间大小
       updateScrollYSpace () {
-        const { isAllOverflow, scrollYLoad, expandColumn, rowExpandedMaps } = reactData
-        const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData } = internalData
+        const { isAllOverflow, scrollYLoad, expandColumn } = reactData
+        const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData
         const { startIndex } = scrollYStore
         const expandOpts = computeExpandOpts.value
         const rowOpts = computeRowOpts.value
@@ -9829,6 +9853,7 @@ export default defineComponent({
       ]
 
       if (expandColumn) {
+        const { handleGetRowId } = createHandleGetRowId($xeTable)
         tableRowExpandedList.forEach((row) => {
           const expandOpts = computeExpandOpts.value
           const { height: expandHeight, padding } = expandOpts
@@ -9836,7 +9861,7 @@ export default defineComponent({
           const treeOpts = computeTreeOpts.value
           const { transform, seqMode } = treeOpts
           const cellStyle: Record<string, string> = {}
-          const rowid = getRowid($xeTable, row)
+          const rowid = handleGetRowId(row)
           const rest = fullAllDataRowIdData[rowid]
           let rowLevel = 0
           let seq: string | number = -1