vxe-table 3.18.16 → 3.18.17

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.16";
+const version = "3.18.17";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2689,7 +2689,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.16"}`;
+const log_version = `table v${"3.18.17"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8342,8 +8342,12 @@ function removeBodyMerges($xeTable, merges) {
   return rest;
 }
 function handleHeaderMerge($xeTable, merges) {
+  const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
+  const {
+    showCustomHeader
+  } = props;
   const {
     footerTableData
   } = reactData;
@@ -8380,6 +8384,10 @@ function handleHeaderMerge($xeTable, merges) {
       if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
         rowspan = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(rowspan) || 1;
         colspan = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(colspan) || 1;
+        if (!showCustomHeader && rowspan > 1) {
+          errLog('vxe.error.notSupportProp', ['[table] show-custom-header=false', `rowspan=${rowspan}`, 'rowspan=1']);
+          return;
+        }
         if (rowspan > 1 || colspan > 1) {
           const row = footerTableData[mergeRowIndex];
           const column = visibleColumn[mergeColumnIndex];