vxe-table 3.15.20 → 3.15.21

package/es/table/src/methods.js

@@ -518,7 +518,7 @@ function updateAfterDataIndex($xeTable) {
     const props = $xeTable;
     const internalData = $xeTable;
     const { treeConfig } = props;
-    const { fullDataRowIdData, fullAllDataRowIdData, afterTreeFullData } = internalData;
+    const { fullDataRowIdData, fullAllDataRowIdData, afterFullData, afterTreeFullData } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const { transform } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -540,8 +540,20 @@ function updateAfterDataIndex($xeTable) {
             }
             fullMaps[rowid] = row;
         }, { children: transform ? treeOpts.mapChildrenField : childrenField });
+        if (transform) {
+            afterFullData.forEach((row, index) => {
+                const rowid = handleGetRowId(row);
+                const rowRest = fullAllDataRowIdData[rowid];
+                const seq = index + 1;
+                if (rowRest) {
+                    if (!treeConfig) {
+                        rowRest.seq = seq;
+                    }
+                    rowRest._index = index;
+                }
+            });
+        }
         internalData.afterFullRowMaps = fullMaps;
-        updateAfterListIndex($xeTable);
     }
     else {
         updateAfterListIndex($xeTable);
@@ -1854,7 +1866,7 @@ const handleFooterMerge = ($xeTable, merges) => {
 };
 function removeBodyMerges($xeTable, merges) {
     const internalData = $xeTable;
-    const { mergeBodyList, fullColumnIdData, fullAllDataRowIdData } = internalData;
+    const { mergeBodyList, fullColumnIdData, fullAllDataRowIdData, mergeBodyMaps } = internalData;
     const rest = [];
     if (merges) {
         const { handleGetRowId } = createHandleGetRowId($xeTable);
@@ -1891,6 +1903,9 @@ function removeBodyMerges($xeTable, merges) {
                 const item = rItems[0];
                 if (item) {
                     rest.push(rItems[0]);
+                    if (mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
+                        delete mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+                    }
                 }
             }
         });
@@ -1899,7 +1914,7 @@ function removeBodyMerges($xeTable, merges) {
 }
 function removeFooterMerges($xeTable, merges) {
     const internalData = $xeTable;
-    const { mergeFooterList, fullColumnIdData } = internalData;
+    const { mergeFooterList, fullColumnIdData, mergeFooterMaps } = internalData;
     const rest = [];
     if (merges) {
         if (!XEUtils.isArray(merges)) {
@@ -1925,6 +1940,9 @@ function removeFooterMerges($xeTable, merges) {
                 const item = rItems[0];
                 if (item) {
                     rest.push(item);
+                    if (mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
+                        delete mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+                    }
                 }
             }
         });

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.20";
+export const version = "3.15.21";
 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.20"}`;
+const version = `table v${"3.15.21"}`;
 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.20";
+const version = "3.15.21";
 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.20"}`;
+const log_version = `table v${"3.15.21"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5913,6 +5913,7 @@ function updateAfterDataIndex($xeTable) {
   const {
     fullDataRowIdData,
     fullAllDataRowIdData,
+    afterFullData,
     afterTreeFullData
   } = internalData;
   const treeOpts = $xeTable.computeTreeOpts;
@@ -5956,8 +5957,20 @@ function updateAfterDataIndex($xeTable) {
     }, {
       children: transform ? treeOpts.mapChildrenField : childrenField
     });
+    if (transform) {
+      afterFullData.forEach((row, index) => {
+        const rowid = handleGetRowId(row);
+        const rowRest = fullAllDataRowIdData[rowid];
+        const seq = index + 1;
+        if (rowRest) {
+          if (!treeConfig) {
+            rowRest.seq = seq;
+          }
+          rowRest._index = index;
+        }
+      });
+    }
     internalData.afterFullRowMaps = fullMaps;
-    updateAfterListIndex($xeTable);
   } else {
     updateAfterListIndex($xeTable);
   }
@@ -7552,7 +7565,8 @@ function removeBodyMerges($xeTable, merges) {
   const {
     mergeBodyList,
     fullColumnIdData,
-    fullAllDataRowIdData
+    fullAllDataRowIdData,
+    mergeBodyMaps
   } = internalData;
   const rest = [];
   if (merges) {
@@ -7593,6 +7607,9 @@ function removeBodyMerges($xeTable, merges) {
         const item = rItems[0];
         if (item) {
           rest.push(rItems[0]);
+          if (mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
+            delete mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+          }
         }
       }
     });
@@ -7603,7 +7620,8 @@ function removeFooterMerges($xeTable, merges) {
   const internalData = $xeTable;
   const {
     mergeFooterList,
-    fullColumnIdData
+    fullColumnIdData,
+    mergeFooterMaps
   } = internalData;
   const rest = [];
   if (merges) {
@@ -7632,6 +7650,9 @@ function removeFooterMerges($xeTable, merges) {
         const item = rItems[0];
         if (item) {
           rest.push(item);
+          if (mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
+            delete mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+          }
         }
       }
     });