vxe-table 3.20.13 → 3.21.0-beta.0

package/es/table/src/props.js

@@ -294,8 +294,8 @@ export const tableProps = {
     virtualYConfig: Object,
     // 滚动条配置项
     scrollbarConfig: Object,
-    // 可撤销配置项
-    undoHistoryConfig: Object,
+    // 撤销/恢复历史配置项
+    undoRedoHistoryConfig: Object,
     // （即将废弃）优化相关
     animat: { type: Boolean, default: () => getConfig().table.animat },
     // （可能会被废弃的参数，不要使用）

package/es/table/src/table.js

@@ -1343,10 +1343,10 @@ export default {
             }
             return [];
         },
-        computeUndoHistoryOpts() {
+        computeUndoRedoHistoryOpts() {
             const $xeTable = this;
             const props = $xeTable;
-            return Object.assign({}, getConfig().table.undoHistoryConfig, props.undoHistoryConfig);
+            return Object.assign({}, getConfig().table.undoRedoHistoryConfig, props.undoRedoHistoryConfig);
         },
         tabsResizeFlag() {
             const $xeTable = this;
@@ -1531,7 +1531,7 @@ export default {
         const internalData = $xeTable;
         XEUtils.assign(internalData, createInternalData());
         handleKeyField($xeTable);
-        const { exportConfig, importConfig, treeConfig, minHeight } = props;
+        const { editConfig, exportConfig, importConfig, treeConfig, minHeight, keepSource } = props;
         const { scrollXStore, scrollYStore } = internalData;
         const columnOpts = $xeTable.computeColumnOpts;
         const columnDragOpts = $xeTable.computeColumnDragOpts;
@@ -1566,8 +1566,15 @@ export default {
         if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
             warnLog('vxe.error.reqProp', ['row-config.keyField']);
         }
-        if (props.editConfig && editOpts.showStatus && !props.keepSource) {
-            warnLog('vxe.error.reqProp', ['keep-source']);
+        if (editConfig) {
+            if (!keepSource) {
+                if (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) {
+                    warnLog('vxe.error.reqSupportProp', ['edit-config.showStatus | showUpdateStatus | showInsertStatus', 'keep-source']);
+                }
+                // if (keyboardOpts.isUndoRedo) {
+                //   warnLog('vxe.error.reqSupportProp', ['keyboard-config.isUndoRedo', 'keep-source'])
+                // }
+            }
         }
         // if (treeConfig && (treeOpts.showLine || treeOpts.line) && !showOverflow) {
         //   warnLog('vxe.error.reqProp', ['show-overflow'])
@@ -1640,7 +1647,7 @@ export default {
         if (rowOpts.height && !this.showOverflow) {
             warnLog('vxe.error.notProp', ['table.show-overflow']);
         }
-        if (!$xeTable.triggerClAreaModnEvent) {
+        if (!$xeTable.triggerCelllAreaMnEvent) {
             if (props.areaConfig) {
                 warnLog('vxe.error.notProp', ['area-config']);
             }

package/es/table/src/util.js

@@ -130,6 +130,10 @@ export function createInternalData() {
         tBodyHeight: 0,
         // 表尾高度
         tFooterHeight: 0,
+        stackHistoryStore: {
+            undoStacks: [],
+            redoStacks: []
+        },
         teleportToWrapperElem: null,
         popupToWrapperElem: null,
         customPopupToElem: null,
@@ -282,7 +286,7 @@ export function createReactData() {
         tooltipStore: {
             row: null,
             column: null,
-            content: null,
+            content: '',
             visible: false,
             type: null,
             currOpts: {}
@@ -769,10 +773,15 @@ export function getLastChildColumn(column) {
     return column;
 }
 export function getCellValue(row, column) {
-    return XEUtils.get(row, column.field);
+    if (column) {
+        return XEUtils.get(row, column.field);
+    }
+    return null;
 }
 export function setCellValue(row, column, value) {
-    return XEUtils.set(row, column.field, value);
+    if (column) {
+        XEUtils.set(row, column.field, value);
+    }
 }
 export function getRefElem(refEl) {
     if (refEl) {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.20.13";
+export const version = "3.21.0-beta.0";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -264,8 +264,8 @@ VxeUI.setConfig({
                 visible: true
             }
         },
-        undoHistoryConfig: {
-            isEditRow: true
+        undoRedoHistoryConfig: {
+            stackSize: 20
         }
     },
     grid: {

package/es/ui/src/dom.js

@@ -164,6 +164,10 @@ export function getAbsolutePos(elem) {
     const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode();
     return { boundingTop, top: scrollTop + boundingTop, boundingLeft, left: scrollLeft + boundingLeft, visibleHeight, visibleWidth };
 }
+export function hasEventInputTarget(target) {
+    const tagName = target ? target.tagName : '';
+    return tagName && ['input', 'textarea'].includes((tagName.toLowerCase()));
+}
 const scrollIntoViewIfNeeded = 'scrollIntoViewIfNeeded';
 const scrollIntoView = 'scrollIntoView';
 export function scrollToView(elem) {

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.20.13"}`;
+const version = `table v${"3.21.0-beta.0"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);