vxe-table 3.20.0-beta.9 → 3.20.1

package/packages/table/src/methods.ts

@@ -3,7 +3,7 @@ import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, scrollTopTo,
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils'
 import { VxeUI } from '../../ui'
 import Cell from './cell'
-import { getRowUniqueId, clearTableAllStatus, getColumnList, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, getCellRestHeight, getLastChildColumn } from './util'
+import { getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, getCellRestHeight, getLastChildColumn } from './util'
 import { getSlotVNs } from '../../ui/src/vn'
 import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from '../../ui/src/anime'
 import { warnLog, errLog } from '../../ui/src/log'
@@ -230,6 +230,7 @@ function handleCustomRestore ($xeTable: VxeTableConstructor & VxeTablePrivateMet
       const newCollectCols = XEUtils.toArrayTree(XEUtils.orderBy(allCols, 'renderSortNumber'), { key: 'id', parentKey: 'parentId', children: 'children' })
       internalData.collectColumn = newCollectCols
       internalData.tableFullColumn = getColumnList(newCollectCols)
+      reactData.updateColFlag++
     }
     reactData.isCustomStatus = true
   } else {
@@ -386,14 +387,19 @@ function cacheColumnMap ($xeTable: VxeTableConstructor & VxeTablePrivateMethods)
     tableFullColumn.forEach(handleFunc)
   }
 
-  if (expandColumn && expandOpts.mode !== 'fixed' && virtualYOpts.enabled) {
-    warnLog('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false'])
-  }
-  if ((expandColumn && expandOpts.mode !== 'fixed') && mouseOpts.area) {
-    errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
-  }
-  if (expandColumn && expandOpts.mode !== 'inside' && (treeConfig && !treeOpts.transform)) {
-    errLog('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=fixed'])
+  if (expandColumn) {
+    if (expandOpts.mode !== 'fixed' && virtualYOpts.enabled) {
+      warnLog('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false'])
+    }
+    if ((expandOpts.mode !== 'fixed') && mouseOpts.area) {
+      errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
+    }
+    if (expandOpts.mode !== 'inside' && (treeConfig && !treeOpts.transform)) {
+      errLog('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=fixed'])
+    }
+    if (props.spanMethod) {
+      warnLog('vxe.error.notSupportProp', ['column.type=expand', 'span-method', 'span-method=null'])
+    }
   }
 
   if (htmlColumn) {
@@ -2917,13 +2923,13 @@ function handleTooltip ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
   return $xeTable.$nextTick()
 }
 
-function handleScrollToRowColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, fieldOrColumn: string | VxeTableDefines.ColumnInfo | null, row?: any) {
+function handleScrollToRowColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, fieldOrColumn: string | VxeTableDefines.ColumnInfo | null, row: any, options?: VxeTableDefines.ScrollToRowConfig) {
   const internalData = $xeTable as unknown as TableInternalData
 
   const { fullColumnIdData } = internalData
   const column = handleFieldOrColumn($xeTable, fieldOrColumn)
   if (column && fullColumnIdData[column.id]) {
-    return colToVisible($xeTable, column, row)
+    return colToVisible($xeTable, options ? options.colAlign !== false : true, column, row)
   }
   return $xeTable.$nextTick()
 }
@@ -3302,6 +3308,7 @@ function handleGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
   if (rowGroups) {
     const aggregateOpts = $xeTable.computeAggregateOpts
     const { rowField, parentField, childrenField, mapChildrenField } = aggregateOpts
+    const rowOpts = $xeTable.computeRowOpts
     const checkboxOpts = $xeTable.computeCheckboxOpts
     const { checkField } = checkboxOpts
     const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
@@ -3337,10 +3344,10 @@ function handleGroupData ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
           childCount: 0,
           [rowField]: getRowUniqueId(),
           [parentField]: null,
-          [rowkey]: getRowUniqueId(),
           [childrenField]: childTreeData,
           [mapChildrenField]: childTreeData
         }
+        aggRow[rowkey] = createRowId(rowOpts, aggRow, rowkey)
         if (checkField) {
           aggRow[checkField] = false
         }
