vxe-table 3.16.0-beta.7 → 3.16.0-beta.8

package/es/table/src/methods.js

@@ -1760,7 +1760,7 @@ function buildMergeData(mergeConfigs) {
     }
     return mergeMaps;
 }
-const handleBodyMerge = ($xeTable, merges) => {
+function handleBodyMerge($xeTable, merges) {
     const internalData = $xeTable;
     const { fullAllDataRowIdData, fullColumnIdData, visibleColumn, afterFullData, mergeBodyList, mergeBodyMaps } = internalData;
     if (merges) {
@@ -1823,8 +1823,8 @@ const handleBodyMerge = ($xeTable, merges) => {
             }
         });
     }
-};
-const handleFooterMerge = ($xeTable, merges) => {
+}
+function handleFooterMerge($xeTable, merges) {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { footerTableData } = reactData;
@@ -1879,7 +1879,7 @@ const handleFooterMerge = ($xeTable, merges) => {
             }
         });
     }
-};
+}
 function removeBodyMerges($xeTable, merges) {
     const internalData = $xeTable;
     const { mergeBodyList, fullColumnIdData, fullAllDataRowIdData, mergeBodyMaps } = internalData;

package/es/table/src/table.js

@@ -23,6 +23,20 @@ import keyboardMixin from '../module/keyboard/mixin';
 import validatorMixin from '../module/validator/mixin';
 import customMixin from '../module/custom/mixin';
 const { getConfig, getIcon, getI18n, renderer, globalResize, globalEvents, globalMixins, renderEmptyElement } = VxeUI;
+function handleUpdateMergeBodyCells($xeTable, merges) {
+    const internalData = $xeTable;
+    internalData.mergeBodyList = [];
+    internalData.mergeBodyMaps = {};
+    internalData.mergeBodyCellMaps = {};
+    $xeTable.setMergeCells(merges);
+}
+function handleUpdateMergeFooterCells($xeTable, merges) {
+    const internalData = $xeTable;
+    internalData.mergeFooterList = [];
+    internalData.mergeFooterMaps = {};
+    internalData.mergeFooterCellMaps = {};
+    $xeTable.setMergeFooterItems(merges);
+}
 function handleKeyField($xeTable) {
     const internalData = $xeTable;
     const keyField = $xeTable.computeRowField;
@@ -1328,13 +1342,11 @@ export default {
         },
         mergeCells(value) {
             const $xeTable = this;
-            $xeTable.clearMergeCells();
-            $xeTable.$nextTick(() => $xeTable.setMergeCells(value));
+            handleUpdateMergeBodyCells($xeTable, value);
         },
         mergeFooterItems(value) {
             const $xeTable = this;
-            $xeTable.clearMergeFooterItems();
-            $xeTable.$nextTick(() => $xeTable.setMergeFooterItems(value));
+            handleUpdateMergeFooterCells($xeTable, value);
         },
         computeRowGroupFields(val) {
             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.16.0-beta.7";
+export const version = "3.16.0-beta.8";
 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.16.0-beta.7"}`;
+const version = `table v${"3.16.0-beta.8"}`;
 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.16.0-beta.7";
+const version = "3.16.0-beta.8";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2667,7 +2667,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.16.0-beta.7"}`;
+const log_version = `table v${"3.16.0-beta.8"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -7386,7 +7386,7 @@ function buildMergeData(mergeConfigs) {
   }
   return mergeMaps;
 }
-const handleBodyMerge = ($xeTable, merges) => {
+function handleBodyMerge($xeTable, merges) {
   const internalData = $xeTable;
   const {
     fullAllDataRowIdData,
@@ -7460,8 +7460,8 @@ const handleBodyMerge = ($xeTable, merges) => {
       }
     });
   }
-};
-const handleFooterMerge = ($xeTable, merges) => {
+}
+function handleFooterMerge($xeTable, merges) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
@@ -7527,7 +7527,7 @@ const handleFooterMerge = ($xeTable, merges) => {
       }
     });
   }
-};
+}
 function removeBodyMerges($xeTable, merges) {
   const internalData = $xeTable;
   const {
@@ -19024,7 +19024,8 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
     scrollXLoad,
     scrollYLoad,
     overflowX,
-    currentColumn
+    currentColumn,
+    mergeFootFlag
   } = tableReactData;
   const {
     fullColumnIdData,
@@ -19120,7 +19121,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 {
@@ -27826,6 +27827,20 @@ const {
   globalMixins: table_globalMixins,
   renderEmptyElement: table_renderEmptyElement
 } = core_.VxeUI;
+function handleUpdateMergeBodyCells($xeTable, merges) {
+  const internalData = $xeTable;
+  internalData.mergeBodyList = [];
+  internalData.mergeBodyMaps = {};
+  internalData.mergeBodyCellMaps = {};
+  $xeTable.setMergeCells(merges);
+}
+function handleUpdateMergeFooterCells($xeTable, merges) {
+  const internalData = $xeTable;
+  internalData.mergeFooterList = [];
+  internalData.mergeFooterMaps = {};
+  internalData.mergeFooterCellMaps = {};
+  $xeTable.setMergeFooterItems(merges);
+}
 function handleKeyField($xeTable) {
   const internalData = $xeTable;
   const keyField = $xeTable.computeRowField;
@@ -29192,13 +29207,11 @@ function renderBody(h, $xeTable) {
     },
     mergeCells(value) {
       const $xeTable = this;
-      $xeTable.clearMergeCells();
-      $xeTable.$nextTick(() => $xeTable.setMergeCells(value));
+      handleUpdateMergeBodyCells($xeTable, value);
     },
     mergeFooterItems(value) {
       const $xeTable = this;
-      $xeTable.clearMergeFooterItems();
-      $xeTable.$nextTick(() => $xeTable.setMergeFooterItems(value));
+      handleUpdateMergeFooterCells($xeTable, value);
     },
     computeRowGroupFields(val) {
       const $xeTable = this;