vxe-table 3.15.19 → 3.15.20

package/es/table/src/methods.js

@@ -1800,7 +1800,7 @@ const handleFooterMerge = ($xeTable, merges) => {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { footerTableData } = reactData;
-    const { mergeFooterList, mergeFooterMaps } = internalData;
+    const { mergeFooterList, mergeFooterMaps, fullColumnIdData } = internalData;
     if (merges) {
         const { visibleColumn } = internalData;
         if (!XEUtils.isArray(merges)) {
@@ -1813,6 +1813,13 @@ const handleFooterMerge = ($xeTable, merges) => {
             if (XEUtils.isNumber(margeCol)) {
                 mergeColumnIndex = margeCol;
             }
+            else {
+                const colid = margeCol ? margeCol.id : null;
+                const colRest = colid ? fullColumnIdData[colid] : null;
+                if (colRest) {
+                    mergeColumnIndex = colRest._index;
+                }
+            }
             if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
                 rowspan = XEUtils.toNumber(rowspan) || 1;
                 colspan = XEUtils.toNumber(colspan) || 1;
@@ -1845,31 +1852,80 @@ const handleFooterMerge = ($xeTable, merges) => {
         });
     }
 };
-function removeMerges($xeTable, merges, mList, rowList) {
-    // const props = $xeTable
+function removeBodyMerges($xeTable, merges) {
     const internalData = $xeTable;
+    const { mergeBodyList, fullColumnIdData, fullAllDataRowIdData } = internalData;
     const rest = [];
     if (merges) {
-        // const { treeConfig } = props
-        const { visibleColumn } = internalData;
+        const { handleGetRowId } = createHandleGetRowId($xeTable);
         if (!XEUtils.isArray(merges)) {
             merges = [merges];
         }
-        // if (treeConfig && merges.length) {
-        //   errLog('vxe.error.noTree', ['merge-cells | merge-footer-items'])
-        // }
         merges.forEach((item) => {
-            let { row, col } = item;
-            if (rowList && XEUtils.isNumber(row)) {
-                row = rowList[row];
+            const { row: margeRow, col: margeCol } = item;
+            let mergeRowIndex = -1;
+            let mergeColumnIndex = -1;
+            if (XEUtils.isNumber(margeRow)) {
+                mergeRowIndex = margeRow;
             }
-            if (XEUtils.isNumber(col)) {
-                col = visibleColumn[col];
+            else {
+                const rowid = margeRow ? handleGetRowId(margeRow) : null;
+                const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
+                if (rowRest) {
+                    mergeRowIndex = rowRest._index;
+                }
+            }
+            if (XEUtils.isNumber(margeCol)) {
+                mergeColumnIndex = margeCol;
+            }
+            else {
+                const colid = margeCol ? margeCol.id : null;
+                const colRest = colid ? fullColumnIdData[colid] : null;
+                if (colRest) {
+                    mergeColumnIndex = colRest._index;
+                }
+            }
+            const mcIndex = XEUtils.findIndexOf(mergeBodyList, item => (item.row === mergeRowIndex) && (item.col === mergeColumnIndex));
+            if (mcIndex > -1) {
+                const rItems = mergeBodyList.splice(mcIndex, 1);
+                const item = rItems[0];
+                if (item) {
+                    rest.push(rItems[0]);
+                }
+            }
+        });
+    }
+    return rest;
+}
+function removeFooterMerges($xeTable, merges) {
+    const internalData = $xeTable;
+    const { mergeFooterList, fullColumnIdData } = internalData;
+    const rest = [];
+    if (merges) {
+        if (!XEUtils.isArray(merges)) {
+            merges = [merges];
+        }
+        merges.forEach((item) => {
+            const { row: margeRow, col: margeCol } = item;
+            const mergeRowIndex = XEUtils.isNumber(margeRow) ? margeRow : -1;
+            let mergeColumnIndex = -1;
+            if (XEUtils.isNumber(margeCol)) {
+                mergeColumnIndex = margeCol;
             }
-            const mcIndex = XEUtils.findIndexOf(mList, item => item._row === row && item._col === col);
+            else {
+                const colid = margeCol ? margeCol.id : null;
+                const colRest = colid ? fullColumnIdData[colid] : null;
+                if (colRest) {
+                    mergeColumnIndex = colRest._index;
+                }
+            }
+            const mcIndex = XEUtils.findIndexOf(mergeFooterList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex);
             if (mcIndex > -1) {
-                const rItems = mList.splice(mcIndex, 1);
-                rest.push(rItems[0]);
+                const rItems = mergeFooterList.splice(mcIndex, 1);
+                const item = rItems[0];
+                if (item) {
+                    rest.push(item);
+                }
             }
         });
     }
@@ -9833,11 +9889,11 @@ const Methods = {
     removeMergeCells(merges) {
         const $xeTable = this;
         const props = $xeTable;
-        const internalData = $xeTable;
         if (props.spanMethod) {
             errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
         }
-        const rest = removeMerges($xeTable, merges, internalData.mergeBodyList, internalData.afterFullData);
+        const rest = removeBodyMerges($xeTable, merges);
+        $xeTable.handleUpdateBodyMerge();
         return $xeTable.$nextTick().then(() => {
             $xeTable.updateCellAreas();
             updateStyle($xeTable);
@@ -9857,10 +9913,12 @@ const Methods = {
      */
     clearMergeCells() {
         const $xeTable = this;
+        const reactData = $xeTable;
         const internalData = $xeTable;
         internalData.mergeBodyList = [];
         internalData.mergeBodyMaps = {};
         internalData.mergeBodyCellMaps = {};
+        reactData.mergeBodyFlag++;
         return $xeTable.$nextTick().then(() => {
             return updateStyle($xeTable);
         });
@@ -9881,11 +9939,11 @@ const Methods = {
     removeMergeFooterItems(merges) {
         const $xeTable = this;
         const props = $xeTable;
-        const internalData = $xeTable;
         if (props.footerSpanMethod) {
             errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
         }
-        const rest = removeMerges($xeTable, merges, internalData.mergeFooterList);
+        const rest = removeFooterMerges($xeTable, merges);
+        $xeTable.handleUpdateFooterMerge();
         return $xeTable.$nextTick().then(() => {
             $xeTable.updateCellAreas();
             updateStyle($xeTable);
@@ -9905,10 +9963,12 @@ const Methods = {
      */
     clearMergeFooterItems() {
         const $xeTable = this;
+        const reactData = $xeTable;
         const internalData = $xeTable;
         internalData.mergeFooterList = [];
         internalData.mergeFooterMaps = {};
         internalData.mergeFooterCellMaps = {};
+        reactData.mergeFootFlag++;
         return $xeTable.$nextTick().then(() => {
             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.19";
+export const version = "3.15.20";
 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.19"}`;
+const version = `table v${"3.15.20"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.19";
+const version = "3.15.20";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2858,7 +2858,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.19"}`;
+const log_version = `table v${"3.15.20"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -7488,7 +7488,8 @@ const handleFooterMerge = ($xeTable, merges) => {
   } = reactData;
   const {
     mergeFooterList,
-    mergeFooterMaps
+    mergeFooterMaps,
+    fullColumnIdData
   } = internalData;
   if (merges) {
     const {
@@ -7508,6 +7509,12 @@ const handleFooterMerge = ($xeTable, merges) => {
       let mergeColumnIndex = -1;
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeCol)) {
         mergeColumnIndex = margeCol;
+      } else {
+        const colid = margeCol ? margeCol.id : null;
+        const colRest = colid ? fullColumnIdData[colid] : null;
+        if (colRest) {
+          mergeColumnIndex = colRest._index;
+        }
       }
       if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
         rowspan = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(rowspan) || 1;
@@ -7540,36 +7547,92 @@ const handleFooterMerge = ($xeTable, merges) => {
     });
   }
 };
-function removeMerges($xeTable, merges, mList, rowList) {
-  // const props = $xeTable
+function removeBodyMerges($xeTable, merges) {
   const internalData = $xeTable;
+  const {
+    mergeBodyList,
+    fullColumnIdData,
+    fullAllDataRowIdData
+  } = internalData;
   const rest = [];
   if (merges) {
-    // const { treeConfig } = props
     const {
-      visibleColumn
-    } = internalData;
+      handleGetRowId
+    } = createHandleGetRowId($xeTable);
     if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(merges)) {
       merges = [merges];
     }
-    // if (treeConfig && merges.length) {
-    //   errLog('vxe.error.noTree', ['merge-cells | merge-footer-items'])
-    // }
     merges.forEach(item => {
-      let {
-        row,
-        col
+      const {
+        row: margeRow,
+        col: margeCol
       } = item;
-      if (rowList && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(row)) {
-        row = rowList[row];
+      let mergeRowIndex = -1;
+      let mergeColumnIndex = -1;
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeRow)) {
+        mergeRowIndex = margeRow;
+      } else {
+        const rowid = margeRow ? handleGetRowId(margeRow) : null;
+        const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
+        if (rowRest) {
+          mergeRowIndex = rowRest._index;
+        }
       }
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(col)) {
-        col = visibleColumn[col];
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeCol)) {
+        mergeColumnIndex = margeCol;
+      } else {
+        const colid = margeCol ? margeCol.id : null;
+        const colRest = colid ? fullColumnIdData[colid] : null;
+        if (colRest) {
+          mergeColumnIndex = colRest._index;
+        }
+      }
+      const mcIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(mergeBodyList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex);
+      if (mcIndex > -1) {
+        const rItems = mergeBodyList.splice(mcIndex, 1);
+        const item = rItems[0];
+        if (item) {
+          rest.push(rItems[0]);
+        }
       }
-      const mcIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(mList, item => item._row === row && item._col === col);
+    });
+  }
+  return rest;
+}
+function removeFooterMerges($xeTable, merges) {
+  const internalData = $xeTable;
+  const {
+    mergeFooterList,
+    fullColumnIdData
+  } = internalData;
+  const rest = [];
+  if (merges) {
+    if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(merges)) {
+      merges = [merges];
+    }
+    merges.forEach(item => {
+      const {
+        row: margeRow,
+        col: margeCol
+      } = item;
+      const mergeRowIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeRow) ? margeRow : -1;
+      let mergeColumnIndex = -1;
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(margeCol)) {
+        mergeColumnIndex = margeCol;
+      } else {
+        const colid = margeCol ? margeCol.id : null;
+        const colRest = colid ? fullColumnIdData[colid] : null;
+        if (colRest) {
+          mergeColumnIndex = colRest._index;
+        }
+      }
+      const mcIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(mergeFooterList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex);
       if (mcIndex > -1) {
-        const rItems = mList.splice(mcIndex, 1);
-        rest.push(rItems[0]);
+        const rItems = mergeFooterList.splice(mcIndex, 1);
+        const item = rItems[0];
+        if (item) {
+          rest.push(item);
+        }
       }
     });
   }
@@ -16774,11 +16837,11 @@ const Methods = {
   removeMergeCells(merges) {
     const $xeTable = this;
     const props = $xeTable;
-    const internalData = $xeTable;
     if (props.spanMethod) {
       errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
-    const rest = removeMerges($xeTable, merges, internalData.mergeBodyList, internalData.afterFullData);
+    const rest = removeBodyMerges($xeTable, merges);
+    $xeTable.handleUpdateBodyMerge();
     return $xeTable.$nextTick().then(() => {
       $xeTable.updateCellAreas();
       updateStyle($xeTable);
@@ -16798,10 +16861,12 @@ const Methods = {
    */
   clearMergeCells() {
     const $xeTable = this;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     internalData.mergeBodyList = [];
     internalData.mergeBodyMaps = {};
     internalData.mergeBodyCellMaps = {};
+    reactData.mergeBodyFlag++;
     return $xeTable.$nextTick().then(() => {
       return updateStyle($xeTable);
     });
@@ -16822,11 +16887,11 @@ const Methods = {
   removeMergeFooterItems(merges) {
     const $xeTable = this;
     const props = $xeTable;
-    const internalData = $xeTable;
     if (props.footerSpanMethod) {
       errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
-    const rest = removeMerges($xeTable, merges, internalData.mergeFooterList);
+    const rest = removeFooterMerges($xeTable, merges);
+    $xeTable.handleUpdateFooterMerge();
     return $xeTable.$nextTick().then(() => {
       $xeTable.updateCellAreas();
       updateStyle($xeTable);
@@ -16846,10 +16911,12 @@ const Methods = {
    */
   clearMergeFooterItems() {
     const $xeTable = this;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     internalData.mergeFooterList = [];
     internalData.mergeFooterMaps = {};
     internalData.mergeFooterCellMaps = {};
+    reactData.mergeFootFlag++;
     return $xeTable.$nextTick().then(() => {
       return updateStyle($xeTable);
     });