vxe-table 3.15.56 → 3.15.57

package/es/table/src/table.js

@@ -743,12 +743,40 @@ export default {
         computeVirtualXOpts() {
             const $xeTable = this;
             const props = $xeTable;
-            return Object.assign({}, getConfig().table.virtualXConfig || getConfig().table.scrollX, props.virtualXConfig || props.scrollX);
+            const { virtualXConfig, scrollX } = props;
+            const globalVirtualXConfig = getConfig().table.virtualXConfig;
+            const globalScrollX = getConfig().table.scrollX;
+            if (virtualXConfig) {
+                return Object.assign({}, globalVirtualXConfig, virtualXConfig);
+            }
+            if (scrollX) {
+                // 已废弃，保留兼容
+                return Object.assign({}, globalScrollX, scrollX);
+            }
+            if (globalVirtualXConfig) {
+                return Object.assign({}, globalVirtualXConfig, virtualXConfig);
+            }
+            // 已废弃，保留兼容
+            return Object.assign({}, globalScrollX, scrollX);
         },
         computeVirtualYOpts() {
             const $xeTable = this;
             const props = $xeTable;
-            return Object.assign({}, getConfig().table.virtualYConfig || getConfig().table.scrollY, props.virtualYConfig || props.scrollY);
+            const { virtualYConfig, scrollY } = props;
+            const globalVirtualYConfig = getConfig().table.virtualYConfig;
+            const globalScrollY = getConfig().table.scrollY;
+            if (virtualYConfig) {
+                return Object.assign({}, globalVirtualYConfig, virtualYConfig);
+            }
+            if (scrollY) {
+                // 已废弃，保留兼容
+                return Object.assign({}, globalScrollY, scrollY);
+            }
+            if (globalVirtualYConfig) {
+                return Object.assign({}, globalVirtualYConfig, virtualYConfig);
+            }
+            // 已废弃，保留兼容
+            return Object.assign({}, globalScrollY, scrollY);
         },
         computeScrollbarOpts() {
             const $xeTable = this;

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -3234,7 +3234,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.15.56";
+const version = "3.15.57";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3907,7 +3907,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.56"}`;
+const log_version = `table v${"3.15.57"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6806,10 +6806,10 @@ function cacheColumnMap($xeTable) {
   }
   if (htmlColumn) {
     if (!columnOpts.useKey) {
-      errLog('vxe.error.reqProp', ['column-config.useKey & column.type=html']);
+      errLog('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true']);
     }
     if (!rowOpts.useKey) {
-      errLog('vxe.error.reqProp', ['row-config.useKey & column.type=html']);
+      errLog('vxe.error.notSupportProp', ['column.type=html', 'row-config.useKey=false', 'row-config.useKey=true']);
     }
   }
   reactData.isGroup = isGroup;
@@ -29753,12 +29753,46 @@ function renderBody(h, $xeTable) {
     computeVirtualXOpts() {
       const $xeTable = this;
       const props = $xeTable;
-      return Object.assign({}, table_getConfig().table.virtualXConfig || table_getConfig().table.scrollX, props.virtualXConfig || props.scrollX);
+      const {
+        virtualXConfig,
+        scrollX
+      } = props;
+      const globalVirtualXConfig = table_getConfig().table.virtualXConfig;
+      const globalScrollX = table_getConfig().table.scrollX;
+      if (virtualXConfig) {
+        return Object.assign({}, globalVirtualXConfig, virtualXConfig);
+      }
+      if (scrollX) {
+        // 已废弃，保留兼容
+        return Object.assign({}, globalScrollX, scrollX);
+      }
+      if (globalVirtualXConfig) {
+        return Object.assign({}, globalVirtualXConfig, virtualXConfig);
+      }
+      // 已废弃，保留兼容
+      return Object.assign({}, globalScrollX, scrollX);
     },
     computeVirtualYOpts() {
       const $xeTable = this;
       const props = $xeTable;
-      return Object.assign({}, table_getConfig().table.virtualYConfig || table_getConfig().table.scrollY, props.virtualYConfig || props.scrollY);
+      const {
+        virtualYConfig,
+        scrollY
+      } = props;
+      const globalVirtualYConfig = table_getConfig().table.virtualYConfig;
+      const globalScrollY = table_getConfig().table.scrollY;
+      if (virtualYConfig) {
+        return Object.assign({}, globalVirtualYConfig, virtualYConfig);
+      }
+      if (scrollY) {
+        // 已废弃，保留兼容
+        return Object.assign({}, globalScrollY, scrollY);
+      }
+      if (globalVirtualYConfig) {
+        return Object.assign({}, globalVirtualYConfig, virtualYConfig);
+      }
+      // 已废弃，保留兼容
+      return Object.assign({}, globalScrollY, scrollY);
     },
     computeScrollbarOpts() {
       const $xeTable = this;