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

package/packages/table/src/table.ts

@@ -9,7 +9,7 @@ import TableHeaderComponent from './header'
 import TableFooterComponent from './footer'
 import tableProps from './props'
 import tableEmits from './emits'
-import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth } from './util'
+import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
 import { warnLog, errLog } from '../../ui/src/log'
 import TableCustomPanelComponent from '../module/custom/panel'
@@ -23,6 +23,7 @@ import type { VxeGridConstructor, VxeGridPrivateMethods, VxeTableConstructor, Ta
 
 const { getConfig, getIcon, getI18n, renderer, formats, createEvent, globalResize, interceptor, hooks, globalEvents, GLOBAL_EVENT_KEYS, useFns, renderEmptyElement } = VxeUI
 
+const supportMaxRow = 5e6
 const customStorageKey = 'VXE_CUSTOM_STORE'
 const maxYHeight = 5e6
 const maxXWidth = 5e6
@@ -506,6 +507,10 @@ export default defineComponent({
       return Object.assign({}, getConfig().table.columnConfig, props.columnConfig) as VxeTablePropTypes.ColumnOpts
     })
 
+    const computeCurrentColumnOpts = computed(() => {
+      return Object.assign({}, getConfig().table.currentColumnConfig, props.currentColumnConfig)
+    })
+
     const computeCellOpts = computed(() => {
       return Object.assign({}, getConfig().table.cellConfig, props.cellConfig)
     })
@@ -519,7 +524,11 @@ export default defineComponent({
     })
 
     const computeRowOpts = computed(() => {
-      return Object.assign({}, getConfig().table.rowConfig, props.rowConfig) as VxeTablePropTypes.RowOpts
+      return Object.assign({}, getConfig().table.rowConfig, props.rowConfig)
+    })
+
+    const computeCurrentRowOpts = computed(() => {
+      return Object.assign({}, getConfig().table.currentRowConfig, props.currentRowConfig)
     })
 
     const computeRowDragOpts = computed(() => {
@@ -823,6 +832,7 @@ export default defineComponent({
       computeScrollbarXToTop,
       computeScrollbarYToLeft,
       computeColumnOpts,
+      computeCurrentColumnOpts,
       computeScrollXThreshold,
       computeScrollYThreshold,
       computeDefaultRowHeight,
@@ -830,6 +840,7 @@ export default defineComponent({
       computeHeaderCellOpts,
       computeFooterCellOpts,
       computeRowOpts,
+      computeCurrentRowOpts,
       computeRowDragOpts,
       computeColumnDragOpts,
       computeResizeOpts,
@@ -1300,7 +1311,7 @@ export default defineComponent({
           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) {
@@ -2367,8 +2378,11 @@ export default defineComponent({
       const childrenField = treeOpts.children || treeOpts.childrenField
       const checkboxOpts = computeCheckboxOpts.value
       const { checkField, reserve, checkMethod } = checkboxOpts
+      const { handleGetRowId } = createHandleGetRowId($xeTable)
+      // indeterminateField 仅支持读取
       const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
       const selectRowMaps: Record<string, any> = {}
+
       /**
        * 绑定属性方式（高性能，有污染）
        * 必须在行数据存在对应的属性，否则将不响应
@@ -2405,7 +2419,8 @@ export default defineComponent({
                */
             XEUtils.eachTree(afterFullData, (row) => {
               if (isForce || (!checkMethod || checkMethod({ row }))) {
-                selectRowMaps[getRowid($xeTable, row)] = row
+                const rowid = handleGetRowId(row)
+                selectRowMaps[rowid] = row
               }
             }, { children: childrenField })
           } else {
@@ -2415,7 +2430,7 @@ export default defineComponent({
                */
             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
                 }
@@ -2431,14 +2446,15 @@ export default defineComponent({
                */
             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 {
@@ -2449,7 +2465,7 @@ export default defineComponent({
                */
             if (!isForce && checkMethod) {
               afterFullData.forEach((row) => {
-                const rowid = getRowid($xeTable, row)
+                const rowid = handleGetRowId(row)
                 if (checkMethod({ row }) ? 0 : selectCheckboxMaps[rowid]) {
                   selectRowMaps[rowid] = row
                 }
@@ -2780,7 +2796,10 @@ export default defineComponent({
       const { transform } = treeOpts
       const childrenField = treeOpts.children || treeOpts.childrenField
       let treeData = []
-      let fullData = reactive(datas ? datas.slice(0) : []) // 转为响应式
+      let fullData = reactive(datas ? datas.slice(0) : []) // 转为响应式数据
+      if (fullData.length > supportMaxRow) {
+        errLog('vxe.error.errMaxRow', [supportMaxRow])
+      }
       if (treeConfig) {
         if (transform) {
           // 树结构自动转换
@@ -2876,7 +2895,7 @@ export default defineComponent({
           //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
           // }
           if (props.spanMethod) {
-            warnLog('vxe.error.scrollErrProp', ['table.span-method'])
+            errLog('vxe.error.scrollErrProp', ['table.span-method'])
           }
         }
 
@@ -3275,9 +3294,9 @@ export default defineComponent({
       handleCheckedAllCheckboxRow(value)
       if (evnt) {
         dispatchEvent('checkbox-all', {
-          records: $xeTable.getCheckboxRecords(),
-          reserves: $xeTable.getCheckboxReserveRecords(),
-          indeterminates: $xeTable.getCheckboxIndeterminateRecords(),
+          records: () => $xeTable.getCheckboxRecords(),
+          reserves: () => $xeTable.getCheckboxReserveRecords(),
+          indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
           checked: value
         }, evnt)
       }
@@ -3589,6 +3608,9 @@ export default defineComponent({
 
     tableMethods = {
       dispatchEvent,
+      getEl () {
+        return refElem.value
+      },
       /**
        * 重置表格的一切数据状态
        */
@@ -3889,12 +3911,14 @@ export default defineComponent({
        */
       revertData (rows: any, field) {
         const { keepSource, treeConfig } = props
-        const { fullAllDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData
+        const { editStore } = reactData
+        const { fullAllDataRowIdData, fullDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData
+        const removeTempMaps = { ...editStore.removeMaps }
         const treeOpts = computeTreeOpts.value
         const { transform } = treeOpts
         if (!keepSource) {
           if (process.env.VUE_APP_VXE_ENV === 'development') {
-            warnLog('vxe.error.reqProp', ['keep-source'])
+            errLog('vxe.error.reqProp', ['keep-source'])
           }
           return nextTick()
         }
@@ -3908,22 +3932,23 @@ export default defineComponent({
         }
         let reDelFlag = false
         if (targetRows.length) {
-          targetRows.forEach((row: any) => {
-            if (!$xeTable.isInsertByRow(row)) {
-              const rowid = getRowid($xeTable, row)
-              const oRow = sourceDataRowIdData[rowid]
-              if (oRow && row) {
-                if (field) {
-                  XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true))
-                } else {
-                  XEUtils.destructuring(row, XEUtils.clone(oRow, true))
-                }
-                if ($xeTable.isRemoveByRow(row)) {
-                  const rowRest = fullAllDataRowIdData[rowid]
-                  if (rowRest) {
-                    const reRow = rowRest.row
-                    tableFullData.unshift(reRow)
-                    afterFullData.unshift(reRow)
+          targetRows.forEach((item: any) => {
+            const rowid = getRowid($xeTable, item)
+            const rowRest = fullAllDataRowIdData[rowid]
+            if (rowRest) {
+              const row = rowRest.row
+              if (!$xeTable.isInsertByRow(row)) {
+                const oRow = sourceDataRowIdData[rowid]
+                if (oRow && row) {
+                  if (field) {
+                    XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true))
+                  } else {
+                    XEUtils.destructuring(row, XEUtils.clone(oRow, true))
+                  }
+                  if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                    delete removeTempMaps[rowid]
+                    tableFullData.unshift(row)
+                    afterFullData.unshift(row)
                     reDelFlag = true
                   }
                 }
@@ -3933,6 +3958,7 @@ export default defineComponent({
         }
         if (rows) {
           if (reDelFlag) {
+            editStore.removeMaps = removeTempMaps
             $xeTable.updateFooter()
             $xeTable.cacheRowMap(false)
             $xeTable.handleTableData(treeConfig && transform)
@@ -4080,18 +4106,20 @@ export default defineComponent({
       },
       /**
        * 检查行或列数据是否发生改变
-       * @param {Row} row 行对象
+       * @param {Row} rowidOrRow 行对象、行主键
        * @param {String} field 字段名
        */
-      isUpdateByRow (row, field) {
+      isUpdateByRow (rowidOrRow, field) {
         const { keepSource } = props
         const { tableFullColumn, fullDataRowIdData, sourceDataRowIdData } = internalData
         if (keepSource) {
-          const rowid = getRowid($xeTable, row)
+          const rowid = XEUtils.isString(rowidOrRow) || XEUtils.isNumber(rowidOrRow) ? rowidOrRow : getRowid($xeTable, rowidOrRow)
+          const rowRest = fullDataRowIdData[rowid]
           // 新增的数据不需要检测
-          if (!fullDataRowIdData[rowid]) {
+          if (!rowRest) {
             return false
           }
+          const row = rowRest.row
           const oRow = sourceDataRowIdData[rowid]
           if (oRow) {
             if (arguments.length > 1) {
@@ -4155,6 +4183,92 @@ export default defineComponent({
           tableColumn: reactData.tableColumn.slice(0)
         }
       },
+      /**
+       * 移动列到指定列的位置
+       * @param fieldOrColumn
+       * @param targetFieldOrColumn
+       * @param options
+       */
+      moveColumnTo (fieldOrColumn, targetFieldOrColumn, options) {
+        const { fullColumnIdData, visibleColumn } = internalData
+        const { dragToChild, dragPos, isCrossDrag } = Object.assign({}, options)
+        const dragCol = handleFieldOrColumn($xeTable, fieldOrColumn)
+        let prevDragCol: VxeTableDefines.ColumnInfo | null = null
+        const colRest = dragCol ? fullColumnIdData[dragCol.id] : null
+        let defPos: 'left' | 'right' = 'left'
+        if (XEUtils.isNumber(targetFieldOrColumn)) {
+          if (colRest && targetFieldOrColumn) {
+            let currList = colRest.items
+            let offsetIndex = colRest._index + targetFieldOrColumn
+            if (isCrossDrag) {
+              currList = visibleColumn
+              offsetIndex = colRest._index + targetFieldOrColumn
+            }
+            if (offsetIndex > 0 && offsetIndex < currList.length - 1) {
+              prevDragCol = currList[offsetIndex]
+            }
+            if (targetFieldOrColumn > 0) {
+              defPos = 'right'
+            }
+          }
+        } else {
+          prevDragCol = handleFieldOrColumn($xeTable, targetFieldOrColumn)
+          const targetColRest = prevDragCol ? fullColumnIdData[prevDragCol.id] : null
+          if (colRest && targetColRest) {
+            if (targetColRest._index > colRest._index) {
+              defPos = 'right'
+            }
+          }
+        }
+        return $xeTable.handleColDragSwapEvent(null, true, dragCol, prevDragCol, dragPos || defPos, dragToChild === true)
+      },
+      /**
+       * 移动行到指定行的位置
+       * @param rowidOrRow
+       * @param targetRowidOrRow
+       * @param options
+       */
+      moveRowTo (rowidOrRow, targetRowidOrRow, options) {
+        const { treeConfig } = props
+        const { fullAllDataRowIdData, afterFullData } = internalData
+        const { dragToChild, dragPos, isCrossDrag } = Object.assign({}, options)
+        const treeOpts = computeTreeOpts.value
+        const dragRow = handleRowidOrRow($xeTable, rowidOrRow)
+        let prevDragRow: any = null
+        let defPos: 'top' | 'bottom' = 'top'
+        const rowRest = dragRow ? fullAllDataRowIdData[getRowid($xeTable, dragRow)] : null
+        if (XEUtils.isNumber(targetRowidOrRow)) {
+          if (rowRest && targetRowidOrRow) {
+            let currList = afterFullData
+            let offsetIndex = rowRest._index + targetRowidOrRow
+            if (treeConfig) {
+              currList = rowRest.items
+              if (treeOpts.transform) {
+                offsetIndex = rowRest.treeIndex + targetRowidOrRow
+                if (isCrossDrag) {
+                  currList = afterFullData
+                  offsetIndex = rowRest._index + targetRowidOrRow
+                }
+              }
+            }
+            if (offsetIndex >= 0 && offsetIndex <= currList.length - 1) {
+              prevDragRow = currList[offsetIndex]
+            }
+            if (targetRowidOrRow > 0) {
+              defPos = 'bottom'
+            }
+          }
+        } else {
+          prevDragRow = handleRowidOrRow($xeTable, targetRowidOrRow)
+          const targetRowRest = prevDragRow ? fullAllDataRowIdData[getRowid($xeTable, prevDragRow)] : null
+          if (rowRest && targetRowRest) {
+            if (targetRowRest._index > rowRest._index) {
+              defPos = 'bottom'
+            }
+          }
+        }
+        return $xeTable.handleRowDragSwapEvent(null, true, dragRow, prevDragRow, dragPos || defPos, dragToChild === true)
+      },
       /**
        * 获取表格的全量列
        */
@@ -4174,6 +4288,7 @@ export default defineComponent({
        */
       getCheckboxRecords (isFull) {
         const { treeConfig } = props
+        const { selectCheckboxMaps } = reactData
         const { tableFullData, afterFullData, afterTreeFullData, tableFullTreeData, fullDataRowIdData, afterFullRowMaps } = internalData
         const treeOpts = computeTreeOpts.value
         const checkboxOpts = computeCheckboxOpts.value
@@ -4181,15 +4296,15 @@ export default defineComponent({
         const { checkField } = checkboxOpts
         const childrenField = treeOpts.children || treeOpts.childrenField
         let rowList: any[] = []
-        const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData)
         if (checkField) {
           if (treeConfig) {
+            const currTableData = isFull ? (transform ? tableFullTreeData : tableFullData) : (transform ? afterTreeFullData : afterFullData)
             rowList = XEUtils.filterTree(currTableData, row => XEUtils.get(row, checkField), { children: transform ? mapChildrenField : childrenField })
           } else {
+            const currTableData = isFull ? tableFullData : afterFullData
             rowList = currTableData.filter((row) => XEUtils.get(row, checkField))
           }
         } else {
-          const { selectCheckboxMaps } = reactData
           XEUtils.each(selectCheckboxMaps, (row, rowid) => {
             if (isFull) {
               if (fullDataRowIdData[rowid]) {
@@ -4873,6 +4988,7 @@ export default defineComponent({
         const childrenField = treeOpts.children || treeOpts.childrenField
         const checkboxOpts = computeCheckboxOpts.value
         const { checkField, reserve } = checkboxOpts
+        // indeterminateField 仅支持读取
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
         if (checkField) {
           const handleClearChecked = (item: any) => {
@@ -5000,13 +5116,20 @@ export default defineComponent({
        * 用于当前列，设置某列行为高亮状态
        */
       setCurrentColumn (fieldOrColumn) {
+        const { mouseConfig } = props
+        const mouseOpts = computeMouseOpts.value
+        const isMouseSelected = mouseConfig && mouseOpts.selected
         const column = handleFieldOrColumn($xeTable, fieldOrColumn)
         if (column) {
-          // tableMethods.clearCurrentRow()
-          tableMethods.clearCurrentColumn()
+          $xeTable.clearCurrentColumn()
           reactData.currentColumn = column
         }
-        return nextTick()
+        return nextTick().then(() => {
+          // 更新状选中态
+          if (isMouseSelected) {
+            $xeTable.addCellSelectedClass()
+          }
+        })
       },
       /**
        * 用于当前列，手动清空当前高亮的状态
@@ -5224,7 +5347,13 @@ export default defineComponent({
           visible: false
         })
         if (visible) {
-          dispatchEvent('filter-visible', { column, property: column.field, field: column.field, filterList: $xeTable.getCheckedFilters(), visible: false }, null)
+          dispatchEvent('filter-visible', {
+            column,
+            property: column.field,
+            field: column.field,
+            filterList: () => $xeTable.getCheckedFilters(),
+            visible: false
+          }, null)
         }
         return nextTick()
       },
@@ -5847,7 +5976,13 @@ export default defineComponent({
         const { id } = props
         const customOpts = computeCustomOpts.value
         const { collectColumn } = internalData
-        const { checkMethod } = customOpts
+        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> = {}
@@ -5867,43 +6002,33 @@ export default defineComponent({
         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) => {
-              const colKey = column.getKey()
-              if (colKey) {
-                hasSort = 1
-                sortData[colKey] = column.renderSortNumber
-              }
-            })
-            if (column.fixed !== column.defaultFixed) {
-              const colKey = column.getKey()
-              if (colKey) {
-                hasFixed = 1
-                fixedData[colKey] = column.fixed
-              }
+            if (isCustomSort) {
+              hasSort = 1
+              sortData[colKey] = column.renderSortNumber
             }
-          }
-          if (column.resizeWidth) {
-            const colKey = column.getKey()
-            if (colKey) {
-              hasResizable = 1
-              resizableData[colKey] = column.renderWidth
+            if (isCustomFixed && column.fixed !== column.defaultFixed) {
+              hasFixed = 1
+              fixedData[colKey] = column.fixed
             }
           }
-          if (!checkMethod || checkMethod({ 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
             }
           }
         })
@@ -6146,7 +6271,7 @@ export default defineComponent({
       // 该行为只对当前激活的表格有效
       if (internalData.isActivated) {
         tablePrivateMethods.preventEvent(evnt, 'event.keydown', null, () => {
-          const { mouseConfig, keyboardConfig, treeConfig, editConfig, highlightCurrentRow } = props
+          const { mouseConfig, keyboardConfig, treeConfig, editConfig, highlightCurrentRow, highlightCurrentColumn } = props
           const { ctxMenuStore, editStore, currentRow } = reactData
           const { afterFullData } = internalData
           const isMenu = computeIsMenu.value
@@ -6157,6 +6282,7 @@ export default defineComponent({
           const treeOpts = computeTreeOpts.value
           const menuList = computeMenuList.value
           const rowOpts = computeRowOpts.value
+          const columnOpts = computeColumnOpts.value
           const { selected, actived } = editStore
           const childrenField = treeOpts.children || treeOpts.childrenField
           const keyCode = evnt.keyCode
@@ -6315,10 +6441,15 @@ export default defineComponent({
               // 如果按下了方向键
               if (selected.row && selected.column) {
                 $xeTable.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt)
-              } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-                // 当前行按键上下移动
+              }
+              // 当前行按键上下移动
+              if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
                 $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt)
               }
+              // 当前行按键左右移动
+              if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
+                $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt)
+              }
             }
           } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
             // 如果按下了 Tab 键切换
@@ -6766,7 +6897,15 @@ export default defineComponent({
         if (el) {
           const parentElem = el.parentNode as HTMLElement
           const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0
-          return Math.floor($xeGrid ? $xeGrid.getParentHeight() : XEUtils.toNumber(getComputedStyle(parentElem).height) - parentPaddingSize)
+          let parentWrapperHeight = 0
+          if (parentElem) {
+            if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+              parentWrapperHeight = $xeGrid.getParentHeight()
+            } else {
+              parentWrapperHeight = parentElem.clientHeight
+            }
+          }
+          return Math.floor(parentWrapperHeight - parentPaddingSize)
         }
         return 0
       },
@@ -6857,32 +6996,18 @@ export default defineComponent({
         const treeOpts = computeTreeOpts.value
         const childrenField = treeOpts.children || treeOpts.childrenField
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
-        const rowkey = getRowkey($xeTable)
+        const { lazy } = treeOpts
         const fullAllDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = { ...fullAllDataRowIdData } // 存在已删除数据
         const fullDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
         const treeTempExpandedMaps = { ...treeExpandedMaps }
-        const handleRow = (row: any, index: number, items: any, path?: any[], parentRow?: any, nodes?: any[]) => {
-          let rowid = getRowid($xeTable, row)
-          const seq = treeConfig && path ? toTreePathSeq(path) : index + 1
-          const level = nodes ? nodes.length - 1 : 0
-          if (eqEmptyValue(rowid)) {
-            rowid = getRowUniqueId()
-            XEUtils.set(row, rowkey, rowid)
-          }
-          if (treeConfig && treeOpts.lazy) {
-            const treeExpRest = treeExpandedMaps[rowid]
-            if (row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
-              row[childrenField] = null
-            }
-            if (treeExpRest) {
-              if (!row[childrenField] || !row[childrenField].length) {
-                delete treeTempExpandedMaps[rowid]
-              }
-            }
-          }
-          let rowRest = fullAllDataRowIdData[rowid]
+
+        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
@@ -6891,15 +7016,35 @@ export default defineComponent({
           rowRest.items = items
           rowRest.parent = parentRow
           rowRest.level = level
-          rowRest.index = treeConfig && parentRow ? -1 : index
+          rowRest.index = currIndex
+          rowRest.treeIndex = index
+
           fullDataRowIdMaps[rowid] = rowRest
           fullAllDataRowIdMaps[rowid] = rowRest
         }
+
         if (treeConfig) {
-          XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField })
+          XEUtils.eachTree(tableFullTreeData, (row, index, items, path, parentRow, nodes) => {
+            const rowid = handleUpdateRowId(row)
+            if (treeConfig && lazy) {
+              const treeExpRest = treeTempExpandedMaps[rowid]
+              if (row[hasChildField] && row[childrenField] === undefined) {
+                row[childrenField] = null
+              }
+              if (treeExpRest) {
+                if (!row[childrenField] || !row[childrenField].length) {
+                  delete treeTempExpandedMaps[rowid]
+                }
+              }
+            }
+            handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, toTreePathSeq(path))
+          }, { children: childrenField })
         } else {
-          tableFullData.forEach(handleRow)
+          tableFullData.forEach((row, index, items) => {
+            handleRowCache(row, index, items, index, null, handleUpdateRowId(row), 0, index + 1)
+          })
         }
+
         internalData.fullDataRowIdData = fullDataRowIdMaps
         internalData.fullAllDataRowIdData = fullAllDataRowIdMaps
         reactData.treeExpandedMaps = treeTempExpandedMaps
@@ -6907,17 +7052,12 @@ export default defineComponent({
       cacheSourceMap (fullData) {
         const { treeConfig } = props
         const treeOpts = computeTreeOpts.value
-        let { sourceDataRowIdData } = internalData
         const sourceData = XEUtils.clone(fullData, true)
-        const rowkey = getRowkey($xeTable)
-        sourceDataRowIdData = internalData.sourceDataRowIdData = {}
+        const { handleUpdateRowId } = createHandleUpdateRowId($xeTable)
+        const sourceRowIdData: Record<string, any> = {}
         const handleSourceRow = (row: any) => {
-          let rowid = getRowid($xeTable, row)
-          if (eqEmptyValue(rowid)) {
-            rowid = getRowUniqueId()
-            XEUtils.set(row, rowkey, rowid)
-          }
-          sourceDataRowIdData[rowid] = row
+          const rowid = handleUpdateRowId(row)
+          sourceRowIdData[rowid] = row
         }
         // 源数据缓存
         if (treeConfig) {
@@ -6926,6 +7066,7 @@ export default defineComponent({
         } else {
           sourceData.forEach(handleSourceRow)
         }
+        internalData.sourceDataRowIdData = sourceRowIdData
         internalData.tableSourceData = sourceData
       },
       /**
@@ -7372,8 +7513,21 @@ export default defineComponent({
         }
         // 兼容老版本
 
-        let rest
-        if (!evntList.some((func) => func(Object.assign({ $grid: $xeGrid, $table: $xeTable, $event: evnt }, args)) === false)) {
+        let rest = null
+        let isStop = false
+        for (let i = 0; i < evntList.length; i++) {
+          const func = evntList[i]
+          const fnRest = func(Object.assign({ $grid: $xeGrid, $table: $xeTable, $event: evnt }, args))
+          if (fnRest === false) {
+            isStop = true
+            break
+          } else if (fnRest && fnRest.status === false) {
+            rest = fnRest.result
+            isStop = true
+            break
+          }
+        }
+        if (!isStop) {
           if (next) {
             rest = next()
           }
@@ -7399,10 +7553,11 @@ export default defineComponent({
         }
         // 树结构
         if (treeConfig) {
+          const { handleGetRowId } = createHandleGetRowId($xeTable)
           const childRowMaps: Record<string, number> = {}
           const childRowList: any[][] = []
           XEUtils.eachTree(afterTreeFullData, (row) => {
-            const rowid = getRowid($xeTable, row)
+            const rowid = handleGetRowId(row)
             const childList = row[transform ? mapChildrenField : childrenField]
             if (childList && childList.length && !childRowMaps[rowid]) {
               childRowMaps[rowid] = 1
@@ -7419,7 +7574,7 @@ export default defineComponent({
             childList.forEach(
               checkMethod
                 ? (item) => {
-                    const childRowid = getRowid($xeTable, item)
+                    const childRowid = handleGetRowId(item)
                     const isSelect = checkField ? XEUtils.get(item, checkField) : selectRowMaps[childRowid]
                     if (checkMethod({ row: item })) {
                       if (isSelect) {
@@ -7437,7 +7592,7 @@ export default defineComponent({
                     }
                   }
                 : item => {
-                  const childRowid = getRowid($xeTable, item)
+                  const childRowid = handleGetRowId(item)
                   const isSelect = checkField ? XEUtils.get(item, checkField) : selectRowMaps[childRowid]
                   if (isSelect) {
                     sLen++
@@ -7484,6 +7639,7 @@ export default defineComponent({
         const checkboxOpts = computeCheckboxOpts.value
         const { checkField, checkMethod, showReserveStatus } = checkboxOpts
         const { afterFullData, afterTreeFullData, checkboxReserveRowMap } = internalData
+        const { handleGetRowId } = createHandleGetRowId($xeTable)
 
         let sLen = 0 // 已选
         let hLen = 0 // 半选
@@ -7492,7 +7648,7 @@ export default defineComponent({
         const rootList = (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) {
@@ -7510,7 +7666,7 @@ export default defineComponent({
             }
           }
           : row => {
-            const childRowid = getRowid($xeTable, row)
+            const childRowid = handleGetRowId(row)
             const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid]
             if (selected) {
               sLen++
@@ -7548,6 +7704,8 @@ export default defineComponent({
         const childrenField = treeOpts.children || treeOpts.childrenField
         const checkboxOpts = computeCheckboxOpts.value
         const { checkField, checkStrictly, checkMethod } = checkboxOpts
+        const { handleGetRowId } = createHandleGetRowId($xeTable)
+        // indeterminateField 仅支持读取
         const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
         if (checkField) {
           // 树结构
@@ -7581,7 +7739,7 @@ export default defineComponent({
         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
@@ -7599,7 +7757,7 @@ export default defineComponent({
 
         // 列表
         rows.forEach(row => {
-          const rowid = getRowid($xeTable, row)
+          const rowid = handleGetRowId(row)
           if (isForce || (!checkMethod || checkMethod({ row }))) {
             if (checked) {
               if (!selectRowMaps[rowid]) {
@@ -7724,17 +7882,18 @@ export default defineComponent({
         const { _lastResizeTime } = internalData
         const sortOpts = computeSortOpts.value
         const columnOpts = computeColumnOpts.value
+        const currentColumnOpts = computeCurrentColumnOpts.value
         const { column } = params
         const cell = evnt.currentTarget
         const triggerResizable = _lastResizeTime && _lastResizeTime > Date.now() - 300
         const triggerSort = getEventTargetNode(evnt, cell, 'vxe-cell--sort').flag
         const triggerFilter = getEventTargetNode(evnt, cell, 'vxe-cell--filter').flag
         if (sortOpts.trigger === 'cell' && !(triggerResizable || triggerSort || triggerFilter)) {
-          tablePrivateMethods.triggerSortEvent(evnt, column, getNextSortOrder(column))
+          $xeTable.triggerSortEvent(evnt, column, getNextSortOrder(column))
         }
         dispatchEvent('header-cell-click', Object.assign({ triggerResizable, triggerSort, triggerFilter, cell }, params), evnt)
-        if (columnOpts.isCurrent || props.highlightCurrentColumn) {
-          tablePrivateMethods.triggerCurrentColumnEvent(evnt, params)
+        if ((columnOpts.isCurrent || props.highlightCurrentColumn) && (!currentColumnOpts.trigger || ['header', 'default'].includes(currentColumnOpts.trigger))) {
+          $xeTable.triggerCurrentColumnEvent(evnt, params)
         }
       },
       triggerHeaderCellDblclickEvent (evnt, params) {
@@ -7746,7 +7905,7 @@ export default defineComponent({
        * 如果是双击模式，则单击后选中状态
        */
       triggerCellClickEvent (evnt, params) {
-        const { highlightCurrentRow, editConfig } = props
+        const { highlightCurrentRow, highlightCurrentColumn, editConfig } = props
         const { editStore, isDragResize } = reactData
         if (isDragResize) {
           return
@@ -7758,6 +7917,8 @@ export default defineComponent({
         const checkboxOpts = computeCheckboxOpts.value
         const keyboardOpts = computeKeyboardOpts.value
         const rowOpts = computeRowOpts.value
+        const columnOpts = computeColumnOpts.value
+        const currentColumnOpts = computeCurrentColumnOpts.value
         const { actived, focused } = editStore
         const { row, column } = params
         const { type, treeNode } = column
@@ -7773,29 +7934,35 @@ export default defineComponent({
         if (!triggerCheckbox && !triggerRadio) {
           // 如果是展开行
           if (!triggerExpandNode && (expandOpts.trigger === 'row' || (isExpandType && expandOpts.trigger === 'cell'))) {
-            tablePrivateMethods.triggerRowExpandEvent(evnt, params)
+            $xeTable.triggerRowExpandEvent(evnt, params)
           }
           // 如果是树形表格
           if ((treeOpts.trigger === 'row' || (treeNode && treeOpts.trigger === 'cell'))) {
-            tablePrivateMethods.triggerTreeExpandEvent(evnt, params)
+            $xeTable.triggerTreeExpandEvent(evnt, params)
           }
         }
         // 如果点击了树节点
         if (!triggerTreeNode) {
           if (!triggerExpandNode) {
-            // 如果是高亮行
+            // 如果是当前行
             if (rowOpts.isCurrent || highlightCurrentRow) {
               if (!triggerCheckbox && !triggerRadio) {
-                tablePrivateMethods.triggerCurrentRowEvent(evnt, params)
+                $xeTable.triggerCurrentRowEvent(evnt, params)
+              }
+            }
+            // 如果是当前列
+            if ((columnOpts.isCurrent || highlightCurrentColumn) && (!currentColumnOpts.trigger || ['cell', 'default'].includes(currentColumnOpts.trigger))) {
+              if (!triggerCheckbox && !triggerRadio) {
+                $xeTable.triggerCurrentColumnEvent(evnt, params)
               }
             }
             // 如果是单选框
             if (!triggerRadio && (radioOpts.trigger === 'row' || (isRadioType && radioOpts.trigger === 'cell'))) {
-              tablePrivateMethods.triggerRadioRowEvent(evnt, params)
+              $xeTable.triggerRadioRowEvent(evnt, params)
             }
             // 如果是复选框
             if (!triggerCheckbox && (checkboxOpts.trigger === 'row' || (isCheckboxType && checkboxOpts.trigger === 'cell'))) {
-              tablePrivateMethods.handleToggleCheckRowEvent(evnt, params)
+              $xeTable.handleToggleCheckRowEvent(evnt, params)
             }
           }
           // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
@@ -7891,36 +8058,38 @@ export default defineComponent({
         }
       },
       triggerCheckRowEvent (evnt: MouseEvent, params, checked) {
-        const checkboxOpts = computeCheckboxOpts.value
         const { row } = params
         const { afterFullData } = internalData
+        const checkboxOpts = computeCheckboxOpts.value
         const { checkMethod, trigger } = checkboxOpts
         if (trigger === 'manual') {
           return
         }
         evnt.stopPropagation()
         if (checkboxOpts.isShiftKey && evnt.shiftKey && !props.treeConfig) {
-          const checkboxRecords = tableMethods.getCheckboxRecords()
+          const checkboxRecords = $xeTable.getCheckboxRecords()
           if (checkboxRecords.length) {
             const firstRow = checkboxRecords[0]
-            const _rowIndex = tableMethods.getVTRowIndex(row)
-            const _firstRowIndex = tableMethods.getVTRowIndex(firstRow)
+            const _rowIndex = $xeTable.getVTRowIndex(row)
+            const _firstRowIndex = $xeTable.getVTRowIndex(firstRow)
             if (_rowIndex !== _firstRowIndex) {
-              tableMethods.setAllCheckboxRow(false)
+              $xeTable.setAllCheckboxRow(false)
               const rangeRows = _rowIndex < _firstRowIndex ? afterFullData.slice(_rowIndex, _firstRowIndex + 1) : afterFullData.slice(_firstRowIndex, _rowIndex + 1)
-              handleCheckedCheckboxRow(rangeRows, true, false)
+              nextTick(() => {
+                handleCheckedCheckboxRow(rangeRows, true, false)
+              })
               dispatchEvent('checkbox-range-select', Object.assign({ rangeRecords: rangeRows }, params), evnt)
               return
             }
           }
         }
         if (!checkMethod || checkMethod({ row })) {
-          tablePrivateMethods.handleBatchSelectRows([row], checked)
-          tablePrivateMethods.checkSelectionStatus()
+          $xeTable.handleBatchSelectRows([row], checked)
+          $xeTable.checkSelectionStatus()
           dispatchEvent('checkbox-change', Object.assign({
-            records: tableMethods.getCheckboxRecords(),
-            reserves: tableMethods.getCheckboxReserveRecords(),
-            indeterminates: tableMethods.getCheckboxIndeterminateRecords(),
+            records: () => $xeTable.getCheckboxRecords(),
+            reserves: () => $xeTable.getCheckboxReserveRecords(),
+            indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
             checked
           }, params), evnt)
         }
@@ -8185,6 +8354,9 @@ export default defineComponent({
         const { afterFullData, tableFullData } = internalData
         const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null)
         const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0
+        const errRest = {
+          status: false
+        }
         if (prevDragRow && dragRow) {
           // 判断是否有拖动
           if (prevDragRow !== dragRow) {
@@ -8199,7 +8371,7 @@ export default defineComponent({
             const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild
             return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
               if (!status) {
-                return
+                return errRest
               }
 
               let oafIndex = -1
@@ -8230,11 +8402,11 @@ export default defineComponent({
                       if (isPeerDrag && !isCrossDrag) {
                         if (oldRest.row[parentField] !== newRest.row[parentField]) {
                           // 非同级
-                          return
+                          return errRest
                         }
                       } else {
                         if (!isCrossDrag) {
-                          return
+                          return errRest
                         }
                         if (oldAllMaps[newRowid]) {
                           isSelfToChildStatus = true
@@ -8245,7 +8417,7 @@ export default defineComponent({
                                 content: getI18n('vxe.error.treeDragChild')
                               })
                             }
-                            return
+                            return errRest
                           }
                         }
                       }
@@ -8253,13 +8425,13 @@ export default defineComponent({
                       // 子到根
 
                       if (!isCrossDrag) {
-                        return
+                        return errRest
                       }
                     } else if (newLevel) {
                       // 根到子
 
                       if (!isCrossDrag) {
-                        return
+                        return errRest
                       }
                       if (oldAllMaps[newRowid]) {
                         isSelfToChildStatus = true
@@ -8270,7 +8442,7 @@ export default defineComponent({
                               content: getI18n('vxe.error.treeDragChild')
                             })
                           }
-                          return
+                          return errRest
                         }
                       }
                     } else {
@@ -8334,28 +8506,36 @@ export default defineComponent({
               if (reactData.scrollYLoad) {
                 $xeTable.updateScrollYSpace()
               }
-              nextTick().then(() => {
+
+              if (evnt) {
+                dispatchEvent('row-dragend', {
+                  oldRow: dragRow,
+                  newRow: prevDragRow,
+                  dragRow,
+                  dragPos: prevDragPos as any,
+                  dragToChild: isDragToChildFlag,
+                  offsetIndex: dragOffsetIndex,
+                  _index: {
+                    newIndex: nafIndex,
+                    oldIndex: oafIndex
+                  }
+                }, evnt)
+              }
+
+              return nextTick().then(() => {
                 $xeTable.updateCellAreas()
                 $xeTable.recalculate()
-              })
-
-              dispatchEvent('row-dragend', {
-                oldRow: dragRow,
-                newRow: prevDragRow,
-                dragRow,
-                dragPos: prevDragPos as any,
-                dragToChild: isDragToChildFlag,
-                offsetIndex: dragOffsetIndex,
-                _index: {
-                  newIndex: nafIndex,
-                  oldIndex: oafIndex
+              }).then(() => {
+                return {
+                  status: true
                 }
-              }, evnt)
+              })
             }).catch(() => {
+              return errRest
             })
           }
         }
-        return Promise.resolve()
+        return Promise.resolve(errRest)
       },
       handleRowDragDragendEvent (evnt) {
         const { treeConfig } = props
@@ -8480,6 +8660,9 @@ export default defineComponent({
         const { isPeerDrag, isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod, dragToChildMethod } = columnDragOpts
         const { collectColumn } = internalData
         const dragOffsetIndex = prevDragPos === 'right' ? 1 : 0
+        const errRest = {
+          status: false
+        }
         if (prevDragCol && dragCol) {
           // 判断是否有拖动
           if (prevDragCol !== dragCol) {
@@ -8496,7 +8679,7 @@ export default defineComponent({
             const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild
             return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
               if (!status) {
-                return
+                return errRest
               }
 
               let oafIndex = -1
@@ -8515,11 +8698,11 @@ export default defineComponent({
                 if (isPeerDrag && !isCrossDrag) {
                   if (dragColumn.parentId !== newColumn.parentId) {
                     // 非同级
-                    return
+                    return errRest
                   }
                 } else {
                   if (!isCrossDrag) {
-                    return
+                    return errRest
                   }
 
                   if (oldAllMaps[newColumn.id]) {
@@ -8531,7 +8714,7 @@ export default defineComponent({
                           content: getI18n('vxe.error.treeDragChild')
                         })
                       }
-                      return
+                      return errRest
                     }
                   }
                 }
@@ -8539,13 +8722,13 @@ export default defineComponent({
                 // 子到根
 
                 if (!isCrossDrag) {
-                  return
+                  return errRest
                 }
               } else if (newColumn.parentId) {
                 // 根到子
 
                 if (!isCrossDrag) {
-                  return
+                  return errRest
                 }
                 if (oldAllMaps[newColumn.id]) {
                   isSelfToChildStatus = true
@@ -8556,7 +8739,7 @@ export default defineComponent({
                         content: getI18n('vxe.error.treeDragChild')
                       })
                     }
-                    return
+                    return errRest
                   }
                 }
               } else {
@@ -8620,27 +8803,34 @@ export default defineComponent({
                 }
               }
 
-              dispatchEvent('column-dragend', {
-                oldColumn: dragColumn,
-                newColumn,
-                dragColumn,
-                dragPos: prevDragPos,
-                dragToChild: isDragToChildFlag,
-                offsetIndex: dragOffsetIndex,
-                _index: {
-                  newIndex: nafIndex,
-                  oldIndex: oafIndex
-                }
-              }, evnt)
+              if (evnt) {
+                dispatchEvent('column-dragend', {
+                  oldColumn: dragColumn,
+                  newColumn,
+                  dragColumn,
+                  dragPos: prevDragPos,
+                  dragToChild: isDragToChildFlag,
+                  offsetIndex: dragOffsetIndex,
+                  _index: {
+                    newIndex: nafIndex,
+                    oldIndex: oafIndex
+                  }
+                }, evnt)
+              }
 
               if (isSyncColumn) {
                 $xeTable.handleColDragSwapColumn()
               }
+
+              return {
+                status: true
+              }
             }).catch(() => {
+              return errRest
             })
           }
         }
-        return Promise.resolve()
+        return Promise.resolve(errRest)
       },
       handleHeaderCellDragDragendEvent (evnt) {
         const { dragCol } = reactData
@@ -9033,10 +9223,10 @@ export default defineComponent({
         }
 
         const { highlightHoverRow } = tableProps
-        const { scrollXLoad, scrollYLoad } = reactData
+        const { scrollXLoad, scrollYLoad, expandColumn } = reactData
         const leftFixedWidth = computeLeftFixedWidth.value
         const rightFixedWidth = computeRightFixedWidth.value
-        if (!(scrollYLoad || leftFixedWidth || rightFixedWidth)) {
+        if (!(scrollYLoad || leftFixedWidth || rightFixedWidth || expandColumn)) {
           return
         }