@@ -3633,12 +3640,14 @@ function handleTableColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMetho
 }
 
 function handleUpdateColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
+  const reactData = $xeTable as unknown as TableReactData
   const internalData = $xeTable as unknown as TableInternalData
 
   const columnList = XEUtils.orderBy(internalData.collectColumn, 'renderSortNumber')
   internalData.collectColumn = columnList
-  const tableFullColumn = getColumnList(columnList)
-  internalData.tableFullColumn = tableFullColumn
+  const tFullColumn = getColumnList(columnList)
+  internalData.tableFullColumn = tFullColumn
+  reactData.updateColFlag++
   cacheColumnMap($xeTable)
 }
 
@@ -3830,8 +3839,9 @@ function handleInitColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
 
   const expandOpts = $xeTable.computeExpandOpts
   internalData.collectColumn = collectColumn
-  const tableFullColumn = getColumnList(collectColumn)
-  internalData.tableFullColumn = tableFullColumn
+  const tFullColumn = getColumnList(collectColumn)
+  internalData.tableFullColumn = tFullColumn
+  reactData.updateColFlag++
   reactData.isColLoading = true
   initColumnHierarchy($xeTable)
   return Promise.resolve(
@@ -4242,7 +4252,7 @@ function updateRowExpandStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMe
         const rowid = expandEl.getAttribute('rowid') || ''
         const rowRest = fullAllDataRowIdData[rowid]
         if (rowRest) {
-          const expandHeight = expandEl.offsetHeight + 1
+          const expandHeight = expandEl.offsetHeight
           const trEl = bodyScrollElem.querySelector(`.vxe-body--row[rowid="${rowid}"]`) as HTMLTableCellElement
           let offsetTop = 0
           if (scrollYLoad) {
@@ -5028,6 +5038,7 @@ const tableMethods: any = {
     const expandOpts = $xeTable.computeExpandOpts
     const treeOpts = $xeTable.computeTreeOpts
     const radioOpts = $xeTable.computeRadioOpts
+    const rowOpts = $xeTable.computeRowOpts
     const checkboxOpts = $xeTable.computeCheckboxOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
     const rowkey = getRowkey($xeTable)
@@ -5061,7 +5072,7 @@ const tableMethods: any = {
       }
       // 必须有行数据的唯一主键，可以自行设置；也可以默认生成一个随机数
       if (eqEmptyValue(XEUtils.get(record, rowkey))) {
-        XEUtils.set(record, rowkey, getRowUniqueId())
+        XEUtils.set(record, rowkey, createRowId(rowOpts, record, rowkey))
       }
       return record
     })
@@ -5407,9 +5418,10 @@ const tableMethods: any = {
     const props = $xeTable
     const internalData = $xeTable as unknown as TableInternalData
 
-    const { keepSource } = props
-    const { tableFullColumn, fullDataRowIdData, sourceDataRowIdData } = internalData
-    if (keepSource) {
+    const { keepSource, editConfig } = props
+    const { fullDataRowIdData, sourceDataRowIdData } = internalData
+    const keepFields = $xeTable.computeKeepFields
+    if (keepSource && editConfig) {
       const rowid = XEUtils.isString(rowOrId) || XEUtils.isNumber(rowOrId) ? rowOrId : getRowid($xeTable, rowOrId)
       const rowRest = fullDataRowIdData[rowid]
       // 新增的数据不需要检测
@@ -5422,9 +5434,8 @@ const tableMethods: any = {
         if (arguments.length > 1) {
           return !eqCellValue(oRow, row, field as string)
         }
-        for (let index = 0, len = tableFullColumn.length; index < len; index++) {
-          const property = tableFullColumn[index].field
-          if (property && !eqCellValue(oRow, row, property)) {
+        for (let i = 0; i < keepFields.length; i++) {
+          if (!eqCellValue(oRow, row, keepFields[i])) {
             return true
           }
         }
@@ -7020,13 +7031,15 @@ const tableMethods: any = {
     if (ctxMenuStore.visible && tableMenu && !getEventTargetNode(evnt, tableMenu.$el).flag) {
       $xeTable.closeMenu()
     }
-    const isActivated = getEventTargetNode(evnt, ($xeGGWrapper || $xeTable).$el).flag
-    // 如果存在校验，点击了表格之外则清除
-    if (!isActivated && editRules && validOpts.autoClear) {
-      reactData.validErrorMaps = {}
+    if (!(actived.row && getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag)) {
+      const isActivated = getEventTargetNode(evnt, ($xeGGWrapper || $xeTable).$el).flag
+      // 如果存在校验，点击了表格之外则清除
+      if (!isActivated && editRules && validOpts.autoClear) {
+        reactData.validErrorMaps = {}
+      }
+      // 最后激活的表格
+      internalData.isActivated = isActivated
     }
-    // 最后激活的表格
-    internalData.isActivated = isActivated
   },
   /**
    * 窗口失焦事件处理
@@ -7104,7 +7117,7 @@ const tableMethods: any = {
       $xeTable.preventEvent(evnt, 'event.keydown', null, () => {
         const { mouseConfig, keyboardConfig, treeConfig, editConfig, highlightCurrentRow, highlightCurrentColumn } = props
         const { ctxMenuStore, editStore, currentRow } = reactData
-        const { afterFullData } = internalData
+        const { afterFullData, visibleColumn } = internalData
         const isContentMenu = $xeTable.computeIsContentMenu
         const bodyMenu = $xeTable.computeBodyMenu
         const keyboardOpts = $xeTable.computeKeyboardOpts
@@ -7114,6 +7127,7 @@ const tableMethods: any = {
         const menuList = $xeTable.computeMenuList
         const rowOpts = $xeTable.computeRowOpts
         const columnOpts = $xeTable.computeColumnOpts
+        const { isLastEnterAppendRow, beforeEnterMethod, enterMethod, isLastTabAppendRow, beforeTabMethod, tabMethod } = keyboardOpts
         const { selected, actived } = editStore
         const { keyCode } = evnt
         const hasBackspaceKey = keyCode === 8
@@ -7188,7 +7202,6 @@ const tableMethods: any = {
             internalData._keyCtx = false
           }, 1000)
         } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow))) {
-          const { isLastEnterAppendRow, beforeEnterMethod, enterMethod } = keyboardOpts
           // 退出选中
           if (isControlKey) {
             // 如果是激活编辑状态，则取消编辑
@@ -7203,6 +7216,8 @@ const tableMethods: any = {
           } else {
             // 如果是激活状态，退则出到上一行/下一行
             if (selected.row || actived.row) {
+              const activeRow = selected.row || actived.row
+              const activeColumn = selected.column || actived.column
               const activeParams = selected.row ? selected.args : actived.args
               if (hasShiftKey) {
                 if (keyboardOpts.enterToTab) {
@@ -7211,12 +7226,44 @@ const tableMethods: any = {
                   $xeTable.moveEnterSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt)
                 }
               } else {
+                const _rowIndex = $xeTable.getVTRowIndex(activeRow)
+                const _columnIndex = $xeTable.getVTColumnIndex(activeColumn)
                 if (keyboardOpts.enterToTab) {
-                  $xeTable.moveTabSelected(activeParams, hasShiftKey, evnt)
+                  const ttrParams = {
+                    row: activeRow,
+                    rowIndex: $xeTable.getRowIndex(activeRow),
+                    $rowIndex: $xeTable.getVMRowIndex(activeRow),
+                    _rowIndex,
+                    column: activeColumn,
+                    columnIndex: $xeTable.getColumnIndex(activeColumn),
+                    $columnIndex: $xeTable.getVMColumnIndex(activeColumn),
+                    _columnIndex,
+                    $table: $xeTable
+                  }
+                  if (!beforeTabMethod || beforeTabMethod(ttrParams) !== false) {
+                    evnt.preventDefault()
+                    // 最后一行按下Tab键，自动追加一行
+                    if (isLastTabAppendRow) {
+                      const newColumn = visibleColumn[0]
+                      if (_rowIndex >= afterFullData.length - 1 && _columnIndex >= visibleColumn.length - 1) {
+                        if (actived.row) {
+                          $xeTable.handleClearEdit(evnt)
+                        }
+                        $xeTable.insertAt({}, -1).then(({ row: newRow }) => {
+                          $xeTable.scrollToRow(newRow, newColumn)
+                          $xeTable.handleSelected({ ...activeParams, row: newRow, column: newColumn }, evnt)
+                        })
+                        $xeTable.dispatchEvent('tab-append-row', ttrParams, evnt)
+                        return
+                      }
+                    }
+                    if (tabMethod) {
+                      tabMethod(ttrParams)
+                    } else {
+                      $xeTable.moveTabSelected(activeParams, hasShiftKey, evnt)
+                    }
+                  }
                 } else {
-                  const activeRow = selected.row || actived.row
-                  const activeColumn = selected.column || actived.column
-                  const _rowIndex = $xeTable.getVTRowIndex(activeRow)
                   const etrParams = {
                     row: activeRow,
                     rowIndex: $xeTable.getRowIndex(activeRow),
@@ -7225,10 +7272,11 @@ const tableMethods: any = {
                     column: activeColumn,
                     columnIndex: $xeTable.getColumnIndex(activeColumn),
                     $columnIndex: $xeTable.getVMColumnIndex(activeColumn),
-                    _columnIndex: $xeTable.getVTColumnIndex(activeColumn),
+                    _columnIndex,
                     $table: $xeTable
                   }
                   if (!beforeEnterMethod || beforeEnterMethod(etrParams) !== false) {
+                    evnt.preventDefault()
                     // 最后一行按下回车键，自动追加一行
                     if (isLastEnterAppendRow) {
                       if (_rowIndex >= afterFullData.length - 1) {
@@ -7240,9 +7288,13 @@ const tableMethods: any = {
                         return
                       }
                     }
-                    $xeTable.moveEnterSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt)
                     if (enterMethod) {
                       enterMethod(etrParams)
+                    } else {
+                      if (actived.row) {
+                        $xeTable.handleClearEdit(evnt)
+                      }
+                      $xeTable.moveEnterSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt)
                     }
                   }
                 }
@@ -7283,10 +7335,49 @@ const tableMethods: any = {
           }
         } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
           // 如果按下了 Tab 键切换
-          if (selected.row || selected.column) {
-            $xeTable.moveTabSelected(selected.args, hasShiftKey, evnt)
-          } else if (actived.row || actived.column) {
-            $xeTable.moveTabSelected(actived.args, hasShiftKey, evnt)
+          if (selected.row || actived.row) {
+            const activeRow = selected.row || actived.row
+            const activeColumn = selected.column || actived.column
+            const activeParams = selected.row ? selected.args : actived.args
+            const _rowIndex = $xeTable.getVTRowIndex(activeRow)
+            const _columnIndex = $xeTable.getVTColumnIndex(activeColumn)
+            const ttrParams = {
+              row: activeRow,
+              rowIndex: $xeTable.getRowIndex(activeRow),
+              $rowIndex: $xeTable.getVMRowIndex(activeRow),
+              _rowIndex,
+              column: activeColumn,
+              columnIndex: $xeTable.getColumnIndex(activeColumn),
+              $columnIndex: $xeTable.getVMColumnIndex(activeColumn),
+              _columnIndex,
+              $table: $xeTable
+            }
+            if (!beforeTabMethod || beforeTabMethod(ttrParams) !== false) {
+              evnt.preventDefault()
+              // 最后一行按下Tab键，自动追加一行
+              if (isLastTabAppendRow) {
+                const newColumn = visibleColumn[0]
+                if (_rowIndex >= afterFullData.length - 1 && _columnIndex >= visibleColumn.length - 1) {
+                  if (actived.row) {
+                    $xeTable.handleClearEdit(evnt)
+                  }
+                  $xeTable.insertAt({}, -1).then(({ row: newRow }) => {
+                    $xeTable.scrollToRow(newRow, newColumn)
+                    $xeTable.handleSelected({ ...activeParams, row: newRow, column: newColumn }, evnt)
+                  })
+                  $xeTable.dispatchEvent('tab-append-row', ttrParams, evnt)
+                  return
+                }
+              }
+              if (tabMethod) {
+                tabMethod(ttrParams)
+              } else {
+                if (actived.row) {
+                  $xeTable.handleClearEdit(evnt)
+                }
+                $xeTable.moveTabSelected(activeParams, hasShiftKey, evnt)
+              }
+            }
           }
         } else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && isEnableConf(editConfig) && (selected.row || selected.column)) {
           // 如果是删除键
@@ -8404,7 +8495,7 @@ const tableMethods: any = {
     const { selectRadioRow: oldValue } = reactData
     const { row } = params
     const radioOpts = $xeTable.computeRadioOpts
-    const { trigger, checkMethod } = radioOpts
+    const { trigger, strict, checkMethod } = radioOpts
     if (trigger === 'manual') {
       return
     }
@@ -8412,9 +8503,10 @@ const tableMethods: any = {
     if (!checkMethod || checkMethod({ $table: $xeTable, row })) {
       let newValue = row
       let isChange = oldValue !== newValue
+      const selected = !isChange
       if (isChange) {
         handleCheckedRadioRow($xeTable, newValue)
-      } else if (!radioOpts.strict) {
+      } else if (!strict) {
         isChange = oldValue === newValue
         if (isChange) {
           newValue = null
@@ -8422,7 +8514,7 @@ const tableMethods: any = {
         }
       }
       if (isChange) {
-        $xeTable.dispatchEvent('radio-change', { oldValue, newValue, ...params }, evnt)
+        $xeTable.dispatchEvent('radio-change', { oldValue, newValue, selected, ...params }, evnt)
       }
     }
   },
@@ -8436,16 +8528,27 @@ const tableMethods: any = {
     const columnOpts = $xeTable.computeColumnOpts
     const currentColumnOpts = $xeTable.computeCurrentColumnOpts
     const beforeRowMethod = currentColumnOpts.beforeSelectMethod || columnOpts.currentMethod as any
-    const { column: newValue } = params
-    const { trigger } = currentColumnOpts
+    let { column: newValue } = params
+    const { trigger, strict } = currentColumnOpts
     if (trigger === 'manual') {
       return
     }
-    const isChange = oldValue !== newValue
-    if (!beforeRowMethod || beforeRowMethod({ column: newValue, $table: $xeTable })) {
-      $xeTable.setCurrentColumn(newValue)
+    let isChange = oldValue !== newValue
+    const selected = !isChange
+    if (!beforeRowMethod || beforeRowMethod({ column: newValue, selected, $table: $xeTable })) {
+      if (strict) {
+        $xeTable.setCurrentColumn(newValue)
+      } else {
+        isChange = oldValue === newValue
+        if (isChange) {
+          newValue = null as any
+          $xeTable.clearCurrentColumn()
+        } else {
+          $xeTable.setCurrentColumn(newValue)
+        }
+      }
       if (isChange) {
-        $xeTable.dispatchEvent('current-column-change', { oldValue, newValue, ...params }, evnt)
+        $xeTable.dispatchEvent('current-column-change', { oldValue, newValue, selected, ...params }, evnt)
       }
     } else {
       $xeTable.dispatchEvent('current-column-disabled', params, evnt)
@@ -8459,18 +8562,29 @@ const tableMethods: any = {
     const rowOpts = $xeTable.computeRowOpts
     const currentRowOpts = $xeTable.computeCurrentRowOpts
     const beforeRowMethod = currentRowOpts.beforeSelectMethod || rowOpts.currentMethod as any
-    const { row: newValue } = params
-    const { trigger } = currentRowOpts
+    let { row: newValue } = params
+    const { trigger, strict } = currentRowOpts
     if (trigger === 'manual') {
       return
     }
-    const isChange = oldValue !== newValue
-    if (!beforeRowMethod || beforeRowMethod({ row: newValue, $table: $xeTable })) {
-      $xeTable.setCurrentRow(newValue)
+    let isChange = oldValue !== newValue
+    const selected = !isChange
+    if (!beforeRowMethod || beforeRowMethod({ row: newValue, selected, $table: $xeTable })) {
+      if (strict) {
+        $xeTable.setCurrentRow(newValue)
+      } else {
+        isChange = oldValue === newValue
+        if (isChange) {
+          newValue = null
+          $xeTable.clearCurrentRow()
+        } else {
+          $xeTable.setCurrentRow(newValue)
+        }
+      }
       if (isChange) {
-        $xeTable.dispatchEvent('current-row-change', { oldValue, newValue, ...params }, evnt)
+        $xeTable.dispatchEvent('current-row-change', { oldValue, newValue, selected, ...params }, evnt)
         // 已废弃
-        $xeTable.dispatchEvent('current-change', { oldValue, newValue, ...params }, evnt)
+        $xeTable.dispatchEvent('current-change', { oldValue, newValue, selected, ...params }, evnt)
       }
     } else {
       $xeTable.dispatchEvent('current-row-disabled', params, evnt)
@@ -9126,11 +9240,13 @@ const tableMethods: any = {
               if (isPeerDrag && !isCrossDrag) {
                 if (oldRest.row[parentField] !== newRest.row[parentField]) {
                   // 非同级
-                  return errRest
+                  handleRowDragEndClearStatus($xeTable)
+                  return Promise.resolve(errRest)
                 }
               } else {
                 if (!isCrossDrag) {
-                  return errRest
+                  handleRowDragEndClearStatus($xeTable)
+                  return Promise.resolve(errRest)
                 }
                 if (oldAllMaps[newRowid]) {
                   isSelfToChildStatus = true
@@ -9141,7 +9257,8 @@ const tableMethods: any = {
                         content: getI18n('vxe.error.treeDragChild')
                       })
                     }
-                    return errRest
+                    handleRowDragEndClearStatus($xeTable)
+                    return Promise.resolve(errRest)
                   }
                 }
               }
@@ -9149,13 +9266,15 @@ const tableMethods: any = {
               // 子到根
 
               if (!isCrossDrag) {
-                return errRest
+                handleRowDragEndClearStatus($xeTable)
+                return Promise.resolve(errRest)
               }
             } else if (newLevel) {
               // 根到子
 
               if (!isCrossDrag) {
-                return errRest
+                handleRowDragEndClearStatus($xeTable)
+                return Promise.resolve(errRest)
               }
               if (oldAllMaps[newRowid]) {
                 isSelfToChildStatus = true
@@ -9166,7 +9285,8 @@ const tableMethods: any = {
                       content: getI18n('vxe.error.treeDragChild')
                     })
                   }
-                  return errRest
+                  handleRowDragEndClearStatus($xeTable)
+                  return Promise.resolve(errRest)
                 }
               }
             } else {
@@ -9188,6 +9308,7 @@ const tableMethods: any = {
             // 移出源位置
             if (oldRest && newRest) {
               const fullList = XEUtils.toTreeArray(internalData.afterTreeFullData, {
+                updated: false,
                 key: rowField,
                 parentKey: parentField,
                 children: mapChildrenField
@@ -11056,8 +11177,8 @@ const tableMethods: any = {
       XEUtils.each(fullAllDataRowIdData, (rowRest) => {
         rowRest.treeLoaded = false
       })
+      internalData.treeExpandedMaps = {}
     }
-    internalData.treeExpandedMaps = {}
     if (transform) {
       handleVirtualTreeToList($xeTable)
       $xeTable.handleTableData()
@@ -12176,7 +12297,7 @@ const tableMethods: any = {
    * @param {Row} row 行对象
    * @param {ColumnInfo} column 列配置
    */
-  scrollToRow (row: any, fieldOrColumn?: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo) {
+  scrollToRow (row: any, fieldOrColumn?: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo, options?: VxeTableDefines.ScrollToRowConfig) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const props = $xeTable
     const reactData = $xeTable as unknown as TableReactData
@@ -12191,7 +12312,7 @@ const tableMethods: any = {
       }
     }
     if (fieldOrColumn) {
-      rest.push(handleScrollToRowColumn($xeTable, fieldOrColumn, row))
+      rest.push(handleScrollToRowColumn($xeTable, fieldOrColumn, row, options))
     }
     return Promise.all(rest).then(() => {
       if (row) {
@@ -12206,51 +12327,51 @@ const tableMethods: any = {
   /**
    * 如果有滚动条，则滚动到第一行
    */
-  scrollToStartRow (fieldOrColumn?: string | VxeTableDefines.ColumnInfo) {
+  scrollToStartRow (fieldOrColumn?: string | VxeTableDefines.ColumnInfo, options?: VxeTableDefines.ScrollToRowConfig) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const internalData = $xeTable as unknown as TableInternalData
 
     const { afterFullData } = internalData
-    return $xeTable.scrollToRow(afterFullData[0], fieldOrColumn)
+    return $xeTable.scrollToRow(afterFullData[0], fieldOrColumn, options)
   },
   /**
    * 如果有滚动条，则滚动到最后一行
    */
-  scrollToEndRow (fieldOrColumn?: string | VxeTableDefines.ColumnInfo) {
+  scrollToEndRow (fieldOrColumn?: string | VxeTableDefines.ColumnInfo, options?: VxeTableDefines.ScrollToRowConfig) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const internalData = $xeTable as unknown as TableInternalData
 
     const { afterFullData } = internalData
-    return $xeTable.scrollToRow(afterFullData[afterFullData.length - 1], fieldOrColumn)
+    return $xeTable.scrollToRow(afterFullData[afterFullData.length - 1], fieldOrColumn, options)
   },
   /**
    * 如果有滚动条，则滚动到对应的列
    * @param {ColumnInfo} column 列配置
    */
-  scrollToColumn (fieldOrColumn: any) {
+  scrollToColumn (fieldOrColumn: any, options?: VxeTableDefines.ScrollToColumnConfig) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
-    return handleScrollToRowColumn($xeTable, fieldOrColumn)
+    return handleScrollToRowColumn($xeTable, null, fieldOrColumn, options)
   },
   /**
    * 如果有滚动条，则滚动到第一列
    */
-  scrollToStartColumn () {
+  scrollToStartColumn (options?: VxeTableDefines.ScrollToColumnConfig) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const internalData = $xeTable as unknown as TableInternalData
 
     const { visibleColumn } = internalData
-    return $xeTable.scrollToColumn(visibleColumn[0])
+    return $xeTable.scrollToColumn(visibleColumn[0], options)
   },
   /**
    * 如果有滚动条，则滚动到最后一列
    */
-  scrollToEndColumn () {
+  scrollToEndColumn (options?: VxeTableDefines.ScrollToColumnConfig) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const internalData = $xeTable as unknown as TableInternalData
 
     const { visibleColumn } = internalData
-    return $xeTable.scrollToColumn(visibleColumn[visibleColumn.length - 1])
+    return $xeTable.scrollToColumn(visibleColumn[visibleColumn.length - 1], options)
   },
   /**
    * 对于树形结构中，可以直接滚动到指定深层节点中
@@ -12361,10 +12482,12 @@ const tableMethods: any = {
   updateStatus (slotParams: any, cellValue: any) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const props = $xeTable
+    const internalData = $xeTable as unknown as TableInternalData
 
     return this.$nextTick().then(() => {
       const { editRules } = props
-      if (slotParams && editRules) {
+      const { isActivated } = internalData
+      if (isActivated && slotParams && editRules) {
         return $xeTable.handleCellRuleUpdateStatus('change', slotParams, cellValue)
       }
     })

package/packages/table/src/props.ts

@@ -205,6 +205,8 @@ export const tableProps = {
   rowConfig: Object as PropType<VxeTablePropTypes.RowConfig>,
   // 数据聚合配置项
   aggregateConfig: Object as PropType<VxeTablePropTypes.AggregateConfig>,
+  // 聚合函数计算精度配置项
+  aggregateAccuracyConfig: Object as PropType<VxeTablePropTypes.AggregateAccuracyConfig>,
   /**
    * 已废弃，被 aggregateConfig 替换
    * @deprecated
@@ -270,6 +272,8 @@ export const tableProps = {
   fnrConfig: Object,
   // 编辑配置项
   editConfig: [Boolean, Object] as PropType<VxeTablePropTypes.EditConfig>,
+  // 数据状态监听配置项
+  editDirtyConfig: Object as PropType<VxeTablePropTypes.EditDirtyConfig>,
   // 校验配置项
   validConfig: Object as PropType<VxeTablePropTypes.ValidConfig>,
   // 校验规则配置项