vxe-table 3.14.0-beta.8 → 3.14.0

package/packages/table/src/methods.ts

@@ -3,7 +3,7 @@ import { browse, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEv
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils'
 import { VxeUI } from '../../ui'
 import Cell from './cell'
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, updateDeepRowKey, updateFastRowKey, getRefElem } from './util'
+import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
 import { warnLog, errLog } from '../../ui/src/log'
 
@@ -11,6 +11,7 @@ import type { VxeTableDefines, VxeColumnPropTypes, VxeTableEmits, ValueOf, Table
 
 const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeUI
 
+const supportMaxRow = 5e6
 const customStorageKey = 'VXE_CUSTOM_STORE'
 const maxYHeight = 5e6
 const maxXWidth = 5e6
@@ -236,7 +237,7 @@ function cacheColumnMap ($xeTable: VxeTableConstructor) {
       fullColumnFieldData[field] = rest
     } else {
       if ((storage && !type) || (columnOpts.drag && (isCrossDrag || isSelfToChildDrag))) {
-        errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`])
+        errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`])
       }
     }
     if (!hasFixed && fixed) {
@@ -340,9 +341,10 @@ function updateAfterListIndex ($xeTable: VxeTableConstructor) {
 
   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) {
@@ -375,8 +377,9 @@ function updateAfterDataIndex ($xeTable: VxeTableConstructor) {
   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) {
@@ -402,22 +405,21 @@ function updateAfterDataIndex ($xeTable: VxeTableConstructor) {
  */
 function handleVirtualTreeToList ($xeTable: VxeTableConstructor) {
   const props = $xeTable
-  const reactData = $xeTable as unknown as TableReactData
   const internalData = $xeTable as unknown as TableInternalData
 
   const { treeConfig } = props
-  const { treeExpandedMaps } = reactData
-  const { fullAllDataRowIdData } = internalData
+  const { fullAllDataRowIdData, treeExpandedMaps } = internalData
   const treeOpts = $xeTable.computeTreeOpts
   const childrenField = treeOpts.children || treeOpts.childrenField
   if (treeConfig && treeOpts.transform) {
+    const { handleGetRowId } = createHandleGetRowId($xeTable)
     const fullData: 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) {
@@ -441,7 +443,7 @@ function updateStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
 
   const { border, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props
   const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn } = reactData
-  const { visibleColumn, fullColumnIdData, tableHeight, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData
+  const { visibleColumn, tableHeight, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData
   const el = $xeTable.$refs.refElem as HTMLDivElement
   if (!el) {
     return
@@ -450,7 +452,6 @@ function updateStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
   const osbWidth = overflowY ? scrollbarWidth : 0
   const osbHeight = overflowX ? scrollbarHeight : 0
   const emptyPlaceholderElem = $xeTable.$refs.refEmptyPlaceholder as HTMLDivElement
-  const cellOffsetWidth = $xeTable.computeCellOffsetWidth
   const mouseOpts = $xeTable.computeMouseOpts
   const expandOpts = $xeTable.computeExpandOpts
   const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper'])
@@ -732,54 +733,6 @@ function updateStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
           tableElem.style.width = tWidth ? `${tWidth}px` : ''
         }
       }
-      const colgroupElem = getRefElem(elemStore[`${name}-${layout}-colgroup`])
-      if (colgroupElem) {
-        XEUtils.arrayEach(colgroupElem.children, (colElem: any) => {
-          const colid = colElem.getAttribute('name')
-          if (fullColumnIdData[colid]) {
-            const colRest = fullColumnIdData[colid]
-            const column = colRest.column
-            const { showHeaderOverflow, showFooterOverflow, showOverflow } = column
-            let cellOverflow
-            colElem.style.width = `${column.renderWidth}px`
-            if (layout === 'header') {
-              cellOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow
-            } else if (layout === 'footer') {
-              cellOverflow = XEUtils.isUndefined(showFooterOverflow) || XEUtils.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow
-            } else {
-              cellOverflow = XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow) ? isAllOverflow : showOverflow
-            }
-            const showEllipsis = cellOverflow === 'ellipsis'
-            const showTitle = cellOverflow === 'title'
-            const showTooltip = cellOverflow === true || cellOverflow === 'tooltip'
-            let hasEllipsis = showTitle || showTooltip || showEllipsis
-            const listElem = getRefElem(elemStore[`${name}-${layout}-list`])
-            // 纵向虚拟滚动不支持动态行高
-            if (scrollYLoad && !hasEllipsis) {
-              hasEllipsis = true
-            }
-            if (listElem) {
-              XEUtils.arrayEach(listElem.querySelectorAll(`.${column.id}`), (elem: any) => {
-                const colspan = parseInt(elem.getAttribute('colspan') || 1)
-                const cellElem = elem.querySelector('.vxe-cell')
-                let colWidth = column.renderWidth
-                if (cellElem) {
-                  if (colspan > 1) {
-                    const columnIndex = $xeTable.getColumnIndex(column)
-                    for (let index = 1; index < colspan; index++) {
-                      const nextColumn = $xeTable.getColumns(columnIndex + index)
-                      if (nextColumn) {
-                        colWidth += nextColumn.renderWidth
-                      }
-                    }
-                  }
-                  cellElem.style.width = hasEllipsis ? `${colWidth - (cellOffsetWidth * colspan)}px` : ''
-                }
-              })
-            }
-          }
-        })
-      }
     })
   })
   if (currentRow) {
@@ -791,6 +744,27 @@ function updateStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
   return $xeTable.$nextTick()
 }
 
+function checkValidate ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, type: any) {
+  if ($xeTable.triggerValidate) {
+    return $xeTable.triggerValidate(type)
+  }
+  return $xeTable.$nextTick()
+}
+
+/**
+ * 当单元格发生改变时
+ * 如果存在规则，则校验
+ */
+function handleChangeCell ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, evnt: Event, params: any) {
+  checkValidate($xeTable, 'blur')
+    .catch((e: any) => e)
+    .then(() => {
+      $xeTable.handleEdit(params, evnt)
+        .then(() => checkValidate($xeTable, 'change'))
+        .catch((e: any) => e)
+    })
+}
+
 function handleRadioReserveRow ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, row: any) {
   const internalData = $xeTable as unknown as TableInternalData
 
@@ -842,12 +816,12 @@ function handleCheckedAllCheckboxRow ($xeTable: VxeTableConstructor & VxeTablePr
   const internalData = $xeTable as unknown as TableInternalData
 
   const { treeConfig } = props
-  const { selectCheckboxMaps } = reactData
-  const { afterFullData, checkboxReserveRowMap } = internalData
+  const { afterFullData, checkboxReserveRowMap, selectCheckboxMaps } = internalData
   const treeOpts = $xeTable.computeTreeOpts
   const childrenField = treeOpts.children || treeOpts.childrenField
   const checkboxOpts = $xeTable.computeCheckboxOpts
   const { checkField, reserve, checkMethod } = checkboxOpts
+  const { handleGetRowId } = createHandleGetRowId($xeTable)
   // indeterminateField 仅支持读取
   const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
   const selectRowMaps: Record<string, any> = {}
@@ -859,7 +833,7 @@ function handleCheckedAllCheckboxRow ($xeTable: VxeTableConstructor & VxeTablePr
     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)
       }
@@ -887,7 +861,8 @@ function handleCheckedAllCheckboxRow ($xeTable: VxeTableConstructor & VxeTablePr
            */
         XEUtils.eachTree(afterFullData, (row) => {
           if (isForce || (!checkMethod || checkMethod({ row }))) {
-            selectRowMaps[getRowid($xeTable, row)] = row
+            const rowid = handleGetRowId(row)
+            selectRowMaps[rowid] = row
           }
         }, { children: childrenField })
       } else {
@@ -897,7 +872,7 @@ function handleCheckedAllCheckboxRow ($xeTable: VxeTableConstructor & VxeTablePr
            */
         if (!isForce && checkMethod) {
           XEUtils.eachTree(afterFullData, (row) => {
-            const rowid = getRowid($xeTable, row)
+            const rowid = handleGetRowId(row)
             if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
               selectRowMaps[rowid] = row
             }
@@ -913,14 +888,15 @@ function handleCheckedAllCheckboxRow ($xeTable: VxeTableConstructor & VxeTablePr
            */
         if (!isForce && checkMethod) {
           afterFullData.forEach((row) => {
-            const rowid = getRowid($xeTable, row)
+            const rowid = handleGetRowId(row)
             if (selectCheckboxMaps[rowid] || checkMethod({ row })) {
               selectRowMaps[rowid] = row
             }
           })
         } else {
           afterFullData.forEach(row => {
-            selectRowMaps[getRowid($xeTable, row)] = row
+            const rowid = handleGetRowId(row)
+            selectRowMaps[rowid] = row
           })
         }
       } else {
@@ -931,7 +907,7 @@ function handleCheckedAllCheckboxRow ($xeTable: VxeTableConstructor & VxeTablePr
            */
         if (!isForce && checkMethod) {
           afterFullData.forEach((row) => {
-            const rowid = getRowid($xeTable, row)
+            const rowid = handleGetRowId(row)
             if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
               selectRowMaps[rowid] = row
             }
@@ -949,11 +925,11 @@ function handleCheckedAllCheckboxRow ($xeTable: VxeTableConstructor & VxeTablePr
       afterFullData.forEach((row) => handleCheckboxReserveRow($xeTable, row, false))
     }
   }
-  reactData.selectCheckboxMaps = checkField ? {} : selectRowMaps
+  reactData.updateCheckboxFlag++
+  internalData.selectCheckboxMaps = checkField ? {} : selectRowMaps
 
   reactData.isAllSelected = checked
   reactData.isIndeterminate = false
-  reactData.treeIndeterminateMaps = {}
   internalData.treeIndeterminateRowMaps = {}
   $xeTable.checkSelectionStatus()
   return $xeTable.$nextTick()
@@ -966,8 +942,8 @@ function handleReserveStatus ($xeTable: VxeTableConstructor & VxeTablePrivateMet
   const internalData = $xeTable as unknown as TableInternalData
 
   const { treeConfig } = props
-  const { expandColumn, currentRow, selectCheckboxMaps, selectRadioRow, rowExpandedMaps, treeExpandedMaps } = reactData
-  const { fullDataRowIdData, fullAllDataRowIdData, radioReserveRow } = internalData
+  const { expandColumn, currentRow, selectRadioRow } = reactData
+  const { fullDataRowIdData, fullAllDataRowIdData, radioReserveRow, selectCheckboxMaps, treeExpandedMaps, rowExpandedMaps } = internalData
   const expandOpts = $xeTable.computeExpandOpts
   const treeOpts = $xeTable.computeTreeOpts
   const radioOpts = $xeTable.computeRadioOpts
@@ -984,7 +960,8 @@ function handleReserveStatus ($xeTable: VxeTableConstructor & VxeTablePrivateMet
     }
   }
   // 复选框
-  reactData.selectCheckboxMaps = getRecoverRowMaps($xeTable, selectCheckboxMaps) // 刷新多选行状态
+  internalData.selectCheckboxMaps = getRecoverRowMaps($xeTable, selectCheckboxMaps) // 刷新多选行状态
+  reactData.updateCheckboxFlag++
   // 还原保留选中状态
   if (checkboxOpts.reserve) {
     handleCheckedCheckboxRow($xeTable, handleReserveRow($xeTable, internalData.checkboxReserveRowMap), true, true)
@@ -993,18 +970,168 @@ function handleReserveStatus ($xeTable: VxeTableConstructor & VxeTablePrivateMet
     reactData.currentRow = null // 刷新当前行状态
   }
   // 行展开
-  reactData.rowExpandedMaps = expandColumn ? getRecoverRowMaps($xeTable, rowExpandedMaps) : {} // 刷新行展开状态
+  internalData.rowExpandedMaps = expandColumn ? getRecoverRowMaps($xeTable, rowExpandedMaps) : {} // 刷新行展开状态
+  reactData.rowExpandedFlag++
   // 还原保留状态
   if (expandColumn && expandOpts.reserve) {
     $xeTable.setRowExpand(handleReserveRow($xeTable, internalData.rowExpandedReserveRowMap), true)
   }
   // 树展开
-  reactData.treeExpandedMaps = treeConfig ? getRecoverRowMaps($xeTable, treeExpandedMaps) : {} // 刷新树展开状态
+  internalData.treeExpandedMaps = treeConfig ? getRecoverRowMaps($xeTable, treeExpandedMaps) : {} // 刷新树展开状态
+  reactData.treeExpandedFlag++
   if (treeConfig && treeOpts.reserve) {
     $xeTable.setTreeExpand(handleReserveRow($xeTable, internalData.treeExpandedReserveRowMap), true)
   }
 }
 
+/**
+ * 处理默认展开树节点
+ */
+const handleDefaultTreeExpand = ($xeTable: VxeTableConstructor) => {
+  const props = $xeTable
+  const internalData = $xeTable as unknown as TableInternalData
+
+  const { treeConfig } = props
+  if (treeConfig) {
+    const { tableFullData } = internalData
+    const treeOpts = $xeTable.computeTreeOpts
+    const { expandAll, expandRowKeys } = treeOpts
+    const childrenField = treeOpts.children || treeOpts.childrenField
+    if (expandAll) {
+      $xeTable.setAllTreeExpand(true)
+    } else if (expandRowKeys) {
+      const defExpandeds: any[] = []
+      const rowkey = getRowkey($xeTable)
+      expandRowKeys.forEach((rowid: any) => {
+        const matchObj = XEUtils.findTree(tableFullData, item => rowid === XEUtils.get(item, rowkey), { children: childrenField })
+        if (matchObj) {
+          defExpandeds.push(matchObj.item)
+        }
+      })
+      $xeTable.setTreeExpand(defExpandeds, true)
+    }
+  }
+}
+
+const handleAsyncTreeExpandChilds = ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, row: any): Promise<void> => {
+  const reactData = $xeTable as unknown as TableReactData
+  const internalData = $xeTable as unknown as TableInternalData
+
+  const treeOpts = $xeTable.computeTreeOpts
+  const checkboxOpts = $xeTable.computeCheckboxOpts
+  const { transform, loadMethod } = treeOpts
+  const { checkStrictly } = checkboxOpts
+  return new Promise<void>(resolve => {
+    if (loadMethod) {
+      const { fullAllDataRowIdData, treeExpandLazyLoadedMaps } = internalData
+      const rowid = getRowid($xeTable, row)
+      const rowRest = fullAllDataRowIdData[rowid]
+      treeExpandLazyLoadedMaps[rowid] = row
+      Promise.resolve(
+        loadMethod({ $table: $xeTable, row })
+      ).then((childRecords: any) => {
+        if (rowRest) {
+          rowRest.treeLoaded = true
+        }
+        if (treeExpandLazyLoadedMaps[rowid]) {
+          delete treeExpandLazyLoadedMaps[rowid]
+        }
+        if (!XEUtils.isArray(childRecords)) {
+          childRecords = []
+        }
+        if (childRecords) {
+          return $xeTable.loadTreeChildren(row, childRecords).then(childRows => {
+            const { treeExpandedMaps } = internalData
+            if (childRows.length && !treeExpandedMaps[rowid]) {
+              treeExpandedMaps[rowid] = row
+            }
+            reactData.treeExpandedFlag++
+            // 如果当前节点已选中，则展开后子节点也被选中
+            if (!checkStrictly && $xeTable.isCheckedByCheckboxRow(row)) {
+              handleCheckedCheckboxRow($xeTable, childRows, true)
+            }
+            return $xeTable.$nextTick().then(() => {
+              if (transform) {
+                $xeTable.handleTableData()
+                updateAfterDataIndex($xeTable)
+                return $xeTable.$nextTick()
+              }
+            })
+          })
+        }
+      }).catch(() => {
+        const { treeExpandLazyLoadedMaps } = internalData
+        if (rowRest) {
+          rowRest.treeLoaded = false
+        }
+        if (treeExpandLazyLoadedMaps[rowid]) {
+          delete treeExpandLazyLoadedMaps[rowid]
+        }
+      }).finally(() => {
+        reactData.treeExpandedFlag++
+        $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => resolve())
+      })
+    } else {
+      resolve()
+    }
+  })
+}
+
+const handleTreeExpandReserve = ($xeTable: VxeTableConstructor, row: any, expanded: boolean) => {
+  const internalData = $xeTable as unknown as TableInternalData
+
+  const { treeExpandedReserveRowMap } = internalData
+  const treeOpts = $xeTable.computeTreeOpts
+  if (treeOpts.reserve) {
+    const rowid = getRowid($xeTable, row)
+    if (expanded) {
+      treeExpandedReserveRowMap[rowid] = row
+    } else if (treeExpandedReserveRowMap[rowid]) {
+      delete treeExpandedReserveRowMap[rowid]
+    }
+  }
+}
+
+const handleAsyncRowExpand = ($xeTable: VxeTableConstructor, row: any): Promise<void> => {
+  const reactData = $xeTable as unknown as TableReactData
+  const internalData = $xeTable as unknown as TableInternalData
+
+  return new Promise<void>(resolve => {
+    const expandOpts = $xeTable.computeExpandOpts
+    const { loadMethod } = expandOpts
+    if (loadMethod) {
+      const { fullAllDataRowIdData, rowExpandLazyLoadedMaps } = internalData
+      const rowid = getRowid($xeTable, row)
+      const rowRest = fullAllDataRowIdData[rowid]
+      rowExpandLazyLoadedMaps[rowid] = row
+      loadMethod({ $table: $xeTable, row, rowIndex: $xeTable.getRowIndex(row), $rowIndex: $xeTable.getVMRowIndex(row) }).then(() => {
+        const { rowExpandedMaps } = internalData
+        if (rowRest) {
+          rowRest.expandLoaded = true
+        }
+        rowExpandedMaps[rowid] = row
+        reactData.rowExpandedFlag++
+      }).catch(() => {
+        if (rowRest) {
+          rowRest.expandLoaded = false
+        }
+      }).finally(() => {
+        const { rowExpandLazyLoadedMaps } = internalData
+        if (rowExpandLazyLoadedMaps[rowid]) {
+          delete rowExpandLazyLoadedMaps[rowid]
+        }
+        reactData.rowExpandedFlag++
+        $xeTable.$nextTick()
+          .then(() => $xeTable.recalculate())
+          .then(() => $xeTable.updateCellAreas())
+          .then(() => resolve())
+      })
+    } else {
+      resolve()
+    }
+  })
+}
+
 function calcVarRowHeightConfig ($xeTable: VxeTableConstructor, sizeKey: 'default' | 'medium' | 'small' | 'mini', sizeEl: Element) {
   const reactData = $xeTable as unknown as TableReactData
 
@@ -1070,12 +1197,13 @@ function handleVirtualYVisible ($xeTable: VxeTableConstructor) {
       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
@@ -1086,7 +1214,7 @@ function handleVirtualYVisible ($xeTable: VxeTableConstructor) {
       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) {
@@ -1118,16 +1246,20 @@ function calculateMergerOffsetIndex (list: any, offsetItem: any, type: any) {
   }
 }
 
-function setMerges (_vm: any, merges: any, mList: any, rowList: any) {
+function setMerges ($xeTable: VxeTableConstructor, merges: VxeTableDefines.MergeOptions | VxeTableDefines.MergeOptions[], mList: VxeTableDefines.MergeItem[], rowList?: any[]) {
+  const props = $xeTable
+  const internalData = $xeTable as unknown as TableInternalData
+
   if (merges) {
-    const { treeConfig, visibleColumn } = _vm
+    const { treeConfig } = props
+    const { visibleColumn } = internalData
     if (!XEUtils.isArray(merges)) {
       merges = [merges]
     }
     if (treeConfig && merges.length) {
       errLog('vxe.error.noTree', ['merge-cells | merge-footer-items'])
     }
-    merges.forEach((item: any) => {
+    merges.forEach((item) => {
       let { row, col, rowspan, colspan } = item
       if (rowList && XEUtils.isNumber(row)) {
         row = rowList[row]
@@ -1166,10 +1298,14 @@ function setMerges (_vm: any, merges: any, mList: any, rowList: any) {
   }
 }
 
-function removeMerges (_vm: any, merges: any, mList: any, rowList: any) {
+function removeMerges ($xeTable: VxeTableConstructor, merges: VxeTableDefines.MergeOptions | VxeTableDefines.MergeOptions[], mList: VxeTableDefines.MergeItem[], rowList?: any) {
+  const props = $xeTable
+  const internalData = $xeTable as unknown as TableInternalData
+
   const rest: any[] = []
   if (merges) {
-    const { treeConfig, visibleColumn } = _vm
+    const { treeConfig } = props
+    const { visibleColumn } = internalData
     if (!XEUtils.isArray(merges)) {
       merges = [merges]
     }
@@ -1352,6 +1488,7 @@ function autoCellWidth ($xeTable: VxeTableConstructor & VxeTablePrivateMethods)
   internalData.headerHeight = headerHeight
   internalData.footerHeight = footerHeight
   reactData.overflowX = overflowX
+  reactData.resizeWidthFlag++
   updateColumnOffsetLeft($xeTable)
   updateHeight($xeTable)
   reactData.parentHeight = Math.max(internalData.headerHeight + footerHeight + 20, $xeTable.getParentHeight())
@@ -1382,8 +1519,9 @@ const calcCellHeight = ($xeTable: VxeTableConstructor) => {
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
   const el = $xeTable.$refs.refElem as HTMLDivElement
   if (!isAllOverflow && scrollYLoad && el) {
+    const { handleGetRowId } = createHandleGetRowId($xeTable)
     tableData.forEach(row => {
-      const rowid = getRowid($xeTable, row)
+      const rowid = handleGetRowId(row)
       const rowRest = fullAllDataRowIdData[rowid]
       if (rowRest) {
         const height = calcCellAutoHeight(rowRest, el)
@@ -1631,10 +1769,11 @@ function hideDropTip ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
  * @param {Event} evnt 事件
  * @param {Row} row 行对象
  */
-function handleTooltip ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, evnt: MouseEvent, tdEl: HTMLTableCellElement, overflowElem: HTMLElement, tipElem: HTMLElement | null, params: any) {
+function handleTooltip ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, evnt: MouseEvent, tdEl: HTMLTableCellElement, overflowElem: HTMLElement | null, params: any) {
   const reactData = $xeTable as unknown as TableReactData
 
-  if (!overflowElem) {
+  const tipOverEl = overflowElem || tdEl
+  if (!tipOverEl) {
     return $xeTable.$nextTick()
   }
   params.cell = tdEl
@@ -1644,9 +1783,8 @@ function handleTooltip ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
   const { showAll, contentMethod } = tooltipOpts
   const customContent = contentMethod ? contentMethod(params) : null
   const useCustom = contentMethod && !XEUtils.eqNull(customContent)
-  const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim()
-  const isCellOverflow = overflowElem.scrollWidth > overflowElem.clientWidth
-  if (content && (showAll || useCustom || isCellOverflow)) {
+  const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim()
+  if (content && (showAll || useCustom || (tipOverEl.scrollWidth > tipOverEl.clientWidth))) {
     Object.assign(tooltipStore, {
       row,
       column,
@@ -1656,7 +1794,7 @@ function handleTooltip ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
     $xeTable.$nextTick(() => {
       const $tooltip = $xeTable.$refs.refTooltip as VxeTooltipInstance
       if ($tooltip && $tooltip.open) {
-        $tooltip.open(isCellOverflow ? overflowElem : (tipElem || overflowElem), formatText(content))
+        $tooltip.open(tipOverEl, formatText(content))
       }
     })
   }
@@ -1845,8 +1983,8 @@ function parseColumns ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, i
   const reactData = $xeTable as unknown as TableReactData
   const internalData = $xeTable as unknown as TableInternalData
 
-  const { showOverflow } = props
-  const rowOpts = $xeTable.computeRowOpts
+  // const { showOverflow } = props
+  // const rowOpts = $xeTable.computeRowOpts
   const leftList: VxeTableDefines.ColumnInfo[] = []
   const centerList: VxeTableDefines.ColumnInfo[] = []
   const rightList: VxeTableDefines.ColumnInfo[] = []
@@ -1911,28 +2049,28 @@ function parseColumns ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, i
   reactData.hasFixedColumn = leftList.length > 0 || rightList.length > 0
   Object.assign(columnStore, { leftList, centerList, rightList })
   if (scrollXLoad) {
-    if (showOverflow) {
-      if (!rowOpts.height) {
-        const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
-        if (errColumn) {
-          errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
-        }
-      }
-    }
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      // if (props.showHeader && !props.showHeaderOverflow) {
-      //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
-      // }
-      // if (props.showFooter && !props.showFooterOverflow) {
-      //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
-      // }
-      if (props.spanMethod) {
-        warnLog('vxe.error.scrollErrProp', ['span-method'])
-      }
-      if (props.footerSpanMethod) {
-        warnLog('vxe.error.scrollErrProp', ['footer-span-method'])
-      }
-    }
+    // if (showOverflow) {
+    //   if (!rowOpts.height) {
+    //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+    //     if (errColumn) {
+    //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+    //     }
+    //   }
+    // }
+    // if (process.env.VUE_APP_VXE_ENV === 'development') {
+    // if (props.showHeader && !props.showHeaderOverflow) {
+    //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
+    // }
+    // if (props.showFooter && !props.showFooterOverflow) {
+    //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
+    // }
+    if (props.spanMethod) {
+      warnLog('vxe.error.scrollErrProp', ['span-method'])
+    }
+    if (props.footerSpanMethod) {
+      warnLog('vxe.error.scrollErrProp', ['footer-span-method'])
+    }
+    // }
     if (isReset) {
       const { visibleSize } = handleVirtualXVisible($xeTable)
       scrollXStore.startIndex = 0
@@ -2055,6 +2193,39 @@ function loadScrollYData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
   }
 }
 
+const createGetRowCacheProp = (prop: 'seq' | 'index' | '_index' | '$index') => {
+  return function (this: VxeTableConstructor & VxeTablePrivateMethods, row: any) {
+    const $xeTable = this
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { fullAllDataRowIdData } = internalData
+    if (row) {
+      const rowid = getRowid($xeTable, row)
+      const rowRest = fullAllDataRowIdData[rowid]
+      if (rowRest) {
+        return rowRest[prop]
+      }
+    }
+    return -1
+  }
+}
+
+const createGetColumnCacheProp = (prop: 'index' | '_index' | '$index') => {
+  return function (this: VxeTableConstructor & VxeTablePrivateMethods, column: VxeTableDefines.ColumnInfo) {
+    const $xeTable = this
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { fullColumnIdData } = internalData
+    if (column) {
+      const colRest = fullColumnIdData[column.id]
+      if (colRest) {
+        return colRest[prop]
+      }
+    }
+    return -1
+  }
+}
+
 function lazyScrollXData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
   const internalData = $xeTable as unknown as TableInternalData
 
@@ -2221,7 +2392,7 @@ function calcCellWidth ($xeTable: VxeTableConstructor & VxeTablePrivateMethods)
 
 function handleUpdateColResize ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, 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)
@@ -2235,7 +2406,7 @@ function handleUpdateRowResize ($xeTable: VxeTableConstructor & VxeTablePrivateM
   const reactData = $xeTable as unknown as TableReactData
 
   reactData.resizeHeightFlag++
-  $xeTable.recalculate(true).then(() => {
+  $xeTable.recalculate().then(() => {
     $xeTable.updateCellAreas()
     $xeTable.dispatchEvent('row-resizable-change', params, evnt)
     setTimeout(() => $xeTable.recalculate(true), 300)
@@ -2260,16 +2431,17 @@ function updateRowOffsetTop ($xeTable: VxeTableConstructor & VxeTablePrivateMeth
   const reactData = $xeTable as unknown as TableReactData
   const internalData = $xeTable as unknown as TableInternalData
 
-  const { expandColumn, rowExpandedMaps } = reactData
-  const { afterFullData, fullAllDataRowIdData } = internalData
+  const { expandColumn } = reactData
+  const { afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData
   const expandOpts = $xeTable.computeExpandOpts
   const rowOpts = $xeTable.computeRowOpts
   const cellOpts = $xeTable.computeCellOpts
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
+  const { handleGetRowId } = createHandleGetRowId($xeTable)
   let offsetTop = 0
   for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
     const row = afterFullData[rIndex]
-    const rowid = getRowid($xeTable, row)
+    const rowid = handleGetRowId(row)
     const rowRest = fullAllDataRowIdData[rowid] || {}
     rowRest.oTop = offsetTop
     offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight
@@ -2284,46 +2456,42 @@ function updateRowExpandStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMe
   const reactData = $xeTable as unknown as TableReactData
   const internalData = $xeTable as unknown as TableInternalData
 
-  const { expandColumn, scrollYLoad, rowExpandedMaps } = reactData
+  const { expandColumn, scrollYLoad, scrollYTop, isScrollYBig } = reactData
   const expandOpts = $xeTable.computeExpandOpts
   const rowOpts = $xeTable.computeRowOpts
   const cellOpts = $xeTable.computeCellOpts
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
   const { mode } = expandOpts
   if (expandColumn && mode === 'fixed') {
-    const { elemStore, afterFullData, fullAllDataRowIdData } = internalData
+    const { elemStore, fullAllDataRowIdData } = internalData
     const rowExpandEl = $xeTable.$refs.refRowExpandElem as HTMLDivElement
     const bodyScrollElem = getRefElem(elemStore['main-body-scroll'])
     if (rowExpandEl && bodyScrollElem) {
       let isUpdateHeight = false
-      if (scrollYLoad) {
-        let offsetTop = 0
-        for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
-          const row = afterFullData[rIndex]
-          const rowid = getRowid($xeTable, row)
-          const rowRest = fullAllDataRowIdData[rowid] || {}
-          rowRest.oTop = offsetTop
-          offsetTop += rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight
-          // 是否展开行
-          if (expandColumn && rowExpandedMaps[rowid]) {
-            offsetTop += rowRest.expandHeight || expandOpts.height || 0
-          }
-        }
-      }
       XEUtils.arrayEach(rowExpandEl.children, reEl => {
         const expandEl = reEl as HTMLDivElement
         const rowid = expandEl.getAttribute('rowid') || ''
         const rowRest = fullAllDataRowIdData[rowid]
         if (rowRest) {
           const expandHeight = expandEl.offsetHeight + 1
+          const trEl = bodyScrollElem.querySelector(`.vxe-body--row[rowid="${rowid}"]`) as HTMLTableCellElement
+          let offsetTop = 0
           if (scrollYLoad) {
-            expandEl.style.top = toCssUnit(rowRest.oTop + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight))
+            if (isScrollYBig && trEl) {
+              offsetTop = trEl.offsetTop + trEl.offsetHeight
+            } else {
+              offsetTop = rowRest.oTop + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight)
+            }
           } else {
-            const trEl = bodyScrollElem.querySelector(`.vxe-body--row[rowid="${rowid}"]`) as HTMLTableCellElement
             if (trEl) {
-              expandEl.style.top = toCssUnit(trEl.offsetTop + trEl.offsetHeight)
+              offsetTop = trEl.offsetTop + trEl.offsetHeight
             }
           }
+          if (isScrollYBig) {
+            offsetTop += scrollYTop
+          }
+          expandEl.style.top = toCssUnit(offsetTop)
+
           if (!isUpdateHeight) {
             if (rowRest.expandHeight !== expandHeight) {
               isUpdateHeight = true
@@ -2334,6 +2502,9 @@ function updateRowExpandStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMe
       })
       if (isUpdateHeight) {
         reactData.rowExpandHeightFlag++
+        $xeTable.$nextTick(() => {
+          updateRowOffsetTop($xeTable)
+        })
       }
     }
   }
@@ -2352,10 +2523,12 @@ function handleRowExpandScroll ($xeTable: VxeTableConstructor & VxeTablePrivateM
 
 const Methods = {
   callSlot (slotFunc: any, params: any, h: any, vNodes: any) {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
+
     if (slotFunc) {
-      const { $xegrid } = this
-      if ($xegrid) {
-        return $xegrid.callSlot(slotFunc, params, h, vNodes)
+      if ($xeGrid) {
+        return $xeGrid.callSlot(slotFunc, params, h, vNodes)
       }
       if (XEUtils.isFunction(slotFunc)) {
         return getSlotVNs(slotFunc.call(this, params, h, vNodes))
@@ -2372,8 +2545,11 @@ const Methods = {
    * 获取父容器元素
    */
   getParentElem () {
-    const { $el, $xegrid } = this
-    return $xegrid ? $xegrid.$el.parentNode : $el.parentNode
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
+
+    const { $el } = this
+    return $xeGrid ? $xeGrid.$el.parentNode : $el.parentNode
   },
   /**
    * 获取父容器的高度
@@ -2406,8 +2582,10 @@ const Methods = {
    * 如果存在表尾合计滚动条，则需要排除滚动条高度
    */
   getExcludeHeight () {
-    const { $xegrid } = this
-    return $xegrid ? $xegrid.getExcludeHeight() : 0
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
+
+    return $xeGrid ? $xeGrid.getExcludeHeight() : 0
   },
   /**
    * 重置表格的一切数据状态
@@ -2488,6 +2666,9 @@ const Methods = {
     const childrenField = treeOpts.children || treeOpts.childrenField
     let treeData = []
     let fullData = datas ? datas.slice(0) : []
+    if (fullData.length > supportMaxRow) {
+      errLog('vxe.error.errMaxRow', [supportMaxRow])
+    }
     if (treeConfig) {
       // 树结构自动转换
       if (treeOpts.transform) {
@@ -2732,25 +2913,19 @@ const Methods = {
     const internalData = $xeTable as unknown as TableInternalData
 
     const { treeConfig } = props
-    const { treeExpandedMaps } = reactData
-    const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData
+    const { fullAllDataRowIdData, tableFullData, tableFullTreeData, treeExpandedMaps } = internalData
     const treeOpts = $xeTable.computeTreeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
     const { lazy } = treeOpts
-    const rowkey = getRowkey($xeTable)
-    const isDeepKey = rowkey.indexOf('.') > -1
     const fullAllDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = { ...fullAllDataRowIdData } // 存在已删除数据
     const fullDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
-    const treeTempExpandedMaps = { ...treeExpandedMaps }
 
-    const handleRowId = isDeepKey ? updateDeepRowKey : updateFastRowKey
+    const { handleUpdateRowId } = createHandleUpdateRowId($xeTable)
     const handleRowCache = (row: any, index: number, items: any, currIndex: number, parentRow: any, rowid: string, level: number, seq: string | number) => {
       let rowRest = fullAllDataRowIdMaps[rowid]
       if (!rowRest) {
         rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
-        fullDataRowIdMaps[rowid] = rowRest
-        fullAllDataRowIdMaps[rowid] = rowRest
       }
       rowRest.treeLoaded = false
       rowRest.expandLoaded = false
@@ -2761,19 +2936,21 @@ const Methods = {
       rowRest.level = level
       rowRest.index = currIndex
       rowRest.treeIndex = index
+
+      fullDataRowIdMaps[rowid] = rowRest
+      fullAllDataRowIdMaps[rowid] = rowRest
     }
 
     if (treeConfig) {
       XEUtils.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
-        const rowid = handleRowId(row, rowkey)
+        const rowid = handleUpdateRowId(row)
         if (treeConfig && lazy) {
-          const treeExpRest = treeTempExpandedMaps[rowid]
           if (row[hasChildField] && row[childrenField] === undefined) {
             row[childrenField] = null
           }
-          if (treeExpRest) {
+          if (treeExpandedMaps[rowid]) {
             if (!row[childrenField] || !row[childrenField].length) {
-              delete treeTempExpandedMaps[rowid]
+              delete treeExpandedMaps[rowid]
             }
           }
         }
@@ -2781,29 +2958,27 @@ const Methods = {
       }, { children: childrenField })
     } else {
       tableFullData.forEach((row, index, items) => {
-        handleRowCache(row, index, items, index, null, handleRowId(row, rowkey), 0, index + 1)
+        handleRowCache(row, index, items, index, null, handleUpdateRowId(row), 0, index + 1)
       })
     }
 
     internalData.fullDataRowIdData = fullDataRowIdMaps
     internalData.fullAllDataRowIdData = fullAllDataRowIdMaps
-    reactData.treeExpandedMaps = treeTempExpandedMaps
+    reactData.treeExpandedFlag++
   },
   cacheSourceMap (fullData: any[]) {
-    let { treeConfig, treeOpts, sourceDataRowIdData } = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { treeConfig } = props
+    const treeOpts = $xeTable.computeTreeOpts
     const sourceData = XEUtils.clone(fullData, true)
-    const rowkey = getRowkey(this)
-    sourceDataRowIdData = this.sourceDataRowIdData = {}
+    const { handleUpdateRowId } = createHandleUpdateRowId($xeTable)
+    const sourceRowIdData: Record<string, any> = {}
     const handleSourceRow = (row: any) => {
-      let rowid = getRowid(this, row)
-      if (eqEmptyValue(rowid)) {
-        rowid = getRowUniqueId()
-        XEUtils.set(row, rowkey, rowid)
-      }
-      sourceDataRowIdData[rowid] = {
-        row,
-        rowid
-      }
+      const rowid = handleUpdateRowId(row)
+      sourceRowIdData[rowid] = row
     }
     // 源数据缓存
     if (treeConfig) {
@@ -2812,7 +2987,8 @@ const Methods = {
     } else {
       sourceData.forEach(handleSourceRow)
     }
-    this.tableSourceData = sourceData
+    internalData.sourceDataRowIdData = sourceRowIdData
+    internalData.tableSourceData = sourceData
   },
   getParams () {
     return this.params
@@ -2900,47 +3076,22 @@ const Methods = {
    * 根据 row 获取序号
    * @param {Row} row 行对象
    */
-  getRowSeq (row: any) {
-    const { fullAllDataRowIdData } = this
-    if (row) {
-      const rowid = getRowid(this, row)
-      const rest = fullAllDataRowIdData[rowid]
-      if (rest) {
-        return rest.seq
-      }
-    }
-    return -1
-  },
+  getRowSeq: createGetRowCacheProp('seq'),
   /**
    * 根据 row 获取相对于 data 中的索引
    * @param {Row} row 行对象
    */
-  getRowIndex (row: any) {
-    const { fullAllDataRowIdData } = this
-    if (row) {
-      const rowid = getRowid(this, row)
-      const rest = fullAllDataRowIdData[rowid]
-      if (rest) {
-        return rest.index
-      }
-    }
-    return -1
-  },
+  getRowIndex: createGetRowCacheProp('index') as ((row: any) => number),
   /**
    * 根据 row 获取相对于当前数据中的索引
    * @param {Row} row 行对象
    */
-  getVTRowIndex (row: any) {
-    const { fullAllDataRowIdData } = this
-    if (row) {
-      const rowid = getRowid(this, row)
-      const rest = fullAllDataRowIdData[rowid]
-      if (rest) {
-        return rest._index
-      }
-    }
-    return -1
-  },
+  getVTRowIndex: createGetRowCacheProp('_index') as ((row: any) => number),
+  /**
+   * 根据 row 获取渲染中的虚拟索引
+   * @param {Row} row 行对象
+   */
+  getVMRowIndex: createGetRowCacheProp('$index') as ((row: any) => number),
   // 在 v3 中废弃
   _getRowIndex (row: any) {
     if (process.env.VUE_APP_VXE_ENV === 'development') {
@@ -2948,21 +3099,6 @@ const Methods = {
     }
     return this.getVTRowIndex(row)
   },
-  /**
-   * 根据 row 获取渲染中的虚拟索引
-   * @param {Row} row 行对象
-   */
-  getVMRowIndex (row: any) {
-    const { fullAllDataRowIdData } = this
-    if (row) {
-      const rowid = getRowid(this, row)
-      const rest = fullAllDataRowIdData[rowid]
-      if (rest) {
-        return rest.$index
-      }
-    }
-    return -1
-  },
   // 在 v3 中废弃
   $getRowIndex (row: any) {
     if (process.env.VUE_APP_VXE_ENV === 'development') {
@@ -2974,30 +3110,17 @@ const Methods = {
    * 根据 column 获取相对于 columns 中的索引
    * @param {ColumnInfo} column 列配置
    */
-  getColumnIndex (column: any) {
-    const { fullColumnIdData } = this
-    if (column) {
-      const rest = fullColumnIdData[column.id]
-      if (rest) {
-        return rest.index
-      }
-    }
-    return -1
-  },
+  getColumnIndex: createGetColumnCacheProp('index'),
   /**
    * 根据 column 获取相对于当前表格列中的索引
    * @param {ColumnInfo} column 列配置
    */
-  getVTColumnIndex (column: any) {
-    const { fullColumnIdData } = this
-    if (column) {
-      const rest = fullColumnIdData[column.id]
-      if (rest) {
-        return rest._index
-      }
-    }
-    return -1
-  },
+  getVTColumnIndex: createGetColumnCacheProp('_index'),
+  /**
+   * 根据 column 获取渲染中的虚拟索引
+   * @param {ColumnInfo} column 列配置
+   */
+  getVMColumnIndex: createGetColumnCacheProp('$index'),
   // 在 v3 中废弃
   _getColumnIndex (column: any) {
     if (process.env.VUE_APP_VXE_ENV === 'development') {
@@ -3005,20 +3128,6 @@ const Methods = {
     }
     return this.getVTColumnIndex(column)
   },
-  /**
-   * 根据 column 获取渲染中的虚拟索引
-   * @param {ColumnInfo} column 列配置
-   */
-  getVMColumnIndex (column: any) {
-    const { fullColumnIdData } = this
-    if (column) {
-      const rest = fullColumnIdData[column.id]
-      if (rest) {
-        return rest.$index
-      }
-    }
-    return -1
-  },
   // 在 v3 中废弃
   $getColumnIndex (column: any) {
     if (process.env.VUE_APP_VXE_ENV === 'development') {
@@ -3112,9 +3221,12 @@ const Methods = {
     const internalData = $xeTable as unknown as TableInternalData
 
     const { keepSource, treeConfig } = props
+    const { editStore } = reactData
     const { fullAllDataRowIdData, fullDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData
+    const removeTempMaps = { ...editStore.removeMaps }
     const treeOpts = $xeTable.computeTreeOpts
     const { transform } = treeOpts
+    const { handleGetRowId } = createHandleGetRowId($xeTable)
     if (!keepSource) {
       if (process.env.VUE_APP_VXE_ENV === 'development') {
         errLog('vxe.error.reqProp', ['keep-source'])
@@ -3132,7 +3244,7 @@ const Methods = {
     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
@@ -3145,6 +3257,7 @@ const Methods = {
                 XEUtils.destructuring(row, XEUtils.clone(oRow, true))
               }
               if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                delete removeTempMaps[rowid]
                 tableFullData.unshift(row)
                 afterFullData.unshift(row)
                 reDelFlag = true
@@ -3156,6 +3269,7 @@ const Methods = {
     }
     if (rows) {
       if (reDelFlag) {
+        editStore.removeMaps = removeTempMaps
         $xeTable.updateFooter()
         $xeTable.cacheRowMap(false)
         $xeTable.handleTableData(treeConfig && transform)
@@ -3523,12 +3637,10 @@ const Methods = {
   getCheckboxRecords (isFull: boolean) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const props = $xeTable
-    const reactData = $xeTable as unknown as TableReactData
     const internalData = $xeTable as unknown as TableInternalData
 
     const { treeConfig } = props
-    const { selectCheckboxMaps } = reactData
-    const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps } = internalData
+    const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps, selectCheckboxMaps } = internalData
     const treeOpts = $xeTable.computeTreeOpts
     const checkboxOpts = $xeTable.computeCheckboxOpts
     const { transform, mapChildrenField } = treeOpts
@@ -3574,7 +3686,7 @@ const Methods = {
     const treeOpts = $xeTable.computeTreeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
     const { transform, rowField, parentField, mapChildrenField } = treeOpts
-    const { remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts
+    const { isEvery, remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts
     const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological } = sortOpts
     let tableData: any[] = []
     let tableTree: any[] = []
@@ -3636,7 +3748,7 @@ const Methods = {
           // 筛选虚拟树
           tableTree = XEUtils.searchTree(tableFullTreeData, handleFilter, {
             original: true,
-            isEvery: true,
+            isEvery,
             children: mapChildrenField,
             mapChildren: childrenField
           })
@@ -3650,7 +3762,7 @@ const Methods = {
           // 还原虚拟树
           tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
             original: true,
-            isEvery: true,
+            isEvery,
             children: mapChildrenField,
             mapChildren: childrenField
           })
@@ -3711,7 +3823,7 @@ const Methods = {
         // 还原虚拟树
         tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
           original: true,
-          isEvery: true,
+          isEvery,
           children: treeOpts.mapChildrenField,
           mapChildren: childrenField
         })
@@ -3865,6 +3977,8 @@ const Methods = {
    * 默认执行一次，除非被重置
    */
   handleLoadDefaults () {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
     if (this.checkboxConfig) {
       this.handleDefaultSelectionChecked()
     }
@@ -3875,7 +3989,7 @@ const Methods = {
       this.handleDefaultRowExpand()
     }
     if (this.treeConfig) {
-      this.handleDefaultTreeExpand()
+      handleDefaultTreeExpand($xeTable)
     }
     if (this.mergeCells) {
       this.handleDefaultMergeCells()
@@ -3899,7 +4013,7 @@ const Methods = {
    * 设置为固定列
    */
   setColumnFixed (fieldOrColumn: any, fixed: any) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
     let status = false
     const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
@@ -4073,9 +4187,9 @@ const Methods = {
     return this.refreshColumn(true)
   },
   handleCustomRestore (storeData: any) {
-    const $xetable = this
-    const reactData = $xetable
-    const internalData = $xetable
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
 
     let { collectColumn } = internalData
     const { resizableData, sortData, visibleData, fixedData } = storeData
@@ -4145,15 +4259,27 @@ const Methods = {
     }
   },
   getCustomStoreData () {
-    const { id, customOpts, collectColumn } = this
-    const { checkMethod } = customOpts
-    const resizableData: any = {}
-    const sortData: any = {}
-    const visibleData: any = {}
-    const fixedData: any = {}
-    const storeData: any = {
-      resizableData: undefined,
-      sortData: undefined,
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { id } = props
+    const customOpts = $xeTable.computeCustomOpts
+    const { collectColumn } = internalData
+    const { storage, checkMethod } = customOpts
+    const isAllCustom = storage === true
+    const storageOpts: VxeTableDefines.VxeTableCustomStorageObj = isAllCustom ? {} : Object.assign({}, storage || {})
+    const isCustomResizable = isAllCustom || storageOpts.resizable
+    const isCustomVisible = isAllCustom || storageOpts.visible
+    const isCustomFixed = isAllCustom || storageOpts.fixed
+    const isCustomSort = isAllCustom || storageOpts.sort
+    const resizableData: Record<string, number> = {}
+    const sortData: Record<string, number> = {}
+    const visibleData: Record<string, boolean> = {}
+    const fixedData: Record<string, VxeColumnPropTypes.Fixed> = {}
+    const storeData: VxeTableDefines.CustomStoreData = {
+      resizableData: undefined,
+      sortData: undefined,
       visibleData: undefined,
       fixedData: undefined
     }
@@ -4163,46 +4289,36 @@ const Methods = {
     }
     let hasResizable = 0
     let hasSort = 0
-    let hasFixedt = 0
+    let hasFixed = 0
     let hasVisible = 0
     XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+      const colKey = column.getKey()
+      if (!colKey) {
+        errLog('vxe.error.reqProp', [`${column.getTitle() || column.type || ''} -> column.field=?`])
+        return
+      }
       // 只支持一级
       if (!parentColumn) {
-        collectColumn.forEach((column: any) => {
-          const colKey = column.getKey()
-          if (colKey) {
-            hasSort = 1
-            sortData[colKey] = column.renderSortNumber
-          }
-        })
-        if (column.fixed !== column.defaultFixed) {
-          const colKey = column.getKey()
-          if (colKey) {
-            hasFixedt = 1
-            fixedData[colKey] = column.fixed
-          }
+        if (isCustomSort) {
+          hasSort = 1
+          sortData[colKey] = column.renderSortNumber
         }
-      }
-      if (column.resizeWidth) {
-        const colKey = column.getKey()
-        if (colKey) {
-          hasResizable = 1
-          resizableData[colKey] = column.renderWidth
+        if (isCustomFixed && column.fixed !== column.defaultFixed) {
+          hasFixed = 1
+          fixedData[colKey] = column.fixed
         }
       }
-      if (!checkMethod || checkMethod({ column })) {
+      if (isCustomResizable && column.resizeWidth) {
+        hasResizable = 1
+        resizableData[colKey] = column.renderWidth
+      }
+      if (isCustomVisible && (!checkMethod || checkMethod({ column }))) {
         if (!column.visible && column.defaultVisible) {
-          const colKey = column.getKey()
-          if (colKey) {
-            hasVisible = 1
-            visibleData[colKey] = false
-          }
+          hasVisible = 1
+          visibleData[colKey] = false
         } else if (column.visible && !column.defaultVisible) {
-          const colKey = column.getKey()
-          if (colKey) {
-            hasVisible = 1
-            visibleData[colKey] = true
-          }
+          hasVisible = 1
+          visibleData[colKey] = true
         }
       }
     })
@@ -4212,7 +4328,7 @@ const Methods = {
     if (hasSort) {
       storeData.sortData = sortData
     }
-    if (hasFixedt) {
+    if (hasFixed) {
       storeData.fixedData = fixedData
     }
     if (hasVisible) {
@@ -4221,9 +4337,9 @@ const Methods = {
     return storeData
   },
   saveCustomStore (type: any) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const props = $xeTable
-    const reactData = $xeTable as TableReactData
+    const reactData = $xeTable as unknown as TableReactData
 
     const { customConfig } = props
     const tableId = $xeTable.computeTableId
@@ -4701,12 +4817,13 @@ const Methods = {
     const internalData = $xeTable as unknown as TableInternalData
 
     const { fullAllDataRowIdData, afterFullData } = internalData
+    const { handleGetRowId } = createHandleGetRowId($xeTable)
     const rowOpts = $xeTable.computeRowOpts
     const cellOpts = $xeTable.computeCellOpts
     const defaultRowHeight = $xeTable.computeDefaultRowHeight
     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
@@ -4734,8 +4851,9 @@ const Methods = {
       rHeight = Math.floor(rHeight * bodyHeight)
     }
     if (rHeight) {
+      const { handleGetRowId } = createHandleGetRowId($xeTable)
       rows.forEach(row => {
-        const rowid = XEUtils.isString(row) || XEUtils.isNumber(row) ? row : getRowid($xeTable, row)
+        const rowid = XEUtils.isString(row) || XEUtils.isNumber(row) ? row : handleGetRowId(row)
         const rowRest = fullAllDataRowIdData[rowid]
         if (rowRest) {
           rowRest.resizeHeight = rHeight
@@ -4882,6 +5000,9 @@ const Methods = {
     }
   },
   preventEvent (evnt: any, type: any, args: any, next: any, end: any) {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
+
     let evntList = interceptor.get(type)
 
     // 兼容老版本
@@ -4895,8 +5016,21 @@ const Methods = {
     }
     // 兼容老版本
 
-    let rest
-    if (!evntList.some(func => func(Object.assign({ $grid: this.$xegrid, $table: this, $event: evnt }, args)) === false)) {
+    let rest = null
+    let isStop = false
+    for (let i = 0; i < evntList.length; i++) {
+      const func = evntList[i]
+      const fnRest = func(Object.assign({ $grid: $xeGrid, $table: $xeTable, $event: evnt }, args))
+      if (fnRest === false) {
+        isStop = true
+        break
+      } else if (fnRest && fnRest.status === false) {
+        rest = fnRest.result
+        isStop = true
+        break
+      }
+    }
+    if (!isStop) {
       if (next) {
         rest = next()
       }
@@ -4910,7 +5044,10 @@ const Methods = {
    * 全局按下事件处理
    */
   handleGlobalMousedownEvent (evnt: any) {
-    const { $el, $refs, $xegrid, $toolbar, mouseConfig, editStore, ctxMenuStore, editRules, editOpts, validOpts, areaOpts, filterStore, customStore, getRowNode } = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
+
+    const { $el, $refs, $toolbar, mouseConfig, editStore, ctxMenuStore, editRules, editOpts, validOpts, areaOpts, filterStore, customStore, getRowNode } = this
     const { actived } = editStore
     const { customWrapper, refValidTooltip } = $refs
     const tableFilter = $refs.refTableFilter
@@ -4996,7 +5133,7 @@ const Methods = {
         }
       }
     } else if (mouseConfig) {
-      if (!getEventTargetNode(evnt, $el).flag && !($xegrid && getEventTargetNode(evnt, $xegrid.$el).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.$el).flag) && !($toolbar && getEventTargetNode(evnt, $toolbar.$el).flag)) {
+      if (!getEventTargetNode(evnt, $el).flag && !($xeGrid && getEventTargetNode(evnt, $xeGrid.$el).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.$el).flag) && !($toolbar && getEventTargetNode(evnt, $toolbar.$el).flag)) {
         if (this.clearSelected) {
           this.clearSelected()
         }
@@ -5018,7 +5155,7 @@ const Methods = {
     if (ctxMenuStore.visible && tableMenu && !getEventTargetNode(evnt, tableMenu.$el).flag) {
       this.closeMenu()
     }
-    const isActivated = getEventTargetNode(evnt, ($xegrid || this).$el).flag
+    const isActivated = getEventTargetNode(evnt, ($xeGrid || this).$el).flag
     // 如果存在校验，点击了表格之外则清除
     if (!isActivated && editRules && validOpts.autoClear) {
       this.validErrorMaps = {}
@@ -5079,8 +5216,9 @@ const Methods = {
    * 全局键盘事件
    */
   handleGlobalKeydownEvent (evnt: any) {
-    const $xeTable = this
-    const internalData = $xeTable
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const internalData = $xeTable as unknown as TableInternalData
+    const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
 
     // 该行为只对当前激活的表格有效
     if (this.isActivated) {
@@ -5171,7 +5309,7 @@ const Methods = {
                 if (keyboardOpts.enterToTab) {
                   this.moveTabSelected(activeParams, hasShiftKey, evnt)
                 } else {
-                  this.moveSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt)
+                  this.moveEnterSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt)
                 }
               } else {
                 if (keyboardOpts.enterToTab) {
@@ -5203,7 +5341,7 @@ const Methods = {
                         return
                       }
                     }
-                    this.moveSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt)
+                    this.moveEnterSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt)
                     if (enterMethod) {
                       enterMethod(etrParams)
                     }
@@ -5227,10 +5365,7 @@ const Methods = {
           if (!isEditStatus) {
             // 如果按下了方向键
             if (selected.row && selected.column) {
-              this.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt)
-            } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-              // 当前行按键上下移动
-              this.moveCurrentRow(isUpArrow, isDwArrow, evnt)
+              $xeTable.moveArrowSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt)
             }
           }
         } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
@@ -5250,7 +5385,7 @@ const Methods = {
               column: selected.column,
               columnIndex: this.getColumnIndex(selected.column),
               $table: this,
-              $grid: this.$xegrid
+              $grid: $xeGrid
             }
             // 是否被禁用
             if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -5275,7 +5410,7 @@ const Methods = {
                 column: selected.column,
                 columnIndex: this.getColumnIndex(selected.column),
                 $table: this,
-                $grid: this.$xegrid
+                $grid: $xeGrid
               }
               // 是否被禁用
               if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -5302,7 +5437,7 @@ const Methods = {
               rowIndex: this.getRowIndex(parentRow),
               $rowIndex: this.getVMRowIndex(parentRow),
               $table: this,
-              $grid: this.$xegrid
+              $grid: $xeGrid
             }
             this.setTreeExpand(parentRow, false)
               .then(() => this.scrollToRow(parentRow))
@@ -5323,7 +5458,7 @@ const Methods = {
               column: selected.column,
               columnIndex: this.getColumnIndex(selected.column),
               $table: this,
-              $grid: this.$xegrid
+              $grid: $xeGrid
             }
             if (!beforeEditMethod || beforeEditMethod(params)) {
               if (editMethod) {
@@ -5445,7 +5580,7 @@ const Methods = {
       return
     }
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, thEl, cellEl, null, params)
+      handleTooltip($xeTable, evnt, thEl, thEl.querySelector<HTMLElement>('.vxe-cell--title') || cellEl, params)
     }
   },
   /**
@@ -5476,7 +5611,7 @@ const Methods = {
       }
     }
     if (tooltipStore.column !== column || tooltipStore.row !== row || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector('.vxe-cell--wrapper') as HTMLElement, null, params)
+      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector<HTMLElement>('.vxe-cell--label') || tdEl.querySelector<HTMLElement>('.vxe-cell--wrapper'), params)
     }
   },
   /**
@@ -5488,10 +5623,10 @@ const Methods = {
 
     const { column } = params
     const { tooltipStore } = reactData
-    const cell = evnt.currentTarget as HTMLTableCellElement
+    const tdEl = evnt.currentTarget as HTMLTableCellElement
     handleTargetEnterEvent($xeTable, tooltipStore.column !== column || !!tooltipStore.row)
     if (tooltipStore.column !== column || !tooltipStore.visible) {
-      handleTooltip($xeTable, evnt, cell, cell.querySelector('.vxe-cell--wrapper') as HTMLElement || cell.children[0], null, params)
+      handleTooltip($xeTable, evnt, tdEl, tdEl.querySelector<HTMLElement>('.vxe-cell--label') || tdEl.querySelector('.vxe-cell--wrapper') as HTMLElement, params)
     }
   },
   openTooltip (target: any, content: any) {
@@ -5549,11 +5684,16 @@ const Methods = {
    * 获取复选框半选状态的行数据
    */
   getCheckboxIndeterminateRecords (isFull: any) {
-    const { treeConfig, treeIndeterminateMaps, fullDataRowIdData } = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { treeConfig } = props
+    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]) {
@@ -5608,7 +5748,7 @@ const Methods = {
   },
   setCheckboxRowKey (keys: any, checked: boolean) {
     const $xeTable = this
-    const internalData = $xeTable
+    const internalData = $xeTable as unknown as TableInternalData
 
     const { fullAllDataRowIdData } = internalData
     if (keys && !XEUtils.isArray(keys)) {
@@ -5625,23 +5765,25 @@ const Methods = {
   },
   isCheckedByCheckboxRow (row: any) {
     const $xeTable = this
-    const reactData = $xeTable
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
 
-    const { selectCheckboxMaps } = reactData
+    const { updateCheckboxFlag } = reactData
+    const { selectCheckboxMaps } = internalData
     const checkboxOpts = $xeTable.computeCheckboxOpts
     const { checkField } = checkboxOpts
     if (checkField) {
       return XEUtils.get(row, checkField)
     }
-    return !!selectCheckboxMaps[getRowid($xeTable, row)]
+    return !!updateCheckboxFlag && !!selectCheckboxMaps[getRowid($xeTable, row)]
   },
   isCheckedByCheckboxRowKey (rowid: string) {
-    const $xeTable = this
-    const reactData = $xeTable
-    const internalData = $xeTable
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
 
-    const { selectCheckboxMaps } = reactData
-    const { fullAllDataRowIdData } = internalData
+    const { updateCheckboxFlag } = reactData
+    const { fullAllDataRowIdData, selectCheckboxMaps } = internalData
     const checkboxOpts = $xeTable.computeCheckboxOpts
     const { checkField } = checkboxOpts
     if (checkField) {
@@ -5651,21 +5793,21 @@ const Methods = {
       }
       return false
     }
-    return !!selectCheckboxMaps[rowid]
+    return !!updateCheckboxFlag && !!selectCheckboxMaps[rowid]
   },
   isIndeterminateByCheckboxRow (row: any) {
-    const $xeTable = this
-    const reactData = $xeTable
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const internalData = $xeTable as unknown as TableInternalData
 
-    const { treeIndeterminateMaps } = reactData
-    return !!treeIndeterminateMaps[getRowid($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row)
+    const { treeIndeterminateRowMaps } = internalData
+    return !!treeIndeterminateRowMaps[getRowid($xeTable, row)] && !$xeTable.isCheckedByCheckboxRow(row)
   },
   isIndeterminateByCheckboxRowKey (rowid: string) {
     const $xeTable = this
-    const reactData = $xeTable
+    const internalData = $xeTable as unknown as TableInternalData
 
-    const { treeIndeterminateMaps } = reactData
-    return !!treeIndeterminateMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid)
+    const { treeIndeterminateRowMaps } = internalData
+    return !!treeIndeterminateRowMaps[rowid] && !$xeTable.isCheckedByCheckboxRowKey(rowid)
   },
   /**
    * 切换选中
@@ -5675,15 +5817,16 @@ const Methods = {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const props = $xeTable
     const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
 
     const { treeConfig } = props
-    const { selectCheckboxMaps } = reactData
-    const selectRowMaps = Object.assign({}, selectCheckboxMaps)
+    const { selectCheckboxMaps } = internalData
     const treeOpts = $xeTable.computeTreeOpts
     const { transform, mapChildrenField } = treeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
     const checkboxOpts = $xeTable.computeCheckboxOpts
     const { checkField, checkStrictly, checkMethod } = checkboxOpts
+    const { handleGetRowId } = createHandleGetRowId($xeTable)
     // indeterminateField 仅支持读取
     const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
     if (checkField) {
@@ -5699,18 +5842,17 @@ const Methods = {
             handleCheckboxReserveRow($xeTable, row, checked)
           }
         }, { children: transform ? mapChildrenField : childrenField })
-        reactData.selectCheckboxMaps = selectRowMaps
+        reactData.updateCheckboxFlag++
         return
-      } else {
-        // 列表
-        rows.forEach(row => {
-          if (isForce || (!checkMethod || checkMethod({ row }))) {
-            XEUtils.set(row, checkField, checked)
-            handleCheckboxReserveRow($xeTable, row, checked)
-          }
-        })
       }
-      reactData.selectCheckboxMaps = selectRowMaps
+      // 列表
+      rows.forEach(row => {
+        if (isForce || (!checkMethod || checkMethod({ row }))) {
+          XEUtils.set(row, checkField, checked)
+          handleCheckboxReserveRow($xeTable, row, checked)
+        }
+      })
+      reactData.updateCheckboxFlag++
       return
     }
 
@@ -5718,51 +5860,55 @@ const Methods = {
     if (treeConfig && !checkStrictly) {
       // 更新子节点状态
       XEUtils.eachTree(rows, (row) => {
-        const rowid = getRowid($xeTable, row)
+        const rowid = handleGetRowId(row)
         if (isForce || (!checkMethod || checkMethod({ row }))) {
           if (checked) {
-            selectRowMaps[rowid] = row
+            selectCheckboxMaps[rowid] = row
           } else {
-            if (selectRowMaps[rowid]) {
-              delete selectRowMaps[rowid]
+            if (selectCheckboxMaps[rowid]) {
+              delete selectCheckboxMaps[rowid]
             }
           }
           handleCheckboxReserveRow($xeTable, row, checked)
         }
       }, { children: transform ? mapChildrenField : childrenField })
-      reactData.selectCheckboxMaps = selectRowMaps
+      reactData.updateCheckboxFlag++
       return
     }
 
     // 列表
     rows.forEach(row => {
-      const rowid = getRowid($xeTable, row)
+      const rowid = handleGetRowId(row)
       if (isForce || (!checkMethod || checkMethod({ row }))) {
         if (checked) {
-          if (!selectRowMaps[rowid]) {
-            selectRowMaps[rowid] = row
+          if (!selectCheckboxMaps[rowid]) {
+            selectCheckboxMaps[rowid] = row
           }
         } else {
-          if (selectRowMaps[rowid]) {
-            delete selectRowMaps[rowid]
+          if (selectCheckboxMaps[rowid]) {
+            delete selectCheckboxMaps[rowid]
           }
         }
         handleCheckboxReserveRow($xeTable, row, checked)
+        reactData.updateCheckboxFlag++
       }
     })
-    reactData.selectCheckboxMaps = selectRowMaps
   },
   /**
    * 即将移除
    * @deprecated
    */
   handleSelectRow ({ row }: any, checked: boolean, isForce?: boolean) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
     $xeTable.handleBatchSelectRows([row], checked, isForce)
   },
   handleToggleCheckRowEvent (evnt: any, params: any) {
-    const { selectCheckboxMaps, checkboxOpts } = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { selectCheckboxMaps } = internalData
+    const checkboxOpts = $xeTable.computeCheckboxOpts
     const { checkField, trigger } = checkboxOpts
     const { row } = params
     if (trigger === 'manual') {
@@ -5772,47 +5918,52 @@ const Methods = {
     if (checkField) {
       checked = !XEUtils.get(row, checkField)
     } else {
-      checked = !selectCheckboxMaps[getRowid(this, row)]
+      checked = !selectCheckboxMaps[getRowid($xeTable, row)]
     }
     if (evnt) {
-      this.triggerCheckRowEvent(evnt, params, checked)
+      $xeTable.triggerCheckRowEvent(evnt, params, checked)
     } else {
-      this.handleSelectRow(params, checked)
-      this.checkSelectionStatus()
+      $xeTable.handleBatchSelectRows([row], checked)
+      $xeTable.checkSelectionStatus()
     }
   },
   triggerCheckRowEvent (evnt: any, params: any, checked: any) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
+    const internalData = $xeTable as unknown as TableInternalData
 
-    const { checkboxOpts, afterFullData } = this
-    const { checkMethod, trigger } = checkboxOpts
     const { row } = params
+    const { afterFullData } = internalData
+    const checkboxOpts = $xeTable.computeCheckboxOpts
+    const { checkMethod, trigger } = checkboxOpts
     if (trigger === 'manual') {
       return
     }
     evnt.stopPropagation()
-    if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
-      const checkboxRecords = this.getCheckboxRecords()
+    if (checkboxOpts.isShiftKey && evnt.shiftKey && !props.treeConfig) {
+      const checkboxRecords = $xeTable.getCheckboxRecords()
       if (checkboxRecords.length) {
         const firstRow = checkboxRecords[0]
-        const _rowIndex = this.getVTRowIndex(row)
-        const _firstRowIndex = this.getVTRowIndex(firstRow)
+        const _rowIndex = $xeTable.getVTRowIndex(row)
+        const _firstRowIndex = $xeTable.getVTRowIndex(firstRow)
         if (_rowIndex !== _firstRowIndex) {
-          this.setAllCheckboxRow(false)
+          $xeTable.setAllCheckboxRow(false)
           const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1)
-          handleCheckedCheckboxRow($xeTable, rangeRows, true, false)
-          this.emitEvent('checkbox-range-select', Object.assign({ rangeRecords: rangeRows }, params), evnt)
+          $xeTable.$nextTick(() => {
+            handleCheckedCheckboxRow($xeTable, rangeRows, true, false)
+          })
+          $xeTable.dispatchEvent('checkbox-range-select', Object.assign({ rangeRecords: rangeRows }, params), evnt)
           return
         }
       }
     }
     if (!checkMethod || checkMethod({ row })) {
-      this.handleSelectRow(params, checked)
-      this.checkSelectionStatus()
-      this.emitEvent('checkbox-change', Object.assign({
-        records: this.getCheckboxRecords(),
-        reserves: this.getCheckboxReserveRecords(),
-        indeterminates: this.getCheckboxIndeterminateRecords(),
+      $xeTable.handleBatchSelectRows([row], checked)
+      $xeTable.checkSelectionStatus()
+      $xeTable.dispatchEvent('checkbox-change', Object.assign({
+        records: () => $xeTable.getCheckboxRecords(),
+        reserves: () => $xeTable.getCheckboxReserveRecords(),
+        indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
         checked
       }, params), evnt)
     }
@@ -5821,9 +5972,11 @@ const Methods = {
    * 多选，切换某一行的选中状态
    */
   toggleCheckboxRow (row: any) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const internalData = $xeTable as unknown as TableInternalData
 
-    const { selectCheckboxMaps, checkboxOpts } = this
+    const { selectCheckboxMaps } = internalData
+    const checkboxOpts = $xeTable.computeCheckboxOpts
     const { checkField } = checkboxOpts
     const checked = checkField ? !XEUtils.get(row, checkField) : !selectCheckboxMaps[getRowid($xeTable, row)]
     $xeTable.handleBatchSelectRows([row], checked, true)
@@ -5846,9 +5999,7 @@ const Methods = {
     const internalData = $xeTable as unknown as TableInternalData
 
     const { treeConfig } = props
-    const { selectCheckboxMaps, treeIndeterminateMaps } = reactData
-    const selectRowMaps = Object.assign({}, selectCheckboxMaps)
-    const halfRowMaps = Object.assign({}, treeIndeterminateMaps)
+    const { selectCheckboxMaps, treeIndeterminateRowMaps } = internalData
     const treeOpts = $xeTable.computeTreeOpts
     const { transform, mapChildrenField } = treeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
@@ -5860,10 +6011,11 @@ const Methods = {
     }
     // 树结构
     if (treeConfig) {
+      const { handleGetRowId } = createHandleGetRowId($xeTable)
       const childRowMaps: Record<string, number> = {}
       const childRowList: any[][] = []
       XEUtils.eachTree(afterTreeFullData, (row: any) => {
-        const rowid = getRowid($xeTable, row)
+        const rowid = handleGetRowId(row)
         const childList = row[transform ? mapChildrenField : childrenField]
         if (childList && childList.length && !childRowMaps[rowid]) {
           childRowMaps[rowid] = 1
@@ -5880,29 +6032,29 @@ const Methods = {
         childList.forEach(
           checkMethod
             ? (item) => {
-                const childRowid = getRowid($xeTable, item)
-                const isSelect = checkField ? XEUtils.get(item, checkField) : selectRowMaps[childRowid]
+                const childRowid = handleGetRowId(item)
+                const isSelect = checkField ? XEUtils.get(item, checkField) : selectCheckboxMaps[childRowid]
                 if (checkMethod({ row: item })) {
                   if (isSelect) {
                     sLen++
-                  } else if (halfRowMaps[childRowid]) {
+                  } else if (treeIndeterminateRowMaps[childRowid]) {
                     hLen++
                   }
                   vLen++
                 } else {
                   if (isSelect) {
                     sLen++
-                  } else if (halfRowMaps[childRowid]) {
+                  } else if (treeIndeterminateRowMaps[childRowid]) {
                     hLen++
                   }
                 }
               }
             : item => {
-              const childRowid = getRowid($xeTable, item)
-              const isSelect = checkField ? XEUtils.get(item, checkField) : selectRowMaps[childRowid]
+              const childRowid = handleGetRowId(item)
+              const isSelect = checkField ? XEUtils.get(item, checkField) : selectCheckboxMaps[childRowid]
               if (isSelect) {
                 sLen++
-              } else if (halfRowMaps[childRowid]) {
+              } else if (treeIndeterminateRowMaps[childRowid]) {
                 hLen++
               }
               vLen++
@@ -5915,29 +6067,28 @@ const Methods = {
         }
         if (isSelected) {
           if (!checkField) {
-            selectRowMaps[rowid] = row
+            selectCheckboxMaps[rowid] = row
           }
-          if (halfRowMaps[rowid]) {
-            delete halfRowMaps[rowid]
+          if (treeIndeterminateRowMaps[rowid]) {
+            delete treeIndeterminateRowMaps[rowid]
           }
         } else {
           if (!checkField) {
-            if (selectRowMaps[rowid]) {
-              delete selectRowMaps[rowid]
+            if (selectCheckboxMaps[rowid]) {
+              delete selectCheckboxMaps[rowid]
             }
           }
           if (halfSelect) {
-            halfRowMaps[rowid] = row
+            treeIndeterminateRowMaps[rowid] = row
           } else {
-            if (halfRowMaps[rowid]) {
-              delete halfRowMaps[rowid]
+            if (treeIndeterminateRowMaps[rowid]) {
+              delete treeIndeterminateRowMaps[rowid]
             }
           }
         }
       })
     }
-    reactData.selectCheckboxMaps = selectRowMaps
-    reactData.treeIndeterminateMaps = halfRowMaps
+    reactData.updateCheckboxFlag++
   },
   updateAllCheckboxStatus () {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
@@ -5946,10 +6097,10 @@ const Methods = {
     const internalData = $xeTable as unknown as TableInternalData
 
     const { treeConfig } = props
-    const { selectCheckboxMaps, treeIndeterminateMaps } = reactData
+    const { afterFullData, afterTreeFullData, checkboxReserveRowMap, selectCheckboxMaps, treeIndeterminateRowMaps } = internalData
     const checkboxOpts = $xeTable.computeCheckboxOpts
     const { checkField, checkMethod, showReserveStatus } = checkboxOpts
-    const { afterFullData, afterTreeFullData, checkboxReserveRowMap } = internalData
+    const { handleGetRowId } = createHandleGetRowId($xeTable)
 
     let sLen = 0 // 已选
     let hLen = 0 // 半选
@@ -5958,29 +6109,29 @@ const Methods = {
     const rootList: any[] = (treeConfig ? afterTreeFullData : afterFullData)
     rootList.forEach(checkMethod
       ? row => {
-        const childRowid = getRowid($xeTable, row)
+        const childRowid = handleGetRowId(row)
         const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid]
         if (checkMethod({ row })) {
           if (selected) {
             sLen++
-          } else if (treeIndeterminateMaps[childRowid]) {
+          } else if (treeIndeterminateRowMaps[childRowid]) {
             hLen++
           }
           vLen++
         } else {
           if (selected) {
             sLen++
-          } else if (treeIndeterminateMaps[childRowid]) {
+          } else if (treeIndeterminateRowMaps[childRowid]) {
             hLen++
           }
         }
       }
       : row => {
-        const childRowid = getRowid($xeTable, row)
+        const childRowid = handleGetRowId(row)
         const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid]
         if (selected) {
           sLen++
-        } else if (treeIndeterminateMaps[childRowid]) {
+        } else if (treeIndeterminateRowMaps[childRowid]) {
           hLen++
         }
         vLen++
@@ -6039,18 +6190,26 @@ const Methods = {
    * 获取复选框保留选中的行
    */
   getCheckboxReserveRecords (isFull: any) {
-    const { fullDataRowIdData, afterFullData, checkboxReserveRowMap, checkboxOpts, treeConfig, treeOpts } = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { treeConfig } = props
+    const { afterFullData, fullDataRowIdData, checkboxReserveRowMap } = internalData
+    const checkboxOpts = $xeTable.computeCheckboxOpts
+    const treeOpts = $xeTable.computeTreeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
     const reserveSelection: any[] = []
     if (checkboxOpts.reserve) {
-      const afterFullIdMaps: any = {}
+      const { handleGetRowId } = createHandleGetRowId($xeTable)
+      const afterFullIdMaps: { [key: string]: number } = {}
       if (treeConfig) {
         XEUtils.eachTree(afterFullData, row => {
-          afterFullIdMaps[getRowid(this, row)] = 1
+          afterFullIdMaps[handleGetRowId(row)] = 1
         }, { children: childrenField })
       } else {
         afterFullData.forEach((row: any) => {
-          afterFullIdMaps[getRowid(this, row)] = 1
+          afterFullIdMaps[handleGetRowId(row)] = 1
         })
       }
       XEUtils.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
@@ -6090,9 +6249,9 @@ const Methods = {
     handleCheckedAllCheckboxRow($xeTable, value)
     if (evnt) {
       $xeTable.dispatchEvent('checkbox-all', {
-        records: $xeTable.getCheckboxRecords(),
-        reserves: $xeTable.getCheckboxReserveRecords(),
-        indeterminates: $xeTable.getCheckboxIndeterminateRecords(),
+        records: () => $xeTable.getCheckboxRecords(),
+        reserves: () => $xeTable.getCheckboxReserveRecords(),
+        indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
         checked: value
       }, evnt)
     }
@@ -6125,9 +6284,17 @@ const Methods = {
    * 清空行为不管是否被禁用还是保留记录，都将彻底清空选中状态
    */
   clearCheckboxRow () {
-    const { tableFullData, treeConfig, treeOpts, checkboxOpts } = this
-    const { checkField, reserve } = checkboxOpts
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { treeConfig } = props
+    const { tableFullData } = internalData
+    const treeOpts = $xeTable.computeTreeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
+    const checkboxOpts = $xeTable.computeCheckboxOpts
+    const { checkField, reserve } = checkboxOpts
     // indeterminateField 仅支持读取
     const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
     if (checkField) {
@@ -6144,12 +6311,13 @@ const Methods = {
       }
     }
     if (reserve) {
-      tableFullData.forEach((row: any) => this.handleCheckboxReserveRow(row, false))
+      tableFullData.forEach((row) => this.handleCheckboxReserveRow(row, false))
     }
-    this.isAllSelected = false
-    this.isIndeterminate = false
-    this.selectCheckboxMaps = {}
-    this.treeIndeterminateMaps = {}
+    reactData.isAllSelected = false
+    reactData.isIndeterminate = false
+    internalData.selectCheckboxMaps = {}
+    internalData.treeIndeterminateRowMaps = {}
+    reactData.updateCheckboxFlag++
     return this.$nextTick()
   },
   /**
@@ -6356,11 +6524,13 @@ const Methods = {
   },
   triggerHeaderCellClickEvent (evnt: MouseEvent, params: VxeTableDefines.CellRenderHeaderParams) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
     const internalData = $xeTable as unknown as TableInternalData
 
     const { _lastResizeTime } = internalData
     const sortOpts = $xeTable.computeSortOpts
     const columnOpts = $xeTable.computeColumnOpts
+    const currentColumnOpts = $xeTable.computeCurrentColumnOpts
     const { column } = params
     const cell = evnt.currentTarget
     const triggerResizable = _lastResizeTime && _lastResizeTime > Date.now() - 300
@@ -6370,7 +6540,7 @@ const Methods = {
       $xeTable.triggerSortEvent(evnt, column, getNextSortOrder($xeTable, column))
     }
     $xeTable.dispatchEvent('header-cell-click', Object.assign({ triggerResizable, triggerSort, triggerFilter, cell }, params), evnt)
-    if (columnOpts.isCurrent || $xeTable.highlightCurrentColumn) {
+    if ((columnOpts.isCurrent || props.highlightCurrentColumn) && (!currentColumnOpts.trigger || ['header', 'default'].includes(currentColumnOpts.trigger))) {
       $xeTable.triggerCurrentColumnEvent(evnt, params)
     }
     return $xeTable.$nextTick()
@@ -6386,13 +6556,24 @@ const Methods = {
    * @param {ColumnInfo} fieldOrColumn 列配置
    */
   setCurrentColumn (fieldOrColumn: any) {
-    const column = handleFieldOrColumn(this, fieldOrColumn)
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
+    const reactData = $xeTable as unknown as TableReactData
+
+    const { mouseConfig } = props
+    const mouseOpts = $xeTable.computeMouseOpts
+    const isMouseSelected = mouseConfig && mouseOpts.selected
+    const column = handleFieldOrColumn($xeTable, fieldOrColumn)
     if (column) {
-      // this.clearCurrentRow()
-      this.clearCurrentColumn()
-      this.currentColumn = column
+      $xeTable.clearCurrentColumn()
+      reactData.currentColumn = column
     }
-    return this.$nextTick()
+    return $xeTable.$nextTick().then(() => {
+      // 更新状选中态
+      if (isMouseSelected) {
+        $xeTable.addCellSelectedClass()
+      }
+    })
   },
   /**
    * 用于当前列，手动清空当前高亮的状态
@@ -6401,36 +6582,17 @@ const Methods = {
     this.currentColumn = null
     return this.$nextTick()
   },
-  checkValidate (type: any) {
-    if (this.triggerValidate) {
-      return this.triggerValidate(type)
-    }
-    return this.$nextTick()
-  },
-  /**
-   * 当单元格发生改变时
-   * 如果存在规则，则校验
-   */
-  handleChangeCell (evnt: Event, params: any) {
-    this.checkValidate('blur')
-      .catch((e: any) => e)
-      .then(() => {
-        this.handleEdit(params, evnt)
-          .then(() => this.checkValidate('change'))
-          .catch((e: any) => e)
-      })
-  },
   /**
    * 列点击事件
    * 如果是单击模式，则激活为编辑状态
    * 如果是双击模式，则单击后选中状态
    */
   triggerCellClickEvent (evnt: MouseEvent, params: VxeTableDefines.CellRenderBodyParams) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const props = $xeTable
-    const reactData = $xeTable
+    const reactData = $xeTable as unknown as TableReactData
 
-    const { highlightCurrentRow, editConfig } = props
+    const { highlightCurrentRow, highlightCurrentColumn, editConfig } = props
     const { editStore, isDragResize } = reactData
     if (isDragResize) {
       return
@@ -6442,6 +6604,8 @@ const Methods = {
     const checkboxOpts = $xeTable.computeCheckboxOpts
     const keyboardOpts = $xeTable.computeKeyboardOpts
     const rowOpts = $xeTable.computeRowOpts
+    const columnOpts = $xeTable.computeColumnOpts
+    const currentColumnOpts = $xeTable.computeCurrentColumnOpts
     const { actived, focused } = editStore
     const { row, column } = params
     const { type, treeNode } = column
@@ -6457,11 +6621,11 @@ const Methods = {
     if (!triggerCheckbox && !triggerRadio) {
       // 如果是展开行
       if (!triggerExpandNode && (expandOpts.trigger === 'row' || (isExpandType && expandOpts.trigger === 'cell'))) {
-        this.triggerRowExpandEvent(evnt, params)
+        $xeTable.triggerRowExpandEvent(evnt, params)
       }
       // 如果是树形表格
       if ((treeOpts.trigger === 'row' || (treeNode && treeOpts.trigger === 'cell'))) {
-        this.triggerTreeExpandEvent(evnt, params)
+        $xeTable.triggerTreeExpandEvent(evnt, params)
       }
     }
     // 如果点击了树节点
@@ -6470,16 +6634,22 @@ const Methods = {
         // 如果是高亮行
         if (rowOpts.isCurrent || highlightCurrentRow) {
           if (!triggerCheckbox && !triggerRadio) {
-            this.triggerCurrentRowEvent(evnt, params)
+            $xeTable.triggerCurrentRowEvent(evnt, params)
+          }
+        }
+        // 如果是当前列
+        if ((columnOpts.isCurrent || highlightCurrentColumn) && (!currentColumnOpts.trigger || ['cell', 'default'].includes(currentColumnOpts.trigger))) {
+          if (!triggerCheckbox && !triggerRadio) {
+            $xeTable.triggerCurrentColumnEvent(evnt, params)
           }
         }
         // 如果是单选框
         if (!triggerRadio && (radioOpts.trigger === 'row' || (isRadioType && radioOpts.trigger === 'cell'))) {
-          this.triggerRadioRowEvent(evnt, params)
+          $xeTable.triggerRadioRowEvent(evnt, params)
         }
         // 如果是复选框
         if (!triggerCheckbox && (checkboxOpts.trigger === 'row' || (isCheckboxType && checkboxOpts.trigger === 'cell'))) {
-          this.handleToggleCheckRowEvent(evnt, params)
+          $xeTable.handleToggleCheckRowEvent(evnt, params)
         }
       }
       // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
@@ -6491,14 +6661,14 @@ const Methods = {
         }
         if (editOpts.trigger === 'manual') {
           if (actived.args && actived.row === row && column !== actived.column) {
-            this.handleChangeCell(evnt, params)
+            handleChangeCell($xeTable, evnt, params)
           }
         } else if (!actived.args || row !== actived.row || column !== actived.column) {
           if (editOpts.trigger === 'click') {
-            this.handleChangeCell(evnt, params)
+            handleChangeCell($xeTable, evnt, params)
           } else if (editOpts.trigger === 'dblclick') {
             if (editOpts.mode === 'row' && actived.row === row) {
-              this.handleChangeCell(evnt, params)
+              handleChangeCell($xeTable, evnt, params)
             }
           }
         }
@@ -6518,7 +6688,7 @@ const Methods = {
         }
       }
     }
-    this.emitEvent('cell-click', params, evnt)
+    $xeTable.dispatchEvent('cell-click', params, evnt)
   },
   /**
    * 列双击点击事件
@@ -6541,16 +6711,16 @@ const Methods = {
     if (isEnableConf(editConfig) && editOpts.trigger === 'dblclick') {
       if (!actived.args || evnt.currentTarget !== actived.args.cell) {
         if (editOpts.mode === 'row') {
-          this.checkValidate('blur')
+          checkValidate($xeTable, 'blur')
             .catch((e: any) => e)
             .then(() => {
               this.handleEdit(params, evnt)
-                .then(() => this.checkValidate('change'))
+                .then(() => checkValidate($xeTable, 'change'))
                 .catch((e: any) => e)
             })
         } else if (editOpts.mode === 'cell') {
           this.handleEdit(params, evnt)
-            .then(() => this.checkValidate('change'))
+            .then(() => checkValidate($xeTable, 'change'))
             .catch((e: any) => e)
         }
       }
@@ -6746,12 +6916,11 @@ const Methods = {
 
     const { treeConfig, dragConfig } = props
     const rowDragOpts = $xeTable.computeRowDragOpts
-    const { fullAllDataRowIdData } = internalData
+    const { afterFullData, tableFullData, fullAllDataRowIdData } = internalData
     const { isPeerDrag, isCrossDrag, isSelfToChildDrag, dragEndMethod, dragToChildMethod } = rowDragOpts
     const treeOpts = $xeTable.computeTreeOpts
     const { transform, rowField, mapChildrenField, parentField } = treeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
-    const { afterFullData, tableFullData } = internalData
     const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null)
     const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0
     const errRest = {
@@ -7347,8 +7516,8 @@ const Methods = {
     }
   },
   handleHeaderCellDragMousedownEvent (evnt: MouseEvent, params: any) {
-    const $xeTable = this
-    const reactData = $xeTable
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
 
     evnt.stopPropagation()
     const columnDragOpts = $xeTable.computeColumnDragOpts
@@ -7373,8 +7542,8 @@ const Methods = {
     $xeTable.dispatchEvent('column-dragstart', params, evnt)
   },
   handleHeaderCellDragMouseupEvent () {
-    const $xeTable = this
-    const reactData = $xeTable
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
 
     clearColDropOrigin($xeTable)
     hideDropTip($xeTable)
@@ -7383,54 +7552,58 @@ const Methods = {
     reactData.isDragColMove = false
   },
   setPendingRow (rows: any, status: any) {
-    const $xeTable = this
-    const reactData = $xeTable
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
 
-    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 $xeTable.$nextTick()
   },
   togglePendingRow (rows: any) {
-    const $xeTable = this
-    const reactData = $xeTable
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
 
-    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 $xeTable.$nextTick()
   },
   hasPendingByRow (row: any) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
     return $xeTable.isPendingByRow(row)
   },
@@ -7443,12 +7616,10 @@ const Methods = {
     return !!pendingRowMaps[rowid]
   },
   getPendingRecords () {
-    const $xeTable = this
-    const reactData = $xeTable
-    const internalData = $xeTable
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const internalData = $xeTable as unknown as TableInternalData
 
-    const { pendingRowMaps } = reactData
-    const { fullAllDataRowIdData } = internalData
+    const { fullAllDataRowIdData, pendingRowMaps } = internalData
     const insertRecords: any[] = []
     XEUtils.each(pendingRowMaps, (row, rowid) => {
       if (fullAllDataRowIdData[rowid]) {
@@ -7458,11 +7629,16 @@ const Methods = {
     return insertRecords
   },
   clearPendingRow () {
-    this.pendingRowMaps = {}
-    return this.$nextTick()
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
+
+    internalData.pendingRowMaps = {}
+    reactData.pendingRowFlag++
+    return $xeTable.$nextTick()
   },
   sort (sortConfs: any, sortOrder: any) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
     const { sortOpts } = this
     const { multiple, remote, orders } = sortOpts
@@ -7612,7 +7788,10 @@ const Methods = {
    * @param {Event} evnt 事件
    */
   closeFilter () {
-    const { filterStore } = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+
+    const { filterStore } = reactData
     const { column, visible } = filterStore
     Object.assign(filterStore, {
       isAllSelected: false,
@@ -7621,9 +7800,15 @@ const Methods = {
       visible: false
     })
     if (visible) {
-      this.emitEvent('filter-visible', { column, field: column.field, property: column.field, filterList: this.getCheckedFilters(), visible: false }, null)
+      $xeTable.dispatchEvent('filter-visible', {
+        column,
+        field: column.field,
+        property: column.field,
+        filterList: () => $xeTable.getCheckedFilters(),
+        visible: false
+      }, null)
     }
-    return this.$nextTick()
+    return $xeTable.$nextTick()
   },
   /**
    * 判断指定列是否为筛选状态，如果为空则判断所有列
@@ -7656,17 +7841,16 @@ const Methods = {
     const reactData = $xeTable as unknown as TableReactData
     const internalData = $xeTable as unknown as TableInternalData
 
-    const rExpandLazyLoadedMaps = { ...reactData.rowExpandLazyLoadedMaps }
-    const { fullAllDataRowIdData } = internalData
+    const { fullAllDataRowIdData, rowExpandLazyLoadedMaps } = internalData
     const expandOpts = $xeTable.computeExpandOpts
     const { lazy } = expandOpts
     const rowid = getRowid($xeTable, row)
     const rowRest = fullAllDataRowIdData[rowid]
     if (lazy && rowRest) {
       rowRest.expandLoaded = false
-      delete rExpandLazyLoadedMaps[rowid]
+      delete rowExpandLazyLoadedMaps[rowid]
     }
-    reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps
+    reactData.rowExpandedFlag++
     return $xeTable.$nextTick()
   },
   /**
@@ -7674,14 +7858,18 @@ const Methods = {
    * @param {Row} row 行对象
    */
   reloadRowExpand (row: any) {
-    const { expandOpts, rowExpandLazyLoadedMaps } = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { rowExpandLazyLoadedMaps } = internalData
+    const expandOpts = $xeTable.computeExpandOpts
     const { lazy } = expandOpts
     const rowid = getRowid(this, row)
     if (lazy && !rowExpandLazyLoadedMaps[rowid]) {
-      this.clearRowExpandLoaded(row)
-        .then(() => this.handleAsyncRowExpand(row))
+      $xeTable.clearRowExpandLoaded(row)
+        .then(() => handleAsyncRowExpand($xeTable, row))
     }
-    return this.$nextTick()
+    return $xeTable.$nextTick()
   },
   reloadExpandContent (row: any) {
     if (process.env.VUE_APP_VXE_ENV === 'development') {
@@ -7694,20 +7882,34 @@ const Methods = {
    * 展开行事件
    */
   triggerRowExpandEvent (evnt: any, params: any) {
-    const { expandOpts, rowExpandLazyLoadedMaps, expandColumn: column } = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { expandColumn: column } = reactData
+    const { rowExpandLazyLoadedMaps } = internalData
+    const expandOpts = $xeTable.computeExpandOpts
     const { row } = params
     const { lazy, trigger } = expandOpts
     if (trigger === 'manual') {
       return
     }
     evnt.stopPropagation()
-    const rowid = getRowid(this, row)
+    const rowid = getRowid($xeTable, row)
     if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
-      const expanded = !this.isRowExpandByRow(row)
-      const columnIndex = this.getColumnIndex(column)
-      const $columnIndex = this.getVMColumnIndex(column)
-      this.setRowExpand(row, expanded)
-      this.emitEvent('toggle-row-expand', { expanded, column, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) }, evnt)
+      const expanded = !$xeTable.isRowExpandByRow(row)
+      const columnIndex = $xeTable.getColumnIndex(column)
+      const $columnIndex = $xeTable.getVMColumnIndex(column)
+      $xeTable.setRowExpand(row, expanded)
+      $xeTable.dispatchEvent('toggle-row-expand', {
+        expanded,
+        column,
+        columnIndex,
+        $columnIndex,
+        row,
+        rowIndex: $xeTable.getRowIndex(row),
+        $rowIndex: $xeTable.getVMRowIndex(row)
+      }, evnt)
     }
   },
   /**
@@ -7751,48 +7953,6 @@ const Methods = {
     }
     return this.setRowExpand(expandedRows, expanded)
   },
-  handleAsyncRowExpand (row: any) {
-    const $xeTable = this
-    const reactData = $xeTable as TableReactData
-    const internalData = $xeTable as TableInternalData
-
-    return new Promise<void>(resolve => {
-      const { expandOpts } = this
-      const { loadMethod } = expandOpts
-      if (loadMethod) {
-        const { fullAllDataRowIdData } = internalData
-        const rExpandLazyLoadedMaps = { ...reactData.rowExpandLazyLoadedMaps }
-        const rowid = getRowid($xeTable, row)
-        const rowRest = fullAllDataRowIdData[rowid]
-        rExpandLazyLoadedMaps[rowid] = row
-        reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps
-        loadMethod({ $table: $xeTable, row, rowIndex: $xeTable.getRowIndex(row), $rowIndex: $xeTable.getVMRowIndex(row) }).then(() => {
-          const rExpandedMaps = { ...reactData.rowExpandedMaps }
-          if (rowRest) {
-            rowRest.expandLoaded = true
-          }
-          rExpandedMaps[rowid] = row
-          reactData.rowExpandedMaps = rExpandedMaps
-        }).catch(() => {
-          if (rowRest) {
-            rowRest.expandLoaded = false
-          }
-        }).finally(() => {
-          const rExpandLazyLoadedMaps = { ...reactData.rowExpandLazyLoadedMaps }
-          if (rExpandLazyLoadedMaps[rowid]) {
-            delete rExpandLazyLoadedMaps[rowid]
-          }
-          reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps
-          $xeTable.$nextTick()
-            .then(() => $xeTable.recalculate())
-            .then(() => $xeTable.updateCellAreas())
-            .then(() => resolve())
-        })
-      } else {
-        resolve()
-      }
-    })
-  },
   /**
    * 设置展开行，二个参数设置这一行展开与否
    * 支持单行
@@ -7801,10 +7961,14 @@ const Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand (rows: any, expanded: any) {
-    const $xeTable = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
 
-    const { rowExpandedMaps, fullAllDataRowIdData, rowExpandLazyLoadedMaps, expandOpts, expandColumn } = this
-    let rExpandedMaps = { ...rowExpandedMaps }
+    const { expandColumn } = reactData
+    let { fullAllDataRowIdData, rowExpandedMaps, rowExpandLazyLoadedMaps } = internalData
+    const { handleGetRowId } = createHandleGetRowId($xeTable)
+    const expandOpts = $xeTable.computeExpandOpts
     const { reserve, lazy, accordion, toggleMethod } = expandOpts
     const lazyRests: any[] = []
     const columnIndex = $xeTable.getColumnIndex(expandColumn)
@@ -7815,28 +7979,29 @@ const Methods = {
       }
       if (accordion) {
         // 只能同时展开一个
-        rExpandedMaps = {}
+        rowExpandedMaps = {}
+        internalData.rowExpandedMaps = rowExpandedMaps
         rows = rows.slice(rows.length - 1, rows.length)
       }
-      const validRows: any[] = toggleMethod ? rows.filter((row: any) => toggleMethod({ expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows
+      const validRows: any[] = toggleMethod ? rows.filter((row: any) => toggleMethod({ $table: $xeTable, expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows
       if (expanded) {
         validRows.forEach((row: any) => {
-          const rowid = getRowid(this, row)
-          if (!rExpandedMaps[rowid]) {
+          const rowid = handleGetRowId(row)
+          if (!rowExpandedMaps[rowid]) {
             const rowRest = fullAllDataRowIdData[rowid]
             const isLoad = lazy && !rowRest.expandLoaded && !rowExpandLazyLoadedMaps[rowid]
             if (isLoad) {
-              lazyRests.push(this.handleAsyncRowExpand(row))
+              lazyRests.push(handleAsyncRowExpand($xeTable, row))
             } else {
-              rExpandedMaps[rowid] = row
+              rowExpandedMaps[rowid] = row
             }
           }
         })
       } else {
         validRows.forEach((item) => {
-          const rowid = getRowid(this, item)
-          if (rExpandedMaps[rowid]) {
-            delete rExpandedMaps[rowid]
+          const rowid = handleGetRowId(item)
+          if (rowExpandedMaps[rowid]) {
+            delete rowExpandedMaps[rowid]
           }
         })
       }
@@ -7844,7 +8009,7 @@ const Methods = {
         validRows.forEach((row) => handleRowExpandReserve($xeTable, row, expanded))
       }
     }
-    this.rowExpandedMaps = rExpandedMaps
+    reactData.rowExpandedFlag++
     return Promise.all(lazyRests)
       .then(() => $xeTable.$nextTick())
       .then(() => $xeTable.recalculate(true))
@@ -7860,9 +8025,14 @@ const Methods = {
    * @param {Row} row 行对象
    */
   isRowExpandByRow (row: any) {
-    const { rowExpandedMaps } = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { rowExpandedFlag } = reactData
+    const { rowExpandedMaps } = internalData
     const rowid = getRowid(this, row)
-    return !!rowExpandedMaps[rowid]
+    return !!rowExpandedFlag && !!rowExpandedMaps[rowid]
   },
   isExpandByRow (row: any) {
     if (process.env.VUE_APP_VXE_ENV === 'development') {
@@ -7883,7 +8053,8 @@ const Methods = {
     const expandOpts = $xeTable.computeExpandOpts
     const { reserve } = expandOpts
     const expList = $xeTable.getRowExpandRecords()
-    reactData.rowExpandedMaps = {}
+    internalData.rowExpandedMaps = {}
+    reactData.rowExpandedFlag++
     if (reserve) {
       tableFullData.forEach((row) => handleRowExpandReserve($xeTable, row, false))
     }
@@ -7903,8 +8074,11 @@ const Methods = {
     return this.$nextTick()
   },
   getRowExpandRecords () {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const internalData = $xeTable as unknown as TableInternalData
+
     const rest: any[] = []
-    XEUtils.each(this.rowExpandedMaps, item => {
+    XEUtils.each(internalData.rowExpandedMaps, item => {
       if (item) {
         rest.push(item)
       }
@@ -7912,8 +8086,11 @@ const Methods = {
     return rest
   },
   getTreeExpandRecords () {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const internalData = $xeTable as unknown as TableInternalData
+
     const rest: any[] = []
-    XEUtils.each(this.treeExpandedMaps, item => {
+    XEUtils.each(internalData.treeExpandedMaps, item => {
       if (item) {
         rest.push(item)
       }
@@ -7948,12 +8125,10 @@ const Methods = {
     const reactData = $xeTable as unknown as TableReactData
     const internalData = $xeTable as unknown as TableInternalData
 
-    const { fullAllDataRowIdData } = internalData
+    const { fullAllDataRowIdData, treeExpandedMaps } = internalData
     const treeOpts = $xeTable.computeTreeOpts
     const { transform } = treeOpts
-    let tExpandedMaps: Record<string, any> = {}
     if (rows) {
-      tExpandedMaps = { ...reactData.treeExpandedMaps }
       if (!XEUtils.isArray(rows)) {
         rows = [rows]
       }
@@ -7962,8 +8137,8 @@ const Methods = {
         const rowRest = fullAllDataRowIdData[rowid]
         if (rowRest) {
           rowRest.treeLoaded = false
-          if (tExpandedMaps[rowid]) {
-            delete tExpandedMaps[rowid]
+          if (treeExpandedMaps[rowid]) {
+            delete treeExpandedMaps[rowid]
           }
         }
       })
@@ -7972,7 +8147,8 @@ const Methods = {
         rowRest.treeLoaded = false
       })
     }
-    reactData.treeExpandedMaps = {}
+    internalData.treeExpandedMaps = {}
+    reactData.treeExpandedFlag++
     if (transform) {
       handleVirtualTreeToList($xeTable)
       return $xeTable.handleTableData()
@@ -7985,37 +8161,45 @@ const Methods = {
    */
   reloadTreeExpand (row: any) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const internalData = $xeTable as unknown as TableInternalData
 
-    const { treeOpts, treeExpandLazyLoadedMaps } = this
+    const { treeExpandLazyLoadedMaps } = internalData
+    const treeOpts = $xeTable.computeTreeOpts
     const { transform, lazy } = treeOpts
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
-    const rowid = getRowid(this, row)
+    const rowid = getRowid($xeTable, row)
     if (lazy && row[hasChildField] && !treeExpandLazyLoadedMaps[rowid]) {
-      return this.clearTreeExpandLoaded(row).then(() => {
-        return this.handleAsyncTreeExpandChilds(row)
+      return $xeTable.clearTreeExpandLoaded(row).then(() => {
+        return handleAsyncTreeExpandChilds($xeTable, row)
       }).then(() => {
         if (transform) {
           handleVirtualTreeToList($xeTable)
-          return this.handleTableData()
+          return $xeTable.handleTableData()
         }
       }).then(() => {
-        return this.recalculate()
+        return $xeTable.recalculate()
       })
     }
-    return this.$nextTick()
+    return $xeTable.$nextTick()
   },
   reloadTreeChilds (row: any) {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
     if (process.env.VUE_APP_VXE_ENV === 'development') {
       warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand'])
     }
     // 即将废弃
-    return this.reloadTreeExpand(row)
+    return $xeTable.reloadTreeExpand(row)
   },
   /**
    * 展开树节点事件
    */
   triggerTreeExpandEvent (evnt: any, params: any) {
-    const { treeOpts, treeExpandLazyLoadedMaps } = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { treeExpandLazyLoadedMaps } = internalData
+    const treeOpts = $xeTable.computeTreeOpts
     const { row, column } = params
     const { lazy, trigger } = treeOpts
     if (trigger === 'manual') {
@@ -8024,11 +8208,11 @@ const Methods = {
     evnt.stopPropagation()
     const rowid = getRowid(this, row)
     if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
-      const expanded = !this.isTreeExpandByRow(row)
-      const columnIndex = this.getColumnIndex(column)
-      const $columnIndex = this.getVMColumnIndex(column)
-      this.setTreeExpand(row, expanded)
-      this.emitEvent('toggle-tree-expand', { expanded, column, columnIndex, $columnIndex, row }, evnt)
+      const expanded = !$xeTable.isTreeExpandByRow(row)
+      const columnIndex = $xeTable.getColumnIndex(column)
+      const $columnIndex = $xeTable.getVMColumnIndex(column)
+      $xeTable.setTreeExpand(row, expanded)
+      $xeTable.dispatchEvent('toggle-tree-expand', { expanded, column, columnIndex, $columnIndex, row }, evnt)
     }
   },
   /**
@@ -8037,88 +8221,6 @@ const Methods = {
   toggleTreeExpand (row: any) {
     return this.setTreeExpand(row, !this.isTreeExpandByRow(row))
   },
-  /**
-   * 处理默认展开树节点
-   */
-  handleDefaultTreeExpand () {
-    const { treeConfig, treeOpts, tableFullData } = this
-    if (treeConfig) {
-      const { expandAll, expandRowKeys } = treeOpts
-      const childrenField = treeOpts.children || treeOpts.childrenField
-      if (expandAll) {
-        this.setAllTreeExpand(true)
-      } else if (expandRowKeys) {
-        const defExpandeds: any[] = []
-        const rowkey = getRowkey(this)
-        expandRowKeys.forEach((rowid: any) => {
-          const matchObj = XEUtils.findTree(tableFullData, item => rowid === XEUtils.get(item, rowkey), { children: childrenField })
-          if (matchObj) {
-            defExpandeds.push(matchObj.item)
-          }
-        })
-        this.setTreeExpand(defExpandeds, true)
-      }
-    }
-  },
-  handleAsyncTreeExpandChilds (row: any) {
-    const $xeTable = this
-
-    const { treeOpts, checkboxOpts } = this
-    const { transform, loadMethod } = treeOpts
-    const { checkStrictly } = checkboxOpts
-    return new Promise<void>(resolve => {
-      if (loadMethod) {
-        const { treeExpandLazyLoadedMaps, fullAllDataRowIdData } = this
-        const rowid = getRowid($xeTable, row)
-        const rowRest = fullAllDataRowIdData[rowid]
-        treeExpandLazyLoadedMaps[rowid] = row
-        Promise.resolve(
-          loadMethod({ $table: $xeTable, row })
-        ).then((childRecords: any) => {
-          if (rowRest) {
-            rowRest.treeLoaded = true
-          }
-          if (treeExpandLazyLoadedMaps[rowid]) {
-            delete treeExpandLazyLoadedMaps[rowid]
-          }
-          if (!XEUtils.isArray(childRecords)) {
-            childRecords = []
-          }
-          if (childRecords) {
-            return this.loadTreeChildren(row, childRecords).then((childRows: any[]) => {
-              const { treeExpandedMaps } = this
-              if (childRows.length && !treeExpandedMaps[rowid]) {
-                treeExpandedMaps[rowid] = row
-              }
-              // 如果当前节点已选中，则展开后子节点也被选中
-              if (!checkStrictly && this.isCheckedByCheckboxRow(row)) {
-                handleCheckedCheckboxRow($xeTable, childRows, true)
-              }
-              return this.$nextTick().then(() => {
-                if (transform) {
-                  this.handleTableData()
-                  updateAfterDataIndex($xeTable)
-                  return this.$nextTick()
-                }
-              })
-            })
-          }
-        }).catch(() => {
-          const { treeExpandLazyLoadedMaps } = this
-          if (rowRest) {
-            rowRest.treeLoaded = false
-          }
-          if (treeExpandLazyLoadedMaps[rowid]) {
-            delete treeExpandLazyLoadedMaps[rowid]
-          }
-        }).finally(() => {
-          this.$nextTick().then(() => this.recalculate()).then(() => resolve())
-        })
-      } else {
-        resolve()
-      }
-    })
-  },
   /**
    * 设置所有树节点的展开与否
    * @param {Boolean} expanded 是否展开
@@ -8143,41 +8245,47 @@ const Methods = {
    * @returns
    */
   handleBaseTreeExpand (rows: any, expanded: any) {
-    const { fullAllDataRowIdData, tableFullData, treeExpandedMaps, treeOpts, treeExpandLazyLoadedMaps, treeNodeColumn } = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { treeNodeColumn } = reactData
+    const { fullAllDataRowIdData, tableFullData, treeExpandedMaps, treeExpandLazyLoadedMaps } = internalData
+    const treeOpts = $xeTable.computeTreeOpts
     const { reserve, lazy, accordion, toggleMethod } = treeOpts
-    const treeTempExpandedMaps = { ...treeExpandedMaps }
     const childrenField = treeOpts.children || treeOpts.childrenField
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
     const result: any[] = []
-    const columnIndex = this.getColumnIndex(treeNodeColumn)
-    const $columnIndex = this.getVMColumnIndex(treeNodeColumn)
-    let validRows = toggleMethod ? rows.filter((row: any) => toggleMethod({ expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows
+    const columnIndex = $xeTable.getColumnIndex(treeNodeColumn)
+    const $columnIndex = $xeTable.getVMColumnIndex(treeNodeColumn)
+    const { handleGetRowId } = createHandleGetRowId($xeTable)
+    let validRows = toggleMethod ? rows.filter((row: any) => toggleMethod({ $table: $xeTable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows
     if (accordion) {
       validRows = validRows.length ? [validRows[validRows.length - 1]] : []
       // 同一级只能展开一个
       const matchObj = XEUtils.findTree(tableFullData, item => item === validRows[0], { children: childrenField })
       if (matchObj) {
         matchObj.items.forEach(item => {
-          const rowid = getRowid(this, item)
-          if (treeTempExpandedMaps[rowid]) {
-            delete treeTempExpandedMaps[rowid]
+          const rowid = handleGetRowId(item)
+          if (treeExpandedMaps[rowid]) {
+            delete treeExpandedMaps[rowid]
           }
         })
       }
     }
     if (expanded) {
       validRows.forEach((row: any) => {
-        const rowid = getRowid(this, row)
-        if (!treeTempExpandedMaps[rowid]) {
+        const rowid = handleGetRowId(row)
+        if (!treeExpandedMaps[rowid]) {
           const rowRest = fullAllDataRowIdData[rowid]
           if (rowRest) {
             const isLoad = lazy && row[hasChildField] && !rowRest.treeLoaded && !treeExpandLazyLoadedMaps[rowid]
             // 是否使用懒加载
             if (isLoad) {
-              result.push(this.handleAsyncTreeExpandChilds(row))
+              result.push(handleAsyncTreeExpandChilds($xeTable, row))
             } else {
               if (row[childrenField] && row[childrenField].length) {
-                treeTempExpandedMaps[rowid] = row
+                treeExpandedMaps[rowid] = row
               }
             }
           }
@@ -8185,18 +8293,18 @@ const Methods = {
       })
     } else {
       validRows.forEach((item: any) => {
-        const rowid = getRowid(this, item)
-        if (treeTempExpandedMaps[rowid]) {
-          delete treeTempExpandedMaps[rowid]
+        const rowid = handleGetRowId(item)
+        if (treeExpandedMaps[rowid]) {
+          delete treeExpandedMaps[rowid]
         }
       })
     }
     if (reserve) {
-      validRows.forEach((row: any) => this.handleTreeExpandReserve(row, expanded))
+      validRows.forEach((row: any) => handleTreeExpandReserve($xeTable, row, expanded))
     }
-    this.treeExpandedMaps = treeTempExpandedMaps
+    reactData.treeExpandedFlag++
     return Promise.all(result).then(() => {
-      return this.recalculate()
+      return $xeTable.recalculate()
     })
   },
   /**
@@ -8250,31 +8358,40 @@ const Methods = {
    * @param {Row} row 行对象
    */
   isTreeExpandByRow (row: any) {
-    const { treeExpandedMaps } = this
-    return !!treeExpandedMaps[getRowid(this, row)]
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { treeExpandedFlag } = reactData
+    const { treeExpandedMaps } = internalData
+    return !!treeExpandedFlag && !!treeExpandedMaps[getRowid($xeTable, row)]
   },
   /**
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand () {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
 
-    const { treeOpts, tableFullData } = this
-    const { transform, reserve } = treeOpts
+    const { tableFullTreeData } = internalData
+    const treeOpts = $xeTable.computeTreeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
-    const expList = this.getTreeExpandRecords()
-    this.treeExpandedMaps = {}
+    const { transform, reserve } = treeOpts
+    const expList = $xeTable.getTreeExpandRecords()
+    internalData.treeExpandedMaps = {}
+    reactData.treeExpandedFlag++
     if (reserve) {
-      XEUtils.eachTree(tableFullData, row => this.handleTreeExpandReserve(row, false), { children: childrenField })
+      XEUtils.eachTree(tableFullTreeData, row => handleTreeExpandReserve($xeTable, row, false), { children: childrenField })
     }
-    return this.handleTableData().then(() => {
+    return $xeTable.handleTableData().then(() => {
       if (transform) {
         handleVirtualTreeToList($xeTable)
-        return this.handleTableData()
+        return $xeTable.handleTableData()
       }
     }).then(() => {
       if (expList.length) {
-        this.recalculate()
+        $xeTable.recalculate()
       }
     })
   },
@@ -8282,17 +8399,6 @@ const Methods = {
     this.treeExpandedReserveRowMap = {}
     return this.$nextTick()
   },
-  handleTreeExpandReserve (row: any, expanded: any) {
-    const { treeExpandedReserveRowMap, treeOpts } = this
-    if (treeOpts.reserve) {
-      const rowid = getRowid(this, row)
-      if (expanded) {
-        treeExpandedReserveRowMap[rowid] = row
-      } else if (treeExpandedReserveRowMap[rowid]) {
-        delete treeExpandedReserveRowMap[rowid]
-      }
-    }
-  },
   /**
    * 获取表格的滚动状态
    */
@@ -8617,10 +8723,10 @@ const Methods = {
     }
 
     const { highlightHoverRow } = tableProps
-    const { scrollXLoad, scrollYLoad } = reactData
+    const { scrollXLoad, scrollYLoad, expandColumn } = reactData
     const leftFixedWidth = $xeTable.computeLeftFixedWidth
     const rightFixedWidth = $xeTable.computeRightFixedWidth
-    if (!(scrollYLoad || leftFixedWidth || rightFixedWidth)) {
+    if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
       return
     }
 
@@ -8889,8 +8995,8 @@ const Methods = {
     const reactData = $xeTable as unknown as TableReactData
     const internalData = $xeTable as unknown as TableInternalData
 
-    const { isAllOverflow, scrollYLoad, expandColumn, rowExpandedMaps } = reactData
-    const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData } = internalData
+    const { isAllOverflow, scrollYLoad, expandColumn } = reactData
+    const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData
     const { startIndex } = scrollYStore
     const expandOpts = $xeTable.computeExpandOpts
     const rowOpts = $xeTable.computeRowOpts
@@ -9137,12 +9243,15 @@ const Methods = {
    * 更新表尾合计
    */
   updateFooter () {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
+
     const { showFooter, visibleColumn, footerData, footerMethod } = this
     let footData = []
     if (showFooter && footerData && footerData.length) {
       footData = footerData.slice(0)
     } else if (showFooter && footerMethod) {
-      footData = visibleColumn.length ? footerMethod({ columns: visibleColumn, data: this.afterFullData, $table: this, $grid: this.$xegrid }) : []
+      footData = visibleColumn.length ? footerMethod({ columns: visibleColumn, data: this.afterFullData, $table: $xeTable, $grid: $xeGrid }) : []
     }
     this.footerTableData = footData
     return this.$nextTick()
@@ -9225,7 +9334,7 @@ const Methods = {
     if (this.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method'])
     }
-    setMerges(this, merges, this.mergeFooterList, null)
+    setMerges(this, merges, this.mergeFooterList)
     return this.$nextTick().then(() => {
       this.updateCellAreas()
       return updateStyle($xeTable)
@@ -9280,12 +9389,17 @@ const Methods = {
     return $xeTable.$nextTick()
   },
   dispatchEvent (type: ValueOf<VxeTableEmits>, params: Record<string, any>, evnt: Event | null) {
-    const $xeTable = this
-    $xeTable.$emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeTable.$xegrid }, params))
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
+
+    $xeTable.$emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeGrid }, params))
   },
   // 已废弃，使用 dispatchEvent
   emitEvent (type: any, params: any, evnt: any) {
-    this.$emit(type, Object.assign({ $table: this, $grid: this.$xegrid, $event: evnt }, params))
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
+
+    this.$emit(type, Object.assign({ $table: $xeTable, $grid: $xeGrid, $event: evnt }, params))
   },
   focus () {
     this.isActivated = true