vxe-table 3.20.13 → 3.21.0-beta.0

package/es/table/src/methods.js

@@ -1,5 +1,5 @@
 import XEUtils from 'xe-utils';
-import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, wheelScrollLeftTo, wheelScrollTopTo, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey, checkTargetElement } from '../../ui/src/dom';
+import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, wheelScrollLeftTo, wheelScrollTopTo, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey, checkTargetElement, hasEventInputTarget } from '../../ui/src/dom';
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import Cell from './cell';
@@ -8,7 +8,7 @@ import { getSlotVNs } from '../../ui/src/vn';
 import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from '../../ui/src/anime';
 import { warnLog, errLog } from '../../ui/src/log';
 import { getCrossTableDragRowInfo } from './store';
-const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeUI;
+const { getConfig, getI18n, renderer, formats, interceptor, createEvent, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI;
 const browseObj = XEUtils.browse();
 const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
@@ -365,7 +365,7 @@ function cacheColumnMap($xeTable) {
             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']);
+            errLog('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=inside']);
         }
         if (props.spanMethod) {
             warnLog('vxe.error.notSupportProp', ['column.type=expand', 'span-method', 'span-method=null']);
@@ -3365,6 +3365,7 @@ function loadTableData($xeTable, datas, isReload, isReset) {
     }
     $xeTable.clearMergeCells();
     $xeTable.clearMergeFooterItems();
+    $xeTable.handleClearStack();
     $xeTable.handleTableData(true);
     $xeTable.updateFooter();
     $xeTable.handleUpdateBodyMerge();
@@ -4293,6 +4294,102 @@ function reUpdateCustomStyleEvent($xeTable, evnt) {
         }
     }
 }
