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.
Files changed (54) hide show
  1. package/dist/all.esm.js +144 -129
  2. package/dist/all.esm.min.js +3 -3
  3. package/dist/style.css +90 -34
  4. package/dist/style.mini.css +1 -1
  5. package/es/style.css +90 -34
  6. package/es/style.mini.css +1 -1
  7. package/es/table/module/export/hook.js +4 -3
  8. package/es/table/src/body.js +2 -2
  9. package/es/table/src/cell.js +6 -6
  10. package/es/table/src/table.js +32 -111
  11. package/es/table/src/tree.d.ts +6 -0
  12. package/es/table/src/tree.js +96 -0
  13. package/es/table/style.css +78 -26
  14. package/es/table/style.mini.css +1 -1
  15. package/es/ui/index.js +5 -6
  16. package/es/ui/src/log.js +1 -1
  17. package/es/vxe-table/style.css +78 -26
  18. package/es/vxe-table/style.mini.css +1 -1
  19. package/lib/index.umd.js +144 -129
  20. package/lib/index.umd.min.js +3 -3
  21. package/lib/style.css +90 -34
  22. package/lib/style.mini.css +1 -1
  23. package/lib/table/module/export/hook.js +4 -3
  24. package/lib/table/src/body.js +2 -2
  25. package/lib/table/src/cell.js +6 -6
  26. package/lib/table/src/table.js +32 -111
  27. package/lib/table/src/tree.d.ts +6 -0
  28. package/lib/table/src/tree.js +116 -0
  29. package/lib/table/style/style.css +78 -26
  30. package/lib/table/style/style.mini.css +1 -1
  31. package/lib/ui/index.js +5 -6
  32. package/lib/ui/src/log.js +1 -1
  33. package/lib/vxe-table/style/style.css +78 -26
  34. package/lib/vxe-table/style/style.mini.css +1 -1
  35. package/package.json +2 -2
  36. package/packages/table/module/export/hook.ts +4 -3
  37. package/packages/table/src/body.ts +2 -2
  38. package/packages/table/src/cell.ts +9 -10
  39. package/packages/table/src/table.ts +32 -129
  40. package/packages/table/src/tree.ts +112 -0
  41. package/packages/ui/index.ts +4 -5
  42. package/styles/components/icon.scss +11 -3
  43. package/styles/components/old-icon.scss +6 -3
  44. package/styles/components/table.scss +14 -4
  45. package/styles/theme/base.scss +13 -9
  46. /package/dist/{iconfont.1794563906464.ttf → iconfont.1794794325954.ttf} +0 -0
  47. /package/dist/{iconfont.1794563906464.woff → iconfont.1794794325954.woff} +0 -0
  48. /package/dist/{iconfont.1794563906464.woff2 → iconfont.1794794325954.woff2} +0 -0
  49. /package/es/{iconfont.1794563906464.ttf → iconfont.1794794325954.ttf} +0 -0
  50. /package/es/{iconfont.1794563906464.woff → iconfont.1794794325954.woff} +0 -0
  51. /package/es/{iconfont.1794563906464.woff2 → iconfont.1794794325954.woff2} +0 -0
  52. /package/lib/{iconfont.1794563906464.ttf → iconfont.1794794325954.ttf} +0 -0
  53. /package/lib/{iconfont.1794563906464.woff → iconfont.1794794325954.woff} +0 -0
  54. /package/lib/{iconfont.1794563906464.woff2 → iconfont.1794794325954.woff2} +0 -0
