vxe-table 4.18.13 → 4.19.0-beta.0

package/es/table/module/edit/hook.js

@@ -44,7 +44,7 @@ hooks.add('tableEditModule', {
             const editOpts = computeEditOpts.value;
             const { actived } = editStore;
             const { row, column } = actived;
-            if (row || column) {
+            if (row && column) {
                 if (editOpts.mode === 'row') {
                     tableColumn.forEach((column) => setEditColumnModel(row, column));
                 }
@@ -92,6 +92,7 @@ hooks.add('tableEditModule', {
                     fullAllDataRowIdData[rowid] = rest;
                 }
             });
+            $xeTable.handleClearStack();
         };
         // const insertGroupRow = (newRecords: any[], isAppend: boolean) => {
         // }
@@ -146,6 +147,7 @@ hooks.add('tableEditModule', {
                             mergeItem.row = mergeRowIndex + newRecords.length;
                         }
                     });
+                    $xeTable.handleClearStack();
                 }
             }
             else {
@@ -171,6 +173,7 @@ hooks.add('tableEditModule', {
                             afterFullData.push(item);
                             tableFullData.push(item);
                         });
+                        $xeTable.handleClearStack();
                     }
                 }
                 else {
@@ -224,6 +227,7 @@ hooks.add('tableEditModule', {
                                     parentChilds.splice(targetIndex, 0, ...treeRecords);
                                 }
                             }
+                            $xeTable.handleClearStack();
                         }
                         else {
                             warnLog('vxe.error.unableInsert');
@@ -276,6 +280,7 @@ hooks.add('tableEditModule', {
                                 mergeItem.rowspan = mergeRowspan + newRecords.length;
                             }
                         });
+                        $xeTable.handleClearStack();
                     }
                 }
             }