+function truncateStackHistory($xeTable) {
+    const internalData = $xeTable;
+    const { stackHistoryStore } = internalData;
+    const { undoStacks } = stackHistoryStore;
+    const undoRedoHistoryOpts = $xeTable.computeUndoRedoHistoryOpts;
+    const { stackSize } = undoRedoHistoryOpts;
+    if (undoStacks.length > XEUtils.toNumber(stackSize)) {
+        undoStacks.shift();
+    }
+}
+/**
+ * 生成快照数据
+ */
+function getSnapshotStackData($xeTable) {
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const { editStore } = reactData;
+    const { afterFullData } = internalData;
+    const { selected, actived } = editStore;
+    const { row: selectRow, column: selectColumn } = selected;
+    const { row: editRow, column: editColumn } = actived;
+    const stackObj = {
+        selectActiveInfo: selectRow && selectColumn
+            ? {
+                rowid: getRowid($xeTable, selectRow),
+                colid: selectColumn.id
+            }
+            : undefined,
+        editActiveInfo: editRow && editColumn
+            ? {
+                rowid: getRowid($xeTable, editRow),
+                colid: editColumn.id
+            }
+            : undefined,
+        visibleData: XEUtils.clone(afterFullData, true),
+        visibleColumn: []
+    };
+    return $xeTable.getCellAreaPushStackObj ? $xeTable.getCellAreaPushStackObj(stackObj) : stackObj;
+}
+/**
+ * 刷新栈视图
+ */
+function handleUpdateSnapshotStackData($xeTable, stackObj) {
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const { editStore } = reactData;
+    const { fullAllDataRowIdData, fullColumnIdData } = internalData;
+    if (!stackObj) {
+        return;
+    }
+    const { visibleData, editActiveInfo, selectActiveInfo } = stackObj;
+    const afterFullList = visibleData.map(item => {
+        const rowid = getRowid($xeTable, item);
+        const rest = fullAllDataRowIdData[rowid];
+        let row = item;
+        if (rest) {
+            row = rest.row;
+            Object.assign(row, item);
+        }
+        return row;
+    });
+    internalData.afterFullData = afterFullList;
+    if ($xeTable.handleCellAreaSnapshotStackData) {
+        $xeTable.handleCellAreaSnapshotStackData(stackObj);
+    }
+    else {
+        const { selected } = editStore;
+        const mouseOpts = $xeTable.computeMouseOpts;
+        let selectRowid = '';
+        let selectColid = '';
+        if (editActiveInfo) {
+            selectRowid = editActiveInfo.rowid;
+            selectColid = editActiveInfo.colid;
+        }
+        else if (selectActiveInfo) {
+            selectRowid = selectActiveInfo.rowid;
+            selectColid = selectActiveInfo.colid;
+        }
+        if (selectRowid && selectColid && mouseOpts.selected) {
+            const editRow = fullAllDataRowIdData[selectRowid] ? fullAllDataRowIdData[selectRowid].row : null;
+            const editColumn = fullColumnIdData[selectColid] ? fullColumnIdData[selectColid].column : null;
+            if (editRow && editColumn) {
+                const params = {
+                    row: editRow,
+                    column: editColumn
+                };
+                selected.row = editRow;
+                selected.column = editColumn;
+                selected.args = params;
+                $xeTable.$nextTick(() => {
+                    $xeTable.addCellSelectedClass();
+                });
+            }
+        }
+    }
+}
 const tableMethods = {
     callSlot(slotFunc, params, h, vNodes) {
         const $xeTable = this;
@@ -7023,18 +7120,20 @@ const tableMethods = {
                 const { isLastEnterAppendRow, beforeEnterMethod, enterMethod, isLastTabAppendRow, beforeTabMethod, tabMethod } = keyboardOpts;
                 const { selected, actived } = editStore;
                 const { keyCode } = evnt;
-                const hasBackspaceKey = keyCode === 8;
-                const isTab = keyCode === 9;
-                const isEnter = keyCode === 13;
-                const isEsc = keyCode === 27;
-                const isSpacebar = keyCode === 32;
-                const isLeftArrow = keyCode === 37;
-                const isUpArrow = keyCode === 38;
-                const isRightArrow = keyCode === 39;
-                const isDwArrow = keyCode === 40;
-                const hasDeleteKey = keyCode === 46;
-                const isF2 = keyCode === 113;
-                const isContextMenu = keyCode === 93;
+                const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE);
+                const hasBackspaceKey = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.BACKSPACE);
+                const isTab = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.TAB);
+                const isEnter = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ENTER);
+                const isSpacebar = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR);
+                const isLeftArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_LEFT);
+                const isUpArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP);
+                const isRightArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_RIGHT);
+                const isDwArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN);
+                const hasDeleteKey = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.DELETE);
+                const isY = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.Y);
+                const isZ = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.Z);
+                const isF2 = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.F2);
+                const isContextMenu = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.CONTEXT_MENU);
                 const isControlKey = hasControlKey(evnt);
                 const hasShiftKey = evnt.shiftKey;
                 const hasAltKey = evnt.altKey;
@@ -7043,6 +7142,7 @@ const tableMethods = {
                 const isEditStatus = isEnableConf(editConfig) && actived.column && actived.row;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
+                const selectColumn = selected.column;
                 if (operCtxMenu) {
                     // 如果配置了右键菜单; 支持方向键操作、回车
                     evnt.preventDefault();
@@ -7074,10 +7174,10 @@ const tableMethods = {
                         }
                     }
                 }
