vxe-table 4.23.19 → 4.24.0-beta.0
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/README.md +2 -0
- package/dist/all.esm.js +631 -343
- package/dist/all.esm.min.js +3 -3
- package/dist/style.css +85 -13
- package/dist/style.mini.css +1 -1
- package/es/components.d.ts +1 -3
- package/es/components.js +1 -2
- package/es/style.css +85 -13
- package/es/style.mini.css +1 -1
- package/es/table/module/custom/panel.js +2 -2
- package/es/table/module/edit/hook.js +95 -5
- package/es/table/src/body.d.ts +2 -2
- package/es/table/src/body.js +26 -49
- package/es/table/src/table.js +256 -35
- package/es/table/style.css +82 -13
- package/es/table/style.mini.css +1 -1
- package/es/ui/abandon.d.ts +82 -0
- package/es/ui/abandon.js +90 -0
- package/es/ui/index.d.ts +1 -82
- package/es/ui/index.js +6 -91
- package/es/ui/src/log.js +1 -1
- package/es/vxe-table/style.css +82 -13
- package/es/vxe-table/style.mini.css +1 -1
- package/lib/components.d.ts +1 -3
- package/lib/components.js +1 -2
- package/lib/index.umd.js +630 -340
- package/lib/index.umd.min.js +3 -3
- package/lib/style.css +85 -13
- package/lib/style.mini.css +1 -1
- package/lib/table/module/custom/panel.js +2 -2
- package/lib/table/module/edit/hook.js +95 -5
- package/lib/table/src/body.d.ts +2 -2
- package/lib/table/src/body.js +26 -49
- package/lib/table/src/table.js +256 -35
- package/lib/table/style/style.css +82 -13
- package/lib/table/style/style.mini.css +1 -1
- package/lib/ui/abandon.d.ts +82 -0
- package/lib/ui/abandon.js +110 -0
- package/lib/ui/index.d.ts +1 -82
- package/lib/ui/index.js +7 -91
- package/lib/ui/src/log.js +1 -1
- package/lib/vxe-table/style/style.css +82 -13
- package/lib/vxe-table/style/style.mini.css +1 -1
- package/package.json +2 -2
- package/packages/components.ts +2 -5
- package/packages/table/module/custom/panel.ts +2 -2
- package/packages/table/module/edit/hook.ts +95 -5
- package/packages/table/src/body.ts +28 -50
- package/packages/table/src/table.ts +292 -34
- package/packages/ui/abandon.ts +136 -0
- package/packages/ui/index.ts +12 -122
- package/styles/components/table.scss +141 -87
- package/styles/theme/base.scss +3 -0
- /package/dist/{iconfont.1794474448348.ttf → iconfont.1794558570397.ttf} +0 -0
- /package/dist/{iconfont.1794474448348.woff → iconfont.1794558570397.woff} +0 -0
- /package/dist/{iconfont.1794474448348.woff2 → iconfont.1794558570397.woff2} +0 -0
- /package/es/{iconfont.1794474448348.ttf → iconfont.1794558570397.ttf} +0 -0
- /package/es/{iconfont.1794474448348.woff → iconfont.1794558570397.woff} +0 -0
- /package/es/{iconfont.1794474448348.woff2 → iconfont.1794558570397.woff2} +0 -0
- /package/lib/{iconfont.1794474448348.ttf → iconfont.1794558570397.ttf} +0 -0
- /package/lib/{iconfont.1794474448348.woff → iconfont.1794558570397.woff} +0 -0
- /package/lib/{iconfont.1794474448348.woff2 → iconfont.1794558570397.woff2} +0 -0
|
@@ -343,8 +343,8 @@ var panel_default = (
|
|
|
343
343
|
const { prevDragCol, prevDragGroupField, prevDragAggFnColid, prevDragPos, prevDragToChild } = customPanelInternalData;
|
|
344
344
|
const dragOffsetIndex = prevDragPos === "bottom" ? 1 : 0;
|
|
345
345
|
if (prevDragGroupField || prevDragAggFnColid) {
|
|
346
|
-
if ($xeTable.
|
|
347
|
-
$xeTable.
|
|
346
|
+
if ($xeTable.handlePivotTableAggPanelDgedEvent) {
|
|
347
|
+
$xeTable.handlePivotTableAggPanelDgedEvent(evnt);
|
|
348
348
|
}
|
|
349
349
|
} else if (prevDragCol && dragCol) {
|
|
350
350
|
if (prevDragCol !== dragCol) {
|
|
@@ -104,7 +104,25 @@ hooks.add("tableEditModule", {
|
|
|
104
104
|
}
|
|
105
105
|
pChilds[funcName](item);
|
|
106
106
|
pMapChilds[funcName](item);
|
|
107
|
-
const rest = {
|
|
107
|
+
const rest = {
|
|
108
|
+
row: item,
|
|
109
|
+
rowid,
|
|
110
|
+
_seq: -1,
|
|
111
|
+
seq: -1,
|
|
112
|
+
index: -1,
|
|
113
|
+
_index: -1,
|
|
114
|
+
$index: -1,
|
|
115
|
+
treeIndex: -1,
|
|
116
|
+
_tIndex: -1,
|
|
117
|
+
items: pChilds,
|
|
118
|
+
parent: parentRow,
|
|
119
|
+
level: parentLevel + 1,
|
|
120
|
+
linesMask: 0,
|
|
121
|
+
height: 0,
|
|
122
|
+
resizeHeight: 0,
|
|
123
|
+
oTop: 0,
|
|
124
|
+
expandHeight: 0
|
|
125
|
+
};
|
|
108
126
|
fullDataRowIdData[rowid] = rest;
|
|
109
127
|
fullAllDataRowIdData[rowid] = rest;
|
|
110
128
|
} else {
|
|
@@ -113,7 +131,25 @@ hooks.add("tableEditModule", {
|
|
|
113
131
|
}
|
|
114
132
|
afterFullData[funcName](item);
|
|
115
133
|
tableFullTreeData[funcName](item);
|
|
116
|
-
const rest = {
|
|
134
|
+
const rest = {
|
|
135
|
+
row: item,
|
|
136
|
+
rowid,
|
|
137
|
+
_seq: -1,
|
|
138
|
+
seq: -1,
|
|
139
|
+
index: -1,
|
|
140
|
+
_index: -1,
|
|
141
|
+
$index: -1,
|
|
142
|
+
treeIndex: -1,
|
|
143
|
+
_tIndex: -1,
|
|
144
|
+
items: tableFullTreeData,
|
|
145
|
+
parent: null,
|
|
146
|
+
level: 0,
|
|
147
|
+
linesMask: 0,
|
|
148
|
+
height: 0,
|
|
149
|
+
resizeHeight: 0,
|
|
150
|
+
oTop: 0,
|
|
151
|
+
expandHeight: 0
|
|
152
|
+
};
|
|
117
153
|
fullDataRowIdData[rowid] = rest;
|
|
118
154
|
fullAllDataRowIdData[rowid] = rest;
|
|
119
155
|
}
|
|
@@ -156,7 +192,25 @@ hooks.add("tableEditModule", {
|
|
|
156
192
|
} else {
|
|
157
193
|
newRecords.forEach((item) => {
|
|
158
194
|
const rowid = getRowid($xeTable, item);
|
|
159
|
-
const rest = {
|
|
195
|
+
const rest = {
|
|
196
|
+
row: item,
|
|
197
|
+
rowid,
|
|
198
|
+
_seq: -1,
|
|
199
|
+
seq: -1,
|
|
200
|
+
index: -1,
|
|
201
|
+
_index: -1,
|
|
202
|
+
$index: -1,
|
|
203
|
+
treeIndex: -1,
|
|
204
|
+
_tIndex: -1,
|
|
205
|
+
items: afterFullData,
|
|
206
|
+
parent: null,
|
|
207
|
+
level: 0,
|
|
208
|
+
linesMask: 0,
|
|
209
|
+
height: 0,
|
|
210
|
+
resizeHeight: 0,
|
|
211
|
+
oTop: 0,
|
|
212
|
+
expandHeight: 0
|
|
213
|
+
};
|
|
160
214
|
fullDataRowIdData[rowid] = rest;
|
|
161
215
|
fullAllDataRowIdData[rowid] = rest;
|
|
162
216
|
afterFullData.unshift(item);
|
|
@@ -181,7 +235,25 @@ hooks.add("tableEditModule", {
|
|
|
181
235
|
} else {
|
|
182
236
|
newRecords.forEach((item) => {
|
|
183
237
|
const rowid = getRowid($xeTable, item);
|
|
184
|
-
const rest = {
|
|
238
|
+
const rest = {
|
|
239
|
+
row: item,
|
|
240
|
+
rowid,
|
|
241
|
+
_seq: -1,
|
|
242
|
+
seq: -1,
|
|
243
|
+
index: -1,
|
|
244
|
+
_index: -1,
|
|
245
|
+
treeIndex: -1,
|
|
246
|
+
_tIndex: -1,
|
|
247
|
+
$index: -1,
|
|
248
|
+
items: afterFullData,
|
|
249
|
+
parent: null,
|
|
250
|
+
level: 0,
|
|
251
|
+
linesMask: 0,
|
|
252
|
+
height: 0,
|
|
253
|
+
resizeHeight: 0,
|
|
254
|
+
oTop: 0,
|
|
255
|
+
expandHeight: 0
|
|
256
|
+
};
|
|
185
257
|
fullDataRowIdData[rowid] = rest;
|
|
186
258
|
fullAllDataRowIdData[rowid] = rest;
|
|
187
259
|
afterFullData.push(item);
|
|
@@ -220,7 +292,25 @@ hooks.add("tableEditModule", {
|
|
|
220
292
|
treeRecords,
|
|
221
293
|
(item) => {
|
|
222
294
|
const rowid = getRowid($xeTable, item);
|
|
223
|
-
const rest = {
|
|
295
|
+
const rest = {
|
|
296
|
+
row: item,
|
|
297
|
+
rowid,
|
|
298
|
+
_seq: -1,
|
|
299
|
+
seq: -1,
|
|
300
|
+
index: -1,
|
|
301
|
+
_index: -1,
|
|
302
|
+
$index: -1,
|
|
303
|
+
treeIndex: -1,
|
|
304
|
+
_tIndex: -1,
|
|
305
|
+
items: parentMapChilds,
|
|
306
|
+
parent: parentRow,
|
|
307
|
+
level: parentLevel + 1,
|
|
308
|
+
linesMask: 0,
|
|
309
|
+
height: 0,
|
|
310
|
+
resizeHeight: 0,
|
|
311
|
+
oTop: 0,
|
|
312
|
+
expandHeight: 0
|
|
313
|
+
};
|
|
224
314
|
if (item[childrenField]) {
|
|
225
315
|
item[mapChildrenField] = item[childrenField];
|
|
226
316
|
}
|
package/es/table/src/body.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PropType } from 'vue';
|
|
1
|
+
import { PropType, VNode } from 'vue';
|
|
2
2
|
import type { VxeTableDefines } from '../../../types';
|
|
3
3
|
declare const _default: import("vue").DefineComponent<{
|
|
4
4
|
tableData: PropType<any[]>;
|
|
@@ -8,7 +8,7 @@ declare const _default: import("vue").DefineComponent<{
|
|
|
8
8
|
type: PropType<"right" | "left" | "">;
|
|
9
9
|
default: string;
|
|
10
10
|
};
|
|
11
|
-
}, () =>
|
|
11
|
+
}, () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
|
|
12
12
|
[key: string]: any;
|
|
13
13
|
}>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
|
|
14
14
|
tableData: PropType<any[]>;
|
package/es/table/src/body.js
CHANGED
|
@@ -46,7 +46,8 @@ var body_default = (
|
|
|
46
46
|
computeVirtualXOpts,
|
|
47
47
|
computeVirtualYOpts,
|
|
48
48
|
computeIsBodyRenderOptimize,
|
|
49
|
-
computeRendererOpts
|
|
49
|
+
computeRendererOpts,
|
|
50
|
+
computeShowTreeLine
|
|
50
51
|
} = $xeTable.getComputeMaps();
|
|
51
52
|
const refElem = ref();
|
|
52
53
|
const refBodyScroll = ref();
|
|
@@ -62,60 +63,33 @@ var body_default = (
|
|
|
62
63
|
const { lastSTime } = tableInternalData;
|
|
63
64
|
return !!(isDragResize || lastSTime && Date.now() < lastSTime + delayHover);
|
|
64
65
|
};
|
|
65
|
-
const renderLine = (rowid, params
|
|
66
|
+
const renderLine = (rowid, params) => {
|
|
66
67
|
const { column } = params;
|
|
67
68
|
const { treeConfig } = tableProps;
|
|
68
|
-
const cellOpts = computeCellOpts.value;
|
|
69
|
-
const rowOpts = computeRowOpts.value;
|
|
70
|
-
const defaultRowHeight = computeDefaultRowHeight.value;
|
|
71
|
-
const treeOpts = computeTreeOpts.value;
|
|
72
69
|
const { slots, treeNode } = column;
|
|
73
|
-
const
|
|
74
|
-
if (treeConfig && treeNode
|
|
70
|
+
const lineVNs = [];
|
|
71
|
+
if (treeConfig && treeNode) {
|
|
75
72
|
if (slots && slots.line) {
|
|
76
73
|
return $xeTable.callSlot(slots.line, params);
|
|
77
74
|
}
|
|
75
|
+
const treeOpts = computeTreeOpts.value;
|
|
76
|
+
const { fullAllDataRowIdData } = tableInternalData;
|
|
77
|
+
const { lineType } = treeOpts;
|
|
78
78
|
const rowRest = fullAllDataRowIdData[rowid];
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
}
|
|
88
|
-
if (!rLevel && !treeOpts.showRootLine) {
|
|
89
|
-
return [];
|
|
90
|
-
}
|
|
91
|
-
if (prevRow) {
|
|
92
|
-
const prevRowRest = fullAllDataRowIdData[getRowid($xeTable, prevRow)] || {};
|
|
93
|
-
lineHeight = `${prevRowRest.lineHeight || 0}px`;
|
|
94
|
-
} else if (rLevel && parentRow) {
|
|
95
|
-
const parentRowRest = fullAllDataRowIdData[getRowid($xeTable, parentRow)] || {};
|
|
96
|
-
lineHeight = `calc(-1em + ${Math.floor(cellHeight / 2 + getCellRestHeight(parentRowRest, cellOpts, rowOpts, defaultRowHeight) / 2)}px)`;
|
|
97
|
-
}
|
|
98
|
-
return [
|
|
99
|
-
h(
|
|
100
|
-
"div",
|
|
101
|
-
{
|
|
102
|
-
key: "tl",
|
|
103
|
-
class: "vxe-tree--line-wrapper"
|
|
104
|
-
},
|
|
105
|
-
[
|
|
106
|
-
h("div", {
|
|
107
|
-
class: "vxe-tree--line",
|
|
108
|
-
style: {
|
|
109
|
-
height: lineHeight,
|
|
110
|
-
bottom: `-${Math.floor(cellHeight / 2)}px`,
|
|
111
|
-
left: `calc(${rLevel * treeOpts.indent}px + 1em)`
|
|
112
|
-
}
|
|
79
|
+
const treeLines = rowRest.treeLines;
|
|
80
|
+
if (treeLines) {
|
|
81
|
+
treeLines.forEach((item, i) => {
|
|
82
|
+
lineVNs.push(
|
|
83
|
+
h("span", {
|
|
84
|
+
key: "le" + i,
|
|
85
|
+
class: ["vxe-tree--line", `type--${lineType || "dashed"}`, item.type],
|
|
86
|
+
style: item.style
|
|
113
87
|
})
|
|
114
|
-
|
|
115
|
-
)
|
|
116
|
-
|
|
88
|
+
);
|
|
89
|
+
});
|
|
90
|
+
}
|
|
117
91
|
}
|
|
118
|
-
return
|
|
92
|
+
return lineVNs;
|
|
119
93
|
};
|
|
120
94
|
const renderTdColumn = (seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) => {
|
|
121
95
|
const $xeGrid = $xeTable.xeGrid;
|
|
@@ -123,6 +97,7 @@ var body_default = (
|
|
|
123
97
|
const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, treeConfig, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
|
|
124
98
|
const { tableData, tableColumn, dragRow, overflowX, overflowY, scrollXLoad, scrollYLoad, mergeBodyFlag, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, editStore, isAllOverflow, validErrorMaps, currColFlag } = tableReactData;
|
|
125
99
|
const { fullAllDataRowIdData, fullColumnIdData, mergeBodyCellMaps, visibleColumn, afterFullData, mergeBodyList, scrollXStore, scrollYStore, keepUpdateFieldMaps, currentCol } = tableInternalData;
|
|
100
|
+
const showTreeLine = computeShowTreeLine.value;
|
|
126
101
|
const cellOpts = computeCellOpts.value;
|
|
127
102
|
const validOpts = computeValidOpts.value;
|
|
128
103
|
const checkboxOpts = computeCheckboxOpts.value;
|
|
@@ -316,6 +291,7 @@ var body_default = (
|
|
|
316
291
|
}
|
|
317
292
|
}
|
|
318
293
|
}
|
|
294
|
+
const tdStyle = {};
|
|
319
295
|
const tcStyle = {};
|
|
320
296
|
if (maxHeight) {
|
|
321
297
|
tcStyle.maxHeight = maxHeight + "px";
|
|
@@ -334,6 +310,7 @@ var body_default = (
|
|
|
334
310
|
}
|
|
335
311
|
if (scrollYLoad || scrollXLoad || hasEllipsis || isCsHeight || isRsHeight) {
|
|
336
312
|
tcStyle.height = cellHeight + "px";
|
|
313
|
+
tdStyle["--vxe-ui-table-cell-height"] = cellHeight + "px";
|
|
337
314
|
} else {
|
|
338
315
|
tcStyle.minHeight = cellHeight + "px";
|
|
339
316
|
}
|
|
@@ -357,8 +334,8 @@ var body_default = (
|
|
|
357
334
|
})
|
|
358
335
|
);
|
|
359
336
|
} else {
|
|
360
|
-
if (treeConfig) {
|
|
361
|
-
tdVNs.push(...renderLine(rowid, cellParams
|
|
337
|
+
if (treeConfig && showTreeLine) {
|
|
338
|
+
tdVNs.push(...renderLine(rowid, cellParams));
|
|
362
339
|
}
|
|
363
340
|
const clVNs = [];
|
|
364
341
|
if (!isVNPreEmptyStatus) {
|
|
@@ -499,7 +476,7 @@ var body_default = (
|
|
|
499
476
|
],
|
|
500
477
|
key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? colid : $columnIndex,
|
|
501
478
|
...tdAttrs,
|
|
502
|
-
style: Object.assign(
|
|
479
|
+
style: Object.assign(tdStyle, XEUtils.isFunction(compCellStyle) ? compCellStyle(cellParams) : compCellStyle, XEUtils.isFunction(cellStyle) ? cellStyle(cellParams) : cellStyle),
|
|
503
480
|
...tdOns
|
|
504
481
|
},
|
|
505
482
|
isOptimizeMode && fixedHiddenColumn ? [] : tdVNs
|
package/es/table/src/table.js
CHANGED
|
@@ -579,6 +579,14 @@ var table_default = (
|
|
|
579
579
|
const computeTreeOpts = computed(() => {
|
|
580
580
|
return Object.assign({}, getConfig().table.treeConfig, props.treeConfig);
|
|
581
581
|
});
|
|
582
|
+
const computeShowTreeLine = computed(() => {
|
|
583
|
+
const treeOpts = computeTreeOpts.value;
|
|
584
|
+
return getDefaultConfig(treeOpts.showLine, treeOpts.line);
|
|
585
|
+
});
|
|
586
|
+
const computeShowTreeRootLine = computed(() => {
|
|
587
|
+
const treeOpts = computeTreeOpts.value;
|
|
588
|
+
return treeOpts.showRootLine;
|
|
589
|
+
});
|
|
582
590
|
const computeEmptyOpts = computed(() => {
|
|
583
591
|
return Object.assign({}, getConfig().table.emptyRender, props.emptyRender);
|
|
584
592
|
});
|
|
@@ -612,8 +620,11 @@ var table_default = (
|
|
|
612
620
|
return "";
|
|
613
621
|
});
|
|
614
622
|
const computeTableStyle = computed(() => {
|
|
623
|
+
const { treeConfig } = props;
|
|
615
624
|
const barWidth = computeScrollYWidth.value;
|
|
616
625
|
const barHeight = computeScrollXHeight.value;
|
|
626
|
+
const treeOpts = computeTreeOpts.value;
|
|
627
|
+
const { indent, lineWidth, lineColor } = treeOpts;
|
|
617
628
|
const stys = {};
|
|
618
629
|
if (barWidth || barHeight) {
|
|
619
630
|
stys["--vxe-ui-table-view-scrollbar-width"] = toCssUnit(barWidth || barHeight);
|
|
@@ -621,6 +632,15 @@ var table_default = (
|
|
|
621
632
|
stys["--vxe-ui-table-view-scrollbar-height"] = toCssUnit(barHeight || barWidth);
|
|
622
633
|
stys["--vxe-ui-scrollbar-x-height"] = toCssUnit(barHeight || barWidth);
|
|
623
634
|
}
|
|
635
|
+
if (treeConfig) {
|
|
636
|
+
stys["--vxe-ui-table-tree-node-indent"] = toCssUnit(indent);
|
|
637
|
+
}
|
|
638
|
+
if (lineWidth) {
|
|
639
|
+
stys["--vxe-ui-table-tree-node-line-width"] = toCssUnit(lineWidth);
|
|
640
|
+
}
|
|
641
|
+
if (lineColor) {
|
|
642
|
+
stys["--vxe-ui-table-tree-node-line-color"] = toCssUnit(lineColor);
|
|
643
|
+
}
|
|
624
644
|
return stys;
|
|
625
645
|
});
|
|
626
646
|
const computeTableRowExpandedList = computed(() => {
|
|
@@ -865,6 +885,7 @@ var table_default = (
|
|
|
865
885
|
computePrintOpts,
|
|
866
886
|
computeExpandOpts,
|
|
867
887
|
computeTreeOpts,
|
|
888
|
+
computeShowTreeLine,
|
|
868
889
|
computeEmptyOpts,
|
|
869
890
|
computeLoadingOpts,
|
|
870
891
|
computeCellOffsetWidth,
|
|
@@ -2048,9 +2069,9 @@ var table_default = (
|
|
|
2048
2069
|
if (!el || !el.clientWidth) {
|
|
2049
2070
|
return;
|
|
2050
2071
|
}
|
|
2051
|
-
const treeOpts = computeTreeOpts.value;
|
|
2052
2072
|
const defaultRowHeight = computeDefaultRowHeight.value;
|
|
2053
|
-
|
|
2073
|
+
const showTreeLine = computeShowTreeLine.value;
|
|
2074
|
+
if (!isAllOverflow && (scrollYLoad || scrollXLoad || treeConfig && showTreeLine)) {
|
|
2054
2075
|
const { handleGetRowId } = createHandleGetRowId($xeTable);
|
|
2055
2076
|
const rowWrapperMaps = {};
|
|
2056
2077
|
el.querySelectorAll(".vxe-cell--wrapper[rowid]").forEach((wrapperElem) => {
|
|
@@ -2111,36 +2132,174 @@ var table_default = (
|
|
|
2111
2132
|
return cellValue;
|
|
2112
2133
|
};
|
|
2113
2134
|
};
|
|
2135
|
+
function getTreeNodeLines(isExpandable, depth, linesMask, isFirstRow, isLastRow, showRootLine) {
|
|
2136
|
+
const lines = [];
|
|
2137
|
+
for (let col = 1; col <= depth; col++) {
|
|
2138
|
+
const leftVal = `var(--vxe-ui-table-tree-node-btn-width) + var(--vxe-ui-table-tree-node-indent) * ${col - 1}`;
|
|
2139
|
+
const through = (linesMask & 1 << col - 1) !== 0;
|
|
2140
|
+
if (col === 1 && !showRootLine) {
|
|
2141
|
+
continue;
|
|
2142
|
+
}
|
|
2143
|
+
if (col < depth) {
|
|
2144
|
+
if (through) {
|
|
2145
|
+
let top = "0";
|
|
2146
|
+
let height = "100%";
|
|
2147
|
+
if (isFirstRow) {
|
|
2148
|
+
top = "50%";
|
|
2149
|
+
height = "50%";
|
|
2150
|
+
} else if (isLastRow) {
|
|
2151
|
+
top = "0";
|
|
2152
|
+
height = "50%";
|
|
2153
|
+
}
|
|
2154
|
+
lines.push({
|
|
2155
|
+
type: "v",
|
|
2156
|
+
style: {
|
|
2157
|
+
left: `calc(${leftVal})`,
|
|
2158
|
+
top,
|
|
2159
|
+
height
|
|
2160
|
+
}
|
|
2161
|
+
});
|
|
2162
|
+
}
|
|
2163
|
+
} else {
|
|
2164
|
+
let vTop = "0";
|
|
2165
|
+
let vHeight = through ? "100%" : "50%";
|
|
2166
|
+
if (isFirstRow && isLastRow) {
|
|
2167
|
+
vTop = "50%";
|
|
2168
|
+
vHeight = "0px";
|
|
2169
|
+
} else if (isFirstRow) {
|
|
2170
|
+
vTop = "50%";
|
|
2171
|
+
vHeight = "50%";
|
|
2172
|
+
} else if (isLastRow) {
|
|
2173
|
+
vTop = "0";
|
|
2174
|
+
vHeight = "50%";
|
|
2175
|
+
}
|
|
2176
|
+
if (isExpandable && vHeight !== "0px") {
|
|
2177
|
+
let cutType = "v cut";
|
|
2178
|
+
if (vTop === "0" && vHeight === "50%") {
|
|
2179
|
+
cutType = "v cut-top";
|
|
2180
|
+
} else if (vTop === "50%" && vHeight === "50%") {
|
|
2181
|
+
cutType = "v cut-bottom";
|
|
2182
|
+
} else if (vHeight === "100%") {
|
|
2183
|
+
cutType = "v cut-full";
|
|
2184
|
+
}
|
|
2185
|
+
lines.push({
|
|
2186
|
+
type: cutType,
|
|
2187
|
+
style: {
|
|
2188
|
+
left: `calc(${leftVal})`,
|
|
2189
|
+
top: vTop,
|
|
2190
|
+
height: vHeight
|
|
2191
|
+
}
|
|
2192
|
+
});
|
|
2193
|
+
} else {
|
|
2194
|
+
if (vHeight !== "0px") {
|
|
2195
|
+
lines.push({
|
|
2196
|
+
type: "v",
|
|
2197
|
+
style: {
|
|
2198
|
+
left: `calc(${leftVal})`,
|
|
2199
|
+
top: vTop,
|
|
2200
|
+
height: vHeight
|
|
2201
|
+
}
|
|
2202
|
+
});
|
|
2203
|
+
}
|
|
2204
|
+
}
|
|
2205
|
+
if (isExpandable) {
|
|
2206
|
+
lines.push({
|
|
2207
|
+
type: "h",
|
|
2208
|
+
style: {
|
|
2209
|
+
left: `calc(${leftVal} + var(--vxe-ui-table-tree-node-btn-width) / 2 + 1px)`,
|
|
2210
|
+
top: "50%",
|
|
2211
|
+
width: "calc(var(--vxe-ui-table-tree-node-indent) - var(--vxe-ui-table-tree-node-btn-width) - 0.25em)"
|
|
2212
|
+
}
|
|
2213
|
+
});
|
|
2214
|
+
} else {
|
|
2215
|
+
lines.push({
|
|
2216
|
+
type: "h",
|
|
2217
|
+
style: {
|
|
2218
|
+
left: `calc(${leftVal})`,
|
|
2219
|
+
top: "50%",
|
|
2220
|
+
width: "calc(var(--vxe-ui-table-tree-node-indent) - var(--vxe-ui-table-tree-node-btn-width))"
|
|
2221
|
+
}
|
|
2222
|
+
});
|
|
2223
|
+
}
|
|
2224
|
+
}
|
|
2225
|
+
}
|
|
2226
|
+
return lines;
|
|
2227
|
+
}
|
|
2114
2228
|
const updateAfterTreeIndex = () => {
|
|
2115
2229
|
const { fullDataRowIdData, fullAllDataRowIdData, afterFullData, afterTreeFullData } = internalData;
|
|
2116
2230
|
const treeOpts = computeTreeOpts.value;
|
|
2117
|
-
const { transform, mapChildrenField } = treeOpts;
|
|
2231
|
+
const { lazy, transform, showRootLine, mapChildrenField } = treeOpts;
|
|
2118
2232
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
2233
|
+
const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
|
|
2234
|
+
const showTreeLine = computeShowTreeLine.value;
|
|
2119
2235
|
const fullMaps = {};
|
|
2120
|
-
|
|
2236
|
+
const treeFullSize = afterTreeFullData.length;
|
|
2237
|
+
const rowNum = 0;
|
|
2121
2238
|
const { handleGetRowId } = createHandleGetRowId($xeTable);
|
|
2122
|
-
|
|
2123
|
-
|
|
2124
|
-
|
|
2125
|
-
|
|
2126
|
-
|
|
2127
|
-
|
|
2128
|
-
|
|
2129
|
-
|
|
2130
|
-
|
|
2131
|
-
|
|
2132
|
-
|
|
2133
|
-
|
|
2134
|
-
|
|
2135
|
-
|
|
2136
|
-
|
|
2137
|
-
|
|
2138
|
-
|
|
2139
|
-
|
|
2140
|
-
|
|
2141
|
-
|
|
2142
|
-
|
|
2143
|
-
|
|
2239
|
+
function handleTreeDFS(row, index, items, parentRow, depth, isFirstRow, isLastRow, isLastChild, stackMask, seq) {
|
|
2240
|
+
const rowid = handleGetRowId(row);
|
|
2241
|
+
let rowRest = fullAllDataRowIdData[rowid];
|
|
2242
|
+
const rowChilds = row[transform ? mapChildrenField : childrenField];
|
|
2243
|
+
if (rowRest) {
|
|
2244
|
+
rowRest.seq = seq;
|
|
2245
|
+
rowRest._seq = rowNum;
|
|
2246
|
+
rowRest.items = items;
|
|
2247
|
+
rowRest.treeIndex = index;
|
|
2248
|
+
rowRest._index = rowNum;
|
|
2249
|
+
rowRest._tIndex = rowNum;
|
|
2250
|
+
} else {
|
|
2251
|
+
rowRest = {
|
|
2252
|
+
row,
|
|
2253
|
+
rowid,
|
|
2254
|
+
_seq: rowNum,
|
|
2255
|
+
seq,
|
|
2256
|
+
index,
|
|
2257
|
+
$index: -1,
|
|
2258
|
+
_index: rowNum,
|
|
2259
|
+
treeIndex: index,
|
|
2260
|
+
_tIndex: rowNum,
|
|
2261
|
+
items,
|
|
2262
|
+
parent: parentRow,
|
|
2263
|
+
level: 0,
|
|
2264
|
+
linesMask: 0,
|
|
2265
|
+
height: 0,
|
|
2266
|
+
resizeHeight: 0,
|
|
2267
|
+
oTop: 0,
|
|
2268
|
+
expandHeight: 0
|
|
2269
|
+
};
|
|
2270
|
+
fullAllDataRowIdData[rowid] = rowRest;
|
|
2271
|
+
fullDataRowIdData[rowid] = rowRest;
|
|
2272
|
+
}
|
|
2273
|
+
let linesMask = stackMask >> 1;
|
|
2274
|
+
if (!isLastChild) {
|
|
2275
|
+
linesMask |= 1 << depth - 1;
|
|
2276
|
+
}
|
|
2277
|
+
rowRest.seq = seq;
|
|
2278
|
+
rowRest._seq = rowNum;
|
|
2279
|
+
rowRest.level = depth - 1;
|
|
2280
|
+
rowRest.linesMask = linesMask;
|
|
2281
|
+
const hasChild = rowChilds && rowChilds.length;
|
|
2282
|
+
let hasLazyChilds = false;
|
|
2283
|
+
let isLazyLoaded = false;
|
|
2284
|
+
if (lazy) {
|
|
2285
|
+
const rest = fullAllDataRowIdData[rowid];
|
|
2286
|
+
hasLazyChilds = row[hasChildField];
|
|
2287
|
+
isLazyLoaded = !!rest.treeLoaded;
|
|
2288
|
+
}
|
|
2289
|
+
const isExpandable = lazy ? isLazyLoaded ? hasChild : hasChild || hasLazyChilds : hasChild;
|
|
2290
|
+
rowRest.treeLines = showTreeLine && treeFullSize > 1 ? getTreeNodeLines(isExpandable, depth, linesMask, isFirstRow, isLastRow, showRootLine) : [];
|
|
2291
|
+
let nextStackMask = stackMask;
|
|
2292
|
+
if (!isLastChild) {
|
|
2293
|
+
nextStackMask |= 1 << depth;
|
|
2294
|
+
}
|
|
2295
|
+
fullMaps[rowid] = row;
|
|
2296
|
+
for (let i = 0; i < rowChilds.length; i++) {
|
|
2297
|
+
handleTreeDFS(rowChilds[i], i, rowChilds, row, depth + 1, false, false, i === rowChilds.length - 1, nextStackMask, `${seq}.${i + 1}`);
|
|
2298
|
+
}
|
|
2299
|
+
}
|
|
2300
|
+
for (let i = 0; i < treeFullSize; i++) {
|
|
2301
|
+
handleTreeDFS(afterTreeFullData[i], i, afterTreeFullData, null, 1, !i, i === treeFullSize - 1, i === treeFullSize - 1, 0, "" + i);
|
|
2302
|
+
}
|
|
2144
2303
|
if (transform) {
|
|
2145
2304
|
afterFullData.forEach((row, index) => {
|
|
2146
2305
|
const rowid = handleGetRowId(row);
|
|
@@ -2166,7 +2325,25 @@ var table_default = (
|
|
|
2166
2325
|
rowRest._seq = rowNum;
|
|
2167
2326
|
rowRest._index = index;
|
|
2168
2327
|
} else {
|
|
2169
|
-
const rest = {
|
|
2328
|
+
const rest = {
|
|
2329
|
+
row,
|
|
2330
|
+
rowid,
|
|
2331
|
+
_seq: rowNum,
|
|
2332
|
+
seq,
|
|
2333
|
+
index: -1,
|
|
2334
|
+
$index: -1,
|
|
2335
|
+
_index: index,
|
|
2336
|
+
treeIndex: -1,
|
|
2337
|
+
_tIndex: -1,
|
|
2338
|
+
items: [],
|
|
2339
|
+
parent: null,
|
|
2340
|
+
level: 0,
|
|
2341
|
+
linesMask: 0,
|
|
2342
|
+
height: 0,
|
|
2343
|
+
resizeHeight: 0,
|
|
2344
|
+
oTop: 0,
|
|
2345
|
+
expandHeight: 0
|
|
2346
|
+
};
|
|
2170
2347
|
fullAllDataRowIdData[rowid] = rest;
|
|
2171
2348
|
fullDataRowIdData[rowid] = rest;
|
|
2172
2349
|
}
|
|
@@ -4848,7 +5025,25 @@ var table_default = (
|
|
|
4848
5025
|
(childRow, index, items, path, parentItem, nodes) => {
|
|
4849
5026
|
const rowid = getRowid($xeTable, childRow);
|
|
4850
5027
|
const parentRow = parentItem || parentRest.row;
|
|
4851
|
-
const rest = {
|
|
5028
|
+
const rest = {
|
|
5029
|
+
row: childRow,
|
|
5030
|
+
rowid,
|
|
5031
|
+
_seq: -1,
|
|
5032
|
+
seq: -1,
|
|
5033
|
+
index,
|
|
5034
|
+
_index: -1,
|
|
5035
|
+
$index: -1,
|
|
5036
|
+
treeIndex: -1,
|
|
5037
|
+
_tIndex: -1,
|
|
5038
|
+
items,
|
|
5039
|
+
parent: parentRow,
|
|
5040
|
+
level: parentLevel + nodes.length,
|
|
5041
|
+
linesMask: 0,
|
|
5042
|
+
height: 0,
|
|
5043
|
+
resizeHeight: 0,
|
|
5044
|
+
oTop: 0,
|
|
5045
|
+
expandHeight: 0
|
|
5046
|
+
};
|
|
4852
5047
|
fullDataRowIdData[rowid] = rest;
|
|
4853
5048
|
fullAllDataRowIdData[rowid] = rest;
|
|
4854
5049
|
},
|
|
@@ -9291,9 +9486,25 @@ var table_default = (
|
|
|
9291
9486
|
errLog("vxe.error.repeatKey", [currKeyField, rowid]);
|
|
9292
9487
|
}
|
|
9293
9488
|
if (!rowRest) {
|
|
9294
|
-
rowRest = {
|
|
9295
|
-
|
|
9296
|
-
|
|
9489
|
+
rowRest = {
|
|
9490
|
+
row,
|
|
9491
|
+
rowid,
|
|
9492
|
+
_seq: -1,
|
|
9493
|
+
seq,
|
|
9494
|
+
index: -1,
|
|
9495
|
+
_index: -1,
|
|
9496
|
+
$index: -1,
|
|
9497
|
+
treeIndex: index,
|
|
9498
|
+
_tIndex: -1,
|
|
9499
|
+
items,
|
|
9500
|
+
parent: parentRow,
|
|
9501
|
+
level,
|
|
9502
|
+
linesMask: 0,
|
|
9503
|
+
height: 0,
|
|
9504
|
+
resizeHeight: 0,
|
|
9505
|
+
oTop: 0,
|
|
9506
|
+
expandHeight: 0
|
|
9507
|
+
};
|
|
9297
9508
|
}
|
|
9298
9509
|
if (isReset || isReLoaded) {
|
|
9299
9510
|
rowRest.treeLoaded = false;
|
|
@@ -10999,8 +11210,8 @@ var table_default = (
|
|
|
10999
11210
|
$xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
|
|
11000
11211
|
}
|
|
11001
11212
|
}
|
|
11002
|
-
if (!triggerDrag && hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.
|
|
11003
|
-
$xeTable.
|
|
11213
|
+
if (!triggerDrag && hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.handleHeadCellAreaMouseDnEvent) {
|
|
11214
|
+
$xeTable.handleHeadCellAreaMouseDnEvent(evnt, Object.assign({ cell, triggerSort, triggerFilter }, params));
|
|
11004
11215
|
}
|
|
11005
11216
|
$xeTable.focus();
|
|
11006
11217
|
if ($xeTable.closeMenu) {
|
|
@@ -13583,7 +13794,7 @@ var table_default = (
|
|
|
13583
13794
|
const validTipConfig = computeValidTipConfig.value;
|
|
13584
13795
|
const validOpts = computeValidOpts.value;
|
|
13585
13796
|
const checkboxOpts = computeCheckboxOpts.value;
|
|
13586
|
-
const
|
|
13797
|
+
const showTreeLine = computeShowTreeLine.value;
|
|
13587
13798
|
const rowOpts = computeRowOpts.value;
|
|
13588
13799
|
const columnOpts = computeColumnOpts.value;
|
|
13589
13800
|
const vSize = computeSize.value;
|
|
@@ -13641,7 +13852,7 @@ var table_default = (
|
|
|
13641
13852
|
"not--footer": !showFooter,
|
|
13642
13853
|
"is--group": isGroup,
|
|
13643
13854
|
"is-row-group": isRowGroupStatus,
|
|
13644
|
-
"is--tree-line": treeConfig &&
|
|
13855
|
+
"is--tree-line": treeConfig && showTreeLine,
|
|
13645
13856
|
"is--fixed-left": leftList.length,
|
|
13646
13857
|
"is--fixed-right": rightList.length,
|
|
13647
13858
|
"is--animat": !!props.animat,
|
|
@@ -14194,6 +14405,16 @@ var table_default = (
|
|
|
14194
14405
|
$xeTable.recalculate(true);
|
|
14195
14406
|
});
|
|
14196
14407
|
});
|
|
14408
|
+
const lineFlag = ref(0);
|
|
14409
|
+
watch(computeShowTreeLine, () => {
|
|
14410
|
+
lineFlag.value++;
|
|
14411
|
+
});
|
|
14412
|
+
watch(computeShowTreeRootLine, () => {
|
|
14413
|
+
lineFlag.value++;
|
|
14414
|
+
});
|
|
14415
|
+
watch(lineFlag, () => {
|
|
14416
|
+
updateAfterDataIndex();
|
|
14417
|
+
});
|
|
14197
14418
|
watch(reScrollFlag, () => {
|
|
14198
14419
|
updateScrollbar().then(() => {
|
|
14199
14420
|
updateScrollbar();
|