vxe-table 3.20.0-beta.9 → 3.20.1

package/es/table/src/methods.js

@@ -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';
@@ -203,6 +203,7 @@ function handleCustomRestore($xeTable, storeData) {
             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;
     }
@@ -356,14 +357,19 @@ function cacheColumnMap($xeTable) {
     else {
         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) {
         if (!columnOpts.useKey) {
@@ -2812,12 +2818,12 @@ function handleTooltip($xeTable, evnt, tipOpts, type, tdEl, overflowElem, tipEle
     }
     return $xeTable.$nextTick();
 }
-function handleScrollToRowColumn($xeTable, fieldOrColumn, row) {
+function handleScrollToRowColumn($xeTable, fieldOrColumn, row, options) {
     const internalData = $xeTable;
     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();
 }
@@ -3165,6 +3171,7 @@ function handleGroupData($xeTable, list, rowGroups) {
     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;
@@ -3200,10 +3207,10 @@ function handleGroupData($xeTable, list, rowGroups) {
                     childCount: 0,
                     [rowField]: getRowUniqueId(),
                     [parentField]: null,
-                    [rowkey]: getRowUniqueId(),
                     [childrenField]: childTreeData,
                     [mapChildrenField]: childTreeData
                 };
+                aggRow[rowkey] = createRowId(rowOpts, aggRow, rowkey);
                 if (checkField) {
                     aggRow[checkField] = false;
                 }
@@ -3490,11 +3497,13 @@ function handleTableColumn($xeTable) {
     reactData.tableColumn = tableColumn;
 }
 function handleUpdateColumn($xeTable) {
+    const reactData = $xeTable;
     const internalData = $xeTable;
     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);
 }
 function loadScrollXData($xeTable) {
@@ -3686,8 +3695,9 @@ function handleInitColumn($xeTable, collectColumn) {
     const internalData = $xeTable;
     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(restoreCustomStorage($xeTable)).then(() => {
@@ -4065,7 +4075,7 @@ function updateRowExpandStyle($xeTable) {
                 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}"]`);
                     let offsetTop = 0;
                     if (scrollYLoad) {
@@ -4821,6 +4831,7 @@ const tableMethods = {
         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);
@@ -4855,7 +4866,7 @@ const tableMethods = {
             }
             // 必须有行数据的唯一主键，可以自行设置；也可以默认生成一个随机数
             if (eqEmptyValue(XEUtils.get(record, rowkey))) {
-                XEUtils.set(record, rowkey, getRowUniqueId());
+                XEUtils.set(record, rowkey, createRowId(rowOpts, record, rowkey));
             }
             return record;
         });
@@ -5201,9 +5212,10 @@ const tableMethods = {
         const $xeTable = this;
         const props = $xeTable;
         const internalData = $xeTable;
-        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];
             // 新增的数据不需要检测
@@ -5216,9 +5228,8 @@ const tableMethods = {
                 if (arguments.length > 1) {
                     return !eqCellValue(oRow, row, field);
                 }
-                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;
                     }
                 }
@@ -6769,13 +6780,15 @@ const tableMethods = {
         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;
     },
     /**
      * 窗口失焦事件处理
@@ -6849,7 +6862,7 @@ const tableMethods = {
             $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;
@@ -6859,6 +6872,7 @@ const tableMethods = {
                 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;
@@ -6941,7 +6955,6 @@ const tableMethods = {
                     }, 1000);
                 }
                 else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow))) {
-                    const { isLastEnterAppendRow, beforeEnterMethod, enterMethod } = keyboardOpts;
                     // 退出选中
                     if (isControlKey) {
                         // 如果是激活编辑状态，则取消编辑
@@ -6957,6 +6970,8 @@ const tableMethods = {
                     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) {
@@ -6967,13 +6982,46 @@ const tableMethods = {
                                 }
                             }
                             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(Object.assign(Object.assign({}, 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),
@@ -6982,10 +7030,11 @@ const tableMethods = {
                                         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) {
@@ -6997,10 +7046,15 @@ const tableMethods = {
                                                 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);
+                                        }
                                     }
                                 }
                             }
@@ -7044,11 +7098,50 @@ const tableMethods = {
                 }
                 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(Object.assign(Object.assign({}, 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)) {
@@ -8147,7 +8240,7 @@ const tableMethods = {
         const { selectRadioRow: oldValue } = reactData;
         const { row } = params;
         const radioOpts = $xeTable.computeRadioOpts;
-        const { trigger, checkMethod } = radioOpts;
+        const { trigger, strict, checkMethod } = radioOpts;
         if (trigger === 'manual') {
             return;
         }
@@ -8155,10 +8248,11 @@ const tableMethods = {
         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;
@@ -8166,7 +8260,7 @@ const tableMethods = {
                 }
             }
             if (isChange) {
-                $xeTable.dispatchEvent('radio-change', Object.assign({ oldValue, newValue }, params), evnt);
+                $xeTable.dispatchEvent('radio-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
             }
         }
     },
@@ -8177,16 +8271,29 @@ const tableMethods = {
         const columnOpts = $xeTable.computeColumnOpts;
         const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
         const beforeRowMethod = currentColumnOpts.beforeSelectMethod || columnOpts.currentMethod;
-        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;
+                    $xeTable.clearCurrentColumn();
+                }
+                else {
+                    $xeTable.setCurrentColumn(newValue);
+                }
+            }
             if (isChange) {
-                $xeTable.dispatchEvent('current-column-change', Object.assign({ oldValue, newValue }, params), evnt);
+                $xeTable.dispatchEvent('current-column-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
             }
         }
         else {
@@ -8200,18 +8307,31 @@ const tableMethods = {
         const rowOpts = $xeTable.computeRowOpts;
         const currentRowOpts = $xeTable.computeCurrentRowOpts;
         const beforeRowMethod = currentRowOpts.beforeSelectMethod || rowOpts.currentMethod;
-        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', Object.assign({ oldValue, newValue }, params), evnt);
+                $xeTable.dispatchEvent('current-row-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
                 // 已废弃
-                $xeTable.dispatchEvent('current-change', Object.assign({ oldValue, newValue }, params), evnt);
+                $xeTable.dispatchEvent('current-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
             }
         }
         else {
@@ -8843,12 +8963,14 @@ const tableMethods = {
                             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;
@@ -8859,7 +8981,8 @@ const tableMethods = {
                                                 content: getI18n('vxe.error.treeDragChild')
                                             });
                                         }
-                                        return errRest;
+                                        handleRowDragEndClearStatus($xeTable);
+                                        return Promise.resolve(errRest);
                                     }
                                 }
                             }
@@ -8867,13 +8990,15 @@ const tableMethods = {
                         else if (oldLevel) {
                             // 子到根
                             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;
@@ -8884,7 +9009,8 @@ const tableMethods = {
                                             content: getI18n('vxe.error.treeDragChild')
                                         });
                                     }
-                                    return errRest;
+                                    handleRowDragEndClearStatus($xeTable);
+                                    return Promise.resolve(errRest);
                                 }
                             }
                         }
@@ -8905,6 +9031,7 @@ const tableMethods = {
                         // 移出源位置
                         if (oldRest && newRest) {
                             const fullList = XEUtils.toTreeArray(internalData.afterTreeFullData, {
+                                updated: false,
                                 key: rowField,
                                 parentKey: parentField,
                                 children: mapChildrenField
@@ -10698,8 +10825,8 @@ const tableMethods = {
             XEUtils.each(fullAllDataRowIdData, (rowRest) => {
                 rowRest.treeLoaded = false;
             });
+            internalData.treeExpandedMaps = {};
         }
-        internalData.treeExpandedMaps = {};
         if (transform) {
             handleVirtualTreeToList($xeTable);
             $xeTable.handleTableData();
@@ -11779,7 +11906,7 @@ const tableMethods = {
      * @param {Row} row 行对象
      * @param {ColumnInfo} column 列配置
      */
-    scrollToRow(row, fieldOrColumn) {
+    scrollToRow(row, fieldOrColumn, options) {
         const $xeTable = this;
         const props = $xeTable;
         const reactData = $xeTable;
@@ -11794,7 +11921,7 @@ const tableMethods = {
             }
         }
         if (fieldOrColumn) {
-            rest.push(handleScrollToRowColumn($xeTable, fieldOrColumn, row));
+            rest.push(handleScrollToRowColumn($xeTable, fieldOrColumn, row, options));
         }
         return Promise.all(rest).then(() => {
             if (row) {
@@ -11809,46 +11936,46 @@ const tableMethods = {
     /**
      * 如果有滚动条，则滚动到第一行
      */
-    scrollToStartRow(fieldOrColumn) {
+    scrollToStartRow(fieldOrColumn, options) {
         const $xeTable = this;
         const internalData = $xeTable;
         const { afterFullData } = internalData;
-        return $xeTable.scrollToRow(afterFullData[0], fieldOrColumn);
+        return $xeTable.scrollToRow(afterFullData[0], fieldOrColumn, options);
     },
     /**
      * 如果有滚动条，则滚动到最后一行
      */
-    scrollToEndRow(fieldOrColumn) {
+    scrollToEndRow(fieldOrColumn, options) {
         const $xeTable = this;
         const internalData = $xeTable;
         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) {
+    scrollToColumn(fieldOrColumn, options) {
         const $xeTable = this;
-        return handleScrollToRowColumn($xeTable, fieldOrColumn);
+        return handleScrollToRowColumn($xeTable, null, fieldOrColumn, options);
     },
     /**
      * 如果有滚动条，则滚动到第一列
      */
-    scrollToStartColumn() {
+    scrollToStartColumn(options) {
         const $xeTable = this;
         const internalData = $xeTable;
         const { visibleColumn } = internalData;
-        return $xeTable.scrollToColumn(visibleColumn[0]);
+        return $xeTable.scrollToColumn(visibleColumn[0], options);
     },
     /**
      * 如果有滚动条，则滚动到最后一列
      */
-    scrollToEndColumn() {
+    scrollToEndColumn(options) {
         const $xeTable = this;
         const internalData = $xeTable;
         const { visibleColumn } = internalData;
-        return $xeTable.scrollToColumn(visibleColumn[visibleColumn.length - 1]);
+        return $xeTable.scrollToColumn(visibleColumn[visibleColumn.length - 1], options);
     },
     /**
      * 对于树形结构中，可以直接滚动到指定深层节点中
@@ -11952,9 +12079,11 @@ const tableMethods = {
     updateStatus(slotParams, cellValue) {
         const $xeTable = this;
         const props = $xeTable;
+        const internalData = $xeTable;
         return this.$nextTick().then(() => {
             const { editRules } = props;
-            if (slotParams && editRules) {
+            const { isActivated } = internalData;
+            if (isActivated && slotParams && editRules) {
                 return $xeTable.handleCellRuleUpdateStatus('change', slotParams, cellValue);
             }
         });

package/es/table/src/props.js

@@ -199,6 +199,8 @@ export const tableProps = {
     rowConfig: Object,
     // 数据聚合配置项
     aggregateConfig: Object,
+    // 聚合函数计算精度配置项
+    aggregateAccuracyConfig: Object,
     /**
      * 已废弃，被 aggregateConfig 替换
      * @deprecated
@@ -264,6 +266,8 @@ export const tableProps = {
     fnrConfig: Object,
     // 编辑配置项
     editConfig: [Boolean, Object],
+    // 数据状态监听配置项
+    editDirtyConfig: Object,
     // 校验配置项
     validConfig: Object,
     // 校验规则配置项