vxe-table 3.14.3 → 3.14.4

package/packages/locale/lang/zh-CN.ts

@@ -18,6 +18,7 @@ export default {
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
       notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
+      notConflictProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会存在功能冲突',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
       barUnableLink: '工具栏无法关联表格',

package/packages/table/module/keyboard/mixin.ts

@@ -294,29 +294,45 @@ export default {
 
       const { highlightCurrentRow, highlightCurrentColumn } = props
       const rowOpts = $xeTable.computeRowOpts
+      const currentRowOpts = $xeTable.computeCurrentRowOpts
       const columnOpts = $xeTable.computeColumnOpts
-      handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow)
-      // 当前行按键上下移动
-      if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-        $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt)
+      const currentColumnOpts = $xeTable.computeCurrentColumnOpts
+      const params = handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow)
+      if (rowOpts.isCurrent || highlightCurrentRow) {
+        if (currentRowOpts.isFollowSelected) {
+          $xeTable.triggerCurrentRowEvent(evnt, params)
+        } else {
+          // 当前行按键上下移动
+          if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
+            $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt)
+          }
+        }
       }
-      // 当前行按键左右移动
-      if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
-        $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt)
+      if (columnOpts.isCurrent || highlightCurrentColumn) {
+        if (currentColumnOpts.isFollowSelected) {
+          $xeTable.triggerCurrentColumnEvent(evnt, params)
+        } else {
+          // 当前行按键左右移动
+          if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
+            $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt)
+          }
+        }
       }
     },
     moveEnterSelected (args: any, isLeftArrow: boolean, isUpArrow: boolean, isRightArrow: boolean, isDwArrow: boolean, evnt: any) {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const props = $xeTable
 
+      const { highlightCurrentRow, highlightCurrentColumn } = props
       const rowOpts = $xeTable.computeRowOpts
       const currentRowOpts = $xeTable.computeCurrentRowOpts
       const columnOpts = $xeTable.computeColumnOpts
       const currentColumnOpts = $xeTable.computeCurrentColumnOpts
       const params = handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow)
-      if ((rowOpts.isCurrent && currentRowOpts.isFollowSelected)) {
+      if (((rowOpts.isCurrent || highlightCurrentRow) && currentRowOpts.isFollowSelected)) {
         $xeTable.triggerCurrentRowEvent(evnt, params)
       }
-      if (columnOpts.isCurrent && currentColumnOpts.isFollowSelected) {
+      if ((columnOpts.isCurrent || highlightCurrentColumn) && currentColumnOpts.isFollowSelected) {
         $xeTable.triggerCurrentColumnEvent(evnt, params)
       }
     },

package/packages/table/src/table.ts

@@ -1415,8 +1415,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 +1428,10 @@ 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
 
     if (props.rowId) {
       warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField'])
@@ -1539,29 +1544,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) && !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) && !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'])
+      }
     }
 
     // 检查是否有安装需要的模块