@@ -673,6 +673,7 @@ hooks.add("tableExportModule", {
673
673
  const { isAllSelected, isIndeterminate } = reactData;
674
674
  const { mergeBodyCellMaps, mergeFooterCellMaps } = internalData;
675
675
  const treeOpts = computeTreeOpts.value;
676
+ const treeIndent = treeOpts.indent || 20;
676
677
  const { print: isPrint, widthMode, isHeader, isFooter, isColgroup, isMerge, colgroups, _columnConfs, original } = opts;
677
678
  const isAutoWidth = widthMode === "auto";
678
679
  const isScaleWidth = widthMode === "scale";
@@ -815,11 +816,11 @@ hooks.add("tableExportModule", {
815
816
  }
816
817
  classNames.push("vxe-table--tree-node");
817
818
  if (column.type === "radio") {
818
- return `<td class="${classNames.join(" ")}" title="${cellValue}"><div style="${getCellWidthStyle(column)}"><div class="vxe-table--tree-node-wrapper" style="padding-left: ${item._level * treeOpts.indent}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>`;
819
+ 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>`;
819
820
  } else if (column.type === "checkbox") {
820
- return `<td class="${classNames.join(" ")}" title="${cellValue}"><div style="${getCellWidthStyle(column)}"><div class="vxe-table--tree-node-wrapper" style="padding-left: ${item._level * treeOpts.indent}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>`;
821
+ 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>`;
821
822
  }
822
- return `<td class="${classNames.join(" ")}" title="${cellValue}"><div style="${getCellWidthStyle(column)}"><div class="vxe-table--tree-node-wrapper" style="padding-left: ${item._level * treeOpts.indent}px"><div class="vxe-table--tree-icon-wrapper">${treeIcon}</div><div class="vxe-table--tree-cell">${cellValue}</div></div></div></td>`;
823
+ 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>`;
823
824
  }
824
825
  if (column.type === "radio") {
825
826
  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>`;
@@ -82,7 +82,7 @@ var body_default = (
82
82
  lineVNs.push(
83
83
  h("span", {
84
84
  key: "le" + i,
85
- class: ["vxe-tree--line", `type--${lineType || "solid"}`, item.type],
85
+ class: ["vxe-table--tree-node-line", `type--${lineType || "solid"}`, item.type],
86
86
  style: item.style
87
87
  })
88
88
  );
@@ -630,7 +630,7 @@ var body_default = (
630
630
  cellStyle.height = `${expandHeight}px`;
631
631
  }
632
632
  if (treeConfig) {
633
- cellStyle.paddingLeft = `${rowLevel * treeOpts.indent + 30}px`;
633
+ cellStyle.paddingLeft = `calc(${rowLevel} * var(--vxe-ui-table-tree-node-indent) + 30px)`;
634
634
  }
635
635
  const { showOverflow } = expandColumn || {};
636
636
  const colid = expandColumn.id;
@@ -531,7 +531,7 @@ const Cell = {
531
531
  const { rowGroupExpandedFlag } = tableReactData;
532
532
  const { rowGroupExpandedMaps } = tableInternalData;
533
533
  const aggregateOpts = computeAggregateOpts.value;
534
- const { mode, padding, indent, showIcon, iconOpen, iconClose } = aggregateOpts;
534
+ const { mode, padding, showIcon, iconOpen, iconClose } = aggregateOpts;
535
535
  const rowid = getRowid($table, row);
536
536
  const isExpand = !!rowGroupExpandedFlag && !!rowGroupExpandedMaps[rowid];
537
537
  return h(
@@ -543,8 +543,8 @@ const Cell = {
543
543
  "is--expanded": isExpand
544
544
  }
545
545
  ],
546
- style: mode !== "column" && padding && indent ? {
547
- paddingLeft: `${level * indent}px`
546
+ style: mode !== "column" && padding ? {
547
+ paddingLeft: `calc(${level} * var(--vxe-ui-table-row-group-tree-node-indent))`
548
548
  } : void 0
549
549
  },
550
550
  [
@@ -589,7 +589,7 @@ const Cell = {
589
589
  const { treeExpandedFlag } = tableReactData;
590
590
  const { fullAllDataRowIdData, treeExpandedMaps, treeExpandLazyLoadedMaps } = tableInternalData;
591
591
  const treeOpts = computeTreeOpts.value;
592
- const { padding, indent, lazy, trigger, visibleMethod, iconLoaded, showIcon, iconOpen, iconClose } = treeOpts;
592
+ const { padding, lazy, trigger, visibleMethod, iconLoaded, showIcon, iconOpen, iconClose } = treeOpts;
593
593
  const childrenField = treeOpts.children || treeOpts.childrenField;
594
594
  const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
595
595
  const rowChilds = row[childrenField];
@@ -623,8 +623,8 @@ const Cell = {
623
623
  "is--active": isActive
624
624
  }
625
625
  ],
626
- style: padding && indent ? {
627
- paddingLeft: `${level * indent}px`
626
+ style: padding ? {
627
+ paddingLeft: `calc(${level} * var(--vxe-ui-table-tree-node-indent))`
628
628
  } : void 0
629
629
  },
630
630
  [
@@ -38,6 +38,7 @@ import {
38
38
  } from "./util";
39
39
  import { getSlotVNs } from "../../ui/src/vn";
40
40
  import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from "../../ui/src/anime";
41
+ import { getTreeNodeLines } from "./tree";
41
42
  import { createComponentLog } from "../../ui/src/log";
42
43
  import { getCrossTableDragRowInfo } from "./store";
43
44
  import Cell from "./cell";
@@ -620,11 +621,14 @@ var table_default = (
620
621
  return "";
621
622
  });
622
623
  const computeTableStyle = computed(() => {
623
- const { treeConfig } = props;
624
624
  const barWidth = computeScrollYWidth.value;
625
625
  const barHeight = computeScrollXHeight.value;
626
626
  const treeOpts = computeTreeOpts.value;
627
- const { indent, lineWidth, lineColor } = treeOpts;
627
+ const { indent: treeIndent, lineWidth, lineColor } = treeOpts;
628
+ const expandOpts = computeExpandOpts.value;
629
+ const { indent: edIndent } = expandOpts;
630
+ const aggregateOpts = computeAggregateOpts.value;
631
+ const { indent: rgIndent } = aggregateOpts;
628
632
  const stys = {};
629
633
  if (barWidth || barHeight) {
630
634
  stys["--vxe-ui-table-view-scrollbar-width"] = toCssUnit(barWidth || barHeight);
@@ -632,8 +636,14 @@ var table_default = (
632
636
  stys["--vxe-ui-table-view-scrollbar-height"] = toCssUnit(barHeight || barWidth);
633
637
  stys["--vxe-ui-scrollbar-x-height"] = toCssUnit(barHeight || barWidth);
634
638
  }
635
- if (treeConfig) {
636
- stys["--vxe-ui-table-tree-node-indent"] = toCssUnit(indent);
639
+ if (edIndent) {
640
+ stys["--vxe-ui-table-expand-tree-node-indent"] = toCssUnit(edIndent);
641
+ }
642
+ if (rgIndent) {
643
+ stys["--vxe-ui-table-row-group-tree-node-indent"] = toCssUnit(rgIndent);
644
+ }
645
+ if (treeIndent) {
646
+ stys["--vxe-ui-table-tree-node-indent"] = toCssUnit(treeIndent);
637
647
  }
638
648
  if (lineWidth) {
639
649
  stys["--vxe-ui-table-tree-node-line-width"] = toCssUnit(lineWidth);
@@ -886,6 +896,7 @@ var table_default = (
886
896
  computeExpandOpts,
887
897
  computeTreeOpts,
888
898
  computeShowTreeLine,
899
+ computeShowTreeRootLine,
889
900
  computeEmptyOpts,
890
901
  computeLoadingOpts,
891
902
  computeCellOffsetWidth,
@@ -2132,109 +2143,17 @@ var table_default = (
2132
2143
  return cellValue;
2133
2144
  };
2134
2145
  };
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
- }
2228
2146
  const updateAfterTreeIndex = () => {
2229
2147
  const { fullDataRowIdData, fullAllDataRowIdData, afterFullData, afterTreeFullData } = internalData;
2230
2148
  const treeOpts = computeTreeOpts.value;
2231
- const { lazy, transform, showRootLine, mapChildrenField } = treeOpts;
2149
+ const { lazy, transform, mapChildrenField } = treeOpts;
2232
2150
  const childrenField = treeOpts.children || treeOpts.childrenField;
2233
2151
  const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
2234
2152
  const showTreeLine = computeShowTreeLine.value;
2153
+ const showTreeRootLine = computeShowTreeRootLine.value;
2235
2154
  const fullMaps = {};
2236
2155
  const treeFullSize = afterTreeFullData.length;
2237
- const rowNum = 0;
2156
+ let rowNum = 0;
2238
2157
  const { handleGetRowId } = createHandleGetRowId($xeTable);
2239
2158
  function handleTreeDFS(row, index, items, parentRow, depth, isFirstRow, isLastRow, isLastChild, stackMask, seq) {
2240
2159
  const rowid = handleGetRowId(row);
@@ -2242,22 +2161,19 @@ var table_default = (
2242
2161
  const rowChilds = row[transform ? mapChildrenField : childrenField];
2243
2162
  if (rowRest) {
2244
2163
  rowRest.seq = seq;
2245
- rowRest._seq = rowNum;
2246
2164
  rowRest.items = items;
2247
2165
  rowRest.treeIndex = index;
2248
- rowRest._index = rowNum;
2249
- rowRest._tIndex = rowNum;
2250
2166
  } else {
2251
2167
  rowRest = {
2252
2168
  row,
2253
2169
  rowid,
2254
- _seq: rowNum,
2255
- seq,
2170
+ _seq: 0,
2171
+ seq: 0,
2256
2172
  index,
2257
2173
  $index: -1,
2258
- _index: rowNum,
2174
+ _index: 0,
2259
2175
  treeIndex: index,
2260
- _tIndex: rowNum,
2176
+ _tIndex: 0,
2261
2177
  items,
2262
2178
  parent: parentRow,
2263
2179
  level: 0,
@@ -2276,6 +2192,8 @@ var table_default = (
2276
2192
  }
2277
2193
  rowRest.seq = seq;
2278
2194
  rowRest._seq = rowNum;
2195
+ rowRest._index = rowNum;
2196
+ rowRest._tIndex = rowNum;
2279
2197
  rowRest.level = depth - 1;
2280
2198
  rowRest.linesMask = linesMask;
2281
2199
  const hasChild = rowChilds && rowChilds.length;
@@ -2287,14 +2205,17 @@ var table_default = (
2287
2205
  isLazyLoaded = !!rest.treeLoaded;
2288
2206
  }
2289
2207
  const isExpandable = lazy ? isLazyLoaded ? hasChild : hasChild || hasLazyChilds : hasChild;
2290
- rowRest.treeLines = showTreeLine && treeFullSize > 1 ? getTreeNodeLines(isExpandable, depth, linesMask, isFirstRow, isLastRow, showRootLine) : [];
2208
+ rowRest.treeLines = showTreeLine && treeFullSize > 1 ? getTreeNodeLines(isExpandable, depth, linesMask, isFirstRow, isLastRow, showTreeRootLine) : [];
2291
2209
  let nextStackMask = stackMask;
2292
2210
  if (!isLastChild) {
2293
2211
  nextStackMask |= 1 << depth;
2294
2212
  }
2213
+ rowNum++;
2295
2214
  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}`);
2215
+ if (rowChilds) {
2216
+ for (let i = 0; i < rowChilds.length; i++) {
2217
+ handleTreeDFS(rowChilds[i], i, rowChilds, row, depth + 1, false, false, i === rowChilds.length - 1, nextStackMask, `${seq}.${i + 1}`);
2218
+ }
2298
2219
  }
2299
2220
  }
2300
2221
  for (let i = 0; i < treeFullSize; i++) {
@@ -13417,7 +13338,7 @@ var table_default = (
13417
13338
  const { handleGetRowId } = createHandleGetRowId($xeTable);
13418
13339
  tableRowExpandedList.forEach((row) => {
13419
13340
  const expandOpts2 = computeExpandOpts.value;
13420
- const { height: expandHeight, padding, indent } = expandOpts2;
13341
+ const { height: expandHeight, padding } = expandOpts2;
13421
13342
  const { fullAllDataRowIdData, fullColumnIdData } = internalData;
13422
13343
  const treeOpts = computeTreeOpts.value;
13423
13344
  const { transform, seqMode } = treeOpts;
@@ -13447,7 +13368,7 @@ var table_default = (
13447
13368
  cellStyle.height = `${expandHeight}px`;
13448
13369
  }
13449
13370
  if (isRowGroupStatus || treeConfig) {
13450
- cellStyle.paddingLeft = `${rowLevel * (XEUtils.isNumber(indent) ? indent : treeOpts.indent) + 30}px`;
13371
+ cellStyle.paddingLeft = `calc(${rowLevel} * var(--vxe-ui-table-expand-tree-node-indent) + 30px)`;
13451
13372
  }
13452
13373
  let columnIndex = -1;
13453
13374
  let $columnIndex = -1;
@@ -0,0 +1,6 @@
1
+ import type { VxeTableDefines } from '../../../types';
2
+ /**
3
+ * 分配树节点的连接线
4
+ * 类名(cut-full / cut-top / cut-bottom)
5
+ */
6
+ export declare function getTreeNodeLines(isExpandable: boolean, depth: number, linesMask: number, isFirstRow: boolean, isLastRow: boolean, showRootLine: boolean | undefined): VxeTableDefines.RowCacheTreeLineData[];
@@ -0,0 +1,96 @@
1
+ function getTreeNodeLines(isExpandable, depth, linesMask, isFirstRow, isLastRow, showRootLine) {
2
+ const lines = [];
3
+ for (let col = 1; col <= depth; col++) {
4
+ const leftVal = `var(--vxe-ui-table-tree-node-btn-width) + var(--vxe-ui-table-tree-node-indent) * ${col - 1}`;
5
+ const through = (linesMask & 1 << col - 1) !== 0;
6
+ if (col === 1 && !showRootLine) {
7
+ continue;
8
+ }
9
+ if (col < depth) {
10
+ if (through) {
11
+ let top = "0";
12
+ let height = "100%";
13
+ if (isFirstRow) {
14
+ top = "50%";
15
+ height = "50%";
16
+ } else if (isLastRow) {
17
+ top = "0";
18
+ height = "50%";
19
+ }
20
+ lines.push({
21
+ type: "v",
22
+ style: {
23
+ left: `calc(${leftVal})`,
24
+ top,
25
+ height
26
+ }
27
+ });
28
+ }
29
+ } else {
30
+ let vTop = "0";
31
+ let vHeight = through ? "100%" : "50%";
32
+ if (isFirstRow && isLastRow) {
33
+ vTop = "50%";
34
+ vHeight = "0px";
35
+ } else if (isFirstRow) {
36
+ vTop = "50%";
37
+ vHeight = "50%";
38
+ } else if (isLastRow) {
39
+ vTop = "0";
40
+ vHeight = "50%";
41
+ }
42
+ if (isExpandable && vHeight !== "0px") {
43
+ let cutType = "v cut";
44
+ if (vTop === "0" && vHeight === "50%") {
45
+ cutType = "v cut-top";
46
+ } else if (vTop === "50%" && vHeight === "50%") {
47
+ cutType = "v cut-bottom";
48
+ } else if (vHeight === "100%") {
49
+ cutType = "v cut-full";
50
+ }
51
+ lines.push({
52
+ type: cutType,
53
+ style: {
54
+ left: `calc(${leftVal})`,
55
+ top: vTop,
56
+ height: vHeight
57
+ }
58
+ });
59
+ } else {
60
+ if (vHeight !== "0px") {
61
+ lines.push({
62
+ type: "v",
63
+ style: {
64
+ left: `calc(${leftVal})`,
65
+ top: vTop,
66
+ height: vHeight
67
+ }
68
+ });
69
+ }
70
+ }
71
+ if (isExpandable) {
72
+ lines.push({
73
+ type: "h",
74
+ style: {
75
+ left: `calc(${leftVal} + var(--vxe-ui-table-tree-node-btn-width) / 2 + 1px)`,
76
+ top: "50%",
77
+ width: "calc(var(--vxe-ui-table-tree-node-indent) - var(--vxe-ui-table-tree-node-btn-width) - 0.2em)"
78
+ }
79
+ });
80
+ } else {
81
+ lines.push({
82
+ type: "h",
83
+ style: {
84
+ left: `calc(${leftVal})`,
85
+ top: "50%",
86
+ width: "calc(var(--vxe-ui-table-tree-node-indent) - var(--vxe-ui-table-tree-node-btn-width) / 2 - 0.1em)"
87
+ }
88
+ });
89
+ }
90
+ }
91
+ }
92
+ return lines;
93
+ }
94
+ export {
95
+ getTreeNodeLines
96
+ };
@@ -10,13 +10,13 @@
10
10
  -moz-user-select: none;
11
11
  user-select: none;
12
12
  }
13
- [class*=vxe-icon--].rotate45 {
13
+ [class*=vxe-icon--].rotate45, [class*=vxe-icon--].rotate-45 {
14
14
  transform: rotate(45deg);
15
15
  }
16
- [class*=vxe-icon--].rotate90 {
16
+ [class*=vxe-icon--].rotate90, [class*=vxe-icon--].rotate-90 {
17
17
  transform: rotate(90deg);
18
18
  }
19
- [class*=vxe-icon--].rotate180 {
19
+ [class*=vxe-icon--].rotate180, [class*=vxe-icon--].rotate-180 {
20
20
  transform: rotate(180deg);
21
21
  }
22
22
 
@@ -568,18 +568,57 @@
568
568
  [class*=vxe-table-icon-].animat {
569
569
  transition: transform 0.25s ease-in-out;
570
570
  }
571
- [class*=vxe-table-icon-].rotate45 {
571
+ [class*=vxe-table-icon-].rotate45, [class*=vxe-table-icon-].rotate-45 {
572
572
  transform: rotate(45deg);
573
573
  }
574
- [class*=vxe-table-icon-].rotate90 {
574
+ [class*=vxe-table-icon-].rotate90, [class*=vxe-table-icon-].rotate-90 {
575
575
  transform: rotate(90deg);
576
576
  }
577
- [class*=vxe-table-icon-].rotate180 {
577
+ [class*=vxe-table-icon-].rotate180, [class*=vxe-table-icon-].rotate-180 {
578
578
  transform: rotate(180deg);
579
579
  }
580
580
  [class*=vxe-table-icon-].roll {
581
581
  animation: rollCircle 1s infinite linear;
582
582
  }
583
+ [class*=vxe-table-icon-].fs-6 {
584
+ font-size: 6px;
585
+ }
586
+ [class*=vxe-table-icon-].fs-7 {
587
+ font-size: 7px;
588
+ }
589
+ [class*=vxe-table-icon-].fs-8 {
590
+ font-size: 8px;
591
+ }
592
+ [class*=vxe-table-icon-].fs-9 {
593
+ font-size: 9px;
594
+ }
595
+ [class*=vxe-table-icon-].fs-10 {
596
+ font-size: 10px;
597
+ }
598
+ [class*=vxe-table-icon-].fs-11 {
599
+ font-size: 11px;
600
+ }
601
+ [class*=vxe-table-icon-].fs-12 {
602
+ font-size: 12px;
603
+ }
604
+ [class*=vxe-table-icon-].fs-13 {
605
+ font-size: 13px;
606
+ }
607
+ [class*=vxe-table-icon-].fs-14 {
608
+ font-size: 14px;
609
+ }
610
+ [class*=vxe-table-icon-].fs-15 {
611
+ font-size: 15px;
612
+ }
613
+ [class*=vxe-table-icon-].fs-16 {
614
+ font-size: 16px;
615
+ }
616
+ [class*=vxe-table-icon-].fs-17 {
617
+ font-size: 17px;
618
+ }
619
+ [class*=vxe-table-icon-].fs-18 {
620
+ font-size: 18px;
621
+ }
583
622
  [class*=vxe-table-icon-].theme--primary {
584
623
  color: var(--vxe-ui-font-primary-color);
585
624
  }
@@ -1869,31 +1908,37 @@
1869
1908
  --vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-default);
1870
1909
  --vxe-ui-table-current-row-line-height: var(--vxe-ui-table-row-line-height);
1871
1910
  --vxe-ui-table-current-row-height: var(--vxe-ui-table-row-height-default);
1911
+ --vxe-ui-table-current-tree-node-indent: var(--vxe-ui-table-tree-node-indent-default);
1872
1912
  }
1873
1913
  .vxe-table.size--xlarge {
1874
1914
  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-xlarge);
1875
1915
  --vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-xlarge);
1876
1916
  --vxe-ui-table-current-row-height: var(--vxe-ui-table-row-height-xlarge);
1917
+ --vxe-ui-table-current-tree-node-indent: var(--vxe-ui-table-tree-node-indent-xlarge);
1877
1918
  }
1878
1919
  .vxe-table.size--large {
1879
1920
  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-large);
1880
1921
  --vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-large);
1881
1922
  --vxe-ui-table-current-row-height: var(--vxe-ui-table-row-height-large);
1923
+ --vxe-ui-table-current-tree-node-indent: var(--vxe-ui-table-tree-node-indent-large);
1882
1924
  }
1883
1925
  .vxe-table.size--medium {
1884
1926
  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-medium);
1885
1927
  --vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-medium);
1886
1928
  --vxe-ui-table-current-row-height: var(--vxe-ui-table-row-height-medium);
1929
+ --vxe-ui-table-current-tree-node-indent: var(--vxe-ui-table-tree-node-indent-medium);
1887
1930
  }
1888
1931
  .vxe-table.size--small {
1889
1932
  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-small);
1890
1933
  --vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-small);
1891
1934
  --vxe-ui-table-current-row-height: var(--vxe-ui-table-row-height-small);
1935
+ --vxe-ui-table-current-tree-node-indent: var(--vxe-ui-table-tree-node-indent-small);
1892
1936
  }
1893
1937
  .vxe-table.size--mini {
1894
1938
  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-mini);
1895
1939
  --vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-mini);
