vxe-table 4.23.8 → 4.23.9
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/dist/all.esm.js +5715 -3783
- package/es/components.d.ts +1 -0
- package/es/components.js +2 -7
- package/es/grid/src/emits.js +1 -15
- package/es/grid/src/grid.js +397 -120
- package/es/index.esm.js +1 -0
- package/es/index.js +1 -0
- package/es/table/module/custom/hook.js +49 -42
- package/es/table/module/custom/panel.js +777 -527
- package/es/table/module/edit/hook.js +140 -62
- package/es/table/module/export/export-panel.js +399 -316
- package/es/table/module/export/hook.js +395 -337
- package/es/table/module/export/import-panel.js +152 -123
- package/es/table/module/filter/hook.js +16 -2
- package/es/table/module/filter/panel.js +146 -84
- package/es/table/module/keyboard/hook.js +8 -4
- package/es/table/module/menu/panel.js +197 -126
- package/es/table/render/index.js +151 -98
- package/es/table/src/body.js +355 -233
- package/es/table/src/cell.js +426 -269
- package/es/table/src/columnInfo.js +1 -0
- package/es/table/src/footer.js +144 -99
- package/es/table/src/group.js +7 -3
- package/es/table/src/header.js +229 -172
- package/es/table/src/table.js +1503 -1030
- package/es/table/src/util.js +15 -19
- package/es/toolbar/src/toolbar.js +132 -75
- package/es/ui/index.js +1 -1
- package/es/ui/src/dom.js +9 -6
- package/es/ui/src/log.js +1 -1
- package/es/ui/src/utils.d.ts +1 -1
- package/lib/components.js +2 -7
- package/lib/grid/src/emits.js +1 -15
- package/lib/grid/src/grid.js +397 -120
- package/lib/index.common.js +1 -0
- package/lib/index.js +1 -0
- package/lib/index.umd.js +5732 -3800
- package/lib/index.umd.min.js +3 -3
- package/lib/table/module/custom/hook.js +49 -42
- package/lib/table/module/custom/panel.js +777 -527
- package/lib/table/module/edit/hook.js +140 -62
- package/lib/table/module/export/export-panel.js +399 -316
- package/lib/table/module/export/hook.js +395 -337
- package/lib/table/module/export/import-panel.js +152 -123
- package/lib/table/module/filter/hook.js +16 -2
- package/lib/table/module/filter/panel.js +146 -84
- package/lib/table/module/keyboard/hook.js +8 -4
- package/lib/table/module/menu/panel.js +197 -126
- package/lib/table/render/index.js +151 -98
- package/lib/table/src/body.js +355 -233
- package/lib/table/src/cell.js +426 -269
- package/lib/table/src/columnInfo.js +1 -0
- package/lib/table/src/footer.js +144 -99
- package/lib/table/src/group.js +7 -3
- package/lib/table/src/header.js +229 -172
- package/lib/table/src/table.js +1471 -1029
- package/lib/table/src/util.js +15 -19
- package/lib/toolbar/src/toolbar.js +132 -75
- package/lib/ui/index.js +1 -1
- package/lib/ui/src/dom.js +9 -6
- package/lib/ui/src/log.js +1 -1
- package/package.json +2 -2
- package/packages/colgroup/index.ts +22 -22
- package/packages/column/index.ts +22 -22
- package/packages/components.ts +41 -44
- package/packages/grid/index.ts +18 -18
- package/packages/grid/src/emits.ts +5 -19
- package/packages/grid/src/grid.ts +2229 -1925
- package/packages/grid/src/props.ts +22 -23
- package/packages/index.ts +11 -11
- package/packages/locale/lang/fr-FR.ts +15 -15
- package/packages/locale/lang/it-IT.ts +4 -4
- package/packages/locale/lang/uk-UA.ts +1 -1
- package/packages/locale/lang/uz-UZ.ts +13 -13
- package/packages/locale/lang/zh-CN.ts +907 -907
- package/packages/table/index.ts +26 -26
- package/packages/table/module/custom/hook.ts +510 -503
- package/packages/table/module/custom/panel.ts +2002 -1743
- package/packages/table/module/edit/hook.ts +1224 -1131
- package/packages/table/module/export/export-panel.ts +697 -611
- package/packages/table/module/export/hook.ts +2160 -2059
- package/packages/table/module/export/import-panel.ts +319 -279
- package/packages/table/module/export/util.ts +25 -24
- package/packages/table/module/filter/hook.ts +519 -501
- package/packages/table/module/filter/panel.ts +368 -304
- package/packages/table/module/keyboard/hook.ts +498 -494
- package/packages/table/module/menu/hook.ts +330 -330
- package/packages/table/module/menu/panel.ts +272 -201
- package/packages/table/module/validator/hook.ts +653 -635
- package/packages/table/render/index.ts +1819 -1744
- package/packages/table/src/body.ts +1078 -955
- package/packages/table/src/cell.ts +1524 -1359
- package/packages/table/src/column.ts +192 -192
- package/packages/table/src/columnInfo.ts +232 -232
- package/packages/table/src/emits.ts +134 -134
- package/packages/table/src/footer.ts +425 -380
- package/packages/table/src/group.ts +67 -63
- package/packages/table/src/header.ts +642 -581
- package/packages/table/src/props.ts +336 -336
- package/packages/table/src/store.ts +14 -14
- package/packages/table/src/table.ts +16011 -15454
- package/packages/table/src/use/cell-view.ts +41 -44
- package/packages/table/src/use/index.ts +1 -1
- package/packages/table/src/util.ts +1206 -1216
- package/packages/toolbar/index.ts +18 -18
- package/packages/toolbar/src/toolbar.ts +768 -706
- package/packages/ui/index.ts +519 -520
- package/packages/ui/src/anime.ts +51 -52
- package/packages/ui/src/comp.ts +3 -3
- package/packages/ui/src/dom.ts +466 -463
- package/packages/ui/src/log.ts +19 -19
- package/packages/ui/src/utils.ts +66 -66
- package/packages/ui/src/vn.ts +55 -55
- package/packages/v-x-e-table/index.d.ts +3 -3
- package/packages/v-x-e-table/index.ts +3 -3
- package/types/all.d.ts +76 -76
- package/types/index.d.ts +4 -4
- /package/dist/{iconfont.1793007753347.ttf → iconfont.1793009263429.ttf} +0 -0
- /package/dist/{iconfont.1793007753347.woff → iconfont.1793009263429.woff} +0 -0
- /package/dist/{iconfont.1793007753347.woff2 → iconfont.1793009263429.woff2} +0 -0
- /package/es/{iconfont.1793007753347.ttf → iconfont.1793009263429.ttf} +0 -0
- /package/es/{iconfont.1793007753347.woff → iconfont.1793009263429.woff} +0 -0
- /package/es/{iconfont.1793007753347.woff2 → iconfont.1793009263429.woff2} +0 -0
- /package/lib/{iconfont.1793007753347.ttf → iconfont.1793009263429.ttf} +0 -0
- /package/lib/{iconfont.1793007753347.woff → iconfont.1793009263429.woff} +0 -0
- /package/lib/{iconfont.1793007753347.woff2 → iconfont.1793009263429.woff2} +0 -0
package/es/table/src/table.js
CHANGED
|
@@ -4,7 +4,38 @@ import XEUtils from "xe-utils";
|
|
|
4
4
|
import { VxeUI } from "@vxe-ui/core";
|
|
5
5
|
import { initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, wheelScrollTopTo, wheelScrollLeftTo, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey, checkTargetElement, hasAxternalInputTarget } from "../../ui/src/dom";
|
|
6
6
|
import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue, hasEnableConf, getDefaultConfig } from "../../ui/src/utils";
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
createReactData,
|
|
9
|
+
createInternalData,
|
|
10
|
+
getRowUniqueId,
|
|
11
|
+
createRowId,
|
|
12
|
+
clearTableAllStatus,
|
|
13
|
+
getColumnList,
|
|
14
|
+
toFilters,
|
|
15
|
+
hasDeepKey,
|
|
16
|
+
getRowkey,
|
|
17
|
+
getRowid,
|
|
18
|
+
rowToVisible,
|
|
19
|
+
colToVisible,
|
|
20
|
+
getCellValue,
|
|
21
|
+
setCellValue,
|
|
22
|
+
handleRowidOrRow,
|
|
23
|
+
handleFieldOrColumn,
|
|
24
|
+
toTreePathSeq,
|
|
25
|
+
restoreScrollLocation,
|
|
26
|
+
getRootColumn,
|
|
27
|
+
getRefElem,
|
|
28
|
+
getColReMinWidth,
|
|
29
|
+
getColReMaxWidth,
|
|
30
|
+
createHandleUpdateRowId,
|
|
31
|
+
createHandleGetRowId,
|
|
32
|
+
getCalcHeight,
|
|
33
|
+
getCellRestHeight,
|
|
34
|
+
getLastChildColumn,
|
|
35
|
+
getRowMaxHeight,
|
|
36
|
+
handleCustomStoreConfig,
|
|
37
|
+
encodeRowid
|
|
38
|
+
} from "./util";
|
|
8
39
|
import { getSlotVNs } from "../../ui/src/vn";
|
|
9
40
|
import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from "../../ui/src/anime";
|
|
10
41
|
import { createComponentLog } from "../../ui/src/log";
|
|
@@ -226,17 +257,20 @@ var table_default = defineVxeComponent({
|
|
|
226
257
|
const scrollbarYToLeft = computeScrollbarYToLeft.value;
|
|
227
258
|
const scrollXVisible = computeScrollXVisible.value;
|
|
228
259
|
const scrollYVisible = computeScrollYVisible.value;
|
|
229
|
-
return domUtils.buildClass(
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
260
|
+
return domUtils.buildClass(
|
|
261
|
+
[
|
|
262
|
+
"vxe-scrollbar is--virtual",
|
|
263
|
+
scrollbarOpts.fluentOverlay ? "is--fluent-overlay" : "is--default-mode",
|
|
264
|
+
`ov-x--${scrollXVisible === false ? "hidden" : "visible"}`,
|
|
265
|
+
`ov-y--${scrollYVisible === false ? "hidden" : "visible"}`,
|
|
266
|
+
`sx-pos--${scrollbarXToTop ? "top" : "bottom"}`,
|
|
267
|
+
`sy-pos--${scrollbarYToLeft ? "left" : "right"}`
|
|
268
|
+
],
|
|
269
|
+
{
|
|
270
|
+
"overflow-y": yThumbHeight,
|
|
271
|
+
"overflow-x": xThumbWidth
|
|
272
|
+
}
|
|
273
|
+
);
|
|
240
274
|
});
|
|
241
275
|
const computeScrollYThreshold = computed(() => {
|
|
242
276
|
const virtualYOpts = computeVirtualYOpts.value;
|
|
@@ -339,17 +373,29 @@ var table_default = defineVxeComponent({
|
|
|
339
373
|
});
|
|
340
374
|
const computeHeaderTooltipOpts = computed(() => {
|
|
341
375
|
const tooltipOpts = computeTooltipOpts.value;
|
|
342
|
-
return Object.assign(
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
376
|
+
return Object.assign(
|
|
377
|
+
{},
|
|
378
|
+
getConfig().tooltip,
|
|
379
|
+
{
|
|
380
|
+
enterable: tooltipOpts.enterable,
|
|
381
|
+
defaultPlacement: tooltipOpts.defaultPlacement
|
|
382
|
+
},
|
|
383
|
+
getConfig().table.headerTooltipConfig,
|
|
384
|
+
props.headerTooltipConfig
|
|
385
|
+
);
|
|
346
386
|
});
|
|
347
387
|
const computeFooterTooltipOpts = computed(() => {
|
|
348
388
|
const tooltipOpts = computeTooltipOpts.value;
|
|
349
|
-
return Object.assign(
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
389
|
+
return Object.assign(
|
|
390
|
+
{},
|
|
391
|
+
getConfig().tooltip,
|
|
392
|
+
{
|
|
393
|
+
enterable: tooltipOpts.enterable,
|
|
394
|
+
defaultPlacement: tooltipOpts.defaultPlacement
|
|
395
|
+
},
|
|
396
|
+
getConfig().table.footerTooltipConfig,
|
|
397
|
+
props.footerTooltipConfig
|
|
398
|
+
);
|
|
353
399
|
});
|
|
354
400
|
const computeTableTipConfig = computed(() => {
|
|
355
401
|
const { tooltipStore } = reactData;
|
|
@@ -855,21 +901,7 @@ var table_default = defineVxeComponent({
|
|
|
855
901
|
// 已废弃
|
|
856
902
|
xegrid: $xeGrid
|
|
857
903
|
};
|
|
858
|
-
const {
|
|
859
|
-
refTrackXElem,
|
|
860
|
-
refTrackYElem,
|
|
861
|
-
refThumbXElem,
|
|
862
|
-
refThumbYElem,
|
|
863
|
-
updateThumbSize,
|
|
864
|
-
updateThumbOffset,
|
|
865
|
-
clickTrackXEvent,
|
|
866
|
-
clickTrackYEvent,
|
|
867
|
-
pointerdownThumbXEvent,
|
|
868
|
-
pointermoveThumbXEvent,
|
|
869
|
-
cleatPointerThumbEvent,
|
|
870
|
-
pointerdownThumbYEvent,
|
|
871
|
-
pointermoveThumbYEvent
|
|
872
|
-
} = useFns.useInitVScrollbar($xeTable);
|
|
904
|
+
const { refTrackXElem, refTrackYElem, refThumbXElem, refThumbYElem, updateThumbSize, updateThumbOffset, clickTrackXEvent, clickTrackYEvent, pointerdownThumbXEvent, pointermoveThumbXEvent, cleatPointerThumbEvent, pointerdownThumbYEvent, pointermoveThumbYEvent } = useFns.useInitVScrollbar($xeTable);
|
|
873
905
|
const eqCellValue = (newRow, oldRow, field) => {
|
|
874
906
|
const val1 = XEUtils.get(newRow, field);
|
|
875
907
|
const val2 = XEUtils.get(oldRow, field);
|
|
@@ -1530,13 +1562,17 @@ var table_default = defineVxeComponent({
|
|
|
1530
1562
|
sortData = XEUtils.orderBy(sortRests, { field: "index", order: "asc" }).map((item) => ({ k: item.key }));
|
|
1531
1563
|
}
|
|
1532
1564
|
let colNum = 1;
|
|
1533
|
-
XEUtils.eachTree(
|
|
1534
|
-
|
|
1535
|
-
|
|
1536
|
-
|
|
1537
|
-
|
|
1538
|
-
|
|
1539
|
-
|
|
1565
|
+
XEUtils.eachTree(
|
|
1566
|
+
sortData,
|
|
1567
|
+
(sObj, index, sOjs, path, pSObj) => {
|
|
1568
|
+
sortColMaps[sObj.k] = {
|
|
1569
|
+
key: sObj.k,
|
|
1570
|
+
sNum: colNum++,
|
|
1571
|
+
pKey: pSObj ? pSObj.k : null
|
|
1572
|
+
};
|
|
1573
|
+
},
|
|
1574
|
+
{ children: "c" }
|
|
1575
|
+
);
|
|
1540
1576
|
}
|
|
1541
1577
|
const colKeyMaps = {};
|
|
1542
1578
|
const allCols = [];
|
|
@@ -1604,9 +1640,7 @@ var table_default = defineVxeComponent({
|
|
|
1604
1640
|
}
|
|
1605
1641
|
const storeData = getCustomStorageMap(tableId);
|
|
1606
1642
|
if (restoreStore) {
|
|
1607
|
-
return Promise.resolve(
|
|
1608
|
-
restoreStore({ $table: $xeTable, id: tableId, type: "restore", storeData })
|
|
1609
|
-
).then((storeData2) => {
|
|
1643
|
+
return Promise.resolve(restoreStore({ $table: $xeTable, id: tableId, type: "restore", storeData })).then((storeData2) => {
|
|
1610
1644
|
if (!storeData2) {
|
|
1611
1645
|
return;
|
|
1612
1646
|
}
|
|
@@ -1745,7 +1779,7 @@ var table_default = defineVxeComponent({
|
|
|
1745
1779
|
if (expandOpts.mode !== "fixed" && mouseOpts.area) {
|
|
1746
1780
|
errLog("vxe.error.errConflicts", ["mouse-config.area", "column.type=expand"]);
|
|
1747
1781
|
}
|
|
1748
|
-
if (expandOpts.mode !== "inside" &&
|
|
1782
|
+
if (expandOpts.mode !== "inside" && treeConfig && !treeOpts.transform) {
|
|
1749
1783
|
errLog("vxe.error.notConflictProp", ["tree-config.transform=false", "expand-config.mode=inside"]);
|
|
1750
1784
|
}
|
|
1751
1785
|
}
|
|
@@ -2048,24 +2082,28 @@ var table_default = defineVxeComponent({
|
|
|
2048
2082
|
const fullMaps = {};
|
|
2049
2083
|
let rowNum = 0;
|
|
2050
2084
|
const { handleGetRowId } = createHandleGetRowId($xeTable);
|
|
2051
|
-
XEUtils.eachTree(
|
|
2052
|
-
|
|
2053
|
-
|
|
2054
|
-
|
|
2055
|
-
|
|
2056
|
-
|
|
2057
|
-
rowRest
|
|
2058
|
-
|
|
2059
|
-
|
|
2060
|
-
|
|
2061
|
-
|
|
2062
|
-
|
|
2063
|
-
|
|
2064
|
-
|
|
2065
|
-
|
|
2066
|
-
|
|
2067
|
-
|
|
2068
|
-
|
|
2085
|
+
XEUtils.eachTree(
|
|
2086
|
+
afterTreeFullData,
|
|
2087
|
+
(row, index, items, path, parentRow) => {
|
|
2088
|
+
const rowid = handleGetRowId(row);
|
|
2089
|
+
const rowRest = fullAllDataRowIdData[rowid];
|
|
2090
|
+
const seq = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : ".").join("");
|
|
2091
|
+
if (rowRest) {
|
|
2092
|
+
rowRest.seq = seq;
|
|
2093
|
+
rowRest._seq = rowNum;
|
|
2094
|
+
rowRest.treeIndex = index;
|
|
2095
|
+
rowRest._index = rowNum;
|
|
2096
|
+
rowRest._tIndex = rowNum;
|
|
2097
|
+
} else {
|
|
2098
|
+
const rest = { row, rowid, _seq: rowNum, seq, index, $index: -1, _index: rowNum, treeIndex: index, _tIndex: rowNum, items, parent: parentRow, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
|
|
2099
|
+
fullAllDataRowIdData[rowid] = rest;
|
|
2100
|
+
fullDataRowIdData[rowid] = rest;
|
|
2101
|
+
}
|
|
2102
|
+
rowNum++;
|
|
2103
|
+
fullMaps[rowid] = row;
|
|
2104
|
+
},
|
|
2105
|
+
{ children: transform ? mapChildrenField : childrenField }
|
|
2106
|
+
);
|
|
2069
2107
|
if (transform) {
|
|
2070
2108
|
afterFullData.forEach((row, index) => {
|
|
2071
2109
|
const rowid = handleGetRowId(row);
|
|
@@ -2119,35 +2157,43 @@ var table_default = defineVxeComponent({
|
|
|
2119
2157
|
const expandMaps = {};
|
|
2120
2158
|
if (treeConfig && treeOpts.transform) {
|
|
2121
2159
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
2122
|
-
XEUtils.eachTree(
|
|
2123
|
-
|
|
2124
|
-
|
|
2125
|
-
|
|
2126
|
-
const
|
|
2127
|
-
if (
|
|
2128
|
-
rowRest
|
|
2160
|
+
XEUtils.eachTree(
|
|
2161
|
+
internalData.afterTreeFullData,
|
|
2162
|
+
(row, index, items, path, parentRow) => {
|
|
2163
|
+
const rowid = handleGetRowId(row);
|
|
2164
|
+
const parentRowid = handleGetRowId(parentRow);
|
|
2165
|
+
if (!parentRow || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
|
|
2166
|
+
const rowRest = fullAllDataRowIdData[rowid];
|
|
2167
|
+
if (rowRest) {
|
|
2168
|
+
rowRest._index = fullData.length;
|
|
2169
|
+
}
|
|
2170
|
+
expandMaps[rowid] = 1;
|
|
2171
|
+
fullData.push(row);
|
|
2129
2172
|
}
|
|
2130
|
-
|
|
2131
|
-
|
|
2132
|
-
|
|
2133
|
-
}, { children: childrenField });
|
|
2173
|
+
},
|
|
2174
|
+
{ children: childrenField }
|
|
2175
|
+
);
|
|
2134
2176
|
internalData.afterFullData = fullData;
|
|
2135
2177
|
updateScrollYStatus(fullData);
|
|
2136
2178
|
return fullData;
|
|
2137
2179
|
} else if (isRowGroupStatus) {
|
|
2138
2180
|
const { childrenField } = aggregateOpts;
|
|
2139
|
-
XEUtils.eachTree(
|
|
2140
|
-
|
|
2141
|
-
|
|
2142
|
-
|
|
2143
|
-
const
|
|
2144
|
-
if (
|
|
2145
|
-
rowRest
|
|
2181
|
+
XEUtils.eachTree(
|
|
2182
|
+
internalData.afterGroupFullData,
|
|
2183
|
+
(row, index, items, path, parentRow) => {
|
|
2184
|
+
const rowid = handleGetRowId(row);
|
|
2185
|
+
const parentRowid = handleGetRowId(parentRow);
|
|
2186
|
+
if (!parentRow || expandMaps[parentRowid] && rowGroupExpandedMaps[parentRowid]) {
|
|
2187
|
+
const rowRest = fullAllDataRowIdData[rowid];
|
|
2188
|
+
if (rowRest) {
|
|
2189
|
+
rowRest._index = fullData.length;
|
|
2190
|
+
}
|
|
2191
|
+
expandMaps[rowid] = 1;
|
|
2192
|
+
fullData.push(row);
|
|
2146
2193
|
}
|
|
2147
|
-
|
|
2148
|
-
|
|
2149
|
-
|
|
2150
|
-
}, { children: childrenField });
|
|
2194
|
+
},
|
|
2195
|
+
{ children: childrenField }
|
|
2196
|
+
);
|
|
2151
2197
|
internalData.afterFullData = fullData;
|
|
2152
2198
|
updateScrollYStatus(fullData);
|
|
2153
2199
|
return fullData;
|
|
@@ -2268,7 +2314,10 @@ var table_default = defineVxeComponent({
|
|
|
2268
2314
|
children: aggregateOpts.mapChildrenField
|
|
2269
2315
|
});
|
|
2270
2316
|
tableTree = XEUtils.toArrayTree(
|
|
2271
|
-
XEUtils.orderBy(
|
|
2317
|
+
XEUtils.orderBy(
|
|
2318
|
+
treeList,
|
|
2319
|
+
orderColumns.map(({ column, order }) => [getOrderField(column), order])
|
|
2320
|
+
),
|
|
2272
2321
|
{
|
|
2273
2322
|
key: aggregateOpts.rowField,
|
|
2274
2323
|
parentKey: aggregateOpts.parentField,
|
|
@@ -2287,7 +2336,10 @@ var table_default = defineVxeComponent({
|
|
|
2287
2336
|
children: mapChildrenField
|
|
2288
2337
|
});
|
|
2289
2338
|
tableTree = XEUtils.toArrayTree(
|
|
2290
|
-
XEUtils.orderBy(
|
|
2339
|
+
XEUtils.orderBy(
|
|
2340
|
+
treeList,
|
|
2341
|
+
orderColumns.map(({ column, order }) => [getOrderField(column), order])
|
|
2342
|
+
),
|
|
2291
2343
|
{
|
|
2292
2344
|
key: rowField,
|
|
2293
2345
|
parentKey: parentField,
|
|
@@ -2302,7 +2354,10 @@ var table_default = defineVxeComponent({
|
|
|
2302
2354
|
const sortRests = allSortMethod({ data: tableData, sortList: orderColumns, $table: $xeTable });
|
|
2303
2355
|
tableData = XEUtils.isArray(sortRests) ? sortRests : tableData;
|
|
2304
2356
|
} else {
|
|
2305
|
-
tableData = XEUtils.orderBy(
|
|
2357
|
+
tableData = XEUtils.orderBy(
|
|
2358
|
+
tableData,
|
|
2359
|
+
orderColumns.map(({ column, order }) => [getOrderField(column), order])
|
|
2360
|
+
);
|
|
2306
2361
|
}
|
|
2307
2362
|
tableTree = tableData;
|
|
2308
2363
|
}
|
|
@@ -2622,6 +2677,7 @@ var table_default = defineVxeComponent({
|
|
|
2622
2677
|
defaultSort = [defaultSort];
|
|
2623
2678
|
}
|
|
2624
2679
|
if (defaultSort.length) {
|
|
2680
|
+
;
|
|
2625
2681
|
(sortConfig.multiple ? defaultSort : defaultSort.slice(0, 1)).forEach((item, index) => {
|
|
2626
2682
|
const { field, order } = item;
|
|
2627
2683
|
if (field && order) {
|
|
@@ -2718,7 +2774,7 @@ var table_default = defineVxeComponent({
|
|
|
2718
2774
|
const handleCheckedRadioRow = (row, isForce) => {
|
|
2719
2775
|
const radioOpts = computeRadioOpts.value;
|
|
2720
2776
|
const { checkMethod } = radioOpts;
|
|
2721
|
-
if (row && (isForce ||
|
|
2777
|
+
if (row && (isForce || !checkMethod || checkMethod({ $table: $xeTable, row }))) {
|
|
2722
2778
|
reactData.selectRadioRow = row;
|
|
2723
2779
|
handleRadioReserveRow(row);
|
|
2724
2780
|
}
|
|
@@ -2746,7 +2802,7 @@ var table_default = defineVxeComponent({
|
|
|
2746
2802
|
const selectRowMaps = {};
|
|
2747
2803
|
if (checkField) {
|
|
2748
2804
|
const checkValFn = (row) => {
|
|
2749
|
-
if (isForce ||
|
|
2805
|
+
if (isForce || !checkMethod || checkMethod({ $table: $xeTable, row })) {
|
|
2750
2806
|
if (checked) {
|
|
2751
2807
|
selectRowMaps[handleGetRowId(row)] = row;
|
|
2752
2808
|
}
|
|
@@ -2764,38 +2820,54 @@ var table_default = defineVxeComponent({
|
|
|
2764
2820
|
} else {
|
|
2765
2821
|
if (isRowGroupStatus) {
|
|
2766
2822
|
if (checked) {
|
|
2767
|
-
XEUtils.eachTree(
|
|
2768
|
-
|
|
2769
|
-
|
|
2770
|
-
|
|
2771
|
-
|
|
2772
|
-
}, { children: aggregateOpts.mapChildrenField });
|
|
2773
|
-
} else {
|
|
2774
|
-
if (!isForce && checkMethod) {
|
|
2775
|
-
XEUtils.eachTree(afterGroupFullData, (row) => {
|
|
2776
|
-
const rowid = handleGetRowId(row);
|
|
2777
|
-
if (checkMethod({ $table: $xeTable, row }) ? false : selectCheckboxMaps[rowid]) {
|
|
2823
|
+
XEUtils.eachTree(
|
|
2824
|
+
afterGroupFullData,
|
|
2825
|
+
(row) => {
|
|
2826
|
+
if (isForce || !checkMethod || checkMethod({ $table: $xeTable, row })) {
|
|
2827
|
+
const rowid = handleGetRowId(row);
|
|
2778
2828
|
selectRowMaps[rowid] = row;
|
|
2779
2829
|
}
|
|
2780
|
-
},
|
|
2830
|
+
},
|
|
2831
|
+
{ children: aggregateOpts.mapChildrenField }
|
|
2832
|
+
);
|
|
2833
|
+
} else {
|
|
2834
|
+
if (!isForce && checkMethod) {
|
|
2835
|
+
XEUtils.eachTree(
|
|
2836
|
+
afterGroupFullData,
|
|
2837
|
+
(row) => {
|
|
2838
|
+
const rowid = handleGetRowId(row);
|
|
2839
|
+
if (checkMethod({ $table: $xeTable, row }) ? false : selectCheckboxMaps[rowid]) {
|
|
2840
|
+
selectRowMaps[rowid] = row;
|
|
2841
|
+
}
|
|
2842
|
+
},
|
|
2843
|
+
{ children: aggregateOpts.mapChildrenField }
|
|
2844
|
+
);
|
|
2781
2845
|
}
|
|
2782
2846
|
}
|
|
2783
2847
|
} else if (treeConfig) {
|
|
2784
2848
|
if (checked) {
|
|
2785
|
-
XEUtils.eachTree(
|
|
2786
|
-
|
|
2787
|
-
|
|
2788
|
-
|
|
2789
|
-
|
|
2790
|
-
}, { children: childrenField });
|
|
2791
|
-
} else {
|
|
2792
|
-
if (!isForce && checkMethod) {
|
|
2793
|
-
XEUtils.eachTree(afterTreeFullData, (row) => {
|
|
2794
|
-
const rowid = handleGetRowId(row);
|
|
2795
|
-
if (checkMethod({ $table: $xeTable, row }) ? false : selectCheckboxMaps[rowid]) {
|
|
2849
|
+
XEUtils.eachTree(
|
|
2850
|
+
afterTreeFullData,
|
|
2851
|
+
(row) => {
|
|
2852
|
+
if (isForce || !checkMethod || checkMethod({ $table: $xeTable, row })) {
|
|
2853
|
+
const rowid = handleGetRowId(row);
|
|
2796
2854
|
selectRowMaps[rowid] = row;
|
|
2797
2855
|
}
|
|
2798
|
-
},
|
|
2856
|
+
},
|
|
2857
|
+
{ children: childrenField }
|
|
2858
|
+
);
|
|
2859
|
+
} else {
|
|
2860
|
+
if (!isForce && checkMethod) {
|
|
2861
|
+
XEUtils.eachTree(
|
|
2862
|
+
afterTreeFullData,
|
|
2863
|
+
(row) => {
|
|
2864
|
+
const rowid = handleGetRowId(row);
|
|
2865
|
+
if (checkMethod({ $table: $xeTable, row }) ? false : selectCheckboxMaps[rowid]) {
|
|
2866
|
+
selectRowMaps[rowid] = row;
|
|
2867
|
+
}
|
|
2868
|
+
},
|
|
2869
|
+
{ children: childrenField }
|
|
2870
|
+
);
|
|
2799
2871
|
}
|
|
2800
2872
|
}
|
|
2801
2873
|
} else {
|
|
@@ -2910,9 +2982,7 @@ var table_default = defineVxeComponent({
|
|
|
2910
2982
|
const rowid = getRowid($xeTable, row);
|
|
2911
2983
|
const rowRest = fullAllDataRowIdData[rowid];
|
|
2912
2984
|
treeExpandLazyLoadedMaps[rowid] = row;
|
|
2913
|
-
Promise.resolve(
|
|
2914
|
-
loadMethod({ $table: $xeTable, row })
|
|
2915
|
-
).then((childRecords) => {
|
|
2985
|
+
Promise.resolve(loadMethod({ $table: $xeTable, row })).then((childRecords) => {
|
|
2916
2986
|
if (rowRest) {
|
|
2917
2987
|
rowRest.treeLoaded = true;
|
|
2918
2988
|
}
|
|
@@ -3221,18 +3291,14 @@ var table_default = defineVxeComponent({
|
|
|
3221
3291
|
if (rceTimeout) {
|
|
3222
3292
|
clearTimeout(rceTimeout);
|
|
3223
3293
|
if (rceRunTime && rceRunTime + minRunDelay < Date.now()) {
|
|
3224
|
-
resolve(
|
|
3225
|
-
handleRecalculateStyle(reFull, reWidth, reHeight)
|
|
3226
|
-
);
|
|
3294
|
+
resolve(handleRecalculateStyle(reFull, reWidth, reHeight));
|
|
3227
3295
|
} else {
|
|
3228
3296
|
nextTick(() => {
|
|
3229
3297
|
resolve();
|
|
3230
3298
|
});
|
|
3231
3299
|
}
|
|
3232
3300
|
} else {
|
|
3233
|
-
resolve(
|
|
3234
|
-
handleRecalculateStyle(reFull, reWidth, reHeight)
|
|
3235
|
-
);
|
|
3301
|
+
resolve(handleRecalculateStyle(reFull, reWidth, reHeight));
|
|
3236
3302
|
}
|
|
3237
3303
|
if ($xeGanttView && $xeGanttView.handleLazyRecalculate) {
|
|
3238
3304
|
$xeGanttView.handleLazyRecalculate();
|
|
@@ -3274,6 +3340,7 @@ var table_default = defineVxeComponent({
|
|
|
3274
3340
|
const aggGroupFields = [];
|
|
3275
3341
|
const aggGroupConfs = [];
|
|
3276
3342
|
if (groupFields) {
|
|
3343
|
+
;
|
|
3277
3344
|
(XEUtils.isArray(groupFields) ? groupFields : [groupFields]).forEach((field) => {
|
|
3278
3345
|
aggGroupFields.push(field);
|
|
3279
3346
|
aggGroupConfs.push({
|
|
@@ -3328,14 +3395,14 @@ var table_default = defineVxeComponent({
|
|
|
3328
3395
|
childCount,
|
|
3329
3396
|
aggValue: currAggData ? currAggData.value : 0,
|
|
3330
3397
|
/**
|
|
3331
|
-
|
|
3332
|
-
|
|
3333
|
-
|
|
3398
|
+
* 已废弃
|
|
3399
|
+
* @deprecated
|
|
3400
|
+
*/
|
|
3334
3401
|
children: childList,
|
|
3335
3402
|
/**
|
|
3336
|
-
|
|
3337
|
-
|
|
3338
|
-
|
|
3403
|
+
* 已废弃
|
|
3404
|
+
* @deprecated
|
|
3405
|
+
*/
|
|
3339
3406
|
totalValue: childCount
|
|
3340
3407
|
};
|
|
3341
3408
|
let aggVal = 0;
|
|
@@ -3371,11 +3438,15 @@ var table_default = defineVxeComponent({
|
|
|
3371
3438
|
const { mapChildrenField } = aggregateOpts;
|
|
3372
3439
|
if ((aggregateConfig || rowGroupConfig) && isRowGroupStatus) {
|
|
3373
3440
|
const aggList = [];
|
|
3374
|
-
XEUtils.eachTree(
|
|
3375
|
-
|
|
3376
|
-
|
|
3377
|
-
|
|
3378
|
-
|
|
3441
|
+
XEUtils.eachTree(
|
|
3442
|
+
tableFullGroupData,
|
|
3443
|
+
(row) => {
|
|
3444
|
+
if (row.isAggregate) {
|
|
3445
|
+
aggList.push(row);
|
|
3446
|
+
}
|
|
3447
|
+
},
|
|
3448
|
+
{ children: mapChildrenField }
|
|
3449
|
+
);
|
|
3379
3450
|
handleeGroupSummary(aggList);
|
|
3380
3451
|
}
|
|
3381
3452
|
};
|
|
@@ -3634,10 +3705,14 @@ var table_default = defineVxeComponent({
|
|
|
3634
3705
|
}
|
|
3635
3706
|
handleReserveStatus();
|
|
3636
3707
|
$xeTable.checkSelectionStatus();
|
|
3637
|
-
$xeTable.dispatchEvent(
|
|
3638
|
-
|
|
3639
|
-
|
|
3640
|
-
|
|
3708
|
+
$xeTable.dispatchEvent(
|
|
3709
|
+
"data-change",
|
|
3710
|
+
{
|
|
3711
|
+
visibleColumn: internalData.visibleColumn,
|
|
3712
|
+
visibleData: internalData.afterFullData
|
|
3713
|
+
},
|
|
3714
|
+
null
|
|
3715
|
+
);
|
|
3641
3716
|
return new Promise((resolve) => {
|
|
3642
3717
|
nextTick().then(() => handleRecalculateStyle(false, false, false)).then(() => {
|
|
3643
3718
|
handleRecalculateStyle(false, true, true);
|
|
@@ -3683,16 +3758,24 @@ var table_default = defineVxeComponent({
|
|
|
3683
3758
|
});
|
|
3684
3759
|
}).then(() => {
|
|
3685
3760
|
if (initStatus) {
|
|
3686
|
-
dispatchEvent(
|
|
3687
|
-
|
|
3688
|
-
|
|
3689
|
-
|
|
3690
|
-
|
|
3761
|
+
dispatchEvent(
|
|
3762
|
+
"data-rendered",
|
|
3763
|
+
{
|
|
3764
|
+
isReload,
|
|
3765
|
+
visibleColumn: internalData.visibleColumn,
|
|
3766
|
+
visibleData: internalData.afterFullData
|
|
3767
|
+
},
|
|
3768
|
+
null
|
|
3769
|
+
);
|
|
3691
3770
|
} else {
|
|
3692
|
-
dispatchEvent(
|
|
3693
|
-
|
|
3694
|
-
|
|
3695
|
-
|
|
3771
|
+
dispatchEvent(
|
|
3772
|
+
"init-rendered",
|
|
3773
|
+
{
|
|
3774
|
+
visibleColumn: internalData.visibleColumn,
|
|
3775
|
+
visibleData: internalData.afterFullData
|
|
3776
|
+
},
|
|
3777
|
+
null
|
|
3778
|
+
);
|
|
3696
3779
|
}
|
|
3697
3780
|
});
|
|
3698
3781
|
});
|
|
@@ -3896,7 +3979,7 @@ var table_default = defineVxeComponent({
|
|
|
3896
3979
|
$xeTable.clearMergeFooterItems();
|
|
3897
3980
|
$xeTable.handleTableData(true);
|
|
3898
3981
|
$xeTable.handleAggregateSummaryData();
|
|
3899
|
-
if ((scrollXLoad || scrollYLoad) &&
|
|
3982
|
+
if ((scrollXLoad || scrollYLoad) && expandColumn && expandOpts.mode !== "fixed") {
|
|
3900
3983
|
warnLog("vxe.error.scrollErrProp", ["column.type=expand"]);
|
|
3901
3984
|
}
|
|
3902
3985
|
return nextTick().then(() => {
|
|
@@ -3924,9 +4007,7 @@ var table_default = defineVxeComponent({
|
|
|
3924
4007
|
reactData.updateColFlag++;
|
|
3925
4008
|
reactData.isColLoading = true;
|
|
3926
4009
|
initColumnHierarchy();
|
|
3927
|
-
return Promise.resolve(
|
|
3928
|
-
restoreCustomStorage()
|
|
3929
|
-
).then(() => {
|
|
4010
|
+
return Promise.resolve(restoreCustomStorage()).then(() => {
|
|
3930
4011
|
return buildColumnInfo();
|
|
3931
4012
|
});
|
|
3932
4013
|
};
|
|
@@ -3950,7 +4031,7 @@ var table_default = defineVxeComponent({
|
|
|
3950
4031
|
const { transform } = treeOpts;
|
|
3951
4032
|
const allList = fullData || internalData.tableFullData;
|
|
3952
4033
|
let scrollYLoad = !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
|
|
3953
|
-
if (scrollYLoad &&
|
|
4034
|
+
if (scrollYLoad && treeConfig && !transform) {
|
|
3954
4035
|
errLog("vxe.error.notSupportProp", ["[table] virtual-y-config.enabled=true", "tree-config.transform=false", "tree-config.transform=true"]);
|
|
3955
4036
|
scrollYLoad = false;
|
|
3956
4037
|
}
|
|
@@ -4108,12 +4189,16 @@ var table_default = defineVxeComponent({
|
|
|
4108
4189
|
const handleCheckAllEvent = (evnt, value) => {
|
|
4109
4190
|
handleCheckedAllCheckboxRow(value);
|
|
4110
4191
|
if (evnt) {
|
|
4111
|
-
dispatchEvent(
|
|
4112
|
-
|
|
4113
|
-
|
|
4114
|
-
|
|
4115
|
-
|
|
4116
|
-
|
|
4192
|
+
dispatchEvent(
|
|
4193
|
+
"checkbox-all",
|
|
4194
|
+
{
|
|
4195
|
+
records: () => $xeTable.getCheckboxRecords(),
|
|
4196
|
+
reserves: () => $xeTable.getCheckboxReserveRecords(),
|
|
4197
|
+
indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
|
|
4198
|
+
checked: value
|
|
4199
|
+
},
|
|
4200
|
+
evnt
|
|
4201
|
+
);
|
|
4117
4202
|
}
|
|
4118
4203
|
};
|
|
4119
4204
|
const loadScrollYData = () => {
|
|
@@ -4241,11 +4326,7 @@ var table_default = defineVxeComponent({
|
|
|
4241
4326
|
});
|
|
4242
4327
|
}
|
|
4243
4328
|
updateRowExpandStyle();
|
|
4244
|
-
return Promise.all([
|
|
4245
|
-
xRest,
|
|
4246
|
-
yRest,
|
|
4247
|
-
scrollXLoad || scrollYLoad ? $xeTable.updateCellAreas() : null
|
|
4248
|
-
]);
|
|
4329
|
+
return Promise.all([xRest, yRest, scrollXLoad || scrollYLoad ? $xeTable.updateCellAreas() : null]);
|
|
4249
4330
|
};
|
|
4250
4331
|
const checkLastSyncScroll = (isRollX, isRollY) => {
|
|
4251
4332
|
const { lcsTimeout } = internalData;
|
|
@@ -4720,13 +4801,17 @@ var table_default = defineVxeComponent({
|
|
|
4720
4801
|
sourceDataRowIdData[rowid2] = XEUtils.clone(childRow, true);
|
|
4721
4802
|
});
|
|
4722
4803
|
}
|
|
4723
|
-
XEUtils.eachTree(
|
|
4724
|
-
|
|
4725
|
-
|
|
4726
|
-
|
|
4727
|
-
|
|
4728
|
-
|
|
4729
|
-
|
|
4804
|
+
XEUtils.eachTree(
|
|
4805
|
+
rows,
|
|
4806
|
+
(childRow, index, items, path, parentItem, nodes) => {
|
|
4807
|
+
const rowid = getRowid($xeTable, childRow);
|
|
4808
|
+
const parentRow = parentItem || parentRest.row;
|
|
4809
|
+
const rest = { row: childRow, rowid, _seq: -1, seq: -1, index, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
|
|
4810
|
+
fullDataRowIdData[rowid] = rest;
|
|
4811
|
+
fullAllDataRowIdData[rowid] = rest;
|
|
4812
|
+
},
|
|
4813
|
+
{ children: childrenField }
|
|
4814
|
+
);
|
|
4730
4815
|
row[childrenField] = rows;
|
|
4731
4816
|
if (transform) {
|
|
4732
4817
|
row[mapChildrenField] = XEUtils.clone(rows, false);
|
|
@@ -6204,9 +6289,13 @@ var table_default = defineVxeComponent({
|
|
|
6204
6289
|
const { handleGetRowId } = createHandleGetRowId($xeTable);
|
|
6205
6290
|
const afterFullIdMaps = {};
|
|
6206
6291
|
if (treeConfig) {
|
|
6207
|
-
XEUtils.eachTree(
|
|
6208
|
-
|
|
6209
|
-
|
|
6292
|
+
XEUtils.eachTree(
|
|
6293
|
+
afterFullData,
|
|
6294
|
+
(row) => {
|
|
6295
|
+
afterFullIdMaps[handleGetRowId(row)] = 1;
|
|
6296
|
+
},
|
|
6297
|
+
{ children: childrenField }
|
|
6298
|
+
);
|
|
6210
6299
|
} else {
|
|
6211
6300
|
afterFullData.forEach((row) => {
|
|
6212
6301
|
afterFullIdMaps[handleGetRowId(row)] = 1;
|
|
@@ -6496,9 +6585,7 @@ var table_default = defineVxeComponent({
|
|
|
6496
6585
|
const { multiple, remote, orders } = sortOpts;
|
|
6497
6586
|
if (sortConfs) {
|
|
6498
6587
|
if (XEUtils.isString(sortConfs)) {
|
|
6499
|
-
sortConfs = [
|
|
6500
|
-
{ field: sortConfs, order: sortOrder }
|
|
6501
|
-
];
|
|
6588
|
+
sortConfs = [{ field: sortConfs, order: sortOrder }];
|
|
6502
6589
|
}
|
|
6503
6590
|
}
|
|
6504
6591
|
if (!XEUtils.isArray(sortConfs)) {
|
|
@@ -6508,6 +6595,7 @@ var table_default = defineVxeComponent({
|
|
|
6508
6595
|
if (!multiple) {
|
|
6509
6596
|
clearAllSort();
|
|
6510
6597
|
}
|
|
6598
|
+
;
|
|
6511
6599
|
(multiple ? sortConfs : [sortConfs[0]]).forEach((confs, index) => {
|
|
6512
6600
|
let { field, order } = confs;
|
|
6513
6601
|
let column = field;
|
|
@@ -6646,13 +6734,17 @@ var table_default = defineVxeComponent({
|
|
|
6646
6734
|
filterStore.visible = false;
|
|
6647
6735
|
if (visible) {
|
|
6648
6736
|
const field = column ? column.field : null;
|
|
6649
|
-
dispatchEvent(
|
|
6650
|
-
|
|
6651
|
-
|
|
6652
|
-
|
|
6653
|
-
|
|
6654
|
-
|
|
6655
|
-
|
|
6737
|
+
dispatchEvent(
|
|
6738
|
+
"filter-visible",
|
|
6739
|
+
{
|
|
6740
|
+
column,
|
|
6741
|
+
property: field,
|
|
6742
|
+
field,
|
|
6743
|
+
filterList: () => $xeTable.getCheckedFilters(),
|
|
6744
|
+
visible: false
|
|
6745
|
+
},
|
|
6746
|
+
null
|
|
6747
|
+
);
|
|
6656
6748
|
}
|
|
6657
6749
|
return nextTick();
|
|
6658
6750
|
},
|
|
@@ -6794,9 +6886,13 @@ var table_default = defineVxeComponent({
|
|
|
6794
6886
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
6795
6887
|
let expandedRows = [];
|
|
6796
6888
|
if (props.treeConfig) {
|
|
6797
|
-
XEUtils.eachTree(
|
|
6798
|
-
|
|
6799
|
-
|
|
6889
|
+
XEUtils.eachTree(
|
|
6890
|
+
tableFullTreeData,
|
|
6891
|
+
(row) => {
|
|
6892
|
+
expandedRows.push(row);
|
|
6893
|
+
},
|
|
6894
|
+
{ children: childrenField }
|
|
6895
|
+
);
|
|
6800
6896
|
} else {
|
|
6801
6897
|
expandedRows = tableFullData;
|
|
6802
6898
|
}
|
|
@@ -6933,9 +7029,11 @@ var table_default = defineVxeComponent({
|
|
|
6933
7029
|
return nextTick();
|
|
6934
7030
|
}
|
|
6935
7031
|
if (confList.length) {
|
|
6936
|
-
handleUpdateRowGroup(
|
|
6937
|
-
|
|
6938
|
-
|
|
7032
|
+
handleUpdateRowGroup(
|
|
7033
|
+
confList.map((fieldOrColumn) => {
|
|
7034
|
+
return XEUtils.isString(fieldOrColumn) ? fieldOrColumn : fieldOrColumn.field;
|
|
7035
|
+
})
|
|
7036
|
+
);
|
|
6939
7037
|
return loadTableData(internalData.tableSynchData, false, true);
|
|
6940
7038
|
}
|
|
6941
7039
|
return nextTick();
|
|
@@ -7021,11 +7119,15 @@ var table_default = defineVxeComponent({
|
|
|
7021
7119
|
groupFields.forEach((groupField) => {
|
|
7022
7120
|
gfKeys[groupField] = true;
|
|
7023
7121
|
});
|
|
7024
|
-
XEUtils.eachTree(
|
|
7025
|
-
|
|
7026
|
-
|
|
7027
|
-
|
|
7028
|
-
|
|
7122
|
+
XEUtils.eachTree(
|
|
7123
|
+
internalData.afterGroupFullData,
|
|
7124
|
+
(row) => {
|
|
7125
|
+
if (row.isAggregate && gfKeys[row.groupField]) {
|
|
7126
|
+
rows.push(row);
|
|
7127
|
+
}
|
|
7128
|
+
},
|
|
7129
|
+
{ children: childrenField }
|
|
7130
|
+
);
|
|
7029
7131
|
if (rows.length) {
|
|
7030
7132
|
return handleRowGroupVirtualExpand(rows, expanded);
|
|
7031
7133
|
}
|
|
@@ -7039,11 +7141,15 @@ var table_default = defineVxeComponent({
|
|
|
7039
7141
|
const { mapChildrenField } = aggregateOpts;
|
|
7040
7142
|
const rgExpandedMaps = {};
|
|
7041
7143
|
if (expanded && mapChildrenField) {
|
|
7042
|
-
XEUtils.eachTree(
|
|
7043
|
-
|
|
7044
|
-
|
|
7045
|
-
|
|
7046
|
-
|
|
7144
|
+
XEUtils.eachTree(
|
|
7145
|
+
tableFullGroupData,
|
|
7146
|
+
(row) => {
|
|
7147
|
+
if (row[mapChildrenField] && row[mapChildrenField].length) {
|
|
7148
|
+
rgExpandedMaps[getRowid($xeTable, row)] = row;
|
|
7149
|
+
}
|
|
7150
|
+
},
|
|
7151
|
+
{ children: mapChildrenField }
|
|
7152
|
+
);
|
|
7047
7153
|
}
|
|
7048
7154
|
internalData.rowGroupExpandedMaps = rgExpandedMaps;
|
|
7049
7155
|
handleVirtualTreeToList();
|
|
@@ -7154,12 +7260,16 @@ var table_default = defineVxeComponent({
|
|
|
7154
7260
|
const { transform, lazy } = treeOpts;
|
|
7155
7261
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
7156
7262
|
const expandeds = [];
|
|
7157
|
-
XEUtils.eachTree(
|
|
7158
|
-
|
|
7159
|
-
|
|
7160
|
-
|
|
7161
|
-
|
|
7162
|
-
|
|
7263
|
+
XEUtils.eachTree(
|
|
7264
|
+
tableFullTreeData,
|
|
7265
|
+
(row) => {
|
|
7266
|
+
const rowChildren = row[childrenField];
|
|
7267
|
+
if (lazy || rowChildren && rowChildren.length) {
|
|
7268
|
+
expandeds.push(row);
|
|
7269
|
+
}
|
|
7270
|
+
},
|
|
7271
|
+
{ children: childrenField }
|
|
7272
|
+
);
|
|
7163
7273
|
return $xeTable.setTreeExpand(expandeds, expanded).then(() => {
|
|
7164
7274
|
if (transform) {
|
|
7165
7275
|
handleVirtualTreeToList();
|
|
@@ -7309,12 +7419,15 @@ var table_default = defineVxeComponent({
|
|
|
7309
7419
|
}
|
|
7310
7420
|
}
|
|
7311
7421
|
return new Promise((resolve) => {
|
|
7312
|
-
setTimeout(
|
|
7313
|
-
|
|
7314
|
-
|
|
7315
|
-
|
|
7316
|
-
|
|
7317
|
-
|
|
7422
|
+
setTimeout(
|
|
7423
|
+
() => {
|
|
7424
|
+
nextTick(() => {
|
|
7425
|
+
internalData.intoRunScroll = false;
|
|
7426
|
+
resolve();
|
|
7427
|
+
});
|
|
7428
|
+
},
|
|
7429
|
+
reactData.scrollXLoad || reactData.scrollYLoad ? 30 : 0
|
|
7430
|
+
);
|
|
7318
7431
|
});
|
|
7319
7432
|
},
|
|
7320
7433
|
/**
|
|
@@ -7454,10 +7567,14 @@ var table_default = defineVxeComponent({
|
|
|
7454
7567
|
reactData.footerTableData = footData;
|
|
7455
7568
|
$xeTable.clearFooterFormatterCache();
|
|
7456
7569
|
$xeTable.handleUpdateFooterMerge();
|
|
7457
|
-
$xeTable.dispatchEvent(
|
|
7458
|
-
|
|
7459
|
-
|
|
7460
|
-
|
|
7570
|
+
$xeTable.dispatchEvent(
|
|
7571
|
+
"footer-data-change",
|
|
7572
|
+
{
|
|
7573
|
+
visibleColumn: internalData.visibleColumn,
|
|
7574
|
+
footData
|
|
7575
|
+
},
|
|
7576
|
+
null
|
|
7577
|
+
);
|
|
7461
7578
|
return nextTick();
|
|
7462
7579
|
},
|
|
7463
7580
|
/**
|
|
@@ -7671,9 +7788,7 @@ var table_default = defineVxeComponent({
|
|
|
7671
7788
|
reactData.updateColFlag++;
|
|
7672
7789
|
reactData.isColLoading = true;
|
|
7673
7790
|
initColumnHierarchy();
|
|
7674
|
-
return Promise.resolve(
|
|
7675
|
-
handleCustomRestore(storeData)
|
|
7676
|
-
).then(() => {
|
|
7791
|
+
return Promise.resolve(handleCustomRestore(storeData)).then(() => {
|
|
7677
7792
|
return buildColumnInfo();
|
|
7678
7793
|
}).then(() => {
|
|
7679
7794
|
const { isRowGroupStatus, rowGroupList } = reactData;
|
|
@@ -8521,6 +8636,7 @@ var table_default = defineVxeComponent({
|
|
|
8521
8636
|
if (el) {
|
|
8522
8637
|
const clss = "row--drag-origin";
|
|
8523
8638
|
XEUtils.arrayEach(el.querySelectorAll(`.${clss}`), (elem) => {
|
|
8639
|
+
;
|
|
8524
8640
|
elem.draggable = false;
|
|
8525
8641
|
removeClass(elem, clss);
|
|
8526
8642
|
});
|
|
@@ -8572,6 +8688,7 @@ var table_default = defineVxeComponent({
|
|
|
8572
8688
|
if (el) {
|
|
8573
8689
|
const clss = "col--drag-origin";
|
|
8574
8690
|
XEUtils.arrayEach(el.querySelectorAll(`.${clss}`), (elem) => {
|
|
8691
|
+
;
|
|
8575
8692
|
elem.draggable = false;
|
|
8576
8693
|
removeClass(elem, clss);
|
|
8577
8694
|
});
|
|
@@ -9113,27 +9230,35 @@ var table_default = defineVxeComponent({
|
|
|
9113
9230
|
const { lazy } = treeOpts;
|
|
9114
9231
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
9115
9232
|
const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
|
|
9116
|
-
XEUtils.eachTree(
|
|
9117
|
-
|
|
9118
|
-
|
|
9119
|
-
|
|
9120
|
-
|
|
9121
|
-
|
|
9122
|
-
|
|
9123
|
-
|
|
9124
|
-
|
|
9233
|
+
XEUtils.eachTree(
|
|
9234
|
+
tableFullTreeData,
|
|
9235
|
+
(row, index, items, path, parentRow, nodes) => {
|
|
9236
|
+
const rowid = handleUpdateRowId(row);
|
|
9237
|
+
if (lazy) {
|
|
9238
|
+
if (row[hasChildField] && row[childrenField] === void 0) {
|
|
9239
|
+
row[childrenField] = null;
|
|
9240
|
+
}
|
|
9241
|
+
if (treeExpandedMaps[rowid]) {
|
|
9242
|
+
if (!row[childrenField] || !row[childrenField].length) {
|
|
9243
|
+
delete treeExpandedMaps[rowid];
|
|
9244
|
+
}
|
|
9125
9245
|
}
|
|
9126
9246
|
}
|
|
9127
|
-
|
|
9128
|
-
|
|
9129
|
-
|
|
9247
|
+
handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, toTreePathSeq(path));
|
|
9248
|
+
},
|
|
9249
|
+
{ children: childrenField }
|
|
9250
|
+
);
|
|
9130
9251
|
} else if (isRowGroupStatus) {
|
|
9131
9252
|
const aggregateOpts = computeAggregateOpts.value;
|
|
9132
9253
|
const { mapChildrenField } = aggregateOpts;
|
|
9133
|
-
XEUtils.eachTree(
|
|
9134
|
-
|
|
9135
|
-
|
|
9136
|
-
|
|
9254
|
+
XEUtils.eachTree(
|
|
9255
|
+
tableFullGroupData,
|
|
9256
|
+
(row, index, items, path, parentRow, nodes) => {
|
|
9257
|
+
const rowid = handleUpdateRowId(row);
|
|
9258
|
+
handleRowCache(row, index, items, parentRow ? -1 : index, parentRow, rowid, nodes.length - 1, toTreePathSeq(path));
|
|
9259
|
+
},
|
|
9260
|
+
{ children: mapChildrenField }
|
|
9261
|
+
);
|
|
9137
9262
|
} else {
|
|
9138
9263
|
tableFullData.forEach((row, index, items) => {
|
|
9139
9264
|
handleRowCache(row, index, items, index, null, handleUpdateRowId(row), 0, index + 1);
|
|
@@ -9690,29 +9815,37 @@ var table_default = defineVxeComponent({
|
|
|
9690
9815
|
if (isRowGroupStatus) {
|
|
9691
9816
|
const mapChildrenField = aggregateOpts.mapChildrenField;
|
|
9692
9817
|
if (mapChildrenField) {
|
|
9693
|
-
XEUtils.eachTree(
|
|
9818
|
+
XEUtils.eachTree(
|
|
9819
|
+
afterGroupFullData,
|
|
9820
|
+
(row) => {
|
|
9821
|
+
const rowid = handleGetRowId(row);
|
|
9822
|
+
const childList = row[mapChildrenField];
|
|
9823
|
+
if (childList && childList.length && !childRowMaps[rowid]) {
|
|
9824
|
+
childRowMaps[rowid] = 1;
|
|
9825
|
+
childRowList.unshift([row, rowid, childList]);
|
|
9826
|
+
}
|
|
9827
|
+
},
|
|
9828
|
+
{ children: mapChildrenField }
|
|
9829
|
+
);
|
|
9830
|
+
}
|
|
9831
|
+
} else if (treeConfig) {
|
|
9832
|
+
const { transform, mapChildrenField } = treeOpts;
|
|
9833
|
+
XEUtils.eachTree(
|
|
9834
|
+
afterTreeFullData,
|
|
9835
|
+
(row) => {
|
|
9694
9836
|
const rowid = handleGetRowId(row);
|
|
9695
|
-
const childList = row[mapChildrenField];
|
|
9837
|
+
const childList = row[transform ? mapChildrenField : childrenField];
|
|
9696
9838
|
if (childList && childList.length && !childRowMaps[rowid]) {
|
|
9697
9839
|
childRowMaps[rowid] = 1;
|
|
9698
9840
|
childRowList.unshift([row, rowid, childList]);
|
|
9841
|
+
} else {
|
|
9842
|
+
if (indeterminateField) {
|
|
9843
|
+
XEUtils.set(row, indeterminateField, false);
|
|
9844
|
+
}
|
|
9699
9845
|
}
|
|
9700
|
-
},
|
|
9701
|
-
|
|
9702
|
-
|
|
9703
|
-
const { transform, mapChildrenField } = treeOpts;
|
|
9704
|
-
XEUtils.eachTree(afterTreeFullData, (row) => {
|
|
9705
|
-
const rowid = handleGetRowId(row);
|
|
9706
|
-
const childList = row[transform ? mapChildrenField : childrenField];
|
|
9707
|
-
if (childList && childList.length && !childRowMaps[rowid]) {
|
|
9708
|
-
childRowMaps[rowid] = 1;
|
|
9709
|
-
childRowList.unshift([row, rowid, childList]);
|
|
9710
|
-
} else {
|
|
9711
|
-
if (indeterminateField) {
|
|
9712
|
-
XEUtils.set(row, indeterminateField, false);
|
|
9713
|
-
}
|
|
9714
|
-
}
|
|
9715
|
-
}, { children: transform ? mapChildrenField : childrenField });
|
|
9846
|
+
},
|
|
9847
|
+
{ children: transform ? mapChildrenField : childrenField }
|
|
9848
|
+
);
|
|
9716
9849
|
}
|
|
9717
9850
|
childRowList.forEach((vals) => {
|
|
9718
9851
|
const row = vals[0];
|
|
@@ -9814,44 +9947,46 @@ var table_default = defineVxeComponent({
|
|
|
9814
9947
|
let dhLen = 0;
|
|
9815
9948
|
let vLen = 0;
|
|
9816
9949
|
const rootList = treeConfig ? afterTreeFullData : isRowGroupStatus ? afterGroupFullData : afterFullData;
|
|
9817
|
-
rootList.forEach(
|
|
9818
|
-
|
|
9819
|
-
|
|
9820
|
-
|
|
9821
|
-
|
|
9822
|
-
|
|
9823
|
-
|
|
9824
|
-
|
|
9825
|
-
|
|
9826
|
-
|
|
9827
|
-
|
|
9828
|
-
|
|
9950
|
+
rootList.forEach(
|
|
9951
|
+
checkMethod ? (row) => {
|
|
9952
|
+
const childRowid = handleGetRowId(row);
|
|
9953
|
+
const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid];
|
|
9954
|
+
if (isRowGroupStatus && $xeTable.isAggregateRecord(row)) {
|
|
9955
|
+
const childList = row[mapChildrenField || ""];
|
|
9956
|
+
if (selected) {
|
|
9957
|
+
vLen++;
|
|
9958
|
+
sLen++;
|
|
9959
|
+
} else if (treeIndeterminateRowMaps[childRowid]) {
|
|
9960
|
+
vLen++;
|
|
9961
|
+
hLen++;
|
|
9962
|
+
} else if (childList && childList.length && childList.some((item) => checkMethod({ $table: $xeTable, row: item }))) {
|
|
9963
|
+
vLen++;
|
|
9964
|
+
}
|
|
9965
|
+
} else if (checkMethod({ $table: $xeTable, row })) {
|
|
9966
|
+
if (selected) {
|
|
9967
|
+
sLen++;
|
|
9968
|
+
} else if (treeIndeterminateRowMaps[childRowid]) {
|
|
9969
|
+
hLen++;
|
|
9970
|
+
}
|
|
9829
9971
|
vLen++;
|
|
9972
|
+
} else {
|
|
9973
|
+
if (selected) {
|
|
9974
|
+
dsLen++;
|
|
9975
|
+
} else if (treeIndeterminateRowMaps[childRowid]) {
|
|
9976
|
+
dhLen++;
|
|
9977
|
+
}
|
|
9830
9978
|
}
|
|
9831
|
-
}
|
|
9979
|
+
} : (row) => {
|
|
9980
|
+
const childRowid = handleGetRowId(row);
|
|
9981
|
+
const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid];
|
|
9832
9982
|
if (selected) {
|
|
9833
9983
|
sLen++;
|
|
9834
9984
|
} else if (treeIndeterminateRowMaps[childRowid]) {
|
|
9835
9985
|
hLen++;
|
|
9836
9986
|
}
|
|
9837
9987
|
vLen++;
|
|
9838
|
-
} else {
|
|
9839
|
-
if (selected) {
|
|
9840
|
-
dsLen++;
|
|
9841
|
-
} else if (treeIndeterminateRowMaps[childRowid]) {
|
|
9842
|
-
dhLen++;
|
|
9843
|
-
}
|
|
9844
9988
|
}
|
|
9845
|
-
|
|
9846
|
-
const childRowid = handleGetRowId(row);
|
|
9847
|
-
const selected = checkField ? XEUtils.get(row, checkField) : selectCheckboxMaps[childRowid];
|
|
9848
|
-
if (selected) {
|
|
9849
|
-
sLen++;
|
|
9850
|
-
} else if (treeIndeterminateRowMaps[childRowid]) {
|
|
9851
|
-
hLen++;
|
|
9852
|
-
}
|
|
9853
|
-
vLen++;
|
|
9854
|
-
});
|
|
9989
|
+
);
|
|
9855
9990
|
const isSelected = rootList.length > 0 ? vLen > 0 ? sLen >= vLen : sLen >= rootList.length : false;
|
|
9856
9991
|
let halfSelect = !isSelected && (sLen > 0 || hLen > 0 || dsLen > 0 || dhLen > 0);
|
|
9857
9992
|
if (!isSelected && !halfSelect && showReserveStatus) {
|
|
@@ -9882,20 +10017,24 @@ var table_default = defineVxeComponent({
|
|
|
9882
10017
|
const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
|
|
9883
10018
|
if (checkField) {
|
|
9884
10019
|
if ((treeConfig || isRowGroupStatus) && !checkStrictly) {
|
|
9885
|
-
XEUtils.eachTree(
|
|
9886
|
-
|
|
9887
|
-
|
|
9888
|
-
if (
|
|
9889
|
-
XEUtils.set(row,
|
|
10020
|
+
XEUtils.eachTree(
|
|
10021
|
+
rows,
|
|
10022
|
+
(row) => {
|
|
10023
|
+
if (isForce || !checkMethod || checkMethod({ $table: $xeTable, row })) {
|
|
10024
|
+
XEUtils.set(row, checkField, checked);
|
|
10025
|
+
if (indeterminateField) {
|
|
10026
|
+
XEUtils.set(row, indeterminateField, false);
|
|
10027
|
+
}
|
|
10028
|
+
handleCheckboxReserveRow(row, checked);
|
|
9890
10029
|
}
|
|
9891
|
-
|
|
9892
|
-
}
|
|
9893
|
-
|
|
10030
|
+
},
|
|
10031
|
+
{ children: transform ? mapChildrenField : childrenField }
|
|
10032
|
+
);
|
|
9894
10033
|
reactData.updateCheckboxFlag++;
|
|
9895
10034
|
return;
|
|
9896
10035
|
}
|
|
9897
10036
|
rows.forEach((row) => {
|
|
9898
|
-
if (isForce ||
|
|
10037
|
+
if (isForce || !checkMethod || checkMethod({ $table: $xeTable, row })) {
|
|
9899
10038
|
XEUtils.set(row, checkField, checked);
|
|
9900
10039
|
handleCheckboxReserveRow(row, checked);
|
|
9901
10040
|
}
|
|
@@ -9905,42 +10044,50 @@ var table_default = defineVxeComponent({
|
|
|
9905
10044
|
}
|
|
9906
10045
|
if (!checkStrictly) {
|
|
9907
10046
|
if (isRowGroupStatus) {
|
|
9908
|
-
XEUtils.eachTree(
|
|
9909
|
-
|
|
9910
|
-
|
|
9911
|
-
|
|
9912
|
-
|
|
9913
|
-
|
|
9914
|
-
|
|
9915
|
-
|
|
10047
|
+
XEUtils.eachTree(
|
|
10048
|
+
rows,
|
|
10049
|
+
(row) => {
|
|
10050
|
+
const rowid = handleGetRowId(row);
|
|
10051
|
+
if (isForce || !checkMethod || checkMethod({ $table: $xeTable, row })) {
|
|
10052
|
+
if (checked) {
|
|
10053
|
+
selectCheckboxMaps[rowid] = row;
|
|
10054
|
+
} else {
|
|
10055
|
+
if (selectCheckboxMaps[rowid]) {
|
|
10056
|
+
delete selectCheckboxMaps[rowid];
|
|
10057
|
+
}
|
|
9916
10058
|
}
|
|
10059
|
+
handleCheckboxReserveRow(row, checked);
|
|
9917
10060
|
}
|
|
9918
|
-
|
|
9919
|
-
}
|
|
9920
|
-
|
|
10061
|
+
},
|
|
10062
|
+
{ children: aggregateOpts.mapChildrenField }
|
|
10063
|
+
);
|
|
9921
10064
|
reactData.updateCheckboxFlag++;
|
|
9922
10065
|
return;
|
|
9923
10066
|
} else if (treeConfig) {
|
|
9924
|
-
XEUtils.eachTree(
|
|
9925
|
-
|
|
9926
|
-
|
|
9927
|
-
|
|
9928
|
-
|
|
9929
|
-
|
|
9930
|
-
|
|
9931
|
-
|
|
10067
|
+
XEUtils.eachTree(
|
|
10068
|
+
rows,
|
|
10069
|
+
(row) => {
|
|
10070
|
+
const rowid = handleGetRowId(row);
|
|
10071
|
+
if (isForce || !checkMethod || checkMethod({ $table: $xeTable, row })) {
|
|
10072
|
+
if (checked) {
|
|
10073
|
+
selectCheckboxMaps[rowid] = row;
|
|
10074
|
+
} else {
|
|
10075
|
+
if (selectCheckboxMaps[rowid]) {
|
|
10076
|
+
delete selectCheckboxMaps[rowid];
|
|
10077
|
+
}
|
|
9932
10078
|
}
|
|
10079
|
+
handleCheckboxReserveRow(row, checked);
|
|
9933
10080
|
}
|
|
9934
|
-
|
|
9935
|
-
}
|
|
9936
|
-
|
|
10081
|
+
},
|
|
10082
|
+
{ children: transform ? mapChildrenField : childrenField }
|
|
10083
|
+
);
|
|
9937
10084
|
reactData.updateCheckboxFlag++;
|
|
9938
10085
|
return;
|
|
9939
10086
|
}
|
|
9940
10087
|
}
|
|
9941
10088
|
rows.forEach((row) => {
|
|
9942
10089
|
const rowid = handleGetRowId(row);
|
|
9943
|
-
if (isForce ||
|
|
10090
|
+
if (isForce || !checkMethod || checkMethod({ $table: $xeTable, row })) {
|
|
9944
10091
|
if (checked) {
|
|
9945
10092
|
if (!selectCheckboxMaps[rowid]) {
|
|
9946
10093
|
selectCheckboxMaps[rowid] = row;
|
|
@@ -10456,12 +10603,19 @@ var table_default = defineVxeComponent({
|
|
|
10456
10603
|
if (!checkMethod || checkMethod({ $table: $xeTable, row })) {
|
|
10457
10604
|
$xeTable.handleBatchSelectRows([row], checked);
|
|
10458
10605
|
$xeTable.checkSelectionStatus();
|
|
10459
|
-
dispatchEvent(
|
|
10460
|
-
|
|
10461
|
-
|
|
10462
|
-
|
|
10463
|
-
|
|
10464
|
-
|
|
10606
|
+
dispatchEvent(
|
|
10607
|
+
"checkbox-change",
|
|
10608
|
+
Object.assign(
|
|
10609
|
+
{
|
|
10610
|
+
records: () => $xeTable.getCheckboxRecords(),
|
|
10611
|
+
reserves: () => $xeTable.getCheckboxReserveRecords(),
|
|
10612
|
+
indeterminates: () => $xeTable.getCheckboxIndeterminateRecords(),
|
|
10613
|
+
checked
|
|
10614
|
+
},
|
|
10615
|
+
params
|
|
10616
|
+
),
|
|
10617
|
+
evnt
|
|
10618
|
+
);
|
|
10465
10619
|
}
|
|
10466
10620
|
},
|
|
10467
10621
|
/**
|
|
@@ -10598,15 +10752,19 @@ var table_default = defineVxeComponent({
|
|
|
10598
10752
|
const columnIndex = expandColumn ? $xeTable.getColumnIndex(expandColumn) : -1;
|
|
10599
10753
|
const $columnIndex = expandColumn ? $xeTable.getVMColumnIndex(expandColumn) : -1;
|
|
10600
10754
|
$xeTable.setRowExpand(row, expanded);
|
|
10601
|
-
dispatchEvent(
|
|
10602
|
-
|
|
10603
|
-
|
|
10604
|
-
|
|
10605
|
-
|
|
10606
|
-
|
|
10607
|
-
|
|
10608
|
-
|
|
10609
|
-
|
|
10755
|
+
dispatchEvent(
|
|
10756
|
+
"toggle-row-expand",
|
|
10757
|
+
{
|
|
10758
|
+
expanded,
|
|
10759
|
+
column: expandColumn,
|
|
10760
|
+
columnIndex,
|
|
10761
|
+
$columnIndex,
|
|
10762
|
+
row,
|
|
10763
|
+
rowIndex: $xeTable.getRowIndex(row),
|
|
10764
|
+
$rowIndex: $xeTable.getVMRowIndex(row)
|
|
10765
|
+
},
|
|
10766
|
+
evnt
|
|
10767
|
+
);
|
|
10610
10768
|
}
|
|
10611
10769
|
},
|
|
10612
10770
|
/**
|
|
@@ -10865,9 +11023,13 @@ var table_default = defineVxeComponent({
|
|
|
10865
11023
|
if (oldRest && newRest) {
|
|
10866
11024
|
const { level: oldLevel } = oldRest;
|
|
10867
11025
|
const { level: newLevel } = newRest;
|
|
10868
|
-
XEUtils.eachTree(
|
|
10869
|
-
|
|
10870
|
-
|
|
11026
|
+
XEUtils.eachTree(
|
|
11027
|
+
[dragRow],
|
|
11028
|
+
(item) => {
|
|
11029
|
+
oldAllMaps[getRowid($xeTable, item)] = item;
|
|
11030
|
+
},
|
|
11031
|
+
{ children: mapChildrenField }
|
|
11032
|
+
);
|
|
10871
11033
|
if (oldLevel && newLevel) {
|
|
10872
11034
|
if (isPeerDrag && !isCrossDrag) {
|
|
10873
11035
|
if (oldRest.row[parentField] !== newRest.row[parentField]) {
|
|
@@ -10943,7 +11105,7 @@ var table_default = defineVxeComponent({
|
|
|
10943
11105
|
const ptfIndex = $xeTable.findRowIndexOf(fullList, prevDragRow);
|
|
10944
11106
|
const ntfIndex = ptfIndex + dragOffsetIndex;
|
|
10945
11107
|
fullList.splice(ntfIndex, 0, dragRow);
|
|
10946
|
-
if (isSelfToChildStatus &&
|
|
11108
|
+
if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
|
|
10947
11109
|
XEUtils.each(dragRow[childrenField], (childRow) => {
|
|
10948
11110
|
childRow[parentField] = dragRow[parentField];
|
|
10949
11111
|
});
|
|
@@ -10981,18 +11143,22 @@ var table_default = defineVxeComponent({
|
|
|
10981
11143
|
$xeTable.updateScrollYSpace();
|
|
10982
11144
|
}
|
|
10983
11145
|
if (evnt) {
|
|
10984
|
-
dispatchEvent(
|
|
10985
|
-
|
|
10986
|
-
|
|
10987
|
-
|
|
10988
|
-
|
|
10989
|
-
|
|
10990
|
-
|
|
10991
|
-
|
|
10992
|
-
|
|
10993
|
-
|
|
10994
|
-
|
|
10995
|
-
|
|
11146
|
+
dispatchEvent(
|
|
11147
|
+
"row-dragend",
|
|
11148
|
+
{
|
|
11149
|
+
oldRow: dragRow,
|
|
11150
|
+
newRow: prevDragRow,
|
|
11151
|
+
dragRow,
|
|
11152
|
+
dragPos: prevDragPos,
|
|
11153
|
+
dragToChild: isDragToChildFlag,
|
|
11154
|
+
offsetIndex: dragOffsetIndex,
|
|
11155
|
+
_index: {
|
|
11156
|
+
newIndex: nafIndex,
|
|
11157
|
+
oldIndex: oafIndex
|
|
11158
|
+
}
|
|
11159
|
+
},
|
|
11160
|
+
evnt
|
|
11161
|
+
);
|
|
10996
11162
|
}
|
|
10997
11163
|
return nextTick().then(() => {
|
|
10998
11164
|
if (animation) {
|
|
@@ -11135,9 +11301,13 @@ var table_default = defineVxeComponent({
|
|
|
11135
11301
|
moveRowAnimateToTb(dtTrList, dragRowHeight);
|
|
11136
11302
|
}
|
|
11137
11303
|
});
|
|
11138
|
-
dispatchEvent(
|
|
11139
|
-
row
|
|
11140
|
-
|
|
11304
|
+
dispatchEvent(
|
|
11305
|
+
"row-remove-dragend",
|
|
11306
|
+
{
|
|
11307
|
+
row: dragRow
|
|
11308
|
+
},
|
|
11309
|
+
evnt
|
|
11310
|
+
);
|
|
11141
11311
|
handleRowDragEndClearStatus();
|
|
11142
11312
|
}
|
|
11143
11313
|
}
|
|
@@ -11253,14 +11423,18 @@ var table_default = defineVxeComponent({
|
|
|
11253
11423
|
insertRest = $xeTable.insert(dragRow);
|
|
11254
11424
|
}
|
|
11255
11425
|
}
|
|
11256
|
-
dispatchEvent(
|
|
11257
|
-
|
|
11258
|
-
|
|
11259
|
-
|
|
11260
|
-
|
|
11261
|
-
|
|
11262
|
-
|
|
11263
|
-
|
|
11426
|
+
dispatchEvent(
|
|
11427
|
+
"row-insert-dragend",
|
|
11428
|
+
{
|
|
11429
|
+
oldRow,
|
|
11430
|
+
newRow: prevDragRow,
|
|
11431
|
+
dragRow,
|
|
11432
|
+
dragPos: prevDragPos,
|
|
11433
|
+
dragToChild: isDragToChildFlag,
|
|
11434
|
+
offsetIndex: dragOffsetIndex
|
|
11435
|
+
},
|
|
11436
|
+
evnt
|
|
11437
|
+
);
|
|
11264
11438
|
clearRowDragData();
|
|
11265
11439
|
insertRest.then(() => {
|
|
11266
11440
|
const { tableData } = reactData;
|
|
@@ -11387,7 +11561,7 @@ var table_default = defineVxeComponent({
|
|
|
11387
11561
|
const row = rowRest.row;
|
|
11388
11562
|
const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
|
|
11389
11563
|
const dragPos = offsetY < trEl.clientHeight / 2 ? "top" : "bottom";
|
|
11390
|
-
internalData.prevDragToChild = !!(treeConfig && transform &&
|
|
11564
|
+
internalData.prevDragToChild = !!(treeConfig && transform && isCrossDrag && isToChildDrag && isControlKey);
|
|
11391
11565
|
internalData.prevDragRow = row;
|
|
11392
11566
|
internalData.prevDragPos = dragPos;
|
|
11393
11567
|
if (isCrossTableDrag && (!treeConfig || isCrossDrag) && crossTableDragRowObj) {
|
|
@@ -11414,16 +11588,20 @@ var table_default = defineVxeComponent({
|
|
|
11414
11588
|
}
|
|
11415
11589
|
}
|
|
11416
11590
|
}
|
|
11417
|
-
if ($xeTable.eqRow(dragRow, row) || isControlKey && treeConfig && lazy && row[hasChildField] &&
|
|
11591
|
+
if ($xeTable.eqRow(dragRow, row) || isControlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded && !isAutoLazyLoadToChild && !isAutoExpandToChild || !isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rowRest.level)) {
|
|
11418
11592
|
showDropTip(evnt, trEl, null, false, dragPos);
|
|
11419
11593
|
return;
|
|
11420
11594
|
}
|
|
11421
11595
|
showDropTip(evnt, trEl, null, true, dragPos);
|
|
11422
|
-
dispatchEvent(
|
|
11423
|
-
|
|
11424
|
-
|
|
11425
|
-
|
|
11426
|
-
|
|
11596
|
+
dispatchEvent(
|
|
11597
|
+
"row-dragover",
|
|
11598
|
+
{
|
|
11599
|
+
oldRow: dragRow,
|
|
11600
|
+
targetRow: row,
|
|
11601
|
+
dragPos
|
|
11602
|
+
},
|
|
11603
|
+
evnt
|
|
11604
|
+
);
|
|
11427
11605
|
}
|
|
11428
11606
|
},
|
|
11429
11607
|
handleCellDragMousedownEvent(evnt, params) {
|
|
@@ -11589,7 +11767,7 @@ var table_default = defineVxeComponent({
|
|
|
11589
11767
|
return errRest;
|
|
11590
11768
|
}
|
|
11591
11769
|
const oldewMatchRest = XEUtils.findTree(collectColumn, (item) => item.id === dragColumn.id);
|
|
11592
|
-
if (isSelfToChildStatus &&
|
|
11770
|
+
if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
|
|
11593
11771
|
if (oldewMatchRest) {
|
|
11594
11772
|
const { items: oCols, index: oIndex } = oldewMatchRest;
|
|
11595
11773
|
const childList = dragColumn.children || [];
|
|
@@ -11639,18 +11817,22 @@ var table_default = defineVxeComponent({
|
|
|
11639
11817
|
}
|
|
11640
11818
|
}
|
|
11641
11819
|
if (evnt) {
|
|
11642
|
-
dispatchEvent(
|
|
11643
|
-
|
|
11644
|
-
|
|
11645
|
-
|
|
11646
|
-
|
|
11647
|
-
|
|
11648
|
-
|
|
11649
|
-
|
|
11650
|
-
|
|
11651
|
-
|
|
11652
|
-
|
|
11653
|
-
|
|
11820
|
+
dispatchEvent(
|
|
11821
|
+
"column-dragend",
|
|
11822
|
+
{
|
|
11823
|
+
oldColumn: dragColumn,
|
|
11824
|
+
newColumn,
|
|
11825
|
+
dragColumn,
|
|
11826
|
+
dragPos: prevDragPos,
|
|
11827
|
+
dragToChild: isDragToChildFlag,
|
|
11828
|
+
offsetIndex: dragOffsetIndex,
|
|
11829
|
+
_index: {
|
|
11830
|
+
newIndex: nafIndex,
|
|
11831
|
+
oldIndex: oafIndex
|
|
11832
|
+
}
|
|
11833
|
+
},
|
|
11834
|
+
evnt
|
|
11835
|
+
);
|
|
11654
11836
|
}
|
|
11655
11837
|
return nextTick().then(() => {
|
|
11656
11838
|
if (isSyncColumn) {
|
|
@@ -11773,11 +11955,15 @@ var table_default = defineVxeComponent({
|
|
|
11773
11955
|
return;
|
|
11774
11956
|
}
|
|
11775
11957
|
showDropTip(evnt, null, thEl, true, dragPos);
|
|
11776
|
-
dispatchEvent(
|
|
11777
|
-
|
|
11778
|
-
|
|
11779
|
-
|
|
11780
|
-
|
|
11958
|
+
dispatchEvent(
|
|
11959
|
+
"column-dragover",
|
|
11960
|
+
{
|
|
11961
|
+
oldColumn: dragCol,
|
|
11962
|
+
targetColumn: column,
|
|
11963
|
+
dragPos
|
|
11964
|
+
},
|
|
11965
|
+
evnt
|
|
11966
|
+
);
|
|
11781
11967
|
const el = refElem.value;
|
|
11782
11968
|
if (!el) {
|
|
11783
11969
|
return;
|
|
@@ -12759,41 +12945,45 @@ var table_default = defineVxeComponent({
|
|
|
12759
12945
|
const fixedColumn = isFixedLeft ? columnStore.leftList : columnStore.rightList;
|
|
12760
12946
|
const osXBehavior = XEUtils.eqNull(overscrollXBehavior) ? scrollbarOpts.overscrollBehavior : overscrollXBehavior;
|
|
12761
12947
|
const osYBehavior = XEUtils.eqNull(overscrollYBehavior) ? scrollbarOpts.overscrollBehavior : overscrollYBehavior;
|
|
12762
|
-
return h(
|
|
12763
|
-
|
|
12764
|
-
|
|
12765
|
-
|
|
12766
|
-
|
|
12767
|
-
|
|
12768
|
-
|
|
12769
|
-
|
|
12770
|
-
|
|
12771
|
-
|
|
12948
|
+
return h(
|
|
12949
|
+
"div",
|
|
12950
|
+
{
|
|
12951
|
+
ref: isFixedLeft ? refLeftContainer : refRightContainer,
|
|
12952
|
+
class: [
|
|
12953
|
+
`vxe-table--fixed-${fixedType}-wrapper`,
|
|
12954
|
+
`sx--${scrollXVisible === false || scrollXVisible === "hidden" ? "hidden" : "visible"}`,
|
|
12955
|
+
`sy--${scrollYVisible === false || scrollYVisible === "hidden" ? "hidden" : "visible"}`,
|
|
12956
|
+
{
|
|
12957
|
+
[`x-ob--${osXBehavior}`]: osXBehavior,
|
|
12958
|
+
[`y-ob--${osYBehavior}`]: osYBehavior
|
|
12959
|
+
}
|
|
12960
|
+
]
|
|
12961
|
+
},
|
|
12962
|
+
[
|
|
12963
|
+
showHeader ? h(TableHeaderComponent, {
|
|
12964
|
+
ref: isFixedLeft ? refTableLeftHeader : refTableRightHeader,
|
|
12965
|
+
fixedType,
|
|
12966
|
+
tableData,
|
|
12967
|
+
tableColumn,
|
|
12968
|
+
tableGroupColumn,
|
|
12969
|
+
fixedColumn
|
|
12970
|
+
}) : renderEmptyElement($xeTable),
|
|
12971
|
+
h(TableBodyComponent, {
|
|
12972
|
+
ref: isFixedLeft ? refTableLeftBody : refTableRightBody,
|
|
12973
|
+
fixedType,
|
|
12974
|
+
tableData,
|
|
12975
|
+
tableColumn,
|
|
12976
|
+
fixedColumn
|
|
12977
|
+
}),
|
|
12978
|
+
showFooter ? h(TableFooterComponent, {
|
|
12979
|
+
ref: isFixedLeft ? refTableLeftFooter : refTableRightFooter,
|
|
12980
|
+
footerTableData,
|
|
12981
|
+
tableColumn,
|
|
12982
|
+
fixedColumn,
|
|
12983
|
+
fixedType
|
|
12984
|
+
}) : renderEmptyElement($xeTable)
|
|
12772
12985
|
]
|
|
12773
|
-
|
|
12774
|
-
showHeader ? h(TableHeaderComponent, {
|
|
12775
|
-
ref: isFixedLeft ? refTableLeftHeader : refTableRightHeader,
|
|
12776
|
-
fixedType,
|
|
12777
|
-
tableData,
|
|
12778
|
-
tableColumn,
|
|
12779
|
-
tableGroupColumn,
|
|
12780
|
-
fixedColumn
|
|
12781
|
-
}) : renderEmptyElement($xeTable),
|
|
12782
|
-
h(TableBodyComponent, {
|
|
12783
|
-
ref: isFixedLeft ? refTableLeftBody : refTableRightBody,
|
|
12784
|
-
fixedType,
|
|
12785
|
-
tableData,
|
|
12786
|
-
tableColumn,
|
|
12787
|
-
fixedColumn
|
|
12788
|
-
}),
|
|
12789
|
-
showFooter ? h(TableFooterComponent, {
|
|
12790
|
-
ref: isFixedLeft ? refTableLeftFooter : refTableRightFooter,
|
|
12791
|
-
footerTableData,
|
|
12792
|
-
tableColumn,
|
|
12793
|
-
fixedColumn,
|
|
12794
|
-
fixedType
|
|
12795
|
-
}) : renderEmptyElement($xeTable)
|
|
12796
|
-
]);
|
|
12986
|
+
);
|
|
12797
12987
|
};
|
|
12798
12988
|
const renderEmptyBody = () => {
|
|
12799
12989
|
const emptyOpts = computeEmptyOpts.value;
|
|
@@ -12837,47 +13027,73 @@ var table_default = defineVxeComponent({
|
|
|
12837
13027
|
const columnDragOpts = computeColumnDragOpts.value;
|
|
12838
13028
|
const dRow = dragRow || (rowDragOpts.isCrossTableDrag ? crossTableDragRowInfo.row : null);
|
|
12839
13029
|
if (rowOpts.drag || columnOpts.drag) {
|
|
12840
|
-
return h(
|
|
12841
|
-
|
|
12842
|
-
|
|
12843
|
-
|
|
12844
|
-
|
|
12845
|
-
|
|
12846
|
-
"is--guides": rowDragOpts.showGuidesStatus
|
|
12847
|
-
}]
|
|
12848
|
-
}),
|
|
12849
|
-
h("div", {
|
|
12850
|
-
ref: refDragColLineElem,
|
|
12851
|
-
class: ["vxe-table--drag-col-line", {
|
|
12852
|
-
"is--guides": columnDragOpts.showGuidesStatus
|
|
12853
|
-
}]
|
|
12854
|
-
}),
|
|
12855
|
-
dRow && rowDragOpts.showDragTip || dragCol && columnDragOpts.showDragTip ? h("div", {
|
|
12856
|
-
ref: refDragTipElem,
|
|
12857
|
-
class: "vxe-table--drag-sort-tip"
|
|
12858
|
-
}, [
|
|
13030
|
+
return h(
|
|
13031
|
+
"div",
|
|
13032
|
+
{
|
|
13033
|
+
class: "vxe-table--drag-wrapper"
|
|
13034
|
+
},
|
|
13035
|
+
[
|
|
12859
13036
|
h("div", {
|
|
12860
|
-
|
|
12861
|
-
|
|
12862
|
-
|
|
12863
|
-
|
|
12864
|
-
|
|
12865
|
-
|
|
12866
|
-
|
|
12867
|
-
|
|
12868
|
-
|
|
12869
|
-
|
|
12870
|
-
|
|
12871
|
-
|
|
12872
|
-
|
|
12873
|
-
|
|
12874
|
-
|
|
12875
|
-
|
|
12876
|
-
|
|
12877
|
-
|
|
12878
|
-
|
|
12879
|
-
|
|
12880
|
-
|
|
13037
|
+
ref: refDragRowLineElem,
|
|
13038
|
+
class: [
|
|
13039
|
+
"vxe-table--drag-row-line",
|
|
13040
|
+
{
|
|
13041
|
+
"is--guides": rowDragOpts.showGuidesStatus
|
|
13042
|
+
}
|
|
13043
|
+
]
|
|
13044
|
+
}),
|
|
13045
|
+
h("div", {
|
|
13046
|
+
ref: refDragColLineElem,
|
|
13047
|
+
class: [
|
|
13048
|
+
"vxe-table--drag-col-line",
|
|
13049
|
+
{
|
|
13050
|
+
"is--guides": columnDragOpts.showGuidesStatus
|
|
13051
|
+
}
|
|
13052
|
+
]
|
|
13053
|
+
}),
|
|
13054
|
+
dRow && rowDragOpts.showDragTip || dragCol && columnDragOpts.showDragTip ? h(
|
|
13055
|
+
"div",
|
|
13056
|
+
{
|
|
13057
|
+
ref: refDragTipElem,
|
|
13058
|
+
class: "vxe-table--drag-sort-tip"
|
|
13059
|
+
},
|
|
13060
|
+
[
|
|
13061
|
+
h(
|
|
13062
|
+
"div",
|
|
13063
|
+
{
|
|
13064
|
+
class: "vxe-table--drag-sort-tip-wrapper"
|
|
13065
|
+
},
|
|
13066
|
+
[
|
|
13067
|
+
h(
|
|
13068
|
+
"div",
|
|
13069
|
+
{
|
|
13070
|
+
class: "vxe-table--drag-sort-tip-status"
|
|
13071
|
+
},
|
|
13072
|
+
[
|
|
13073
|
+
h("span", {
|
|
13074
|
+
class: ["vxe-table--drag-sort-tip-normal-status", dRow ? getIcon().TABLE_DRAG_STATUS_ROW : getIcon().TABLE_DRAG_STATUS_COLUMN]
|
|
13075
|
+
}),
|
|
13076
|
+
h("span", {
|
|
13077
|
+
class: ["vxe-table--drag-sort-tip-sub-status", getIcon().TABLE_DRAG_STATUS_SUB_ROW]
|
|
13078
|
+
}),
|
|
13079
|
+
h("span", {
|
|
13080
|
+
class: ["vxe-table--drag-sort-tip-disabled-status", getIcon().TABLE_DRAG_DISABLED]
|
|
13081
|
+
})
|
|
13082
|
+
]
|
|
13083
|
+
),
|
|
13084
|
+
h(
|
|
13085
|
+
"div",
|
|
13086
|
+
{
|
|
13087
|
+
class: "vxe-table--drag-sort-tip-content"
|
|
13088
|
+
},
|
|
13089
|
+
renderDragTipContents()
|
|
13090
|
+
)
|
|
13091
|
+
]
|
|
13092
|
+
)
|
|
13093
|
+
]
|
|
13094
|
+
) : renderEmptyElement($xeTable)
|
|
13095
|
+
]
|
|
13096
|
+
);
|
|
12881
13097
|
}
|
|
12882
13098
|
return renderEmptyElement($xeTable);
|
|
12883
13099
|
};
|
|
@@ -12965,94 +13181,133 @@ var table_default = defineVxeComponent({
|
|
|
12965
13181
|
items: []
|
|
12966
13182
|
};
|
|
12967
13183
|
expandVNs.push(
|
|
12968
|
-
h(
|
|
12969
|
-
|
|
12970
|
-
|
|
12971
|
-
|
|
12972
|
-
|
|
12973
|
-
|
|
12974
|
-
|
|
12975
|
-
|
|
12976
|
-
|
|
12977
|
-
|
|
12978
|
-
|
|
12979
|
-
|
|
12980
|
-
|
|
13184
|
+
h(
|
|
13185
|
+
"div",
|
|
13186
|
+
{
|
|
13187
|
+
key: rowid,
|
|
13188
|
+
class: [
|
|
13189
|
+
"vxe-body--row-expanded-cell",
|
|
13190
|
+
{
|
|
13191
|
+
"is--padding": padding,
|
|
13192
|
+
"is--ellipsis": expandHeight
|
|
13193
|
+
}
|
|
13194
|
+
],
|
|
13195
|
+
rowid,
|
|
13196
|
+
style: cellStyle
|
|
13197
|
+
},
|
|
13198
|
+
[
|
|
13199
|
+
h(
|
|
13200
|
+
"div",
|
|
13201
|
+
{
|
|
13202
|
+
class: "vxe-body--row-expanded-content"
|
|
13203
|
+
},
|
|
13204
|
+
expandColumn.renderData(expandParams)
|
|
13205
|
+
)
|
|
13206
|
+
]
|
|
13207
|
+
)
|
|
12981
13208
|
);
|
|
12982
13209
|
});
|
|
12983
13210
|
}
|
|
12984
|
-
return h(
|
|
12985
|
-
|
|
12986
|
-
|
|
12987
|
-
|
|
13211
|
+
return h(
|
|
13212
|
+
"div",
|
|
13213
|
+
{
|
|
13214
|
+
ref: refRowExpandElem,
|
|
13215
|
+
class: "vxe-table--row-expanded-wrapper"
|
|
13216
|
+
},
|
|
13217
|
+
expandVNs
|
|
13218
|
+
);
|
|
12988
13219
|
};
|
|
12989
13220
|
const renderScrollX = () => {
|
|
12990
|
-
return h(
|
|
12991
|
-
|
|
12992
|
-
|
|
12993
|
-
|
|
12994
|
-
|
|
12995
|
-
|
|
12996
|
-
|
|
12997
|
-
|
|
12998
|
-
}),
|
|
12999
|
-
h("div", {
|
|
13000
|
-
ref: refScrollXWrapperElem,
|
|
13001
|
-
class: "vxe-table--scroll-x-wrapper"
|
|
13002
|
-
}, [
|
|
13221
|
+
return h(
|
|
13222
|
+
"div",
|
|
13223
|
+
{
|
|
13224
|
+
key: "vsx",
|
|
13225
|
+
ref: refScrollXVirtualElem,
|
|
13226
|
+
class: "vxe-table--scroll-x-virtual"
|
|
13227
|
+
},
|
|
13228
|
+
[
|
|
13003
13229
|
h("div", {
|
|
13004
|
-
ref:
|
|
13005
|
-
class: "vxe-table--scroll-x-
|
|
13006
|
-
|
|
13007
|
-
|
|
13008
|
-
|
|
13009
|
-
|
|
13010
|
-
|
|
13011
|
-
|
|
13012
|
-
|
|
13230
|
+
ref: refScrollXLeftCornerElem,
|
|
13231
|
+
class: "vxe-table--scroll-x-left-corner"
|
|
13232
|
+
}),
|
|
13233
|
+
h(
|
|
13234
|
+
"div",
|
|
13235
|
+
{
|
|
13236
|
+
ref: refScrollXWrapperElem,
|
|
13237
|
+
class: "vxe-table--scroll-x-wrapper"
|
|
13238
|
+
},
|
|
13239
|
+
[
|
|
13240
|
+
h(
|
|
13241
|
+
"div",
|
|
13242
|
+
{
|
|
13243
|
+
ref: refScrollXHandleElem,
|
|
13244
|
+
class: "vxe-table--scroll-x-handle",
|
|
13245
|
+
onScroll: $xeTable.triggerVirtualScrollXEvent
|
|
13246
|
+
},
|
|
13247
|
+
[
|
|
13248
|
+
h("div", {
|
|
13249
|
+
ref: refScrollXSpaceElem,
|
|
13250
|
+
class: "vxe-table--scroll-x-space"
|
|
13251
|
+
})
|
|
13252
|
+
]
|
|
13253
|
+
),
|
|
13254
|
+
h("div", {
|
|
13255
|
+
class: "vxe-table--scroll-x-handle-appearance"
|
|
13256
|
+
})
|
|
13257
|
+
]
|
|
13258
|
+
),
|
|
13013
13259
|
h("div", {
|
|
13014
|
-
|
|
13260
|
+
ref: refScrollXRightCornerElem,
|
|
13261
|
+
class: "vxe-table--scroll-x-right-corner"
|
|
13015
13262
|
})
|
|
13016
|
-
]
|
|
13017
|
-
|
|
13018
|
-
ref: refScrollXRightCornerElem,
|
|
13019
|
-
class: "vxe-table--scroll-x-right-corner"
|
|
13020
|
-
})
|
|
13021
|
-
]);
|
|
13263
|
+
]
|
|
13264
|
+
);
|
|
13022
13265
|
};
|
|
13023
13266
|
const renderScrollY = () => {
|
|
13024
|
-
return h(
|
|
13025
|
-
|
|
13026
|
-
|
|
13027
|
-
|
|
13028
|
-
|
|
13029
|
-
|
|
13030
|
-
|
|
13031
|
-
|
|
13032
|
-
}),
|
|
13033
|
-
h("div", {
|
|
13034
|
-
ref: refScrollYWrapperElem,
|
|
13035
|
-
class: "vxe-table--scroll-y-wrapper"
|
|
13036
|
-
}, [
|
|
13267
|
+
return h(
|
|
13268
|
+
"div",
|
|
13269
|
+
{
|
|
13270
|
+
key: "vsy",
|
|
13271
|
+
ref: refScrollYVirtualElem,
|
|
13272
|
+
class: "vxe-table--scroll-y-virtual"
|
|
13273
|
+
},
|
|
13274
|
+
[
|
|
13037
13275
|
h("div", {
|
|
13038
|
-
ref:
|
|
13039
|
-
class: "vxe-table--scroll-y-
|
|
13040
|
-
|
|
13041
|
-
|
|
13042
|
-
|
|
13043
|
-
|
|
13044
|
-
|
|
13045
|
-
|
|
13046
|
-
|
|
13276
|
+
ref: refScrollYTopCornerElem,
|
|
13277
|
+
class: "vxe-table--scroll-y-top-corner"
|
|
13278
|
+
}),
|
|
13279
|
+
h(
|
|
13280
|
+
"div",
|
|
13281
|
+
{
|
|
13282
|
+
ref: refScrollYWrapperElem,
|
|
13283
|
+
class: "vxe-table--scroll-y-wrapper"
|
|
13284
|
+
},
|
|
13285
|
+
[
|
|
13286
|
+
h(
|
|
13287
|
+
"div",
|
|
13288
|
+
{
|
|
13289
|
+
ref: refScrollYHandleElem,
|
|
13290
|
+
class: "vxe-table--scroll-y-handle",
|
|
13291
|
+
onScroll: $xeTable.triggerVirtualScrollYEvent
|
|
13292
|
+
},
|
|
13293
|
+
[
|
|
13294
|
+
h("div", {
|
|
13295
|
+
ref: refScrollYSpaceElem,
|
|
13296
|
+
class: "vxe-table--scroll-y-space"
|
|
13297
|
+
})
|
|
13298
|
+
]
|
|
13299
|
+
),
|
|
13300
|
+
h("div", {
|
|
13301
|
+
class: "vxe-table--scroll-y-handle-appearance"
|
|
13302
|
+
})
|
|
13303
|
+
]
|
|
13304
|
+
),
|
|
13047
13305
|
h("div", {
|
|
13048
|
-
|
|
13306
|
+
ref: refScrollYBottomCornerElem,
|
|
13307
|
+
class: "vxe-table--scroll-y-bottom-corner"
|
|
13049
13308
|
})
|
|
13050
|
-
]
|
|
13051
|
-
|
|
13052
|
-
ref: refScrollYBottomCornerElem,
|
|
13053
|
-
class: "vxe-table--scroll-y-bottom-corner"
|
|
13054
|
-
})
|
|
13055
|
-
]);
|
|
13309
|
+
]
|
|
13310
|
+
);
|
|
13056
13311
|
};
|
|
13057
13312
|
const renderViewport = () => {
|
|
13058
13313
|
const { showHeader, showFooter } = props;
|
|
@@ -13067,68 +13322,74 @@ var table_default = defineVxeComponent({
|
|
|
13067
13322
|
const { leftList, rightList } = columnStore;
|
|
13068
13323
|
const osXBehavior = XEUtils.eqNull(overscrollXBehavior) ? scrollbarOpts.overscrollBehavior : overscrollXBehavior;
|
|
13069
13324
|
const osYBehavior = XEUtils.eqNull(overscrollYBehavior) ? scrollbarOpts.overscrollBehavior : overscrollYBehavior;
|
|
13070
|
-
return h(
|
|
13071
|
-
|
|
13072
|
-
|
|
13073
|
-
|
|
13074
|
-
|
|
13075
|
-
[`y-ob--${osYBehavior}`]: osYBehavior
|
|
13076
|
-
}]
|
|
13077
|
-
}, [
|
|
13078
|
-
h("div", {
|
|
13325
|
+
return h(
|
|
13326
|
+
"div",
|
|
13327
|
+
{
|
|
13328
|
+
key: "tvw",
|
|
13329
|
+
ref: refTableViewportElem,
|
|
13079
13330
|
class: [
|
|
13080
|
-
"vxe-table--
|
|
13081
|
-
|
|
13082
|
-
|
|
13331
|
+
"vxe-table--viewport-wrapper",
|
|
13332
|
+
{
|
|
13333
|
+
[`x-ob--${osXBehavior}`]: osXBehavior,
|
|
13334
|
+
[`y-ob--${osYBehavior}`]: osYBehavior
|
|
13335
|
+
}
|
|
13083
13336
|
]
|
|
13084
|
-
},
|
|
13085
|
-
|
|
13086
|
-
|
|
13087
|
-
|
|
13088
|
-
|
|
13089
|
-
|
|
13090
|
-
|
|
13091
|
-
|
|
13092
|
-
|
|
13093
|
-
|
|
13094
|
-
|
|
13095
|
-
|
|
13096
|
-
|
|
13097
|
-
|
|
13098
|
-
|
|
13099
|
-
|
|
13100
|
-
|
|
13101
|
-
|
|
13102
|
-
|
|
13103
|
-
|
|
13104
|
-
|
|
13105
|
-
|
|
13106
|
-
|
|
13107
|
-
|
|
13108
|
-
|
|
13109
|
-
|
|
13110
|
-
|
|
13111
|
-
|
|
13112
|
-
|
|
13113
|
-
|
|
13114
|
-
|
|
13115
|
-
|
|
13116
|
-
|
|
13117
|
-
|
|
13118
|
-
|
|
13337
|
+
},
|
|
13338
|
+
[
|
|
13339
|
+
h(
|
|
13340
|
+
"div",
|
|
13341
|
+
{
|
|
13342
|
+
class: ["vxe-table--main-wrapper", `sx--${scrollXVisible === false || scrollXVisible === "hidden" ? "hidden" : "visible"}`, `sy--${scrollYVisible === false || scrollYVisible === "hidden" ? "hidden" : "visible"}`]
|
|
13343
|
+
},
|
|
13344
|
+
[
|
|
13345
|
+
/**
|
|
13346
|
+
* 表头
|
|
13347
|
+
*/
|
|
13348
|
+
showHeader ? h(TableHeaderComponent, {
|
|
13349
|
+
ref: refTableHeader,
|
|
13350
|
+
tableData,
|
|
13351
|
+
tableColumn,
|
|
13352
|
+
tableGroupColumn
|
|
13353
|
+
}) : renderEmptyElement($xeTable),
|
|
13354
|
+
/**
|
|
13355
|
+
* 表体
|
|
13356
|
+
*/
|
|
13357
|
+
h(TableBodyComponent, {
|
|
13358
|
+
ref: refTableBody,
|
|
13359
|
+
tableData,
|
|
13360
|
+
tableColumn
|
|
13361
|
+
}),
|
|
13362
|
+
/**
|
|
13363
|
+
* 表尾
|
|
13364
|
+
*/
|
|
13365
|
+
showFooter ? h(TableFooterComponent, {
|
|
13366
|
+
ref: refTableFooter,
|
|
13367
|
+
footerTableData,
|
|
13368
|
+
tableColumn
|
|
13369
|
+
}) : renderEmptyElement($xeTable)
|
|
13370
|
+
]
|
|
13371
|
+
),
|
|
13372
|
+
h(
|
|
13373
|
+
"div",
|
|
13374
|
+
{
|
|
13375
|
+
class: "vxe-table--fixed-wrapper"
|
|
13376
|
+
},
|
|
13377
|
+
[leftList && leftList.length && overflowX ? renderViewFixed("left") : renderEmptyElement($xeTable), rightList && rightList.length && overflowX ? renderViewFixed("right") : renderEmptyElement($xeTable)]
|
|
13378
|
+
),
|
|
13379
|
+
renderRowExpandedVNs()
|
|
13380
|
+
]
|
|
13381
|
+
);
|
|
13119
13382
|
};
|
|
13120
13383
|
const renderNativeBody = () => {
|
|
13121
13384
|
const scrollbarYToLeft = computeScrollbarYToLeft.value;
|
|
13122
|
-
return h(
|
|
13123
|
-
|
|
13124
|
-
|
|
13125
|
-
|
|
13126
|
-
|
|
13127
|
-
|
|
13128
|
-
|
|
13129
|
-
|
|
13130
|
-
renderScrollY()
|
|
13131
|
-
]);
|
|
13385
|
+
return h(
|
|
13386
|
+
"div",
|
|
13387
|
+
{
|
|
13388
|
+
key: "lnb",
|
|
13389
|
+
class: "vxe-table--layout-wrapper"
|
|
13390
|
+
},
|
|
13391
|
+
scrollbarYToLeft ? [renderScrollY(), renderViewport()] : [renderViewport(), renderScrollY()]
|
|
13392
|
+
);
|
|
13132
13393
|
};
|
|
13133
13394
|
const renderVirtualBody = () => {
|
|
13134
13395
|
const $xeGanttView = internalData.xeGanttView;
|
|
@@ -13144,53 +13405,74 @@ var table_default = defineVxeComponent({
|
|
|
13144
13405
|
const scrollbarWrapperClss = computeScrollbarWrapperClss.value;
|
|
13145
13406
|
const hideXScroll = scrollXVisible === false || scrollXVisible === "hidden";
|
|
13146
13407
|
const hideYScroll = scrollYVisible === false || scrollYVisible === "hidden";
|
|
13147
|
-
return h(
|
|
13148
|
-
|
|
13149
|
-
|
|
13150
|
-
"
|
|
13151
|
-
|
|
13152
|
-
|
|
13153
|
-
|
|
13154
|
-
|
|
13155
|
-
|
|
13156
|
-
|
|
13157
|
-
|
|
13158
|
-
|
|
13159
|
-
|
|
13160
|
-
|
|
13161
|
-
|
|
13162
|
-
|
|
13163
|
-
|
|
13164
|
-
|
|
13165
|
-
|
|
13166
|
-
|
|
13167
|
-
|
|
13168
|
-
|
|
13169
|
-
|
|
13170
|
-
|
|
13171
|
-
|
|
13172
|
-
|
|
13173
|
-
|
|
13174
|
-
|
|
13175
|
-
|
|
13176
|
-
|
|
13177
|
-
|
|
13178
|
-
|
|
13179
|
-
|
|
13180
|
-
|
|
13181
|
-
|
|
13182
|
-
|
|
13183
|
-
|
|
13184
|
-
|
|
13185
|
-
|
|
13186
|
-
|
|
13187
|
-
|
|
13188
|
-
|
|
13189
|
-
|
|
13190
|
-
|
|
13191
|
-
|
|
13192
|
-
|
|
13193
|
-
|
|
13408
|
+
return h(
|
|
13409
|
+
"div",
|
|
13410
|
+
{
|
|
13411
|
+
key: "lvb",
|
|
13412
|
+
class: [
|
|
13413
|
+
"vxe-table--layout-wrapper",
|
|
13414
|
+
`sx-pos--${scrollbarXToTop ? "top" : "bottom"}`,
|
|
13415
|
+
`sy-pos--${scrollbarYToLeft ? "left" : "right"}`,
|
|
13416
|
+
{
|
|
13417
|
+
"is--virtual-scrollbar": isVScrollbar,
|
|
13418
|
+
"ov-padding": isVScrollbar && scrollbarOpts.padding,
|
|
13419
|
+
"ov-x--auto-hide": isVScrollbar && scrollXAutoHide,
|
|
13420
|
+
"ov-y--auto-hide": isVScrollbar && scrollYAutoHide,
|
|
13421
|
+
"overflow-y": yThumbHeight,
|
|
13422
|
+
"overflow-x": xThumbWidth
|
|
13423
|
+
}
|
|
13424
|
+
]
|
|
13425
|
+
},
|
|
13426
|
+
[
|
|
13427
|
+
renderViewport(),
|
|
13428
|
+
h(
|
|
13429
|
+
"div",
|
|
13430
|
+
{
|
|
13431
|
+
class: scrollbarWrapperClss
|
|
13432
|
+
},
|
|
13433
|
+
[
|
|
13434
|
+
hideXScroll ? renderEmptyElement($xeTable) : h(
|
|
13435
|
+
"div",
|
|
13436
|
+
{
|
|
13437
|
+
ref: refTrackXElem,
|
|
13438
|
+
class: "vxe-scrollbar--track-x",
|
|
13439
|
+
onClick: clickTrackXEvent
|
|
13440
|
+
},
|
|
13441
|
+
[
|
|
13442
|
+
h("div", {
|
|
13443
|
+
ref: refThumbXElem,
|
|
13444
|
+
class: "vxe-scrollbar--thumb-x",
|
|
13445
|
+
onPointerdown: pointerdownThumbXEvent,
|
|
13446
|
+
onPointermove: pointermoveThumbXEvent,
|
|
13447
|
+
onPointerup: cleatPointerThumbEvent,
|
|
13448
|
+
onPointercancel: cleatPointerThumbEvent,
|
|
13449
|
+
onLostpointercapture: cleatPointerThumbEvent
|
|
13450
|
+
})
|
|
13451
|
+
]
|
|
13452
|
+
),
|
|
13453
|
+
hideYScroll || $xeGantt && $xeGanttView && $xeGantt.reactData.showRightView && !scrollbarYToLeft ? renderEmptyElement($xeTable) : h(
|
|
13454
|
+
"div",
|
|
13455
|
+
{
|
|
13456
|
+
ref: refTrackYElem,
|
|
13457
|
+
class: "vxe-scrollbar--track-y",
|
|
13458
|
+
onClick: clickTrackYEvent
|
|
13459
|
+
},
|
|
13460
|
+
[
|
|
13461
|
+
h("div", {
|
|
13462
|
+
ref: refThumbYElem,
|
|
13463
|
+
class: "vxe-scrollbar--thumb-y",
|
|
13464
|
+
onPointerdown: pointerdownThumbYEvent,
|
|
13465
|
+
onPointermove: pointermoveThumbYEvent,
|
|
13466
|
+
onPointerup: cleatPointerThumbEvent,
|
|
13467
|
+
onPointercancel: cleatPointerThumbEvent,
|
|
13468
|
+
onLostpointercapture: cleatPointerThumbEvent
|
|
13469
|
+
})
|
|
13470
|
+
]
|
|
13471
|
+
)
|
|
13472
|
+
]
|
|
13473
|
+
)
|
|
13474
|
+
]
|
|
13475
|
+
);
|
|
13194
13476
|
};
|
|
13195
13477
|
const renderVN = () => {
|
|
13196
13478
|
const { loading, stripe, showHeader, height, treeConfig, mouseConfig, showFooter, highlightCell, highlightHoverRow, highlightHoverColumn, editConfig, editRules, importConfig, exportConfig, printConfig } = props;
|
|
@@ -13237,316 +13519,423 @@ var table_default = defineVxeComponent({
|
|
|
13237
13519
|
if (isCrossTableDrag && !tableData.length) {
|
|
13238
13520
|
tbOns.onDragover = $xeTable.handleCrossTableRowDragoverEmptyEvent;
|
|
13239
13521
|
}
|
|
13240
|
-
return h(
|
|
13241
|
-
|
|
13242
|
-
|
|
13243
|
-
|
|
13244
|
-
|
|
13245
|
-
|
|
13246
|
-
|
|
13247
|
-
|
|
13248
|
-
|
|
13249
|
-
|
|
13250
|
-
|
|
13251
|
-
|
|
13252
|
-
|
|
13253
|
-
|
|
13254
|
-
|
|
13255
|
-
|
|
13256
|
-
|
|
13257
|
-
|
|
13258
|
-
|
|
13259
|
-
|
|
13260
|
-
|
|
13261
|
-
|
|
13262
|
-
|
|
13263
|
-
|
|
13264
|
-
|
|
13265
|
-
|
|
13266
|
-
|
|
13267
|
-
|
|
13268
|
-
|
|
13269
|
-
|
|
13270
|
-
|
|
13271
|
-
|
|
13272
|
-
|
|
13273
|
-
|
|
13274
|
-
|
|
13275
|
-
|
|
13276
|
-
|
|
13277
|
-
|
|
13278
|
-
|
|
13279
|
-
|
|
13280
|
-
|
|
13281
|
-
|
|
13282
|
-
|
|
13283
|
-
|
|
13284
|
-
|
|
13285
|
-
|
|
13286
|
-
|
|
13287
|
-
|
|
13288
|
-
|
|
13289
|
-
|
|
13290
|
-
|
|
13291
|
-
|
|
13292
|
-
|
|
13293
|
-
|
|
13294
|
-
|
|
13295
|
-
|
|
13296
|
-
h(
|
|
13297
|
-
|
|
13298
|
-
|
|
13299
|
-
|
|
13300
|
-
|
|
13301
|
-
|
|
13302
|
-
|
|
13303
|
-
|
|
13304
|
-
|
|
13522
|
+
return h(
|
|
13523
|
+
"div",
|
|
13524
|
+
{
|
|
13525
|
+
ref: refElem,
|
|
13526
|
+
class: [
|
|
13527
|
+
"vxe-table",
|
|
13528
|
+
"vxe-table--render-default",
|
|
13529
|
+
`tid_${xID}`,
|
|
13530
|
+
`border--${tableBorder}`,
|
|
13531
|
+
isVScrollbar ? "is--virtual-scrollbar" : "is--native-scrollbar",
|
|
13532
|
+
`sx-pos--${scrollbarXToTop ? "top" : "bottom"}`,
|
|
13533
|
+
`sy-pos--${scrollbarYToLeft ? "left" : "right"}`,
|
|
13534
|
+
{
|
|
13535
|
+
[`size--${vSize}`]: vSize,
|
|
13536
|
+
[`valid-msg--${validOpts.msgMode}`]: !!editRules,
|
|
13537
|
+
"vxe-editable": !!editConfig,
|
|
13538
|
+
"old-cell-valid": editRules && getConfig().cellVaildMode === "obsolete",
|
|
13539
|
+
"cell--highlight": highlightCell,
|
|
13540
|
+
"cell--selected": hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.selected,
|
|
13541
|
+
"cell--area": isArea,
|
|
13542
|
+
"header-cell--area": isArea && areaOpts.selectCellByHeader,
|
|
13543
|
+
"body-cell--area": isArea && areaOpts.selectCellByBody,
|
|
13544
|
+
"row--highlight": rowOpts.isHover || highlightHoverRow,
|
|
13545
|
+
"column--highlight": columnOpts.isHover || highlightHoverColumn,
|
|
13546
|
+
"checkbox--range": checkboxOpts.range,
|
|
13547
|
+
"col--drag-cell": columnOpts.drag && columnDragOpts.trigger === "cell",
|
|
13548
|
+
"is--header": showHeader,
|
|
13549
|
+
"not--header": !showHeader,
|
|
13550
|
+
"is--footer": showFooter,
|
|
13551
|
+
"not--footer": !showFooter,
|
|
13552
|
+
"is--group": isGroup,
|
|
13553
|
+
"is-row-group": isRowGroupStatus,
|
|
13554
|
+
"is--tree-line": treeConfig && (treeOpts.showLine || treeOpts.line),
|
|
13555
|
+
"is--fixed-left": leftList.length,
|
|
13556
|
+
"is--fixed-right": rightList.length,
|
|
13557
|
+
"is--animat": !!props.animat,
|
|
13558
|
+
"is--round": props.round,
|
|
13559
|
+
"is--stripe": !treeConfig && stripe,
|
|
13560
|
+
"is--loading": currLoading,
|
|
13561
|
+
"is--empty": !currLoading && !tableData.length,
|
|
13562
|
+
"is--scroll-y": overflowY,
|
|
13563
|
+
"not--scroll-y": !overflowY,
|
|
13564
|
+
"is--scroll-x": overflowX,
|
|
13565
|
+
"not--scroll-x": !overflowX,
|
|
13566
|
+
"is--virtual-x": scrollXLoad,
|
|
13567
|
+
"is--virtual-y": scrollYLoad
|
|
13568
|
+
}
|
|
13569
|
+
],
|
|
13570
|
+
style: tableStyle,
|
|
13571
|
+
spellcheck: false,
|
|
13572
|
+
...tbOns
|
|
13573
|
+
},
|
|
13574
|
+
[
|
|
13575
|
+
/**
|
|
13576
|
+
* 隐藏列
|
|
13577
|
+
*/
|
|
13578
|
+
h(
|
|
13579
|
+
"div",
|
|
13580
|
+
{
|
|
13581
|
+
key: "tss",
|
|
13582
|
+
class: "vxe-table-slots"
|
|
13583
|
+
},
|
|
13584
|
+
slots.default ? slots.default({}) : []
|
|
13585
|
+
),
|
|
13586
|
+
h(
|
|
13587
|
+
"div",
|
|
13588
|
+
{
|
|
13589
|
+
key: "tvr",
|
|
13590
|
+
ref: refVarElem,
|
|
13591
|
+
class: "vxe-table-vars"
|
|
13592
|
+
},
|
|
13593
|
+
[
|
|
13594
|
+
h("div", {
|
|
13595
|
+
class: "vxe-table-var-xlarge"
|
|
13596
|
+
}),
|
|
13597
|
+
h("div", {
|
|
13598
|
+
class: "vxe-table-var-large"
|
|
13599
|
+
}),
|
|
13600
|
+
h("div", {
|
|
13601
|
+
class: "vxe-table-var-default"
|
|
13602
|
+
}),
|
|
13603
|
+
h("div", {
|
|
13604
|
+
class: "vxe-table-var-medium"
|
|
13605
|
+
}),
|
|
13606
|
+
h("div", {
|
|
13607
|
+
class: "vxe-table-var-small"
|
|
13608
|
+
}),
|
|
13609
|
+
h("div", {
|
|
13610
|
+
class: "vxe-table-var-mini"
|
|
13611
|
+
})
|
|
13612
|
+
]
|
|
13613
|
+
),
|
|
13614
|
+
h(
|
|
13615
|
+
"div",
|
|
13616
|
+
{
|
|
13617
|
+
key: "tw",
|
|
13618
|
+
class: "vxe-table--render-wrapper"
|
|
13619
|
+
},
|
|
13620
|
+
isVScrollbar ? [renderVirtualBody()] : scrollbarXToTop ? [renderScrollX(), renderNativeBody()] : [renderNativeBody(), renderScrollX()]
|
|
13621
|
+
),
|
|
13622
|
+
/**
|
|
13623
|
+
* 空数据
|
|
13624
|
+
*/
|
|
13625
|
+
h(
|
|
13626
|
+
"div",
|
|
13627
|
+
{
|
|
13628
|
+
key: "tn",
|
|
13629
|
+
ref: refEmptyPlaceholder,
|
|
13630
|
+
class: "vxe-table--empty-place-wrapper",
|
|
13631
|
+
xid: xID
|
|
13632
|
+
},
|
|
13633
|
+
[
|
|
13634
|
+
h(
|
|
13635
|
+
"div",
|
|
13636
|
+
{
|
|
13637
|
+
class: "vxe-table--empty-placeholder"
|
|
13638
|
+
},
|
|
13639
|
+
[
|
|
13640
|
+
h(
|
|
13641
|
+
"div",
|
|
13642
|
+
{
|
|
13643
|
+
class: "vxe-table--empty-content"
|
|
13644
|
+
},
|
|
13645
|
+
renderEmptyBody()
|
|
13646
|
+
)
|
|
13647
|
+
]
|
|
13648
|
+
)
|
|
13649
|
+
]
|
|
13650
|
+
),
|
|
13651
|
+
/**
|
|
13652
|
+
* 边框线
|
|
13653
|
+
*/
|
|
13305
13654
|
h("div", {
|
|
13306
|
-
|
|
13655
|
+
key: "tl",
|
|
13656
|
+
class: "vxe-table--border-line"
|
|
13307
13657
|
}),
|
|
13308
|
-
|
|
13309
|
-
|
|
13310
|
-
|
|
13311
|
-
|
|
13312
|
-
|
|
13313
|
-
|
|
13314
|
-
|
|
13315
|
-
|
|
13316
|
-
|
|
13317
|
-
|
|
13318
|
-
|
|
13319
|
-
renderNativeBody(),
|
|
13320
|
-
renderScrollX()
|
|
13321
|
-
]),
|
|
13322
|
-
/**
|
|
13323
|
-
* 空数据
|
|
13324
|
-
*/
|
|
13325
|
-
h("div", {
|
|
13326
|
-
key: "tn",
|
|
13327
|
-
ref: refEmptyPlaceholder,
|
|
13328
|
-
class: "vxe-table--empty-place-wrapper",
|
|
13329
|
-
xid: xID
|
|
13330
|
-
}, [
|
|
13331
|
-
h("div", {
|
|
13332
|
-
class: "vxe-table--empty-placeholder"
|
|
13333
|
-
}, [
|
|
13334
|
-
h("div", {
|
|
13335
|
-
class: "vxe-table--empty-content"
|
|
13336
|
-
}, renderEmptyBody())
|
|
13337
|
-
])
|
|
13338
|
-
]),
|
|
13339
|
-
/**
|
|
13340
|
-
* 边框线
|
|
13341
|
-
*/
|
|
13342
|
-
h("div", {
|
|
13343
|
-
key: "tl",
|
|
13344
|
-
class: "vxe-table--border-line"
|
|
13345
|
-
}),
|
|
13346
|
-
/**
|
|
13347
|
-
* 列宽线
|
|
13348
|
-
*/
|
|
13349
|
-
h("div", {
|
|
13350
|
-
key: "tcl",
|
|
13351
|
-
ref: refColResizeBar,
|
|
13352
|
-
class: "vxe-table--resizable-col-bar"
|
|
13353
|
-
}, resizableOpts.showDragTip ? [
|
|
13354
|
-
h("div", {
|
|
13355
|
-
class: "vxe-table--resizable-number-tip"
|
|
13356
|
-
})
|
|
13357
|
-
] : []),
|
|
13358
|
-
h("div", {
|
|
13359
|
-
key: "ttw"
|
|
13360
|
-
}, [
|
|
13361
|
-
h(Teleport, {
|
|
13362
|
-
to: teleportToWrapperElem,
|
|
13363
|
-
disabled: !($xeGantt && teleportToWrapperElem)
|
|
13364
|
-
}, [
|
|
13365
|
-
h("div", {
|
|
13366
|
-
ref: refTeleportWrapper
|
|
13367
|
-
}, [
|
|
13368
|
-
/**
|
|
13369
|
-
* 行高线
|
|
13370
|
-
*/
|
|
13658
|
+
/**
|
|
13659
|
+
* 列宽线
|
|
13660
|
+
*/
|
|
13661
|
+
h(
|
|
13662
|
+
"div",
|
|
13663
|
+
{
|
|
13664
|
+
key: "tcl",
|
|
13665
|
+
ref: refColResizeBar,
|
|
13666
|
+
class: "vxe-table--resizable-col-bar"
|
|
13667
|
+
},
|
|
13668
|
+
resizableOpts.showDragTip ? [
|
|
13371
13669
|
h("div", {
|
|
13372
|
-
|
|
13373
|
-
|
|
13374
|
-
|
|
13375
|
-
|
|
13376
|
-
|
|
13377
|
-
|
|
13378
|
-
|
|
13379
|
-
|
|
13380
|
-
|
|
13381
|
-
|
|
13382
|
-
|
|
13383
|
-
|
|
13384
|
-
|
|
13385
|
-
|
|
13386
|
-
|
|
13387
|
-
|
|
13388
|
-
|
|
13389
|
-
|
|
13390
|
-
|
|
13391
|
-
|
|
13392
|
-
|
|
13393
|
-
|
|
13394
|
-
|
|
13395
|
-
|
|
13396
|
-
|
|
13397
|
-
|
|
13398
|
-
|
|
13399
|
-
|
|
13400
|
-
|
|
13401
|
-
|
|
13402
|
-
|
|
13403
|
-
|
|
13404
|
-
|
|
13405
|
-
|
|
13406
|
-
|
|
13407
|
-
|
|
13408
|
-
|
|
13409
|
-
|
|
13410
|
-
|
|
13411
|
-
|
|
13412
|
-
|
|
13413
|
-
|
|
13414
|
-
|
|
13415
|
-
|
|
13416
|
-
|
|
13417
|
-
|
|
13418
|
-
|
|
13419
|
-
|
|
13420
|
-
|
|
13421
|
-
|
|
13422
|
-
|
|
13423
|
-
|
|
13424
|
-
|
|
13425
|
-
|
|
13426
|
-
|
|
13427
|
-
|
|
13428
|
-
|
|
13429
|
-
|
|
13430
|
-
|
|
13431
|
-
|
|
13432
|
-
|
|
13433
|
-
|
|
13434
|
-
|
|
13435
|
-
|
|
13436
|
-
|
|
13437
|
-
|
|
13438
|
-
|
|
13439
|
-
|
|
13440
|
-
|
|
13441
|
-
|
|
13442
|
-
|
|
13443
|
-
|
|
13444
|
-
|
|
13445
|
-
|
|
13446
|
-
]
|
|
13447
|
-
|
|
13448
|
-
|
|
13449
|
-
|
|
13450
|
-
|
|
13451
|
-
|
|
13452
|
-
|
|
13453
|
-
|
|
13454
|
-
|
|
13455
|
-
|
|
13456
|
-
|
|
13457
|
-
|
|
13458
|
-
|
|
13459
|
-
|
|
13460
|
-
|
|
13461
|
-
|
|
13462
|
-
|
|
13463
|
-
|
|
13464
|
-
|
|
13465
|
-
|
|
13466
|
-
|
|
13467
|
-
|
|
13468
|
-
|
|
13670
|
+
class: "vxe-table--resizable-number-tip"
|
|
13671
|
+
})
|
|
13672
|
+
] : []
|
|
13673
|
+
),
|
|
13674
|
+
h(
|
|
13675
|
+
"div",
|
|
13676
|
+
{
|
|
13677
|
+
key: "ttw"
|
|
13678
|
+
},
|
|
13679
|
+
[
|
|
13680
|
+
h(
|
|
13681
|
+
Teleport,
|
|
13682
|
+
{
|
|
13683
|
+
to: teleportToWrapperElem,
|
|
13684
|
+
disabled: !($xeGantt && teleportToWrapperElem)
|
|
13685
|
+
},
|
|
13686
|
+
[
|
|
13687
|
+
h(
|
|
13688
|
+
"div",
|
|
13689
|
+
{
|
|
13690
|
+
ref: refTeleportWrapper
|
|
13691
|
+
},
|
|
13692
|
+
[
|
|
13693
|
+
/**
|
|
13694
|
+
* 行高线
|
|
13695
|
+
*/
|
|
13696
|
+
h(
|
|
13697
|
+
"div",
|
|
13698
|
+
{
|
|
13699
|
+
key: "trl",
|
|
13700
|
+
ref: refRowResizeBar,
|
|
13701
|
+
class: "vxe-table--resizable-row-bar"
|
|
13702
|
+
},
|
|
13703
|
+
resizableOpts.showDragTip ? [
|
|
13704
|
+
h("div", {
|
|
13705
|
+
class: "vxe-table--resizable-number-tip"
|
|
13706
|
+
})
|
|
13707
|
+
] : []
|
|
13708
|
+
),
|
|
13709
|
+
/**
|
|
13710
|
+
* 加载中
|
|
13711
|
+
*/
|
|
13712
|
+
VxeUILoadingComponent ? h(
|
|
13713
|
+
VxeUILoadingComponent,
|
|
13714
|
+
{
|
|
13715
|
+
key: "lg",
|
|
13716
|
+
class: "vxe-table--loading",
|
|
13717
|
+
modelValue: currLoading,
|
|
13718
|
+
icon: loadingOpts.icon,
|
|
13719
|
+
text: loadingOpts.text
|
|
13720
|
+
},
|
|
13721
|
+
loadingSlot ? {
|
|
13722
|
+
default: () => callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, loading: currLoading })
|
|
13723
|
+
} : {}
|
|
13724
|
+
) : loadingSlot ? h(
|
|
13725
|
+
"div",
|
|
13726
|
+
{
|
|
13727
|
+
class: [
|
|
13728
|
+
"vxe-loading--custom-wrapper",
|
|
13729
|
+
{
|
|
13730
|
+
"is--visible": currLoading
|
|
13731
|
+
}
|
|
13732
|
+
]
|
|
13733
|
+
},
|
|
13734
|
+
callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, loading: currLoading })
|
|
13735
|
+
) : renderEmptyElement($xeTable),
|
|
13736
|
+
/**
|
|
13737
|
+
* 拖拽排序提示
|
|
13738
|
+
*/
|
|
13739
|
+
renderDragTip()
|
|
13740
|
+
]
|
|
13741
|
+
)
|
|
13742
|
+
]
|
|
13743
|
+
)
|
|
13744
|
+
]
|
|
13745
|
+
),
|
|
13746
|
+
h(
|
|
13747
|
+
"div",
|
|
13748
|
+
{
|
|
13749
|
+
key: "fpw",
|
|
13750
|
+
ref: refCustomContainerElem
|
|
13751
|
+
},
|
|
13752
|
+
[
|
|
13753
|
+
h(
|
|
13754
|
+
Teleport,
|
|
13755
|
+
{
|
|
13756
|
+
to: customPopupToElem,
|
|
13757
|
+
disabled: !!reactData.ctPopupFlag && !customPopupToElem
|
|
13758
|
+
},
|
|
13759
|
+
[
|
|
13760
|
+
/**
|
|
13761
|
+
* 自定义列
|
|
13762
|
+
*/
|
|
13763
|
+
initStore.custom ? h(TableCustomPanelComponent, {
|
|
13764
|
+
key: "cs",
|
|
13765
|
+
ref: refTableCustom,
|
|
13766
|
+
customStore
|
|
13767
|
+
}) : renderEmptyElement($xeTable)
|
|
13768
|
+
]
|
|
13769
|
+
)
|
|
13770
|
+
]
|
|
13771
|
+
),
|
|
13772
|
+
h(
|
|
13773
|
+
"div",
|
|
13774
|
+
{
|
|
13775
|
+
key: "tpw"
|
|
13776
|
+
},
|
|
13777
|
+
[
|
|
13778
|
+
h(
|
|
13779
|
+
Teleport,
|
|
13780
|
+
{
|
|
13781
|
+
to: popupToWrapperElem,
|
|
13782
|
+
disabled: !($xeGGWrapper && popupToWrapperElem)
|
|
13783
|
+
},
|
|
13784
|
+
[
|
|
13785
|
+
h(
|
|
13786
|
+
"div",
|
|
13787
|
+
{
|
|
13788
|
+
ref: refPopupWrapperElem
|
|
13789
|
+
},
|
|
13790
|
+
[
|
|
13791
|
+
/**
|
|
13792
|
+
* 筛选
|
|
13793
|
+
*/
|
|
13794
|
+
initStore.filter ? h(TableFilterPanelComponent, {
|
|
13795
|
+
key: "tf",
|
|
13796
|
+
ref: refTableFilter,
|
|
13797
|
+
filterStore
|
|
13798
|
+
}) : renderEmptyElement($xeTable),
|
|
13799
|
+
/**
|
|
13800
|
+
* 快捷菜单
|
|
13801
|
+
*/
|
|
13802
|
+
isContentMenu ? h(TableMenuPanelComponent, {
|
|
13803
|
+
key: "tm",
|
|
13804
|
+
ref: refTableMenu
|
|
13805
|
+
}) : renderEmptyElement($xeTable)
|
|
13806
|
+
]
|
|
13807
|
+
)
|
|
13808
|
+
]
|
|
13809
|
+
)
|
|
13810
|
+
]
|
|
13811
|
+
),
|
|
13469
13812
|
/**
|
|
13470
|
-
*
|
|
13813
|
+
* 导入
|
|
13471
13814
|
*/
|
|
13472
|
-
h(
|
|
13473
|
-
key: "
|
|
13474
|
-
|
|
13475
|
-
|
|
13476
|
-
|
|
13477
|
-
useScrollbar: isVScrollbar
|
|
13478
|
-
}),
|
|
13815
|
+
initStore.import && hasEnableConf(importConfig, importOpts) ? h(TableImportPanelComponent, {
|
|
13816
|
+
key: "it",
|
|
13817
|
+
defaultOptions: reactData.importParams,
|
|
13818
|
+
storeData: reactData.importStore
|
|
13819
|
+
}) : renderEmptyElement($xeTable),
|
|
13479
13820
|
/**
|
|
13480
|
-
|
|
13481
|
-
|
|
13482
|
-
h(
|
|
13483
|
-
key: "
|
|
13484
|
-
|
|
13485
|
-
|
|
13486
|
-
|
|
13487
|
-
enterDelay: tableTipConfig.enterDelay,
|
|
13488
|
-
leaveDelay: tableTipConfig.leaveDelay,
|
|
13489
|
-
useHtml: XEUtils.isBoolean(tableTipConfig.useHtml) ? tableTipConfig.useHtml : void 0,
|
|
13490
|
-
// 已废弃
|
|
13491
|
-
useHTML: XEUtils.isBoolean(tableTipConfig.useHTML) ? tableTipConfig.useHTML : void 0,
|
|
13492
|
-
width: tableTipConfig.width,
|
|
13493
|
-
height: tableTipConfig.height,
|
|
13494
|
-
minWidth: tableTipConfig.minWidth,
|
|
13495
|
-
minHeight: tableTipConfig.minHeight,
|
|
13496
|
-
maxWidth: tableTipConfig.maxWidth,
|
|
13497
|
-
maxHeight: tableTipConfig.maxHeight,
|
|
13498
|
-
placement: tableTipConfig.placement,
|
|
13499
|
-
defaultPlacement: tableTipConfig.defaultPlacement,
|
|
13500
|
-
popupClassName: tableTipConfig.popupClassName,
|
|
13501
|
-
useScrollbar: tableTipConfig.useScrollbar
|
|
13502
|
-
}, currTooltipSlot ? {
|
|
13503
|
-
content: () => {
|
|
13504
|
-
const { type, row, column, content: tooltipContent } = tooltipStore;
|
|
13505
|
-
if (currTooltipSlot) {
|
|
13506
|
-
if (column && type === "header") {
|
|
13507
|
-
return h("div", {
|
|
13508
|
-
key: type
|
|
13509
|
-
}, currTooltipSlot({ column, tooltipContent, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }));
|
|
13510
|
-
}
|
|
13511
|
-
if (row && column && type === "body") {
|
|
13512
|
-
return h("div", {
|
|
13513
|
-
key: type
|
|
13514
|
-
}, currTooltipSlot({ row, column, tooltipContent, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }));
|
|
13515
|
-
}
|
|
13516
|
-
if (row && column && type === "footer") {
|
|
13517
|
-
return h("div", {
|
|
13518
|
-
key: type
|
|
13519
|
-
}, currTooltipSlot({ row, column, tooltipContent, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }));
|
|
13520
|
-
}
|
|
13521
|
-
}
|
|
13522
|
-
return renderEmptyElement($xeTable);
|
|
13523
|
-
}
|
|
13524
|
-
} : {}),
|
|
13821
|
+
* 导出
|
|
13822
|
+
*/
|
|
13823
|
+
initStore.export && (hasEnableConf(exportConfig, exportOpts) || hasEnableConf(printConfig, printOpts)) ? h(TableExportPanelComponent, {
|
|
13824
|
+
key: "et",
|
|
13825
|
+
defaultOptions: reactData.exportParams,
|
|
13826
|
+
storeData: reactData.exportStore
|
|
13827
|
+
}) : renderEmptyElement($xeTable),
|
|
13525
13828
|
/**
|
|
13526
|
-
|
|
13527
|
-
|
|
13528
|
-
|
|
13529
|
-
|
|
13530
|
-
|
|
13531
|
-
|
|
13532
|
-
|
|
13533
|
-
|
|
13534
|
-
|
|
13535
|
-
|
|
13536
|
-
|
|
13537
|
-
|
|
13538
|
-
|
|
13539
|
-
|
|
13540
|
-
|
|
13541
|
-
|
|
13829
|
+
* 提示相关
|
|
13830
|
+
*/
|
|
13831
|
+
VxeUITooltipComponent ? h("div", {}, [
|
|
13832
|
+
/**
|
|
13833
|
+
* 通用提示
|
|
13834
|
+
*/
|
|
13835
|
+
h(VxeUITooltipComponent, {
|
|
13836
|
+
key: "ctp",
|
|
13837
|
+
ref: refCommTooltip,
|
|
13838
|
+
isArrow: false,
|
|
13839
|
+
enterable: false,
|
|
13840
|
+
useScrollbar: isVScrollbar
|
|
13841
|
+
}),
|
|
13842
|
+
/**
|
|
13843
|
+
* 工具提示
|
|
13844
|
+
*/
|
|
13845
|
+
h(
|
|
13846
|
+
VxeUITooltipComponent,
|
|
13847
|
+
{
|
|
13848
|
+
key: "btp",
|
|
13849
|
+
ref: refTooltip,
|
|
13850
|
+
theme: tableTipConfig.theme,
|
|
13851
|
+
enterable: tableTipConfig.enterable,
|
|
13852
|
+
enterDelay: tableTipConfig.enterDelay,
|
|
13853
|
+
leaveDelay: tableTipConfig.leaveDelay,
|
|
13854
|
+
useHtml: XEUtils.isBoolean(tableTipConfig.useHtml) ? tableTipConfig.useHtml : void 0,
|
|
13855
|
+
// 已废弃
|
|
13856
|
+
useHTML: XEUtils.isBoolean(tableTipConfig.useHTML) ? tableTipConfig.useHTML : void 0,
|
|
13857
|
+
width: tableTipConfig.width,
|
|
13858
|
+
height: tableTipConfig.height,
|
|
13859
|
+
minWidth: tableTipConfig.minWidth,
|
|
13860
|
+
minHeight: tableTipConfig.minHeight,
|
|
13861
|
+
maxWidth: tableTipConfig.maxWidth,
|
|
13862
|
+
maxHeight: tableTipConfig.maxHeight,
|
|
13863
|
+
placement: tableTipConfig.placement,
|
|
13864
|
+
defaultPlacement: tableTipConfig.defaultPlacement,
|
|
13865
|
+
popupClassName: tableTipConfig.popupClassName,
|
|
13866
|
+
useScrollbar: tableTipConfig.useScrollbar
|
|
13867
|
+
},
|
|
13868
|
+
currTooltipSlot ? {
|
|
13869
|
+
content: () => {
|
|
13870
|
+
const { type, row, column, content: tooltipContent } = tooltipStore;
|
|
13871
|
+
if (currTooltipSlot) {
|
|
13872
|
+
if (column && type === "header") {
|
|
13873
|
+
return h(
|
|
13874
|
+
"div",
|
|
13875
|
+
{
|
|
13876
|
+
key: type
|
|
13877
|
+
},
|
|
13878
|
+
currTooltipSlot({ column, tooltipContent, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })
|
|
13879
|
+
);
|
|
13880
|
+
}
|
|
13881
|
+
if (row && column && type === "body") {
|
|
13882
|
+
return h(
|
|
13883
|
+
"div",
|
|
13884
|
+
{
|
|
13885
|
+
key: type
|
|
13886
|
+
},
|
|
13887
|
+
currTooltipSlot({ row, column, tooltipContent, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })
|
|
13888
|
+
);
|
|
13889
|
+
}
|
|
13890
|
+
if (row && column && type === "footer") {
|
|
13891
|
+
return h(
|
|
13892
|
+
"div",
|
|
13893
|
+
{
|
|
13894
|
+
key: type
|
|
13895
|
+
},
|
|
13896
|
+
currTooltipSlot({ row, column, tooltipContent, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })
|
|
13897
|
+
);
|
|
13898
|
+
}
|
|
13899
|
+
}
|
|
13900
|
+
return renderEmptyElement($xeTable);
|
|
13901
|
+
}
|
|
13902
|
+
} : {}
|
|
13903
|
+
),
|
|
13904
|
+
/**
|
|
13905
|
+
* 校验提示
|
|
13906
|
+
*/
|
|
13907
|
+
props.editRules && validOpts.showErrorMessage && (validOpts.message === "default" ? !height : validOpts.message === "tooltip") ? h(VxeUITooltipComponent, {
|
|
13908
|
+
key: "vtp",
|
|
13909
|
+
ref: refValidTooltip,
|
|
13910
|
+
class: [
|
|
13911
|
+
{
|
|
13912
|
+
"old-cell-valid": editRules && getConfig().cellVaildMode === "obsolete"
|
|
13913
|
+
},
|
|
13914
|
+
"vxe-table--valid-error"
|
|
13915
|
+
],
|
|
13916
|
+
theme: validTipConfig.theme,
|
|
13917
|
+
enterable: validTipConfig.enterable,
|
|
13918
|
+
enterDelay: validTipConfig.enterDelay,
|
|
13919
|
+
leaveDelay: validTipConfig.leaveDelay,
|
|
13920
|
+
useScrollbar: validTipConfig.useScrollbar
|
|
13921
|
+
}) : renderEmptyElement($xeTable)
|
|
13922
|
+
]) : renderEmptyElement($xeTable)
|
|
13923
|
+
]
|
|
13924
|
+
);
|
|
13542
13925
|
};
|
|
13543
13926
|
const dataFlag = ref(0);
|
|
13544
|
-
watch(
|
|
13545
|
-
|
|
13546
|
-
|
|
13547
|
-
|
|
13548
|
-
|
|
13549
|
-
|
|
13927
|
+
watch(
|
|
13928
|
+
() => props.data ? props.data.length : -1,
|
|
13929
|
+
() => {
|
|
13930
|
+
dataFlag.value++;
|
|
13931
|
+
}
|
|
13932
|
+
);
|
|
13933
|
+
watch(
|
|
13934
|
+
() => props.data,
|
|
13935
|
+
() => {
|
|
13936
|
+
dataFlag.value++;
|
|
13937
|
+
}
|
|
13938
|
+
);
|
|
13550
13939
|
watch(dataFlag, () => {
|
|
13551
13940
|
const { initStatus } = internalData;
|
|
13552
13941
|
const value = props.data || [];
|
|
@@ -13561,78 +13950,126 @@ var table_default = defineVxeComponent({
|
|
|
13561
13950
|
if (!initStatus) {
|
|
13562
13951
|
handleLoadDefaults();
|
|
13563
13952
|
}
|
|
13564
|
-
if ((scrollXLoad || scrollYLoad) &&
|
|
13953
|
+
if ((scrollXLoad || scrollYLoad) && expandColumn && expandOpts.mode !== "fixed") {
|
|
13565
13954
|
warnLog("vxe.error.scrollErrProp", ["column.type=expand"]);
|
|
13566
13955
|
}
|
|
13567
13956
|
return $xeTable.recalculate();
|
|
13568
13957
|
});
|
|
13569
13958
|
});
|
|
13570
13959
|
const staticColumnFlag = ref(0);
|
|
13571
|
-
watch(
|
|
13572
|
-
|
|
13573
|
-
|
|
13574
|
-
|
|
13575
|
-
|
|
13576
|
-
|
|
13960
|
+
watch(
|
|
13961
|
+
() => reactData.staticColumns.length,
|
|
13962
|
+
() => {
|
|
13963
|
+
staticColumnFlag.value++;
|
|
13964
|
+
}
|
|
13965
|
+
);
|
|
13966
|
+
watch(
|
|
13967
|
+
() => reactData.staticColumns,
|
|
13968
|
+
() => {
|
|
13969
|
+
staticColumnFlag.value++;
|
|
13970
|
+
}
|
|
13971
|
+
);
|
|
13577
13972
|
watch(staticColumnFlag, () => {
|
|
13578
13973
|
nextTick(() => handleInitColumn(XEUtils.clone(reactData.staticColumns)));
|
|
13579
13974
|
});
|
|
13580
13975
|
const tableColumnFlag = ref(0);
|
|
13581
|
-
watch(
|
|
13582
|
-
|
|
13583
|
-
|
|
13584
|
-
|
|
13585
|
-
|
|
13586
|
-
|
|
13976
|
+
watch(
|
|
13977
|
+
() => reactData.tableColumn.length,
|
|
13978
|
+
() => {
|
|
13979
|
+
tableColumnFlag.value++;
|
|
13980
|
+
}
|
|
13981
|
+
);
|
|
13982
|
+
watch(
|
|
13983
|
+
() => reactData.tableColumn,
|
|
13984
|
+
() => {
|
|
13985
|
+
tableColumnFlag.value++;
|
|
13986
|
+
}
|
|
13987
|
+
);
|
|
13587
13988
|
watch(tableColumnFlag, () => {
|
|
13588
13989
|
$xeTable.analyColumnWidth();
|
|
13589
13990
|
});
|
|
13590
|
-
watch(
|
|
13591
|
-
|
|
13592
|
-
|
|
13593
|
-
|
|
13594
|
-
|
|
13595
|
-
|
|
13596
|
-
|
|
13597
|
-
|
|
13598
|
-
|
|
13599
|
-
|
|
13991
|
+
watch(
|
|
13992
|
+
() => reactData.upDataFlag,
|
|
13993
|
+
() => {
|
|
13994
|
+
nextTick(() => {
|
|
13995
|
+
$xeTable.updateData();
|
|
13996
|
+
});
|
|
13997
|
+
}
|
|
13998
|
+
);
|
|
13999
|
+
watch(
|
|
14000
|
+
() => reactData.reColumnFlag,
|
|
14001
|
+
() => {
|
|
14002
|
+
nextTick(() => {
|
|
14003
|
+
$xeTable.refreshColumn();
|
|
14004
|
+
});
|
|
14005
|
+
}
|
|
14006
|
+
);
|
|
13600
14007
|
const reScrollFlag = ref(0);
|
|
13601
14008
|
const reLayoutFlag = ref(0);
|
|
13602
14009
|
watch(computeSize, () => {
|
|
13603
14010
|
reLayoutFlag.value++;
|
|
13604
14011
|
});
|
|
13605
|
-
watch(
|
|
13606
|
-
|
|
13607
|
-
|
|
13608
|
-
|
|
13609
|
-
|
|
13610
|
-
|
|
13611
|
-
watch(
|
|
13612
|
-
|
|
13613
|
-
|
|
13614
|
-
|
|
13615
|
-
|
|
13616
|
-
|
|
13617
|
-
|
|
13618
|
-
|
|
13619
|
-
|
|
13620
|
-
|
|
13621
|
-
|
|
13622
|
-
|
|
13623
|
-
|
|
13624
|
-
|
|
13625
|
-
|
|
13626
|
-
|
|
13627
|
-
|
|
13628
|
-
|
|
13629
|
-
|
|
13630
|
-
watch(
|
|
13631
|
-
|
|
13632
|
-
|
|
13633
|
-
|
|
13634
|
-
|
|
13635
|
-
|
|
14012
|
+
watch(
|
|
14013
|
+
() => props.showHeader,
|
|
14014
|
+
() => {
|
|
14015
|
+
reLayoutFlag.value++;
|
|
14016
|
+
}
|
|
14017
|
+
);
|
|
14018
|
+
watch(
|
|
14019
|
+
() => props.showFooter,
|
|
14020
|
+
() => {
|
|
14021
|
+
reLayoutFlag.value++;
|
|
14022
|
+
}
|
|
14023
|
+
);
|
|
14024
|
+
watch(
|
|
14025
|
+
() => props.showHeaderOverflow,
|
|
14026
|
+
() => {
|
|
14027
|
+
reLayoutFlag.value++;
|
|
14028
|
+
}
|
|
14029
|
+
);
|
|
14030
|
+
watch(
|
|
14031
|
+
() => props.showOverflow,
|
|
14032
|
+
() => {
|
|
14033
|
+
updateColumnAllOverflow();
|
|
14034
|
+
reLayoutFlag.value++;
|
|
14035
|
+
}
|
|
14036
|
+
);
|
|
14037
|
+
watch(
|
|
14038
|
+
() => props.showFooterOverflow,
|
|
14039
|
+
() => {
|
|
14040
|
+
reLayoutFlag.value++;
|
|
14041
|
+
}
|
|
14042
|
+
);
|
|
14043
|
+
watch(
|
|
14044
|
+
() => reactData.overflowX,
|
|
14045
|
+
() => {
|
|
14046
|
+
reLayoutFlag.value++;
|
|
14047
|
+
}
|
|
14048
|
+
);
|
|
14049
|
+
watch(
|
|
14050
|
+
() => reactData.overflowY,
|
|
14051
|
+
() => {
|
|
14052
|
+
reLayoutFlag.value++;
|
|
14053
|
+
}
|
|
14054
|
+
);
|
|
14055
|
+
watch(
|
|
14056
|
+
() => props.height,
|
|
14057
|
+
() => {
|
|
14058
|
+
reLayoutFlag.value++;
|
|
14059
|
+
}
|
|
14060
|
+
);
|
|
14061
|
+
watch(
|
|
14062
|
+
() => props.maxHeight,
|
|
14063
|
+
() => {
|
|
14064
|
+
reLayoutFlag.value++;
|
|
14065
|
+
}
|
|
14066
|
+
);
|
|
14067
|
+
watch(
|
|
14068
|
+
() => VxeUI.getLanguage(),
|
|
14069
|
+
() => {
|
|
14070
|
+
reLayoutFlag.value++;
|
|
14071
|
+
}
|
|
14072
|
+
);
|
|
13636
14073
|
watch(computeIsVScrollbar, () => {
|
|
13637
14074
|
nextTick(() => {
|
|
13638
14075
|
bindScrollbarResize();
|
|
@@ -13673,58 +14110,91 @@ var table_default = defineVxeComponent({
|
|
|
13673
14110
|
});
|
|
13674
14111
|
});
|
|
13675
14112
|
const footFlag = ref(0);
|
|
13676
|
-
watch(
|
|
13677
|
-
|
|
13678
|
-
|
|
13679
|
-
|
|
13680
|
-
|
|
13681
|
-
|
|
14113
|
+
watch(
|
|
14114
|
+
() => props.footerData ? props.footerData.length : -1,
|
|
14115
|
+
() => {
|
|
14116
|
+
footFlag.value++;
|
|
14117
|
+
}
|
|
14118
|
+
);
|
|
14119
|
+
watch(
|
|
14120
|
+
() => props.footerData,
|
|
14121
|
+
() => {
|
|
14122
|
+
footFlag.value++;
|
|
14123
|
+
}
|
|
14124
|
+
);
|
|
13682
14125
|
watch(footFlag, () => {
|
|
13683
14126
|
internalData.footerFullDataRowData = {};
|
|
13684
14127
|
$xeTable.updateFooter();
|
|
13685
14128
|
});
|
|
13686
|
-
watch(
|
|
13687
|
-
|
|
13688
|
-
|
|
13689
|
-
|
|
14129
|
+
watch(
|
|
14130
|
+
() => props.syncResize,
|
|
14131
|
+
(value) => {
|
|
14132
|
+
if (value) {
|
|
13690
14133
|
handleUpdateResize();
|
|
13691
|
-
|
|
13692
|
-
|
|
14134
|
+
nextTick(() => {
|
|
14135
|
+
handleUpdateResize();
|
|
14136
|
+
setTimeout(() => handleUpdateResize());
|
|
14137
|
+
});
|
|
14138
|
+
}
|
|
13693
14139
|
}
|
|
13694
|
-
|
|
14140
|
+
);
|
|
13695
14141
|
const mergeCellFlag = ref(0);
|
|
13696
|
-
watch(
|
|
13697
|
-
|
|
13698
|
-
|
|
13699
|
-
|
|
13700
|
-
|
|
13701
|
-
|
|
14142
|
+
watch(
|
|
14143
|
+
() => props.mergeCells ? props.mergeCells.length : -1,
|
|
14144
|
+
() => {
|
|
14145
|
+
mergeCellFlag.value++;
|
|
14146
|
+
}
|
|
14147
|
+
);
|
|
14148
|
+
watch(
|
|
14149
|
+
() => props.mergeCells,
|
|
14150
|
+
() => {
|
|
14151
|
+
mergeCellFlag.value++;
|
|
14152
|
+
}
|
|
14153
|
+
);
|
|
13702
14154
|
watch(mergeCellFlag, () => {
|
|
13703
14155
|
handleUpdateMergeBodyCells(props.mergeCells || []);
|
|
13704
14156
|
});
|
|
13705
14157
|
const mergeHeaderItemFlag = ref(0);
|
|
13706
|
-
watch(
|
|
13707
|
-
|
|
13708
|
-
|
|
13709
|
-
|
|
13710
|
-
|
|
13711
|
-
|
|
14158
|
+
watch(
|
|
14159
|
+
() => props.mergeHeaderCells ? props.mergeHeaderCells.length : -1,
|
|
14160
|
+
() => {
|
|
14161
|
+
mergeHeaderItemFlag.value++;
|
|
14162
|
+
}
|
|
14163
|
+
);
|
|
14164
|
+
watch(
|
|
14165
|
+
() => props.mergeHeaderCells,
|
|
14166
|
+
() => {
|
|
14167
|
+
mergeHeaderItemFlag.value++;
|
|
14168
|
+
}
|
|
14169
|
+
);
|
|
13712
14170
|
watch(mergeHeaderItemFlag, () => {
|
|
13713
14171
|
handleUpdateMergeHeaderCells(props.mergeHeaderCells || []);
|
|
13714
14172
|
});
|
|
13715
14173
|
const mergeFooteCellFlag = ref(0);
|
|
13716
|
-
watch(
|
|
13717
|
-
|
|
13718
|
-
|
|
13719
|
-
|
|
13720
|
-
|
|
13721
|
-
|
|
13722
|
-
watch(
|
|
13723
|
-
|
|
13724
|
-
|
|
13725
|
-
|
|
13726
|
-
|
|
13727
|
-
|
|
14174
|
+
watch(
|
|
14175
|
+
() => props.mergeFooterCells ? props.mergeFooterCells.length : -1,
|
|
14176
|
+
() => {
|
|
14177
|
+
mergeFooteCellFlag.value++;
|
|
14178
|
+
}
|
|
14179
|
+
);
|
|
14180
|
+
watch(
|
|
14181
|
+
() => props.mergeFooterCells,
|
|
14182
|
+
() => {
|
|
14183
|
+
mergeFooteCellFlag.value++;
|
|
14184
|
+
}
|
|
14185
|
+
);
|
|
14186
|
+
watch(
|
|
14187
|
+
() => props.mergeFooterItems ? props.mergeFooterItems.length : -1,
|
|
14188
|
+
() => {
|
|
14189
|
+
mergeFooteCellFlag.value++;
|
|
14190
|
+
}
|
|
14191
|
+
);
|
|
14192
|
+
watch(
|
|
14193
|
+
() => props.mergeFooterItems,
|
|
14194
|
+
() => {
|
|
14195
|
+
mergeFooteCellFlag.value++;
|
|
14196
|
+
}
|
|
14197
|
+
);
|
|
13728
14198
|
watch(mergeFooteCellFlag, () => {
|
|
13729
14199
|
const mFooterCells = props.mergeFooterCells || props.mergeFooterItems;
|
|
13730
14200
|
handleUpdateMergeFooterCells(mFooterCells || []);
|
|
@@ -13743,9 +14213,12 @@ var table_default = defineVxeComponent({
|
|
|
13743
14213
|
}
|
|
13744
14214
|
});
|
|
13745
14215
|
const kfFlag = ref(0);
|
|
13746
|
-
watch(
|
|
13747
|
-
|
|
13748
|
-
|
|
14216
|
+
watch(
|
|
14217
|
+
() => reactData.updateColFlag,
|
|
14218
|
+
() => {
|
|
14219
|
+
kfFlag.value++;
|
|
14220
|
+
}
|
|
14221
|
+
);
|
|
13749
14222
|
watch(computeKeepFields, () => {
|
|
13750
14223
|
kfFlag.value++;
|
|
13751
14224
|
});
|
|
@@ -13971,7 +14444,7 @@ var table_default = defineVxeComponent({
|
|
|
13971
14444
|
if (mouseOpts.area && mouseOpts.selected) {
|
|
13972
14445
|
warnLog("vxe.error.errConflicts", ["mouse-config.area", "mouse-config.selected"]);
|
|
13973
14446
|
}
|
|
13974
|
-
if (mouseOpts.area &&
|
|
14447
|
+
if (mouseOpts.area && props.treeConfig && !treeOpts.transform) {
|
|
13975
14448
|
errLog("vxe.error.notSupportProp", ["mouse-config.area", "tree-config.transform=false", "tree-config.transform=true"]);
|
|
13976
14449
|
}
|
|
13977
14450
|
if (props.editConfig && editOpts.activeMethod) {
|