vxe-table 3.15.52 → 3.15.53

package/es/table/src/footer.js

@@ -14,7 +14,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
     const $xeGrid = $xeTable.$xeGrid;
     const { fixedType } = props;
     const { resizable: allResizable, border, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, footerSpanMethod, align: allAlign, columnKey, showFooterOverflow: allColumnFooterOverflow } = tableProps;
-    const { scrollXLoad, scrollYLoad, overflowX, currentColumn } = tableReactData;
+    const { scrollXLoad, scrollYLoad, overflowX, currentColumn, mergeFootFlag } = tableReactData;
     const { fullColumnIdData, mergeFooterList, mergeFooterCellMaps, scrollXStore } = tableInternalData;
     const virtualXOpts = $xeTable.computeVirtualXOpts;
     const tooltipOpts = $xeTable.computeTooltipOpts;
@@ -89,7 +89,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
         };
         let isMergeCell = false;
         // 合并行或列
-        if (mergeFooterList.length) {
+        if (mergeFootFlag && mergeFooterList.length) {
             const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`];
             if (spanRest) {
                 const { rowspan, colspan } = spanRest;

package/es/table/src/methods.js

@@ -10200,12 +10200,19 @@ const Methods = {
     setMergeCells(merges) {
         const $xeTable = this;
         const props = $xeTable;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
         if (props.spanMethod) {
             errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
         }
         handleBodyMerge($xeTable, merges);
         $xeTable.handleUpdateBodyMerge();
         return $xeTable.$nextTick().then(() => {
+            const { expandColumn } = reactData;
+            const { mergeBodyList } = internalData;
+            if (expandColumn && mergeBodyList.length) {
+                warnLog('vxe.error.errConflicts', ['type=expand', 'merge-cells | span-method']);
+            }
             $xeTable.updateCellAreas();
             return updateStyle($xeTable);
         });

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.52";
+export const version = "3.15.53";
 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.52"}`;
+const version = `table v${"3.15.53"}`;
 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.52";
+const version = "3.15.53";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3906,7 +3906,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.52"}`;
+const log_version = `table v${"3.15.53"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -4966,7 +4966,7 @@ function renderTitleContent(h, params, content) {
   const titleVN = getRenderDefaultColumnTitle(h, column, content);
   return [h('span', {
     class: 'vxe-cell--title',
-    ...ons
+    on: ons
   }, isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles ? $table.getPivotTableAggregateRenderColTitles(h, column, titleVN) : [titleVN])];
 }
 function getFooterContent(h, params) {
@@ -18361,12 +18361,23 @@ const Methods = {
   setMergeCells(merges) {
     const $xeTable = this;
     const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     if (props.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
     handleBodyMerge($xeTable, merges);
     $xeTable.handleUpdateBodyMerge();
     return $xeTable.$nextTick().then(() => {
+      const {
+        expandColumn
+      } = reactData;
+      const {
+        mergeBodyList
+      } = internalData;
+      if (expandColumn && mergeBodyList.length) {
+        warnLog('vxe.error.errConflicts', ['type=expand', 'merge-cells | span-method']);
+      }
       $xeTable.updateCellAreas();
       return updateStyle($xeTable);
     });
@@ -20093,7 +20104,8 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
     scrollXLoad,
     scrollYLoad,
     overflowX,
-    currentColumn
+    currentColumn,
+    mergeFootFlag
   } = tableReactData;
   const {
     fullColumnIdData,
@@ -20189,7 +20201,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
     };
     let isMergeCell = false;
     // 合并行或列
-    if (mergeFooterList.length) {
+    if (mergeFootFlag && mergeFooterList.length) {
       const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`];
       if (spanRest) {
         const {
@@ -35420,6 +35432,7 @@ const Toolbar = VxeToolbar;
       overCountErr: '最多只能选择{0}个文件！',
       overCountExtraErr: '已超出最大数量{0}个，超出的{1}个文件将被忽略！',
       overSizeErr: '文件大小最大不能超过{0}！',
+      manualUpload: '点击上传',
       reUpload: '重新上传',
       uploadProgress: '上传中 {0}%',
       uploadErr: '上传失败',