@@ -356,10 +361,10 @@ hooks.add('tableEditModule', {
                     return nextTick();
                 }
                 syncActivedCell();
+                $xeTable.updateFooter();
                 actived.args = null;
                 actived.row = null;
                 actived.column = null;
-                $xeTable.updateFooter();
                 $xeTable.dispatchEvent('edit-closed', {
                     row,
                     rowIndex: $xeTable.getRowIndex(row),
@@ -380,7 +385,7 @@ hooks.add('tableEditModule', {
             }
             return nextTick().then(() => $xeTable.updateCellAreas());
         };
-        const handleEditActive = (params, evnt, isFocus, isPos) => {
+        const handleEditActive = (params, evnt, options) => {
             const $xeGrid = $xeTable.xeGrid;
             const $xeGantt = $xeTable.xeGantt;
             const { editConfig, mouseConfig } = props;
@@ -390,6 +395,7 @@ hooks.add('tableEditModule', {
             const { actived, focused } = editStore;
             const { row, column } = params;
             const { editRender } = column;
+            const { isFocus, isPos, isClear } = options;
             const cell = (params.cell || $xeTable.getCellElement(row, column));
             const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
             params.cell = cell;
@@ -416,6 +422,10 @@ hooks.add('tableEditModule', {
                             actived.args = params;
                             actived.row = row;
                             actived.column = column;
+                            $xeTable.handlePushStack();
+                            if (isClear) {
+                                setCellValue(row, column, null);
+                            }
                             if (mode === 'row') {
                                 tableColumn.forEach((column) => getEditColumnModel(row, column));
                             }
@@ -461,7 +471,7 @@ hooks.add('tableEditModule', {
                                 $xeTable.clearCopyCellArea();
                             }
                         }
-                        if (oldColumn !== column) {
+                        if (oldColumn && oldColumn !== column) {
                             const { model: oldModel } = oldColumn;
                             if (oldModel.update) {
                                 setCellValue(row, oldColumn, oldModel.value);
@@ -486,8 +496,9 @@ hooks.add('tableEditModule', {
             }
             return nextTick();
         };
-        const handleEditCell = (row, fieldOrColumn, isPos) => {
+        const handleEditCell = (row, fieldOrColumn, options) => {
             const { editConfig } = props;
+            const { isPos } = options;
             const column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
             if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender) && !$xeTable.isAggregateRecord(row)) {
                 return Promise.resolve(isPos ? $xeTable.scrollToRow(row, column) : null).then(() => {
@@ -500,7 +511,10 @@ hooks.add('tableEditModule', {
                             columnIndex: $xeTable.getColumnIndex(column),
                             cell,
                             $table: $xeTable
-                        }, null, isPos, isPos);
+                        }, null, {
+                            isFocus: isPos,
+                            isPos
+                        });
                         internalData._lastCallTime = Date.now();
                     }
                     return nextTick();
@@ -651,6 +665,7 @@ hooks.add('tableEditModule', {
                 reactData.removeRowFlag++;
                 reactData.insertRowFlag++;
                 reactData.pendingRowFlag++;
+                $xeTable.handleClearStack();
                 $xeTable.cacheRowMap(false);
                 $xeTable.handleTableData(treeConfig && transform);
                 $xeTable.updateFooter();
@@ -848,7 +863,7 @@ hooks.add('tableEditModule', {
             /**
              * 激活行编辑
              */
-            setEditRow(row, fieldOrColumn) {
+            setEditRow(row, fieldOrColumn, options) {
                 const { visibleColumn } = internalData;
                 let column = XEUtils.find(visibleColumn, column => isEnableConf(column.editRender));
                 let isPos = false;
@@ -858,7 +873,10 @@ hooks.add('tableEditModule', {
                         column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
                     }
                 }
-                return handleEditCell(row, column, isPos);
+                return handleEditCell(row, column, Object.assign({
+                    isPos,
+                    isFocus: isPos
+                }, options));
             },
             setActiveCell(row, fieldOrColumn) {
                 warnLog('vxe.error.delFunc', ['setActiveCell', 'setEditCell']);
@@ -868,8 +886,11 @@ hooks.add('tableEditModule', {
             /**
              * 激活单元格编辑
              */
-            setEditCell(row, fieldOrColumn) {
-                return handleEditCell(row, fieldOrColumn, true);
+            setEditCell(row, fieldOrColumn, options) {
+                return handleEditCell(row, fieldOrColumn, Object.assign({
+                    isFocus: true,
+                    isPos: true
+                }, options));
             },
             /**
              * 只对 trigger=dblclick 有效，选中单元格
@@ -899,8 +920,11 @@ hooks.add('tableEditModule', {
             /**
              * 处理激活编辑
              */
-            handleEdit(params, evnt) {
-                return handleEditActive(params, evnt, true, true);
+            handleEdit(params, evnt, options) {
+                return handleEditActive(params, evnt, Object.assign({
+                    isFocus: true,
+                    isPos: true
+                }, options));
             },
             /**
              * @deprecated

package/es/table/module/keyboard/hook.js

@@ -250,8 +250,8 @@ hooks.add('tableKeyboardModule', {
             const checkboxOpts = computeCheckboxOpts.value;
             const mouseOpts = computeMouseOpts.value;
             const editOpts = computeEditOpts.value;
-            if (mouseConfig && mouseOpts.area && $xeTable.triggerClAreaModnEvent) {
-                return $xeTable.triggerClAreaModnEvent(evnt, params);
+            if (mouseConfig && mouseOpts.area && $xeTable.triggerCelllAreaMnEvent) {
+                return $xeTable.triggerCelllAreaMnEvent(evnt, params);
             }
             else {
                 if (checkboxConfig && checkboxOpts.range) {

package/es/table/src/emits.js

@@ -9,6 +9,8 @@ export const tableEmits = [
     'paste',
     'copy',
     'cut',
+    'undo',
+    'redo',
     'context-menu',
     'columns-change',
     'data-change',

package/es/table/src/props.js

@@ -301,8 +301,8 @@ export const tableProps = {
     virtualYConfig: Object,
     // 滚动条配置项
     scrollbarConfig: Object,
-    // 可撤销配置项
-    undoHistoryConfig: Object,
+    // 撤销/恢复历史配置项
+    undoRedoHistoryConfig: Object,
     // （即将废弃）优化相关
     animat: {
         type: Boolean,