vxe-table 3.20.13 → 3.21.0-beta.0

package/packages/table/src/props.ts

@@ -182,7 +182,7 @@ export const tableProps = {
    * @deprecated
    */
   rowId: { type: String, default: () => getConfig().table.rowId },
-  zIndex: Number,
+  zIndex: Number as PropType<VxeTablePropTypes.ZIndex>,
   emptyText: { type: String, default: () => getConfig().table.emptyText },
   keepSource: { type: Boolean, default: () => getConfig().table.keepSource },
   // 是否自动监听父容器变化去更新响应式表格宽高
@@ -300,8 +300,8 @@ export const tableProps = {
   virtualYConfig: Object as PropType<VxeTablePropTypes.VirtualYConfig>,
   // 滚动条配置项
   scrollbarConfig: Object as PropType<VxeTablePropTypes.ScrollbarConfig>,
-  // 可撤销配置项
-  undoHistoryConfig: Object as PropType<VxeTablePropTypes.UndoHistoryConfig>,
+  // 撤销/恢复历史配置项
+  undoRedoHistoryConfig: Object as PropType<VxeTablePropTypes.UndoRedoHistoryConfig>,
   // （即将废弃）优化相关
   animat: { type: Boolean, default: () => getConfig().table.animat },
   // （可能会被废弃的参数，不要使用）

package/packages/table/src/table.ts

@@ -1451,11 +1451,11 @@ export default {
       }
       return []
     },
-    computeUndoHistoryOpts () {
+    computeUndoRedoHistoryOpts () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const props = $xeTable
 
-      return Object.assign({}, getConfig().table.undoHistoryConfig, props.undoHistoryConfig)
+      return Object.assign({}, getConfig().table.undoRedoHistoryConfig, props.undoRedoHistoryConfig)
     },
     tabsResizeFlag () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
@@ -1662,7 +1662,7 @@ export default {
 
     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
@@ -1698,8 +1698,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'])
@@ -1773,7 +1780,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/packages/table/src/util.ts

@@ -143,6 +143,11 @@ export function createInternalData (): TableInternalData {
     // 表尾高度
     tFooterHeight: 0,
 
+    stackHistoryStore: {
+      undoStacks: [],
+      redoStacks: []
+    },
+
     teleportToWrapperElem: null,
     popupToWrapperElem: null,
     customPopupToElem: null,
@@ -299,7 +304,7 @@ export function createReactData (): TableReactData {
     tooltipStore: {
       row: null,
       column: null,
-      content: null,
+      content: '',
       visible: false,
       type: null,
       currOpts: {}
@@ -833,12 +838,17 @@ export function getLastChildColumn (column: VxeTableDefines.ColumnInfo): VxeTabl
   return column
 }
 
-export function getCellValue (row: any, column: any) {
-  return XEUtils.get(row, column.field)
+export function getCellValue (row: any, column: VxeTableDefines.ColumnInfo | null) {
+  if (column) {
+    return XEUtils.get(row, column.field)
+  }
+  return null
 }
 
-export function setCellValue (row: any, column:any, value: any) {
-  return XEUtils.set(row, column.field, value)
+export function setCellValue (row: any, column: VxeTableDefines.ColumnInfo | null, value: any) {
+  if (column) {
+    XEUtils.set(row, column.field, value)
+  }
 }
 
 export function getRefElem (refEl: any) {
@@ -907,7 +917,7 @@ export function getColumnList (columns: VxeTableDefines.ColumnInfo[]) {
   return result
 }
 
-export function createColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, options: any, renderOptions: any): any {
+export function createColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, options: VxeTableDefines.ColumnOptions | VxeTableDefines.ColumnInfo, renderOptions: any): any {
   return isColumnInfo(options) ? options : new ColumnInfo($xeTable, options, renderOptions)
 }
 

package/packages/ui/index.ts

@@ -271,8 +271,8 @@ VxeUI.setConfig({
         visible: true
       }
     },
-    undoHistoryConfig: {
-      isEditRow: true
+    undoRedoHistoryConfig: {
+      stackSize: 20
     }
   },
   grid: {

package/packages/ui/src/dom.ts

@@ -190,6 +190,11 @@ export function getAbsolutePos (elem: any) {
   return { boundingTop, top: scrollTop + boundingTop, boundingLeft, left: scrollLeft + boundingLeft, visibleHeight, visibleWidth }
 }
 
+export function hasEventInputTarget (target: EventTarget | Element | null) {
+  const tagName = target ? (target as Element).tagName : ''
+  return tagName && ['input', 'textarea'].includes((tagName.toLowerCase()))
+}
+
 const scrollIntoViewIfNeeded = 'scrollIntoViewIfNeeded'
 const scrollIntoView = 'scrollIntoView'