vxe-table 3.14.3 → 3.14.5

package/packages/table/src/table.ts

@@ -625,6 +625,7 @@ export default {
         original: false,
         message: true,
         isHeader: false,
+        isTitle: false,
         isFooter: false
       },
 
@@ -1415,8 +1416,9 @@ export default {
       swYTotal: 0
     })
 
-    const { data, exportConfig, importConfig, treeConfig, showOverflow } = props
+    const { data, exportConfig, importConfig, treeConfig, showOverflow, highlightCurrentRow, highlightCurrentColumn } = props
     const { scrollXStore, scrollYStore } = internalData
+    const columnOpts = $xeTable.computeColumnOpts
     const editOpts = $xeTable.computeEditOpts
     const treeOpts = $xeTable.computeTreeOpts
     const radioOpts = $xeTable.computeRadioOpts
@@ -1427,6 +1429,11 @@ export default {
     const mouseOpts = $xeTable.computeMouseOpts
     const exportOpts = $xeTable.computeExportOpts
     const importOpts = $xeTable.computeImportOpts
+    const currentRowOpts = $xeTable.computeCurrentRowOpts
+    const currentColumnOpts = $xeTable.computeCurrentColumnOpts
+    const virtualXOpts = $xeTable.computeVirtualXOpts
+    const virtualYOpts = $xeTable.computeVirtualYOpts
+    const keyboardOpts = $xeTable.computeKeyboardOpts
 
     if (props.rowId) {
       warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
@@ -1470,6 +1477,12 @@ export default {
     if (this.highlightHoverColumn) {
       warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
     }
+    // if (props.scrollY) {
+    //   warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
+    // }
+    // if (props.scrollX) {
+    //   warnLog('vxe.error.delProp', ['scroll-x', 'virtual-x-config'])
+    // }
     // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
     if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
       warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')])
@@ -1539,29 +1552,51 @@ export default {
         warnLog('vxe.error.errProp', [`table.context-menu=${this.contextMenu}`, 'table.context-menu={}'])
       }
     }
-    if (this.menuConfig && !XEUtils.isObject(this.menuConfig)) {
-      warnLog('vxe.error.errProp', [`table.menu-config=${this.menuConfig}`, 'table.menu-config={}'])
+    if (props.menuConfig && !XEUtils.isObject(props.menuConfig)) {
+      warnLog('vxe.error.errProp', [`table.menu-config=${props.menuConfig}`, 'table.menu-config={}'])
+    }
+    if (props.exportConfig && !XEUtils.isObject(props.exportConfig)) {
+      warnLog('vxe.error.errProp', [`table.export-config=${props.exportConfig}`, 'table.export-config={}'])
+    }
+    if (props.importConfig && !XEUtils.isObject(props.importConfig)) {
+      warnLog('vxe.error.errProp', [`table.import-config=${props.importConfig}`, 'table.import-config={}'])
+    }
+    if (props.printConfig && !XEUtils.isObject(props.printConfig)) {
+      warnLog('vxe.error.errProp', [`table.print-config=${props.printConfig}`, 'table.print-config={}'])
+    }
+    if (props.treeConfig && !XEUtils.isObject(props.treeConfig)) {
+      warnLog('vxe.error.errProp', [`table.tree-config=${props.treeConfig}`, 'table.tree-config={}'])
     }
-    if (this.exportConfig && !XEUtils.isObject(this.exportConfig)) {
-      warnLog('vxe.error.errProp', [`table.export-config=${this.exportConfig}`, 'table.export-config={}'])
+    if (props.customConfig && !XEUtils.isObject(props.customConfig)) {
+      warnLog('vxe.error.errProp', [`table.custom-config=${props.customConfig}`, 'table.custom-config={}'])
     }
-    if (this.importConfig && !XEUtils.isObject(this.importConfig)) {
-      warnLog('vxe.error.errProp', [`table.import-config=${this.importConfig}`, 'table.import-config={}'])
+    if (props.editConfig && !XEUtils.isObject(props.editConfig)) {
+      warnLog('vxe.error.errProp', [`table.edit-config=${props.editConfig}`, 'table.edit-config={}'])
     }
-    if (this.printConfig && !XEUtils.isObject(this.printConfig)) {
-      warnLog('vxe.error.errProp', [`table.print-config=${this.printConfig}`, 'table.print-config={}'])
+    if (props.emptyRender && !XEUtils.isObject(props.emptyRender)) {
+      warnLog('vxe.error.errProp', [`table.empty-render=${props.emptyRender}`, 'table.empty-render={}'])
     }
-    if (this.treeConfig && !XEUtils.isObject(this.treeConfig)) {
-      warnLog('vxe.error.errProp', [`table.tree-config=${this.treeConfig}`, 'table.tree-config={}'])
+
+    if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
+      warnLog('vxe.error.notConflictProp', ['row-config.isCurrent', 'current-row-config.isFollowSelected'])
     }
-    if (this.customConfig && !XEUtils.isObject(this.customConfig)) {
-      warnLog('vxe.error.errProp', [`table.custom-config=${this.customConfig}`, 'table.custom-config={}'])
+    if ((columnOpts.isCurrent || highlightCurrentColumn) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
+      warnLog('vxe.error.notConflictProp', ['column-config.isCurrent', 'current-column-config.isFollowSelected'])
     }
-    if (this.editConfig && !XEUtils.isObject(this.editConfig)) {
-      warnLog('vxe.error.errProp', [`table.edit-config=${this.editConfig}`, 'table.edit-config={}'])
+
+    // 如果不支持虚拟滚动
+    if (props.spanMethod) {
+      if (virtualXOpts.enabled) {
+        warnLog('vxe.error.notConflictProp', ['span-method', 'virtual-x-config.enabled=false'])
+      }
+      if (virtualYOpts.enabled) {
+        warnLog('vxe.error.notConflictProp', ['span-method', 'virtual-y-config.enabled=false'])
+      }
     }
-    if (this.emptyRender && !XEUtils.isObject(this.emptyRender)) {
-      warnLog('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}'])
+    if (props.footerSpanMethod) {
+      if (virtualXOpts.enabled) {
+        warnLog('vxe.error.notConflictProp', ['footer-span-method', 'virtual-x-config.enabled=false'])
+      }
     }
 
     // 检查是否有安装需要的模块