vxe-table 3.15.20 → 3.15.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/style.css +1 -1
- package/es/table/src/methods.js +22 -4
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +26 -5
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/src/methods.js +24 -3
- package/lib/table/src/methods.min.js +1 -1
- package/lib/ui/index.js +1 -1
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +2 -2
- package/packages/table/src/methods.ts +8 -2
- /package/es/{iconfont.1746750963305.ttf → iconfont.1746783133677.ttf} +0 -0
- /package/es/{iconfont.1746750963305.woff → iconfont.1746783133677.woff} +0 -0
- /package/es/{iconfont.1746750963305.woff2 → iconfont.1746783133677.woff2} +0 -0
- /package/lib/{iconfont.1746750963305.ttf → iconfont.1746783133677.ttf} +0 -0
- /package/lib/{iconfont.1746750963305.woff → iconfont.1746783133677.woff} +0 -0
- /package/lib/{iconfont.1746750963305.woff2 → iconfont.1746783133677.woff2} +0 -0
package/lib/table/src/methods.js
CHANGED
|
@@ -649,6 +649,7 @@ function updateAfterDataIndex($xeTable) {
|
|
|
649
649
|
const {
|
|
650
650
|
fullDataRowIdData,
|
|
651
651
|
fullAllDataRowIdData,
|
|
652
|
+
afterFullData,
|
|
652
653
|
afterTreeFullData
|
|
653
654
|
} = internalData;
|
|
654
655
|
const treeOpts = $xeTable.computeTreeOpts;
|
|
@@ -692,8 +693,20 @@ function updateAfterDataIndex($xeTable) {
|
|
|
692
693
|
}, {
|
|
693
694
|
children: transform ? treeOpts.mapChildrenField : childrenField
|
|
694
695
|
});
|
|
696
|
+
if (transform) {
|
|
697
|
+
afterFullData.forEach((row, index) => {
|
|
698
|
+
const rowid = handleGetRowId(row);
|
|
699
|
+
const rowRest = fullAllDataRowIdData[rowid];
|
|
700
|
+
const seq = index + 1;
|
|
701
|
+
if (rowRest) {
|
|
702
|
+
if (!treeConfig) {
|
|
703
|
+
rowRest.seq = seq;
|
|
704
|
+
}
|
|
705
|
+
rowRest._index = index;
|
|
706
|
+
}
|
|
707
|
+
});
|
|
708
|
+
}
|
|
695
709
|
internalData.afterFullRowMaps = fullMaps;
|
|
696
|
-
updateAfterListIndex($xeTable);
|
|
697
710
|
} else {
|
|
698
711
|
updateAfterListIndex($xeTable);
|
|
699
712
|
}
|
|
@@ -2288,7 +2301,8 @@ function removeBodyMerges($xeTable, merges) {
|
|
|
2288
2301
|
const {
|
|
2289
2302
|
mergeBodyList,
|
|
2290
2303
|
fullColumnIdData,
|
|
2291
|
-
fullAllDataRowIdData
|
|
2304
|
+
fullAllDataRowIdData,
|
|
2305
|
+
mergeBodyMaps
|
|
2292
2306
|
} = internalData;
|
|
2293
2307
|
const rest = [];
|
|
2294
2308
|
if (merges) {
|
|
@@ -2329,6 +2343,9 @@ function removeBodyMerges($xeTable, merges) {
|
|
|
2329
2343
|
const item = rItems[0];
|
|
2330
2344
|
if (item) {
|
|
2331
2345
|
rest.push(rItems[0]);
|
|
2346
|
+
if (mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
|
|
2347
|
+
delete mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
|
|
2348
|
+
}
|
|
2332
2349
|
}
|
|
2333
2350
|
}
|
|
2334
2351
|
});
|
|
@@ -2339,7 +2356,8 @@ function removeFooterMerges($xeTable, merges) {
|
|
|
2339
2356
|
const internalData = $xeTable;
|
|
2340
2357
|
const {
|
|
2341
2358
|
mergeFooterList,
|
|
2342
|
-
fullColumnIdData
|
|
2359
|
+
fullColumnIdData,
|
|
2360
|
+
mergeFooterMaps
|
|
2343
2361
|
} = internalData;
|
|
2344
2362
|
const rest = [];
|
|
2345
2363
|
if (merges) {
|
|
@@ -2368,6 +2386,9 @@ function removeFooterMerges($xeTable, merges) {
|
|
|
2368
2386
|
const item = rItems[0];
|
|
2369
2387
|
if (item) {
|
|
2370
2388
|
rest.push(item);
|
|
2389
|
+
if (mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
|
|
2390
|
+
delete mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
|
|
2391
|
+
}
|
|
2371
2392
|
}
|
|
2372
2393
|
}
|
|
2373
2394
|
});
|