1896
1940
  --vxe-ui-table-current-row-height: var(--vxe-ui-table-row-height-mini);
1941
+ --vxe-ui-table-current-tree-node-indent: var(--vxe-ui-table-tree-node-indent-mini);
1897
1942
  }
1898
1943
 
1899
1944
  .vxe-table-slots,
@@ -1930,6 +1975,10 @@
1930
1975
  height: var(--vxe-ui-table-row-height-mini);
1931
1976
  }
1932
1977
 
1978
+ .vxe-table {
1979
+ --vxe-ui-table-tree-node-indent: var(--vxe-ui-table-current-tree-node-indent);
1980
+ }
1981
+
1933
1982
  .vxe-table--print-frame {
1934
1983
  position: fixed;
1935
1984
  bottom: -100%;
@@ -3568,80 +3617,80 @@
3568
3617
  .vxe-table--render-default {
3569
3618
  /*树形节点*/
3570
3619
  }
3571
- .vxe-table--render-default .vxe-tree--line {
3620
+ .vxe-table--render-default .vxe-table--tree-node-line {
3572
3621
  --vxe-ui-table-current-line-gap: calc((var(--vxe-ui-table-cell-height, var(--vxe-ui-table-current-row-height)) - var(--vxe-ui-table-tree-node-btn-width)) / 2);
3573
3622
  }
3574
- .vxe-table--render-default .vxe-tree--line {
3623
+ .vxe-table--render-default .vxe-table--tree-node-line {
3575
3624
  position: absolute;
3576
3625
  pointer-events: none;
3577
3626
  }
3578
- .vxe-table--render-default .vxe-tree--line.v {
3627
+ .vxe-table--render-default .vxe-table--tree-node-line.v {
3579
3628
  width: var(--vxe-ui-table-tree-node-line-width);
3580
3629
  transform: translateX(-50%);
3581
3630
  /* 伪元素基础尺寸和位置,不含背景 */
3582
3631
  }
3583
- .vxe-table--render-default .vxe-tree--line.v.cut-full::before, .vxe-table--render-default .vxe-tree--line.v.cut-top::before, .vxe-table--render-default .vxe-tree--line.v.cut-full::after, .vxe-table--render-default .vxe-tree--line.v.cut-bottom::after {
3632
+ .vxe-table--render-default .vxe-table--tree-node-line.v.cut-full::before, .vxe-table--render-default .vxe-table--tree-node-line.v.cut-top::before, .vxe-table--render-default .vxe-table--tree-node-line.v.cut-full::after, .vxe-table--render-default .vxe-table--tree-node-line.v.cut-bottom::after {
3584
3633
  content: "";
3585
3634
  position: absolute;
3586
3635
  left: 0;
3587
3636
  width: var(--vxe-ui-table-tree-node-line-width);
3588
3637
  }
3589
- .vxe-table--render-default .vxe-tree--line.v.cut-full::before, .vxe-table--render-default .vxe-tree--line.v.cut-top::before {
3638
+ .vxe-table--render-default .vxe-table--tree-node-line.v.cut-full::before, .vxe-table--render-default .vxe-table--tree-node-line.v.cut-top::before {
3590
3639
  top: 0;
3591
3640
  height: var(--vxe-ui-table-current-line-gap);
3592
3641
  }
3593
- .vxe-table--render-default .vxe-tree--line.v.cut-full::after, .vxe-table--render-default .vxe-tree--line.v.cut-bottom::after {
3642
+ .vxe-table--render-default .vxe-table--tree-node-line.v.cut-full::after, .vxe-table--render-default .vxe-table--tree-node-line.v.cut-bottom::after {
3594
3643
  top: calc(100% - var(--vxe-ui-table-current-line-gap));
3595
3644
  height: var(--vxe-ui-table-current-line-gap);
3596
3645
  }
3597
- .vxe-table--render-default .vxe-tree--line.h {
3646
+ .vxe-table--render-default .vxe-table--tree-node-line.h {
3598
3647
  height: var(--vxe-ui-table-tree-node-line-width);
3599
3648
  transform: translateY(-50%);
3600
3649
  }
3601
- .vxe-table--render-default .vxe-tree--line.type--solid.v {
3650
+ .vxe-table--render-default .vxe-table--tree-node-line.type--solid.v {
3602
3651
  background-color: var(--vxe-ui-table-tree-node-line-color);
3603
3652
  }
3604
- .vxe-table--render-default .vxe-tree--line.type--solid.v.cut-full, .vxe-table--render-default .vxe-tree--line.type--solid.v.cut-top, .vxe-table--render-default .vxe-tree--line.type--solid.v.cut-bottom {
3653
+ .vxe-table--render-default .vxe-table--tree-node-line.type--solid.v.cut-full, .vxe-table--render-default .vxe-table--tree-node-line.type--solid.v.cut-top, .vxe-table--render-default .vxe-table--tree-node-line.type--solid.v.cut-bottom {
3605
3654
  background: none;
3606
3655
  }
3607
- .vxe-table--render-default .vxe-tree--line.type--solid.v.cut-full::before, .vxe-table--render-default .vxe-tree--line.type--solid.v.cut-top::before, .vxe-table--render-default .vxe-tree--line.type--solid.v.cut-full::after, .vxe-table--render-default .vxe-tree--line.type--solid.v.cut-bottom::after {
3656
+ .vxe-table--render-default .vxe-table--tree-node-line.type--solid.v.cut-full::before, .vxe-table--render-default .vxe-table--tree-node-line.type--solid.v.cut-top::before, .vxe-table--render-default .vxe-table--tree-node-line.type--solid.v.cut-full::after, .vxe-table--render-default .vxe-table--tree-node-line.type--solid.v.cut-bottom::after {
3608
3657
  background-color: var(--vxe-ui-table-tree-node-line-color);
3609
3658
  }
3610
- .vxe-table--render-default .vxe-tree--line.type--solid.h {
3659
+ .vxe-table--render-default .vxe-table--tree-node-line.type--solid.h {
3611
3660
  background-color: var(--vxe-ui-table-tree-node-line-color);
3612
3661
  }
3613
- .vxe-table--render-default .vxe-tree--line.type--dashed.v {
3662
+ .vxe-table--render-default .vxe-table--tree-node-line.type--dashed.v {
3614
3663
  background-color: transparent;
3615
3664
  background-image: linear-gradient(to bottom, var(--vxe-ui-table-tree-node-line-color) 50%, transparent 50%);
3616
3665
  background-size: var(--vxe-ui-table-tree-node-line-width) calc(var(--vxe-ui-table-tree-node-line-width) * 4);
3617
3666
  }
3618
- .vxe-table--render-default .vxe-tree--line.type--dashed.v.cut-full, .vxe-table--render-default .vxe-tree--line.type--dashed.v.cut-top, .vxe-table--render-default .vxe-tree--line.type--dashed.v.cut-bottom {
3667
+ .vxe-table--render-default .vxe-table--tree-node-line.type--dashed.v.cut-full, .vxe-table--render-default .vxe-table--tree-node-line.type--dashed.v.cut-top, .vxe-table--render-default .vxe-table--tree-node-line.type--dashed.v.cut-bottom {
3619
3668
  background: none;
3620
3669
  }
3621
- .vxe-table--render-default .vxe-tree--line.type--dashed.v.cut-full::before, .vxe-table--render-default .vxe-tree--line.type--dashed.v.cut-top::before, .vxe-table--render-default .vxe-tree--line.type--dashed.v.cut-full::after, .vxe-table--render-default .vxe-tree--line.type--dashed.v.cut-bottom::after {
3670
+ .vxe-table--render-default .vxe-table--tree-node-line.type--dashed.v.cut-full::before, .vxe-table--render-default .vxe-table--tree-node-line.type--dashed.v.cut-top::before, .vxe-table--render-default .vxe-table--tree-node-line.type--dashed.v.cut-full::after, .vxe-table--render-default .vxe-table--tree-node-line.type--dashed.v.cut-bottom::after {
3622
3671
  background-color: transparent;
3623
3672
  background-image: linear-gradient(to bottom, var(--vxe-ui-table-tree-node-line-color) 50%, transparent 50%);
3624
3673
  background-size: var(--vxe-ui-table-tree-node-line-width) calc(var(--vxe-ui-table-tree-node-line-width) * 4);
3625
3674
  }
3626
- .vxe-table--render-default .vxe-tree--line.type--dashed.h {
3675
+ .vxe-table--render-default .vxe-table--tree-node-line.type--dashed.h {
3627
3676
  background-color: transparent;
3628
3677
  background-image: linear-gradient(to right, var(--vxe-ui-table-tree-node-line-color) 50%, transparent 50%);
3629
3678
  background-size: calc(var(--vxe-ui-table-tree-node-line-width) * 4) var(--vxe-ui-table-tree-node-line-width);
3630
3679
  }
3631
- .vxe-table--render-default .vxe-tree--line.type--dotted.v {
3680
+ .vxe-table--render-default .vxe-table--tree-node-line.type--dotted.v {
3632
3681
  background-color: transparent;
3633
3682
  background-image: linear-gradient(to bottom, var(--vxe-ui-table-tree-node-line-color) 50%, transparent 50%);
3634
3683
  background-size: var(--vxe-ui-table-tree-node-line-width) calc(var(--vxe-ui-table-tree-node-line-width) * 2);
3635
3684
  }
3636
- .vxe-table--render-default .vxe-tree--line.type--dotted.v.cut-full, .vxe-table--render-default .vxe-tree--line.type--dotted.v.cut-top, .vxe-table--render-default .vxe-tree--line.type--dotted.v.cut-bottom {
3685
+ .vxe-table--render-default .vxe-table--tree-node-line.type--dotted.v.cut-full, .vxe-table--render-default .vxe-table--tree-node-line.type--dotted.v.cut-top, .vxe-table--render-default .vxe-table--tree-node-line.type--dotted.v.cut-bottom {
3637
3686
  background: none;
3638
3687
  }
3639
- .vxe-table--render-default .vxe-tree--line.type--dotted.v.cut-full::before, .vxe-table--render-default .vxe-tree--line.type--dotted.v.cut-top::before, .vxe-table--render-default .vxe-tree--line.type--dotted.v.cut-full::after, .vxe-table--render-default .vxe-tree--line.type--dotted.v.cut-bottom::after {
3688
+ .vxe-table--render-default .vxe-table--tree-node-line.type--dotted.v.cut-full::before, .vxe-table--render-default .vxe-table--tree-node-line.type--dotted.v.cut-top::before, .vxe-table--render-default .vxe-table--tree-node-line.type--dotted.v.cut-full::after, .vxe-table--render-default .vxe-table--tree-node-line.type--dotted.v.cut-bottom::after {
3640
3689
  background-color: transparent;
3641
3690
  background-image: linear-gradient(to bottom, var(--vxe-ui-table-tree-node-line-color) 50%, transparent 50%);
3642
3691
  background-size: var(--vxe-ui-table-tree-node-line-width) calc(var(--vxe-ui-table-tree-node-line-width) * 2);
3643
3692
  }
3644
- .vxe-table--render-default .vxe-tree--line.type--dotted.h {
3693
+ .vxe-table--render-default .vxe-table--tree-node-line.type--dotted.h {
3645
3694
  background-color: transparent;
3646
3695
  background-image: linear-gradient(to right, var(--vxe-ui-table-tree-node-line-color) 50%, transparent 50%);
3647
3696
  background-size: calc(var(--vxe-ui-table-tree-node-line-width) * 2) var(--vxe-ui-table-tree-node-line-width);
@@ -4104,7 +4153,10 @@
4104
4153
  .vxe-table--render-default .vxe-cell--wrapper {
4105
4154
  margin: auto 0;
4106
4155
  }
4107
- .vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-cell--wrapper > div > .vxe-reusekeep-control, .vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-cell--wrapper > span > .vxe-reusekeep-control, .vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-cell--wrapper > .vxe-reusekeep-control {
4156
+ .vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-cell--wrapper > div > .vxe-reusekeep-control, .vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-cell--wrapper > span > .vxe-reusekeep-control, .vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-cell--wrapper > .vxe-reusekeep-control,
4157
+ .vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-tree-cell > div > .vxe-reusekeep-control,
4158
+ .vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-tree-cell > span > .vxe-reusekeep-control,
4159
+ .vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-tree-cell > .vxe-reusekeep-control {
4108
4160
  position: absolute;
4109
4161
  width: 0;
4110
4162
  height: 0;