vxe-table 3.15.19 → 3.15.20

package/lib/table/src/methods.js

@@ -2224,7 +2224,8 @@ const handleFooterMerge = ($xeTable, merges) => {
   } = reactData;
   const {
     mergeFooterList,
-    mergeFooterMaps
+    mergeFooterMaps,
+    fullColumnIdData
   } = internalData;
   if (merges) {
     const {
@@ -2244,6 +2245,12 @@ const handleFooterMerge = ($xeTable, merges) => {
       let mergeColumnIndex = -1;
       if (_xeUtils.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 = _xeUtils.default.toNumber(rowspan) || 1;
@@ -2276,36 +2283,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
+    } = (0, _util.createHandleGetRowId)($xeTable);
     if (!_xeUtils.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 && _xeUtils.default.isNumber(row)) {
-        row = rowList[row];
+      let mergeRowIndex = -1;
+      let mergeColumnIndex = -1;
+      if (_xeUtils.default.isNumber(margeRow)) {
+        mergeRowIndex = margeRow;
+      } else {
+        const rowid = margeRow ? handleGetRowId(margeRow) : null;
+        const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
+        if (rowRest) {
+          mergeRowIndex = rowRest._index;
+        }
       }
-      if (_xeUtils.default.isNumber(col)) {
-        col = visibleColumn[col];
+      if (_xeUtils.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 = _xeUtils.default.findIndexOf(mList, item => item._row === row && item._col === col);
+      const mcIndex = _xeUtils.default.findIndexOf(mergeBodyList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex);
       if (mcIndex > -1) {
-        const rItems = mList.splice(mcIndex, 1);
-        rest.push(rItems[0]);
+        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.default.isArray(merges)) {
+      merges = [merges];
+    }
+    merges.forEach(item => {
+      const {
+        row: margeRow,
+        col: margeCol
+      } = item;
+      const mergeRowIndex = _xeUtils.default.isNumber(margeRow) ? margeRow : -1;
+      let mergeColumnIndex = -1;
+      if (_xeUtils.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 = _xeUtils.default.findIndexOf(mergeFooterList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex);
+      if (mcIndex > -1) {
+        const rItems = mergeFooterList.splice(mcIndex, 1);
+        const item = rItems[0];
+        if (item) {
+          rest.push(item);
+        }
       }
     });
   }
@@ -11498,11 +11561,11 @@ const Methods = {
   removeMergeCells(merges) {
     const $xeTable = this;
     const props = $xeTable;
-    const internalData = $xeTable;
     if (props.spanMethod) {
       (0, _log.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);
@@ -11522,10 +11585,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);
     });
@@ -11546,11 +11611,11 @@ const Methods = {
   removeMergeFooterItems(merges) {
     const $xeTable = this;
     const props = $xeTable;
-    const internalData = $xeTable;
     if (props.footerSpanMethod) {
       (0, _log.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);
@@ -11570,10 +11635,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);
     });