vxe-table 4.12.3 → 4.12.4

package/es/table/src/table.js

@@ -792,6 +792,7 @@ export default defineComponent({
             computeBodyMenu,
             computeFooterMenu,
             computeIsMenu,
+            computeMenuList,
             computeMenuOpts,
             computeExportOpts,
             computeImportOpts,
@@ -10272,7 +10273,7 @@ export default defineComponent({
                 initTpImg();
             }
             nextTick(() => {
-                const { data, exportConfig, importConfig, treeConfig, showOverflow } = props;
+                const { data, exportConfig, importConfig, treeConfig, showOverflow, highlightCurrentRow, highlightCurrentColumn } = props;
                 const { scrollXStore, scrollYStore } = internalData;
                 const editOpts = computeEditOpts.value;
                 const treeOpts = computeTreeOpts.value;
@@ -10284,6 +10285,10 @@ export default defineComponent({
                 const mouseOpts = computeMouseOpts.value;
                 const exportOpts = computeExportOpts.value;
                 const importOpts = computeImportOpts.value;
+                const currentRowOpts = computeCurrentRowOpts.value;
+                const currentColumnOpts = computeCurrentColumnOpts.value;
+                const virtualXOpts = computeVirtualXOpts.value;
+                const virtualYOpts = computeVirtualYOpts.value;
                 if (props.rowId) {
                     warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
                 }
@@ -10383,6 +10388,26 @@ export default defineComponent({
                 if (checkboxOpts.halfField) {
                     warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
                 }
+                if ((rowOpts.isCurrent || highlightCurrentRow) && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
+                    warnLog('vxe.error.notConflictProp', ['row-config.isCurrent', 'current-row-config.isFollowSelected']);
+                }
+                if ((columnOpts.isCurrent || highlightCurrentColumn) && !XEUtils.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) {
                     errLog('vxe.error.reqModule', ['Edit']);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.12.3";
+export const version = "4.12.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${"4.12.3"}`;
+const version = `table v${"4.12.4"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);