-                else if (keyboardConfig && isSpacebar && keyboardOpts.isChecked && selected.row && selected.column && (selected.column.type === 'checkbox' || selected.column.type === 'radio')) {
+                else if (keyboardConfig && isSpacebar && keyboardOpts.isChecked && selected.row && selectColumn && (selectColumn.type === 'checkbox' || selectColumn.type === 'radio')) {
                     // 空格键支持选中复选框
                     evnt.preventDefault();
-                    if (selected.column.type === 'checkbox') {
+                    if (selectColumn.type === 'checkbox') {
                         $xeTable.handleToggleCheckRowEvent(evnt, selected.args);
                     }
                     else {
@@ -7087,8 +7187,7 @@ const tableMethods = {
                 else if (isF2 && isEnableConf(editConfig)) {
                     if (!isEditStatus) {
                         // 如果按下了 F2 键
-                        if (selected.row && selected.column) {
-                            evnt.stopPropagation();
+                        if (selected.row && selectColumn) {
                             evnt.preventDefault();
                             $xeTable.handleEdit(selected.args, evnt);
                         }
@@ -7096,7 +7195,7 @@ const tableMethods = {
                 }
                 else if (isContextMenu) {
                     // 如果按下上下文键
-                    internalData._keyCtx = selected.row && selected.column && bodyMenu.length;
+                    internalData._keyCtx = selected.row && selectColumn && bodyMenu.length;
                     clearTimeout(internalData.keyCtxTimeout);
                     internalData.keyCtxTimeout = setTimeout(() => {
                         internalData._keyCtx = false;
@@ -7119,89 +7218,91 @@ const tableMethods = {
                         // 如果是激活状态，退则出到上一行/下一行
                         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) {
-                                    $xeTable.moveTabSelected(activeParams, hasShiftKey, evnt);
+                            const activeColumn = selectColumn || actived.column;
+                            if (activeColumn) {
+                                const activeParams = selected.row ? selected.args : actived.args;
+                                if (hasShiftKey) {
+                                    if (keyboardOpts.enterToTab) {
+                                        $xeTable.moveTabSelected(activeParams, hasShiftKey, evnt);
+                                    }
+                                    else {
+                                        $xeTable.moveEnterSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
+                                    }
                                 }
                                 else {
-                                    $xeTable.moveEnterSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
-                                }
-                            }
-                            else {
-                                const _rowIndex = $xeTable.getVTRowIndex(activeRow);
-                                const _columnIndex = $xeTable.getVTColumnIndex(activeColumn);
-                                if (keyboardOpts.enterToTab) {
-                                    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);
+                                    const _rowIndex = $xeTable.getVTRowIndex(activeRow);
+                                    const _columnIndex = $xeTable.getVTColumnIndex(activeColumn);
+                                    if (keyboardOpts.enterToTab) {
+                                        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;
                                                 }
-                                                $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);
+                                            if (tabMethod) {
+                                                tabMethod(ttrParams);
+                                            }
+                                            else {
+                                                $xeTable.moveTabSelected(activeParams, hasShiftKey, evnt);
+                                            }
                                         }
                                     }
-                                }
-                                else {
-                                    const etrParams = {
-                                        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 (!beforeEnterMethod || beforeEnterMethod(etrParams) !== false) {
-                                        evnt.preventDefault();
-                                        // 最后一行按下回车键，自动追加一行
-                                        if (isLastEnterAppendRow) {
-                                            if (_rowIndex >= afterFullData.length - 1) {
-                                                $xeTable.insertAt({}, -1).then(({ row: newRow }) => {
-                                                    $xeTable.scrollToRow(newRow, selected.column);
-                                                    $xeTable.handleSelected(Object.assign(Object.assign({}, activeParams), { row: newRow }), evnt);
-                                                });
-                                                $xeTable.dispatchEvent('enter-append-row', etrParams, evnt);
-                                                return;
+                                    else {
+                                        const etrParams = {
+                                            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 (!beforeEnterMethod || beforeEnterMethod(etrParams) !== false) {
+                                            evnt.preventDefault();
+                                            // 最后一行按下回车键，自动追加一行
+                                            if (isLastEnterAppendRow) {
+                                                if (_rowIndex >= afterFullData.length - 1) {
+                                                    $xeTable.insertAt({}, -1).then(({ row: newRow }) => {
+                                                        $xeTable.scrollToRow(newRow, selectColumn);
+                                                        $xeTable.handleSelected(Object.assign(Object.assign({}, activeParams), { row: newRow }), evnt);
+                                                    });
+                                                    $xeTable.dispatchEvent('enter-append-row', etrParams, evnt);
+                                                    return;
+                                                }
                                             }
-                                        }
-                                        if (enterMethod) {
-                                            enterMethod(etrParams);
-                                        }
-                                        else {
-                                            if (actived.row) {
-                                                $xeTable.handleClearEdit(evnt);
+                                            if (enterMethod) {
+                                                enterMethod(etrParams);
+                                            }
+                                            else {
+                                                if (actived.row) {
+                                                    $xeTable.handleClearEdit(evnt);
+                                                }
+                                                $xeTable.moveEnterSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
                                             }
-                                            $xeTable.moveEnterSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
                                         }
                                     }
                                 }
@@ -7229,7 +7330,7 @@ const tableMethods = {
                 else if (operArrow && keyboardConfig && keyboardOpts.isArrow) {
                     if (!isEditStatus) {
                         // 如果按下了方向键
-                        if (mouseOpts.selected && selected.row && selected.column) {
+                        if (mouseOpts.selected && selected.row && selectColumn) {
                             $xeTable.moveArrowSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
                         }
                         else {
@@ -7248,59 +7349,61 @@ const tableMethods = {
                     // 如果按下了 Tab 键切换
                     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) {
+                        const activeColumn = selectColumn || actived.column;
+                        if (activeColumn) {
+                            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.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);
                                 }
-                                $xeTable.moveTabSelected(activeParams, hasShiftKey, evnt);
                             }
                         }
                     }
                 }
-                else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && isEnableConf(editConfig) && (selected.row || selected.column)) {
+                else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && isEnableConf(editConfig) && (selected.row || selectColumn)) {
                     // 如果是删除键
                     if (!isEditStatus) {
                         const { delMethod } = keyboardOpts;
                         const params = {
                             row: selected.row,
                             rowIndex: $xeTable.getRowIndex(selected.row),
-                            column: selected.column,
-                            columnIndex: $xeTable.getColumnIndex(selected.column),
+                            column: selectColumn,
+                            columnIndex: $xeTable.getColumnIndex(selectColumn),
                             $table: $xeTable,
                             $grid: $xeGrid,
                             $gantt: $xeGantt
@@ -7311,7 +7414,11 @@ const tableMethods = {
                                 delMethod(params);
                             }
                             else {
-                                setCellValue(selected.row, selected.column, null);
+                                const selectCellValue = getCellValue(selected.row, selectColumn);
+                                if (selectCellValue !== null) {
+                                    $xeTable.handlePushStack();
+                                    setCellValue(selected.row, selectColumn, null);
+                                }
                             }
                             // 如果按下 del 键，更新表尾数据
                             $xeTable.updateFooter();
@@ -7319,16 +7426,16 @@ const tableMethods = {
                         }
                     }
                 }
-                else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selected.column)) {
+                else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selectColumn)) {
                     if (!isEditStatus) {
-                        const { editMode, backMethod } = keyboardOpts;
+                        const { backMethod } = keyboardOpts;
                         // 如果是删除键
-                        if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
+                        if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selectColumn)) {
                             const params = {
                                 row: selected.row,
                                 rowIndex: $xeTable.getRowIndex(selected.row),
-                                column: selected.column,
-                                columnIndex: $xeTable.getColumnIndex(selected.column),
+                                column: selectColumn,
+                                columnIndex: $xeTable.getColumnIndex(selectColumn),
                                 $table: $xeTable,
                                 $grid: $xeGrid,
                                 $gantt: $xeGantt
@@ -7339,11 +7446,9 @@ const tableMethods = {
                                     backMethod(params);
                                 }
                                 else {
-                                    // 追加方式与覆盖式
-                                    if (editMode !== 'insert') {
-                                        setCellValue(selected.row, selected.column, null);
-                                    }
-                                    $xeTable.handleEdit(selected.args, evnt);
+                                    $xeTable.handleEdit(params, evnt, {
+                                        isClear: true
+                                    });
                                 }
                                 $xeTable.dispatchEvent('cell-backspace-value', params, evnt);
                             }
@@ -7368,20 +7473,32 @@ const tableMethods = {
                             .then(() => $xeTable.triggerCurrentRowEvent(evnt, params));
                     }
                 }
+                else if (keyboardConfig && keyboardOpts.isUndoRedo && isControlKey && (isZ || isY) && !hasEventInputTarget(evnt.target)) {
+                    if (isY || (hasShiftKey && isZ)) {
+                        // 恢复被撤销的操作：Ctrl + Y 或 Ctrl + Shift + Z
+                        evnt.preventDefault();
+                        $xeTable.handleRedoStackEvent(evnt);
+                    }
+                    else if (isZ) {
+                        // ‌撤销上一步操作‌：Ctrl + Z
+                        evnt.preventDefault();
+                        $xeTable.handleUndoStackEvent(evnt);
+                    }
+                }
                 else if (keyboardConfig && keyboardOpts.isEdit && !isControlKey && (isSpacebar || (keyCode >= 48 && keyCode <= 57) || (keyCode >= 65 && keyCode <= 90) || (keyCode >= 96 && keyCode <= 111) || (keyCode >= 186 && keyCode <= 192) || (keyCode >= 219 && keyCode <= 222))) {
-                    const { editMethod } = keyboardOpts;
+                    const { editMode, editMethod } = keyboardOpts;
                     // 启用编辑后，空格键功能将失效
                     // if (isSpacebar) {
                     //   evnt.preventDefault()
                     // }
                     // 如果是按下非功能键之外允许直接编辑
-                    if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
+                    if (selectColumn && selected.row && isEnableConf(selectColumn.editRender)) {
                         const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
                         const params = {
                             row: selected.row,
                             rowIndex: $xeTable.getRowIndex(selected.row),
-                            column: selected.column,
-                            columnIndex: $xeTable.getColumnIndex(selected.column),
+                            column: selectColumn,
+                            columnIndex: $xeTable.getColumnIndex(selectColumn),
                             $table: $xeTable,
                             $grid: $xeGrid,
                             $gantt: $xeGantt
@@ -7391,8 +7508,14 @@ const tableMethods = {
                                 editMethod(params);
                             }
                             else {
-                                setCellValue(selected.row, selected.column, null);
-                                $xeTable.handleEdit(selected.args, evnt);
+                                let isClearValue = false;
+                                // 追加方式与覆盖式
+                                if (editMode !== 'insert') {
+                                    isClearValue = true;
+                                }
+                                $xeTable.handleEdit(params, evnt, {
+                                    isClear: isClearValue
+                                });
                             }
                         }
                     }
@@ -9236,6 +9359,7 @@ const tableMethods = {
                     afterFullData.splice(nafIndex, 0, dragRow);
                     tableFullData.splice(ntfIndex, 0, dragRow);
                 }
+                $xeTable.handleClearStack();
                 $xeTable.handleTableData(treeConfig && transform);
                 $xeTable.cacheRowMap(false);
                 updateScrollYStatus($xeTable);
@@ -9929,6 +10053,7 @@ const tableMethods = {
                         column.renderSortNumber = sortIndex;
                     }
                 });
+                $xeTable.handleClearStack();
                 if (mouseConfig) {
                     if ($xeTable.clearSelected) {
                         $xeTable.clearSelected();
@@ -12434,12 +12559,71 @@ const tableMethods = {
         const internalData = $xeTable;
         return loadTableData($xeTable, internalData.tableSynchData, false, true);
     },
+    handlePushStack() {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const keyboardOpts = $xeTable.computeKeyboardOpts;
+        if (!keyboardOpts.isUndoRedo) {
+            return;
+        }
+        const { stackHistoryStore } = internalData;
+        const stackObj = getSnapshotStackData($xeTable);
+        stackHistoryStore.undoStacks.push(stackObj);
+        stackHistoryStore.redoStacks = [];
+        truncateStackHistory($xeTable);
+    },
+    handleUndoStackEvent(evnt) {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const { stackHistoryStore } = internalData;
+        const { undoStacks, redoStacks } = stackHistoryStore;
+        if (undoStacks.length) {
+            const stackObj = getSnapshotStackData($xeTable);
+            redoStacks.push(stackObj);
+            handleUpdateSnapshotStackData($xeTable, undoStacks.pop());
+            if (evnt) {
+                $xeTable.dispatchEvent('undo', {}, evnt);
+            }
+            return $xeTable.$nextTick(() => {
+                return { status: true };
+            });
+        }
+        return Promise.resolve({ status: false });
+    },
+    handleRedoStackEvent(evnt) {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const { stackHistoryStore } = internalData;
+        const { undoStacks, redoStacks } = stackHistoryStore;
+        if (redoStacks.length) {
+            const stackObj = getSnapshotStackData($xeTable);
+            undoStacks.push(stackObj);
+            handleUpdateSnapshotStackData($xeTable, redoStacks.pop());
+            if (evnt) {
+                $xeTable.dispatchEvent('redo', {}, evnt);
+            }
+            return $xeTable.$nextTick(() => {
+                return { status: true };
+            });
+        }
+        return Promise.resolve({ status: false });
+    },
+    handleClearStack() {
+        const $xeTable = this;
+        const internalData = $xeTable;
+        const { stackHistoryStore } = internalData;
+        stackHistoryStore.undoStacks = [];
+        stackHistoryStore.redoStacks = [];
+    },
     updateZindex() {
-        if (this.zIndex) {
-            this.tZindex = this.zIndex;
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        if (props.zIndex) {
+            internalData.tZindex = props.zIndex;
         }
-        else if (this.tZindex < getLastZIndex()) {
-            this.tZindex = nextZIndex();
+        else if (internalData.tZindex < getLastZIndex()) {
+            internalData.tZindex = nextZIndex();
         }
     },
     updateCellAreas() {
@@ -12452,6 +12636,14 @@ const tableMethods = {
         }
         return $xeTable.$nextTick();
     },
+    undo() {
+        const $xeTable = this;
+        return $xeTable.handleUndoStackEvent(null);
+    },
+    redo() {
+        const $xeTable = this;
+        return $xeTable.handleRedoStackEvent(null);
+    },
     dispatchEvent(type, params, evnt) {
         const $xeTable = this;
         const $xeGrid = $xeTable.$xeGrid;
@@ -12464,19 +12656,24 @@ const tableMethods = {
         $xeTable.dispatchEvent(type, params, evnt);
     },
     focus() {
-        this.isActivated = true;
-        return this.$nextTick();
+        const $xeTable = this;
+        const internalData = $xeTable;
+        internalData.isActivated = true;
+        return $xeTable.$nextTick();
     },
     blur() {
-        this.isActivated = false;
-        return this.$nextTick();
+        const $xeTable = this;
+        const internalData = $xeTable;
+        internalData.isActivated = false;
+        return $xeTable.$nextTick();
     },
     /**
      * 已废弃，被 connectToolbar 替换
      * @deprecated
      */
     connect($toolbar) {
-        return this.connectToolbar($toolbar);
+        const $xeTable = this;
+        return $xeTable.connectToolbar($toolbar);
     },
     /**
      * 连接工具栏
@@ -12484,14 +12681,15 @@ const tableMethods = {
      */
     connectToolbar($toolbar) {
         const $xeTable = this;
+        const internalData = $xeTable;
         if ($toolbar && $toolbar.syncUpdate) {
-            $toolbar.syncUpdate({ collectColumn: this.collectColumn, $table: $xeTable });
+            $toolbar.syncUpdate({ collectColumn: internalData.collectColumn, $table: $xeTable });
             this.$toolbar = $toolbar;
         }
         else {
             errLog('vxe.error.barUnableLink');
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     handleConnectGanttView($ganttView) {
         const $xeTable = this;
@@ -12510,17 +12708,19 @@ const tableMethods = {
      * @deprecated
      */
     getCell(row, column) {
-        return this.getCellElement(row, column);
+        const $xeTable = this;
+        return $xeTable.getCellElement(row, column);
     },
     findRowIndexOf(list, row) {
         return row ? XEUtils.findIndexOf(list, item => this.eqRow(item, row)) : -1;
     },
     eqRow(row1, row2) {
+        const $xeTable = this;
         if (row1 && row2) {
             if (row1 === row2) {
                 return true;
             }
-            return getRowid(this, row1) === getRowid(this, row2);
+            return getRowid($xeTable, row1) === getRowid($xeTable, row2);
         }
         return false;
     },