vxe-table 4.24.0-beta.2 → 4.24.0-beta.4
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 +144 -129
- package/dist/all.esm.min.js +3 -3
- package/dist/style.css +90 -34
- package/dist/style.mini.css +1 -1
- package/es/style.css +90 -34
- package/es/style.mini.css +1 -1
- package/es/table/module/export/hook.js +4 -3
- package/es/table/src/body.js +2 -2
- package/es/table/src/cell.js +6 -6
- package/es/table/src/table.js +32 -111
- package/es/table/src/tree.d.ts +6 -0
- package/es/table/src/tree.js +96 -0
- package/es/table/style.css +78 -26
- package/es/table/style.mini.css +1 -1
- package/es/ui/index.js +5 -6
- package/es/ui/src/log.js +1 -1
- package/es/vxe-table/style.css +78 -26
- package/es/vxe-table/style.mini.css +1 -1
- package/lib/index.umd.js +144 -129
- package/lib/index.umd.min.js +3 -3
- package/lib/style.css +90 -34
- package/lib/style.mini.css +1 -1
- package/lib/table/module/export/hook.js +4 -3
- package/lib/table/src/body.js +2 -2
- package/lib/table/src/cell.js +6 -6
- package/lib/table/src/table.js +32 -111
- package/lib/table/src/tree.d.ts +6 -0
- package/lib/table/src/tree.js +116 -0
- package/lib/table/style/style.css +78 -26
- package/lib/table/style/style.mini.css +1 -1
- package/lib/ui/index.js +5 -6
- package/lib/ui/src/log.js +1 -1
- package/lib/vxe-table/style/style.css +78 -26
- package/lib/vxe-table/style/style.mini.css +1 -1
- package/package.json +2 -2
- package/packages/table/module/export/hook.ts +4 -3
- package/packages/table/src/body.ts +2 -2
- package/packages/table/src/cell.ts +9 -10
- package/packages/table/src/table.ts +32 -129
- package/packages/table/src/tree.ts +112 -0
- package/packages/ui/index.ts +4 -5
- package/styles/components/icon.scss +11 -3
- package/styles/components/old-icon.scss +6 -3
- package/styles/components/table.scss +14 -4
- package/styles/theme/base.scss +13 -9
- /package/dist/{iconfont.1794563906464.ttf → iconfont.1794794325954.ttf} +0 -0
- /package/dist/{iconfont.1794563906464.woff → iconfont.1794794325954.woff} +0 -0
- /package/dist/{iconfont.1794563906464.woff2 → iconfont.1794794325954.woff2} +0 -0
- /package/es/{iconfont.1794563906464.ttf → iconfont.1794794325954.ttf} +0 -0
- /package/es/{iconfont.1794563906464.woff → iconfont.1794794325954.woff} +0 -0
- /package/es/{iconfont.1794563906464.woff2 → iconfont.1794794325954.woff2} +0 -0
- /package/lib/{iconfont.1794563906464.ttf → iconfont.1794794325954.ttf} +0 -0
- /package/lib/{iconfont.1794563906464.woff → iconfont.1794794325954.woff} +0 -0
- /package/lib/{iconfont.1794563906464.woff2 → iconfont.1794794325954.woff2} +0 -0
package/dist/all.esm.js
CHANGED
|
@@ -228,7 +228,7 @@ var modal = {
|
|
|
228
228
|
};
|
|
229
229
|
|
|
230
230
|
// packages_temp/ui/index.ts
|
|
231
|
-
var version = "4.24.0-beta.
|
|
231
|
+
var version = "4.24.0-beta.4";
|
|
232
232
|
VxeUI3.tableVersion = version;
|
|
233
233
|
VxeUI3.version = version;
|
|
234
234
|
VxeUI3.setConfig({
|
|
@@ -404,7 +404,6 @@ VxeUI3.setConfig({
|
|
|
404
404
|
parentField: "_X_ROW_PARENT_KEY",
|
|
405
405
|
childrenField: "_X_ROW_CHILDREN",
|
|
406
406
|
mapChildrenField: "_X_ROW_CHILD_LIST",
|
|
407
|
-
indent: 28,
|
|
408
407
|
showIcon: true,
|
|
409
408
|
maxGroupSize: 4,
|
|
410
409
|
showAggFuncTitle: true
|
|
@@ -416,7 +415,7 @@ VxeUI3.setConfig({
|
|
|
416
415
|
childrenField: "children",
|
|
417
416
|
hasChildField: "hasChild",
|
|
418
417
|
mapChildrenField: "_X_ROW_CHILD",
|
|
419
|
-
indent:
|
|
418
|
+
// indent: 20,
|
|
420
419
|
showIcon: true,
|
|
421
420
|
// lineType: 'dashed',
|
|
422
421
|
showRootLine: true
|
|
@@ -567,10 +566,10 @@ VxeUI3.setIcon({
|
|
|
567
566
|
TABLE_TITLE_PREFIX: iconPrefix + "question-circle-fill",
|
|
568
567
|
TABLE_TITLE_SUFFIX: iconPrefix + "question-circle-fill",
|
|
569
568
|
TABLE_TREE_LOADED: iconPrefix + "spinner roll",
|
|
570
|
-
TABLE_TREE_OPEN: iconPrefix + "caret-right
|
|
569
|
+
TABLE_TREE_OPEN: iconPrefix + "caret-right rotate-90",
|
|
571
570
|
TABLE_TREE_CLOSE: iconPrefix + "caret-right",
|
|
572
571
|
TABLE_EXPAND_LOADED: iconPrefix + "spinner roll",
|
|
573
|
-
TABLE_EXPAND_OPEN: iconPrefix + "arrow-right
|
|
572
|
+
TABLE_EXPAND_OPEN: iconPrefix + "arrow-right rotate-90",
|
|
574
573
|
TABLE_EXPAND_CLOSE: iconPrefix + "arrow-right",
|
|
575
574
|
TABLE_CHECKBOX_CHECKED: iconPrefix + "checkbox-checked-fill",
|
|
576
575
|
TABLE_CHECKBOX_UNCHECKED: iconPrefix + "checkbox-unchecked",
|
|
@@ -599,7 +598,7 @@ VxeUI3.setIcon({
|
|
|
599
598
|
TABLE_DRAG_STATUS_AGG_VALUES: iconPrefix + "values",
|
|
600
599
|
TABLE_DRAG_STATUS_COLUMN: iconPrefix + "swap",
|
|
601
600
|
TABLE_DRAG_DISABLED: iconPrefix + "no-drop",
|
|
602
|
-
TABLE_ROW_GROUP_OPEN: iconPrefix + "arrow-right
|
|
601
|
+
TABLE_ROW_GROUP_OPEN: iconPrefix + "arrow-right rotate-90",
|
|
603
602
|
TABLE_ROW_GROUP_CLOSE: iconPrefix + "arrow-right",
|
|
604
603
|
TABLE_AGGREGATE_GROUPING: iconPrefix + "grouping",
|
|
605
604
|
TABLE_AGGREGATE_VALUES: iconPrefix + "values",
|
|
@@ -981,7 +980,7 @@ function getPopupAppendElement(appendTo) {
|
|
|
981
980
|
// packages_temp/ui/src/log.ts
|
|
982
981
|
import { VxeUI as VxeUI4 } from "@vxe-ui/core";
|
|
983
982
|
var { log } = VxeUI4;
|
|
984
|
-
var tableVersion = `table v${"4.24.0-beta.
|
|
983
|
+
var tableVersion = `table v${"4.24.0-beta.4"}`;
|
|
985
984
|
function createComponentLog(name) {
|
|
986
985
|
const uiVersion = VxeUI4.uiVersion ? `ui v${VxeUI4.uiVersion}` : "";
|
|
987
986
|
const ganttVersion = VxeUI4.ganttVersion ? `gantt v${VxeUI4.ganttVersion}` : "";
|
|
@@ -2848,7 +2847,7 @@ var Cell = {
|
|
|
2848
2847
|
const { rowGroupExpandedFlag } = tableReactData;
|
|
2849
2848
|
const { rowGroupExpandedMaps } = tableInternalData;
|
|
2850
2849
|
const aggregateOpts = computeAggregateOpts.value;
|
|
2851
|
-
const { mode, padding,
|
|
2850
|
+
const { mode, padding, showIcon, iconOpen, iconClose } = aggregateOpts;
|
|
2852
2851
|
const rowid = getRowid($table, row);
|
|
2853
2852
|
const isExpand = !!rowGroupExpandedFlag && !!rowGroupExpandedMaps[rowid];
|
|
2854
2853
|
return h(
|
|
@@ -2860,8 +2859,8 @@ var Cell = {
|
|
|
2860
2859
|
"is--expanded": isExpand
|
|
2861
2860
|
}
|
|
2862
2861
|
],
|
|
2863
|
-
style: mode !== "column" && padding
|
|
2864
|
-
paddingLeft:
|
|
2862
|
+
style: mode !== "column" && padding ? {
|
|
2863
|
+
paddingLeft: `calc(${level} * var(--vxe-ui-table-row-group-tree-node-indent))`
|
|
2865
2864
|
} : void 0
|
|
2866
2865
|
},
|
|
2867
2866
|
[
|
|
@@ -2906,7 +2905,7 @@ var Cell = {
|
|
|
2906
2905
|
const { treeExpandedFlag } = tableReactData;
|
|
2907
2906
|
const { fullAllDataRowIdData, treeExpandedMaps, treeExpandLazyLoadedMaps } = tableInternalData;
|
|
2908
2907
|
const treeOpts = computeTreeOpts.value;
|
|
2909
|
-
const { padding,
|
|
2908
|
+
const { padding, lazy, trigger, visibleMethod, iconLoaded, showIcon, iconOpen, iconClose } = treeOpts;
|
|
2910
2909
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
2911
2910
|
const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
|
|
2912
2911
|
const rowChilds = row[childrenField];
|
|
@@ -2940,8 +2939,8 @@ var Cell = {
|
|
|
2940
2939
|
"is--active": isActive
|
|
2941
2940
|
}
|
|
2942
2941
|
],
|
|
2943
|
-
style: padding
|
|
2944
|
-
paddingLeft:
|
|
2942
|
+
style: padding ? {
|
|
2943
|
+
paddingLeft: `calc(${level} * var(--vxe-ui-table-tree-node-indent))`
|
|
2945
2944
|
} : void 0
|
|
2946
2945
|
},
|
|
2947
2946
|
[
|
|
@@ -4537,6 +4536,101 @@ function clearColAnimate(elem, clss) {
|
|
|
4537
4536
|
}, 500);
|
|
4538
4537
|
}
|
|
4539
4538
|
|
|
4539
|
+
// packages_temp/table/src/tree.ts
|
|
4540
|
+
function getTreeNodeLines(isExpandable, depth, linesMask, isFirstRow, isLastRow, showRootLine) {
|
|
4541
|
+
const lines = [];
|
|
4542
|
+
for (let col = 1; col <= depth; col++) {
|
|
4543
|
+
const leftVal = `var(--vxe-ui-table-tree-node-btn-width) + var(--vxe-ui-table-tree-node-indent) * ${col - 1}`;
|
|
4544
|
+
const through = (linesMask & 1 << col - 1) !== 0;
|
|
4545
|
+
if (col === 1 && !showRootLine) {
|
|
4546
|
+
continue;
|
|
4547
|
+
}
|
|
4548
|
+
if (col < depth) {
|
|
4549
|
+
if (through) {
|
|
4550
|
+
let top = "0";
|
|
4551
|
+
let height = "100%";
|
|
4552
|
+
if (isFirstRow) {
|
|
4553
|
+
top = "50%";
|
|
4554
|
+
height = "50%";
|
|
4555
|
+
} else if (isLastRow) {
|
|
4556
|
+
top = "0";
|
|
4557
|
+
height = "50%";
|
|
4558
|
+
}
|
|
4559
|
+
lines.push({
|
|
4560
|
+
type: "v",
|
|
4561
|
+
style: {
|
|
4562
|
+
left: `calc(${leftVal})`,
|
|
4563
|
+
top,
|
|
4564
|
+
height
|
|
4565
|
+
}
|
|
4566
|
+
});
|
|
4567
|
+
}
|
|
4568
|
+
} else {
|
|
4569
|
+
let vTop = "0";
|
|
4570
|
+
let vHeight = through ? "100%" : "50%";
|
|
4571
|
+
if (isFirstRow && isLastRow) {
|
|
4572
|
+
vTop = "50%";
|
|
4573
|
+
vHeight = "0px";
|
|
4574
|
+
} else if (isFirstRow) {
|
|
4575
|
+
vTop = "50%";
|
|
4576
|
+
vHeight = "50%";
|
|
4577
|
+
} else if (isLastRow) {
|
|
4578
|
+
vTop = "0";
|
|
4579
|
+
vHeight = "50%";
|
|
4580
|
+
}
|
|
4581
|
+
if (isExpandable && vHeight !== "0px") {
|
|
4582
|
+
let cutType = "v cut";
|
|
4583
|
+
if (vTop === "0" && vHeight === "50%") {
|
|
4584
|
+
cutType = "v cut-top";
|
|
4585
|
+
} else if (vTop === "50%" && vHeight === "50%") {
|
|
4586
|
+
cutType = "v cut-bottom";
|
|
4587
|
+
} else if (vHeight === "100%") {
|
|
4588
|
+
cutType = "v cut-full";
|
|
4589
|
+
}
|
|
4590
|
+
lines.push({
|
|
4591
|
+
type: cutType,
|
|
4592
|
+
style: {
|
|
4593
|
+
left: `calc(${leftVal})`,
|
|
4594
|
+
top: vTop,
|
|
4595
|
+
height: vHeight
|
|
4596
|
+
}
|
|
4597
|
+
});
|
|
4598
|
+
} else {
|
|
4599
|
+
if (vHeight !== "0px") {
|
|
4600
|
+
lines.push({
|
|
4601
|
+
type: "v",
|
|
4602
|
+
style: {
|
|
4603
|
+
left: `calc(${leftVal})`,
|
|
4604
|
+
top: vTop,
|
|
4605
|
+
height: vHeight
|
|
4606
|
+
}
|
|
4607
|
+
});
|
|
4608
|
+
}
|
|
4609
|
+
}
|
|
4610
|
+
if (isExpandable) {
|
|
4611
|
+
lines.push({
|
|
4612
|
+
type: "h",
|
|
4613
|
+
style: {
|
|
4614
|
+
left: `calc(${leftVal} + var(--vxe-ui-table-tree-node-btn-width) / 2 + 1px)`,
|
|
4615
|
+
top: "50%",
|
|
4616
|
+
width: "calc(var(--vxe-ui-table-tree-node-indent) - var(--vxe-ui-table-tree-node-btn-width) - 0.2em)"
|
|
4617
|
+
}
|
|
4618
|
+
});
|
|
4619
|
+
} else {
|
|
4620
|
+
lines.push({
|
|
4621
|
+
type: "h",
|
|
4622
|
+
style: {
|
|
4623
|
+
left: `calc(${leftVal})`,
|
|
4624
|
+
top: "50%",
|
|
4625
|
+
width: "calc(var(--vxe-ui-table-tree-node-indent) - var(--vxe-ui-table-tree-node-btn-width) / 2 - 0.1em)"
|
|
4626
|
+
}
|
|
4627
|
+
});
|
|
4628
|
+
}
|
|
4629
|
+
}
|
|
4630
|
+
}
|
|
4631
|
+
return lines;
|
|
4632
|
+
}
|
|
4633
|
+
|
|
4540
4634
|
// packages_temp/table/src/store.ts
|
|
4541
4635
|
import { reactive as reactive2 } from "vue";
|
|
4542
4636
|
var crossTableDragRowInfo = reactive2({
|
|
@@ -4626,7 +4720,7 @@ var body_default = (
|
|
|
4626
4720
|
lineVNs.push(
|
|
4627
4721
|
h4("span", {
|
|
4628
4722
|
key: "le" + i,
|
|
4629
|
-
class: ["vxe-tree
|
|
4723
|
+
class: ["vxe-table--tree-node-line", `type--${lineType || "solid"}`, item.type],
|
|
4630
4724
|
style: item.style
|
|
4631
4725
|
})
|
|
4632
4726
|
);
|
|
@@ -5174,7 +5268,7 @@ var body_default = (
|
|
|
5174
5268
|
cellStyle.height = `${expandHeight}px`;
|
|
5175
5269
|
}
|
|
5176
5270
|
if (treeConfig) {
|
|
5177
|
-
cellStyle.paddingLeft =
|
|
5271
|
+
cellStyle.paddingLeft = `calc(${rowLevel} * var(--vxe-ui-table-tree-node-indent) + 30px)`;
|
|
5178
5272
|
}
|
|
5179
5273
|
const { showOverflow } = expandColumn || {};
|
|
5180
5274
|
const colid = expandColumn.id;
|
|
@@ -12394,6 +12488,7 @@ hooks4.add("tableExportModule", {
|
|
|
12394
12488
|
const { isAllSelected, isIndeterminate } = reactData;
|
|
12395
12489
|
const { mergeBodyCellMaps, mergeFooterCellMaps } = internalData;
|
|
12396
12490
|
const treeOpts = computeTreeOpts.value;
|
|
12491
|
+
const treeIndent = treeOpts.indent || 20;
|
|
12397
12492
|
const { print: isPrint, widthMode, isHeader, isFooter, isColgroup, isMerge, colgroups, _columnConfs, original } = opts;
|
|
12398
12493
|
const isAutoWidth = widthMode === "auto";
|
|
12399
12494
|
const isScaleWidth = widthMode === "scale";
|
|
@@ -12536,11 +12631,11 @@ hooks4.add("tableExportModule", {
|
|
|
12536
12631
|
}
|
|
12537
12632
|
classNames.push("vxe-table--tree-node");
|
|
12538
12633
|
if (column.type === "radio") {
|
|
12539
|
-
return `<td class="${classNames.join(" ")}" title="${cellValue}"><div style="${getCellWidthStyle(column)}"><div class="vxe-table--tree-node-wrapper" style="padding-left: ${item._level *
|
|
12634
|
+
return `<td class="${classNames.join(" ")}" title="${cellValue}"><div style="${getCellWidthStyle(column)}"><div class="vxe-table--tree-node-wrapper" style="padding-left: ${item._level * treeIndent}px"><div class="vxe-table--tree-icon-wrapper">${treeIcon}</div><div class="vxe-table--tree-cell"><input type="radio" name="radio_${id}" ${item._radioDisabled ? "disabled " : ""}${getBooleanValue(cellValue) ? "checked" : ""}><span>${item._radioLabel}</span></div></div></div></td>`;
|
|
12540
12635
|
} else if (column.type === "checkbox") {
|
|
12541
|
-
return `<td class="${classNames.join(" ")}" title="${cellValue}"><div style="${getCellWidthStyle(column)}"><div class="vxe-table--tree-node-wrapper" style="padding-left: ${item._level *
|
|
12636
|
+
return `<td class="${classNames.join(" ")}" title="${cellValue}"><div style="${getCellWidthStyle(column)}"><div class="vxe-table--tree-node-wrapper" style="padding-left: ${item._level * treeIndent}px"><div class="vxe-table--tree-icon-wrapper">${treeIcon}</div><div class="vxe-table--tree-cell"><input type="checkbox" ${item._checkboxDisabled ? "disabled " : ""}${getBooleanValue(cellValue) ? "checked" : ""}><span>${item._checkboxLabel}</span></div></div></div></td>`;
|
|
12542
12637
|
}
|
|
12543
|
-
return `<td class="${classNames.join(" ")}" title="${cellValue}"><div style="${getCellWidthStyle(column)}"><div class="vxe-table--tree-node-wrapper" style="padding-left: ${item._level *
|
|
12638
|
+
return `<td class="${classNames.join(" ")}" title="${cellValue}"><div style="${getCellWidthStyle(column)}"><div class="vxe-table--tree-node-wrapper" style="padding-left: ${item._level * treeIndent}px"><div class="vxe-table--tree-icon-wrapper">${treeIcon}</div><div class="vxe-table--tree-cell">${cellValue}</div></div></div></td>`;
|
|
12544
12639
|
}
|
|
12545
12640
|
if (column.type === "radio") {
|
|
12546
12641
|
return `<td class="${classNames.join(" ")}"><div style="${getCellWidthStyle(column)}"><input type="radio" name="radio_${id}" ${item._radioDisabled ? "disabled " : ""}${getBooleanValue(cellValue) ? "checked" : ""}><span>${item._radioLabel}</span></div></td>`;
|
|
@@ -17390,11 +17485,14 @@ var table_default = (
|
|
|
17390
17485
|
return "";
|
|
17391
17486
|
});
|
|
17392
17487
|
const computeTableStyle = computed4(() => {
|
|
17393
|
-
const { treeConfig } = props;
|
|
17394
17488
|
const barWidth = computeScrollYWidth.value;
|
|
17395
17489
|
const barHeight = computeScrollXHeight.value;
|
|
17396
17490
|
const treeOpts = computeTreeOpts.value;
|
|
17397
|
-
const { indent, lineWidth, lineColor } = treeOpts;
|
|
17491
|
+
const { indent: treeIndent, lineWidth, lineColor } = treeOpts;
|
|
17492
|
+
const expandOpts = computeExpandOpts.value;
|
|
17493
|
+
const { indent: edIndent } = expandOpts;
|
|
17494
|
+
const aggregateOpts = computeAggregateOpts.value;
|
|
17495
|
+
const { indent: rgIndent } = aggregateOpts;
|
|
17398
17496
|
const stys = {};
|
|
17399
17497
|
if (barWidth || barHeight) {
|
|
17400
17498
|
stys["--vxe-ui-table-view-scrollbar-width"] = toCssUnit(barWidth || barHeight);
|
|
@@ -17402,8 +17500,14 @@ var table_default = (
|
|
|
17402
17500
|
stys["--vxe-ui-table-view-scrollbar-height"] = toCssUnit(barHeight || barWidth);
|
|
17403
17501
|
stys["--vxe-ui-scrollbar-x-height"] = toCssUnit(barHeight || barWidth);
|
|
17404
17502
|
}
|
|
17405
|
-
if (
|
|
17406
|
-
stys["--vxe-ui-table-tree-node-indent"] = toCssUnit(
|
|
17503
|
+
if (edIndent) {
|
|
17504
|
+
stys["--vxe-ui-table-expand-tree-node-indent"] = toCssUnit(edIndent);
|
|
17505
|
+
}
|
|
17506
|
+
if (rgIndent) {
|
|
17507
|
+
stys["--vxe-ui-table-row-group-tree-node-indent"] = toCssUnit(rgIndent);
|
|
17508
|
+
}
|
|
17509
|
+
if (treeIndent) {
|
|
17510
|
+
stys["--vxe-ui-table-tree-node-indent"] = toCssUnit(treeIndent);
|
|
17407
17511
|
}
|
|
17408
17512
|
if (lineWidth) {
|
|
17409
17513
|
stys["--vxe-ui-table-tree-node-line-width"] = toCssUnit(lineWidth);
|
|
@@ -17656,6 +17760,7 @@ var table_default = (
|
|
|
17656
17760
|
computeExpandOpts,
|
|
17657
17761
|
computeTreeOpts,
|
|
17658
17762
|
computeShowTreeLine,
|
|
17763
|
+
computeShowTreeRootLine,
|
|
17659
17764
|
computeEmptyOpts,
|
|
17660
17765
|
computeLoadingOpts,
|
|
17661
17766
|
computeCellOffsetWidth,
|
|
@@ -18902,109 +19007,17 @@ var table_default = (
|
|
|
18902
19007
|
return cellValue;
|
|
18903
19008
|
};
|
|
18904
19009
|
};
|
|
18905
|
-
function getTreeNodeLines(isExpandable, depth, linesMask, isFirstRow, isLastRow, showRootLine) {
|
|
18906
|
-
const lines = [];
|
|
18907
|
-
for (let col = 1; col <= depth; col++) {
|
|
18908
|
-
const leftVal = `var(--vxe-ui-table-tree-node-btn-width) + var(--vxe-ui-table-tree-node-indent) * ${col - 1}`;
|
|
18909
|
-
const through = (linesMask & 1 << col - 1) !== 0;
|
|
18910
|
-
if (col === 1 && !showRootLine) {
|
|
18911
|
-
continue;
|
|
18912
|
-
}
|
|
18913
|
-
if (col < depth) {
|
|
18914
|
-
if (through) {
|
|
18915
|
-
let top = "0";
|
|
18916
|
-
let height = "100%";
|
|
18917
|
-
if (isFirstRow) {
|
|
18918
|
-
top = "50%";
|
|
18919
|
-
height = "50%";
|
|
18920
|
-
} else if (isLastRow) {
|
|
18921
|
-
top = "0";
|
|
18922
|
-
height = "50%";
|
|
18923
|
-
}
|
|
18924
|
-
lines.push({
|
|
18925
|
-
type: "v",
|
|
18926
|
-
style: {
|
|
18927
|
-
left: `calc(${leftVal})`,
|
|
18928
|
-
top,
|
|
18929
|
-
height
|
|
18930
|
-
}
|
|
18931
|
-
});
|
|
18932
|
-
}
|
|
18933
|
-
} else {
|
|
18934
|
-
let vTop = "0";
|
|
18935
|
-
let vHeight = through ? "100%" : "50%";
|
|
18936
|
-
if (isFirstRow && isLastRow) {
|
|
18937
|
-
vTop = "50%";
|
|
18938
|
-
vHeight = "0px";
|
|
18939
|
-
} else if (isFirstRow) {
|
|
18940
|
-
vTop = "50%";
|
|
18941
|
-
vHeight = "50%";
|
|
18942
|
-
} else if (isLastRow) {
|
|
18943
|
-
vTop = "0";
|
|
18944
|
-
vHeight = "50%";
|
|
18945
|
-
}
|
|
18946
|
-
if (isExpandable && vHeight !== "0px") {
|
|
18947
|
-
let cutType = "v cut";
|
|
18948
|
-
if (vTop === "0" && vHeight === "50%") {
|
|
18949
|
-
cutType = "v cut-top";
|
|
18950
|
-
} else if (vTop === "50%" && vHeight === "50%") {
|
|
18951
|
-
cutType = "v cut-bottom";
|
|
18952
|
-
} else if (vHeight === "100%") {
|
|
18953
|
-
cutType = "v cut-full";
|
|
18954
|
-
}
|
|
18955
|
-
lines.push({
|
|
18956
|
-
type: cutType,
|
|
18957
|
-
style: {
|
|
18958
|
-
left: `calc(${leftVal})`,
|
|
18959
|
-
top: vTop,
|
|
18960
|
-
height: vHeight
|
|
18961
|
-
}
|
|
18962
|
-
});
|
|
18963
|
-
} else {
|
|
18964
|
-
if (vHeight !== "0px") {
|
|
18965
|
-
lines.push({
|
|
18966
|
-
type: "v",
|
|
18967
|
-
style: {
|
|
18968
|
-
left: `calc(${leftVal})`,
|
|
18969
|
-
top: vTop,
|
|
18970
|
-
height: vHeight
|
|
18971
|
-
}
|
|
18972
|
-
});
|
|
18973
|
-
}
|
|
18974
|
-
}
|
|
18975
|
-
if (isExpandable) {
|
|
18976
|
-
lines.push({
|
|
18977
|
-
type: "h",
|
|
18978
|
-
style: {
|
|
18979
|
-
left: `calc(${leftVal} + var(--vxe-ui-table-tree-node-btn-width) / 2 + 1px)`,
|
|
18980
|
-
top: "50%",
|
|
18981
|
-
width: "calc(var(--vxe-ui-table-tree-node-indent) - var(--vxe-ui-table-tree-node-btn-width) - 0.25em)"
|
|
18982
|
-
}
|
|
18983
|
-
});
|
|
18984
|
-
} else {
|
|
18985
|
-
lines.push({
|
|
18986
|
-
type: "h",
|
|
18987
|
-
style: {
|
|
18988
|
-
left: `calc(${leftVal})`,
|
|
18989
|
-
top: "50%",
|
|
18990
|
-
width: "calc(var(--vxe-ui-table-tree-node-indent) - var(--vxe-ui-table-tree-node-btn-width))"
|
|
18991
|
-
}
|
|
18992
|
-
});
|
|
18993
|
-
}
|
|
18994
|
-
}
|
|
18995
|
-
}
|
|
18996
|
-
return lines;
|
|
18997
|
-
}
|
|
18998
19010
|
const updateAfterTreeIndex = () => {
|
|
18999
19011
|
const { fullDataRowIdData, fullAllDataRowIdData, afterFullData, afterTreeFullData } = internalData;
|
|
19000
19012
|
const treeOpts = computeTreeOpts.value;
|
|
19001
|
-
const { lazy, transform,
|
|
19013
|
+
const { lazy, transform, mapChildrenField } = treeOpts;
|
|
19002
19014
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
19003
19015
|
const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
|
|
19004
19016
|
const showTreeLine = computeShowTreeLine.value;
|
|
19017
|
+
const showTreeRootLine = computeShowTreeRootLine.value;
|
|
19005
19018
|
const fullMaps = {};
|
|
19006
19019
|
const treeFullSize = afterTreeFullData.length;
|
|
19007
|
-
|
|
19020
|
+
let rowNum = 0;
|
|
19008
19021
|
const { handleGetRowId } = createHandleGetRowId($xeTable);
|
|
19009
19022
|
function handleTreeDFS(row, index, items, parentRow, depth, isFirstRow, isLastRow, isLastChild, stackMask, seq) {
|
|
19010
19023
|
const rowid = handleGetRowId(row);
|
|
@@ -19012,22 +19025,19 @@ var table_default = (
|
|
|
19012
19025
|
const rowChilds = row[transform ? mapChildrenField : childrenField];
|
|
19013
19026
|
if (rowRest) {
|
|
19014
19027
|
rowRest.seq = seq;
|
|
19015
|
-
rowRest._seq = rowNum;
|
|
19016
19028
|
rowRest.items = items;
|
|
19017
19029
|
rowRest.treeIndex = index;
|
|
19018
|
-
rowRest._index = rowNum;
|
|
19019
|
-
rowRest._tIndex = rowNum;
|
|
19020
19030
|
} else {
|
|
19021
19031
|
rowRest = {
|
|
19022
19032
|
row,
|
|
19023
19033
|
rowid,
|
|
19024
|
-
_seq:
|
|
19025
|
-
seq,
|
|
19034
|
+
_seq: 0,
|
|
19035
|
+
seq: 0,
|
|
19026
19036
|
index,
|
|
19027
19037
|
$index: -1,
|
|
19028
|
-
_index:
|
|
19038
|
+
_index: 0,
|
|
19029
19039
|
treeIndex: index,
|
|
19030
|
-
_tIndex:
|
|
19040
|
+
_tIndex: 0,
|
|
19031
19041
|
items,
|
|
19032
19042
|
parent: parentRow,
|
|
19033
19043
|
level: 0,
|
|
@@ -19046,6 +19056,8 @@ var table_default = (
|
|
|
19046
19056
|
}
|
|
19047
19057
|
rowRest.seq = seq;
|
|
19048
19058
|
rowRest._seq = rowNum;
|
|
19059
|
+
rowRest._index = rowNum;
|
|
19060
|
+
rowRest._tIndex = rowNum;
|
|
19049
19061
|
rowRest.level = depth - 1;
|
|
19050
19062
|
rowRest.linesMask = linesMask;
|
|
19051
19063
|
const hasChild = rowChilds && rowChilds.length;
|
|
@@ -19057,14 +19069,17 @@ var table_default = (
|
|
|
19057
19069
|
isLazyLoaded = !!rest.treeLoaded;
|
|
19058
19070
|
}
|
|
19059
19071
|
const isExpandable = lazy ? isLazyLoaded ? hasChild : hasChild || hasLazyChilds : hasChild;
|
|
19060
|
-
rowRest.treeLines = showTreeLine && treeFullSize > 1 ? getTreeNodeLines(isExpandable, depth, linesMask, isFirstRow, isLastRow,
|
|
19072
|
+
rowRest.treeLines = showTreeLine && treeFullSize > 1 ? getTreeNodeLines(isExpandable, depth, linesMask, isFirstRow, isLastRow, showTreeRootLine) : [];
|
|
19061
19073
|
let nextStackMask = stackMask;
|
|
19062
19074
|
if (!isLastChild) {
|
|
19063
19075
|
nextStackMask |= 1 << depth;
|
|
19064
19076
|
}
|
|
19077
|
+
rowNum++;
|
|
19065
19078
|
fullMaps[rowid] = row;
|
|
19066
|
-
|
|
19067
|
-
|
|
19079
|
+
if (rowChilds) {
|
|
19080
|
+
for (let i = 0; i < rowChilds.length; i++) {
|
|
19081
|
+
handleTreeDFS(rowChilds[i], i, rowChilds, row, depth + 1, false, false, i === rowChilds.length - 1, nextStackMask, `${seq}.${i + 1}`);
|
|
19082
|
+
}
|
|
19068
19083
|
}
|
|
19069
19084
|
}
|
|
19070
19085
|
for (let i = 0; i < treeFullSize; i++) {
|
|
@@ -30187,7 +30202,7 @@ var table_default = (
|
|
|
30187
30202
|
const { handleGetRowId } = createHandleGetRowId($xeTable);
|
|
30188
30203
|
tableRowExpandedList.forEach((row) => {
|
|
30189
30204
|
const expandOpts2 = computeExpandOpts.value;
|
|
30190
|
-
const { height: expandHeight, padding
|
|
30205
|
+
const { height: expandHeight, padding } = expandOpts2;
|
|
30191
30206
|
const { fullAllDataRowIdData, fullColumnIdData } = internalData;
|
|
30192
30207
|
const treeOpts = computeTreeOpts.value;
|
|
30193
30208
|
const { transform, seqMode } = treeOpts;
|
|
@@ -30217,7 +30232,7 @@ var table_default = (
|
|
|
30217
30232
|
cellStyle.height = `${expandHeight}px`;
|
|
30218
30233
|
}
|
|
30219
30234
|
if (isRowGroupStatus || treeConfig) {
|
|
30220
|
-
cellStyle.paddingLeft =
|
|
30235
|
+
cellStyle.paddingLeft = `calc(${rowLevel} * var(--vxe-ui-table-expand-tree-node-indent) + 30px)`;
|
|
30221
30236
|
}
|
|
30222
30237
|
let columnIndex = -1;
|
|
30223
30238
|
let $columnIndex = -1;
|