vxe-table 3.14.3 → 3.14.4

package/es/table/src/table.js

@@ -1328,8 +1328,9 @@ export default {
             swYInterval: 0,
             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;
@@ -1340,6 +1341,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']);
         }
@@ -1449,29 +1454,49 @@ 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 (this.exportConfig && !XEUtils.isObject(this.exportConfig)) {
-            warnLog('vxe.error.errProp', [`table.export-config=${this.exportConfig}`, 'table.export-config={}']);
+        if (props.treeConfig && !XEUtils.isObject(props.treeConfig)) {
+            warnLog('vxe.error.errProp', [`table.tree-config=${props.treeConfig}`, 'table.tree-config={}']);
         }
-        if (this.importConfig && !XEUtils.isObject(this.importConfig)) {
-            warnLog('vxe.error.errProp', [`table.import-config=${this.importConfig}`, 'table.import-config={}']);
+        if (props.customConfig && !XEUtils.isObject(props.customConfig)) {
+            warnLog('vxe.error.errProp', [`table.custom-config=${props.customConfig}`, 'table.custom-config={}']);
         }
-        if (this.printConfig && !XEUtils.isObject(this.printConfig)) {
-            warnLog('vxe.error.errProp', [`table.print-config=${this.printConfig}`, 'table.print-config={}']);
+        if (props.editConfig && !XEUtils.isObject(props.editConfig)) {
+            warnLog('vxe.error.errProp', [`table.edit-config=${props.editConfig}`, 'table.edit-config={}']);
         }
-        if (this.treeConfig && !XEUtils.isObject(this.treeConfig)) {
-            warnLog('vxe.error.errProp', [`table.tree-config=${this.treeConfig}`, 'table.tree-config={}']);
+        if (props.emptyRender && !XEUtils.isObject(props.emptyRender)) {
+            warnLog('vxe.error.errProp', [`table.empty-render=${props.emptyRender}`, 'table.empty-render={}']);
         }
-        if (this.customConfig && !XEUtils.isObject(this.customConfig)) {
-            warnLog('vxe.error.errProp', [`table.custom-config=${this.customConfig}`, 'table.custom-config={}']);
+        if ((rowOpts.isCurrent || highlightCurrentRow) && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
+            warnLog('vxe.error.notConflictProp', ['row-config.isCurrent', 'current-row-config.isFollowSelected']);
         }
-        if (this.editConfig && !XEUtils.isObject(this.editConfig)) {
-            warnLog('vxe.error.errProp', [`table.edit-config=${this.editConfig}`, 'table.edit-config={}']);
+        if ((columnOpts.isCurrent || highlightCurrentColumn) && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
+            warnLog('vxe.error.notConflictProp', ['column-config.isCurrent', 'current-column-config.isFollowSelected']);
         }
-        if (this.emptyRender && !XEUtils.isObject(this.emptyRender)) {
-            warnLog('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}']);
+        // 如果不支持虚拟滚动
+        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 (props.footerSpanMethod) {
+            if (virtualXOpts.enabled) {
+                warnLog('vxe.error.notConflictProp', ['footer-span-method', 'virtual-x-config.enabled=false']);
+            }
         }
         // 检查是否有安装需要的模块
         if (props.editConfig && !$xeTable.insert) {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.14.3";
+export const version = "3.14.4";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.14.3";
+const version = "3.14.4";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2843,7 +2843,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.14.3"}`;
+const log_version = `table v${"3.14.4"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -24652,28 +24652,47 @@ function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRigh
         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, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
       const $xeTable = this;
+      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);
       }
     },
@@ -27245,12 +27264,15 @@ function renderBody(h, $xeTable) {
       exportConfig,
       importConfig,
       treeConfig,
-      showOverflow
+      showOverflow,
+      highlightCurrentRow,
+      highlightCurrentColumn
     } = props;
     const {
       scrollXStore,
       scrollYStore
     } = internalData;
+    const columnOpts = $xeTable.computeColumnOpts;
     const editOpts = $xeTable.computeEditOpts;
     const treeOpts = $xeTable.computeTreeOpts;
     const radioOpts = $xeTable.computeRadioOpts;
@@ -27261,6 +27283,10 @@ function renderBody(h, $xeTable) {
     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']);
     }
@@ -27370,29 +27396,49 @@ function renderBody(h, $xeTable) {
         warnLog('vxe.error.errProp', [`table.context-menu=${this.contextMenu}`, 'table.context-menu={}']);
       }
     }
-    if (this.menuConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.menuConfig)) {
-      warnLog('vxe.error.errProp', [`table.menu-config=${this.menuConfig}`, 'table.menu-config={}']);
+    if (props.menuConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.menuConfig)) {
+      warnLog('vxe.error.errProp', [`table.menu-config=${props.menuConfig}`, 'table.menu-config={}']);
+    }
+    if (props.exportConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.exportConfig)) {
+      warnLog('vxe.error.errProp', [`table.export-config=${props.exportConfig}`, 'table.export-config={}']);
+    }
+    if (props.importConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.importConfig)) {
+      warnLog('vxe.error.errProp', [`table.import-config=${props.importConfig}`, 'table.import-config={}']);
     }
-    if (this.exportConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.exportConfig)) {
-      warnLog('vxe.error.errProp', [`table.export-config=${this.exportConfig}`, 'table.export-config={}']);
+    if (props.printConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.printConfig)) {
+      warnLog('vxe.error.errProp', [`table.print-config=${props.printConfig}`, 'table.print-config={}']);
     }
-    if (this.importConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.importConfig)) {
-      warnLog('vxe.error.errProp', [`table.import-config=${this.importConfig}`, 'table.import-config={}']);
+    if (props.treeConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.treeConfig)) {
+      warnLog('vxe.error.errProp', [`table.tree-config=${props.treeConfig}`, 'table.tree-config={}']);
     }
-    if (this.printConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.printConfig)) {
-      warnLog('vxe.error.errProp', [`table.print-config=${this.printConfig}`, 'table.print-config={}']);
+    if (props.customConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.customConfig)) {
+      warnLog('vxe.error.errProp', [`table.custom-config=${props.customConfig}`, 'table.custom-config={}']);
     }
-    if (this.treeConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.treeConfig)) {
-      warnLog('vxe.error.errProp', [`table.tree-config=${this.treeConfig}`, 'table.tree-config={}']);
+    if (props.editConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.editConfig)) {
+      warnLog('vxe.error.errProp', [`table.edit-config=${props.editConfig}`, 'table.edit-config={}']);
     }
-    if (this.customConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.customConfig)) {
-      warnLog('vxe.error.errProp', [`table.custom-config=${this.customConfig}`, 'table.custom-config={}']);
+    if (props.emptyRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(props.emptyRender)) {
+      warnLog('vxe.error.errProp', [`table.empty-render=${props.emptyRender}`, 'table.empty-render={}']);
     }
-    if (this.editConfig && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.editConfig)) {
-      warnLog('vxe.error.errProp', [`table.edit-config=${this.editConfig}`, 'table.edit-config={}']);
+    if ((rowOpts.isCurrent || highlightCurrentRow) && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(currentRowOpts.isFollowSelected)) {
+      warnLog('vxe.error.notConflictProp', ['row-config.isCurrent', 'current-row-config.isFollowSelected']);
     }
-    if (this.emptyRender && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isObject(this.emptyRender)) {
-      warnLog('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}']);
+    if ((columnOpts.isCurrent || highlightCurrentColumn) && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(currentColumnOpts.isFollowSelected)) {
+      warnLog('vxe.error.notConflictProp', ['column-config.isCurrent', 'current-column-config.isFollowSelected']);
+    }
+    // 如果不支持虚拟滚动
+    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 (props.footerSpanMethod) {
+      if (virtualXOpts.enabled) {
+        warnLog('vxe.error.notConflictProp', ['footer-span-method', 'virtual-x-config.enabled=false']);
+      }
     }
     // 检查是否有安装需要的模块
     if (props.editConfig && !$xeTable.insert) {
@@ -31523,6 +31569,7 @@ const Toolbar = VxeToolbar;
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
       notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
+      notConflictProp: '当使用 "{0}" 时，应该设置 "{1}"，否则可能会存在功能冲突',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
       barUnableLink: '工具栏无法关联表格',