vxe-pc-ui 4.21.0 → 4.21.2

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 (75) hide show
  1. package/dist/all.esm.js +442 -94
  2. package/dist/all.esm.min.js +3 -3
  3. package/dist/style.css +149 -29
  4. package/dist/style.mini.css +1 -1
  5. package/es/esm.index.d.ts +7 -0
  6. package/es/esm.index.js +8 -0
  7. package/es/icon/style.css +43 -4
  8. package/es/icon/style.mini.css +1 -1
  9. package/es/style.css +149 -29
  10. package/es/style.mini.css +1 -1
  11. package/es/tree/index.d.ts +14 -6
  12. package/es/tree/src/tree.d.ts +3 -1
  13. package/es/tree/src/tree.js +111 -48
  14. package/es/tree/src/util.d.ts +5 -0
  15. package/es/tree/src/util.js +97 -2
  16. package/es/tree/style.css +99 -23
  17. package/es/tree/style.mini.css +1 -1
  18. package/es/ui/index.js +15 -12
  19. package/es/ui/src/log.js +1 -1
  20. package/es/vxe-icon/style.css +43 -4
  21. package/es/vxe-icon/style.mini.css +1 -1
  22. package/es/vxe-tree/style.css +99 -23
  23. package/es/vxe-tree/style.mini.css +1 -1
  24. package/lib/esm.index.d.ts +7 -0
  25. package/lib/esm.index.js +39 -0
  26. package/lib/icon/style/style.css +43 -4
  27. package/lib/icon/style/style.mini.css +1 -1
  28. package/lib/index.umd.js +221 -93
  29. package/lib/index.umd.min.js +3 -3
  30. package/lib/style.css +149 -29
  31. package/lib/style.mini.css +1 -1
  32. package/lib/tree/index.d.ts +14 -6
  33. package/lib/tree/src/tree.d.ts +3 -1
  34. package/lib/tree/src/tree.js +110 -47
  35. package/lib/tree/src/util.d.ts +5 -0
  36. package/lib/tree/src/util.js +97 -2
  37. package/lib/tree/style/style.css +99 -23
  38. package/lib/tree/style/style.mini.css +1 -1
  39. package/lib/ui/index.js +15 -12
  40. package/lib/ui/src/log.js +1 -1
  41. package/lib/vxe-icon/style/style.css +43 -4
  42. package/lib/vxe-icon/style/style.mini.css +1 -1
  43. package/lib/vxe-tree/style/style.css +99 -23
  44. package/lib/vxe-tree/style/style.mini.css +1 -1
  45. package/package.json +2 -2
  46. package/packages/esm.index.ts +10 -0
  47. package/packages/tree/src/tree.ts +129 -48
  48. package/packages/tree/src/util.ts +113 -1
  49. package/packages/ui/index.ts +14 -11
  50. package/styles/components/icon.scss +11 -3
  51. package/styles/components/tree.scss +145 -14
  52. package/styles/theme/base.scss +7 -2
  53. package/types/components/table.d.ts +1 -0
  54. package/types/components/tree.d.ts +34 -0
  55. /package/dist/{iconfont.1794558186564.ttf → iconfont.1794797289947.ttf} +0 -0
  56. /package/dist/{iconfont.1794558186564.woff → iconfont.1794797289947.woff} +0 -0
  57. /package/dist/{iconfont.1794558186564.woff2 → iconfont.1794797289947.woff2} +0 -0
  58. /package/es/icon/{iconfont.1794558186564.ttf → iconfont.1794797289947.ttf} +0 -0
  59. /package/es/icon/{iconfont.1794558186564.woff → iconfont.1794797289947.woff} +0 -0
  60. /package/es/icon/{iconfont.1794558186564.woff2 → iconfont.1794797289947.woff2} +0 -0
  61. /package/es/{iconfont.1794558186564.ttf → iconfont.1794797289947.ttf} +0 -0
  62. /package/es/{iconfont.1794558186564.woff → iconfont.1794797289947.woff} +0 -0
  63. /package/es/{iconfont.1794558186564.woff2 → iconfont.1794797289947.woff2} +0 -0
  64. /package/es/vxe-icon/{iconfont.1794558186564.ttf → iconfont.1794797289947.ttf} +0 -0
  65. /package/es/vxe-icon/{iconfont.1794558186564.woff → iconfont.1794797289947.woff} +0 -0
  66. /package/es/vxe-icon/{iconfont.1794558186564.woff2 → iconfont.1794797289947.woff2} +0 -0
  67. /package/lib/icon/style/{iconfont.1794558186564.ttf → iconfont.1794797289947.ttf} +0 -0
  68. /package/lib/icon/style/{iconfont.1794558186564.woff → iconfont.1794797289947.woff} +0 -0
  69. /package/lib/icon/style/{iconfont.1794558186564.woff2 → iconfont.1794797289947.woff2} +0 -0
  70. /package/lib/{iconfont.1794558186564.ttf → iconfont.1794797289947.ttf} +0 -0
  71. /package/lib/{iconfont.1794558186564.woff → iconfont.1794797289947.woff} +0 -0
  72. /package/lib/{iconfont.1794558186564.woff2 → iconfont.1794797289947.woff2} +0 -0
  73. /package/lib/vxe-icon/style/{iconfont.1794558186564.ttf → iconfont.1794797289947.ttf} +0 -0
  74. /package/lib/vxe-icon/style/{iconfont.1794558186564.woff → iconfont.1794797289947.woff} +0 -0
  75. /package/lib/vxe-icon/style/{iconfont.1794558186564.woff2 → iconfont.1794797289947.woff2} +0 -0
@@ -3,24 +3,31 @@
3
3
  // 局部变量
4
4
  .vxe-tree {
5
5
  --vxe-ui-tree-current-font-size: var(--vxe-ui-font-size-default);
6
+ --vxe-ui-tree-current-node-indent: var(--vxe-ui-tree-node-indent-default);
6
7
  &.size--xlarge {
7
8
  --vxe-ui-tree-current-font-size: var(--vxe-ui-font-size-xlarge);
9
+ --vxe-ui-tree-current-node-indent: var(--vxe-ui-tree-node-indent-xlarge);
8
10
  }
9
11
  &.size--large {
10
12
  --vxe-ui-tree-current-font-size: var(--vxe-ui-font-size-large);
13
+ --vxe-ui-tree-current-node-indent: var(--vxe-ui-tree-node-indent-large);
11
14
  }
12
15
  &.size--medium {
13
16
  --vxe-ui-tree-current-font-size: var(--vxe-ui-font-size-medium);
17
+ --vxe-ui-tree-current-node-indent: var(--vxe-ui-tree-node-indent-medium);
14
18
  }
15
19
  &.size--small {
16
20
  --vxe-ui-tree-current-font-size: var(--vxe-ui-font-size-small);
21
+ --vxe-ui-tree-current-node-indent: var(--vxe-ui-tree-node-indent-small);
17
22
  }
18
23
  &.size--mini {
19
24
  --vxe-ui-tree-current-font-size: var(--vxe-ui-font-size-mini);
25
+ --vxe-ui-tree-current-node-indent: var(--vxe-ui-tree-node-indent-mini);
20
26
  }
21
27
  }
22
28
 
23
29
  .vxe-tree {
30
+ --vxe-ui-tree-node-indent: var(--vxe-ui-tree-current-node-indent);
24
31
  position: relative;
25
32
  font-size: var(--vxe-ui-tree-current-font-size);
26
33
  color: var(--vxe-ui-font-color);
@@ -112,6 +119,7 @@
112
119
  }
113
120
 
114
121
  .vxe-tree--node-wrapper {
122
+ position: relative;
115
123
  &.row--drag-move {
116
124
  transition: transform 0.5s ease;
117
125
  }
@@ -121,7 +129,7 @@
121
129
  @for $i from 0 to 10 {
122
130
  &.node--level-#{$i} {
123
131
  & > .vxe-tree--node-item {
124
- padding-left: calc(var(--vxe-ui-tree-node-indent) * $i + var(--vxe-ui-tree-node-root-indent) + var(--vxe-ui-tree-node-padding));
132
+ padding-left: calc(var(--vxe-ui-tree-node-indent) * $i + var(--vxe-ui-tree-node-padding));
125
133
  }
126
134
  }
127
135
  }
@@ -217,20 +225,142 @@
217
225
  white-space: nowrap;
218
226
  }
219
227
 
220
- .vxe-tree--node-line-wrapper {
221
- position: relative;
222
- display: block;
223
- height: 0;
228
+ // 虚线
229
+ @mixin dashed-vertical {
230
+ background-color: transparent;
231
+ background-image: linear-gradient(to bottom, var(--vxe-ui-tree-node-line-color) 50%, transparent 50%);
232
+ background-size: var(--vxe-ui-tree-node-line-width) calc(var(--vxe-ui-tree-node-line-width) * 4);
233
+ }
234
+ @mixin dashed-horizontal {
235
+ background-color: transparent;
236
+ background-image: linear-gradient(to right, var(--vxe-ui-tree-node-line-color) 50%, transparent 50%);
237
+ background-size: calc(var(--vxe-ui-tree-node-line-width) * 4) var(--vxe-ui-tree-node-line-width);
238
+ }
239
+
240
+ // 点线
241
+ @mixin dotted-vertical {
242
+ background-color: transparent;
243
+ background-image: linear-gradient(to bottom, var(--vxe-ui-tree-node-line-color) 50%, transparent 50%);
244
+ background-size: var(--vxe-ui-tree-node-line-width) calc(var(--vxe-ui-tree-node-line-width) * 2);
245
+ }
246
+ @mixin dotted-horizontal {
247
+ background-color: transparent;
248
+ background-image: linear-gradient(to right, var(--vxe-ui-tree-node-line-color) 50%, transparent 50%);
249
+ background-size: calc(var(--vxe-ui-tree-node-line-width) * 2) var(--vxe-ui-tree-node-line-width);
250
+ }
251
+ /*树形节点*/
252
+ .vxe-tree--node-line {
253
+ --vxe-ui-tree-current-line-gap: calc((var(--vxe-ui-tree-node-height) - var(--vxe-ui-tree-node-btn-width)) / 2);
224
254
  }
225
255
  .vxe-tree--node-line {
226
256
  position: absolute;
227
- bottom: calc(var(--vxe-ui-tree-node-height) / 2 * -1);
228
- left: 0.6em;
229
- width: 0.6em;
230
- border-width: 0 0 var(--vxe-ui-tree-node-line-width) var(--vxe-ui-tree-node-line-width);
231
- border-style: var(--vxe-ui-tree-node-line-style);
232
- border-color: var(--vxe-ui-tree-node-line-color);
233
257
  pointer-events: none;
258
+
259
+ &.v {
260
+ width: var(--vxe-ui-tree-node-line-width);
261
+ transform: translateX(-50%);
262
+
263
+ /* 伪元素基础尺寸和位置,不含背景 */
264
+ &.cut-full::before,
265
+ &.cut-top::before,
266
+ &.cut-full::after,
267
+ &.cut-bottom::after {
268
+ content: '';
269
+ position: absolute;
270
+ left: 0;
271
+ width: var(--vxe-ui-tree-node-line-width);
272
+ }
273
+
274
+ &.cut-full::before,
275
+ &.cut-top::before {
276
+ top: 0;
277
+ height: var(--vxe-ui-tree-current-line-gap);
278
+ }
279
+
280
+ &.cut-full::after,
281
+ &.cut-bottom::after {
282
+ top: calc(100% - var(--vxe-ui-tree-current-line-gap));
283
+ height: var(--vxe-ui-tree-current-line-gap);
284
+ }
285
+ }
286
+
287
+ &.h {
288
+ height: var(--vxe-ui-tree-node-line-width);
289
+ transform: translateY(-50%);
290
+ }
291
+ }
292
+ .vxe-tree--node-line {
293
+ // 实线
294
+ &.type--solid {
295
+ &.v {
296
+ background-color: var(--vxe-ui-tree-node-line-color);
297
+
298
+ &.cut-full,
299
+ &.cut-top,
300
+ &.cut-bottom {
301
+ background: none;
302
+ }
303
+
304
+ &.cut-full::before,
305
+ &.cut-top::before,
306
+ &.cut-full::after,
307
+ &.cut-bottom::after {
308
+ background-color: var(--vxe-ui-tree-node-line-color);
309
+ }
310
+ }
311
+
312
+ &.h {
313
+ background-color: var(--vxe-ui-tree-node-line-color);
314
+ }
315
+ }
316
+
317
+ // 虚线
318
+ &.type--dashed {
319
+ &.v {
320
+ @include dashed-vertical;
321
+
322
+ &.cut-full,
323
+ &.cut-top,
324
+ &.cut-bottom {
325
+ background: none;
326
+ }
327
+
328
+ &.cut-full::before,
329
+ &.cut-top::before,
330
+ &.cut-full::after,
331
+ &.cut-bottom::after {
332
+ @include dashed-vertical;
333
+ }
334
+ }
335
+
336
+ &.h {
337
+ @include dashed-horizontal;
338
+ }
339
+ }
340
+
341
+ // 点线
342
+ &.type--dotted {
343
+ &.v {
344
+ @include dotted-vertical;
345
+
346
+ &.cut-full,
347
+ &.cut-top,
348
+ &.cut-bottom {
349
+ background: none;
350
+ }
351
+
352
+ &.cut-full::before,
353
+ &.cut-top::before,
354
+ &.cut-full::after,
355
+ &.cut-bottom::after {
356
+ @include dotted-vertical;
357
+ }
358
+ }
359
+
360
+ &.h {
361
+ @include dotted-horizontal;
362
+ }
363
+ }
234
364
  }
235
365
 
236
366
  .vxe-tree--node-list-wrapper {
@@ -259,7 +389,8 @@
259
389
  }
260
390
  .vxe-tree--node-item-switcher {
261
391
  position: relative;
262
- width: 1.4em;
392
+ width: var(--vxe-ui-tree-node-btn-width);
393
+ padding-right: var(--vxe-ui-tree-node-indent);
263
394
  flex-shrink: 0;
264
395
  user-select: none;
265
396
  }
@@ -267,8 +398,8 @@
267
398
  position: absolute;
268
399
  display: inline-flex;
269
400
  top: 50%;
270
- left: 50%;
271
- transform: translate(-50%, -50%);
401
+ left: 0;
402
+ transform: translateY(-50%);
272
403
  cursor: pointer;
273
404
  text-align: center;
274
405
  z-index: 7;
@@ -228,9 +228,14 @@
228
228
 
229
229
  /*tree*/
230
230
  --vxe-ui-tree-node-height: 2em;
231
- --vxe-ui-tree-node-indent: 20px;
232
231
  --vxe-ui-tree-node-padding: 0px;
233
- --vxe-ui-tree-node-root-indent: 0px;
232
+ --vxe-ui-tree-node-indent-xlarge: 28px;
233
+ --vxe-ui-tree-node-indent-large: 26px;
234
+ --vxe-ui-tree-node-indent-default: 24px;
235
+ --vxe-ui-tree-node-indent-medium: 22px;
236
+ --vxe-ui-tree-node-indent-small: 20px;
237
+ --vxe-ui-tree-node-indent-mini: 18px;
238
+ --vxe-ui-tree-node-btn-width: 1em;
234
239
  --vxe-ui-tree-node-line-color:#909399;
235
240
  --vxe-ui-tree-node-line-style: dotted;
236
241
  --vxe-ui-tree-node-line-width: 1px;
@@ -3551,6 +3551,7 @@ export interface TablePrivateComputed<D = any> {
3551
3551
  computeExpandOpts: ComputedRef<VxeTablePropTypes.ExpandOpts<D>>
3552
3552
  computeTreeOpts: ComputedRef<VxeTablePropTypes.TreeOpts<D>>
3553
3553
  computeShowTreeLine: ComputedRef<boolean>
3554
+ computeShowTreeRootLine: ComputedRef<boolean>
3554
3555
  computeEmptyOpts: ComputedRef<VxeTablePropTypes.EmptyOpts>
3555
3556
  computeLoadingOpts: ComputedRef<VxeTablePropTypes.LoadingOpts>
3556
3557
  computeCellOffsetWidth: ComputedRef<number>
@@ -111,6 +111,26 @@ export namespace VxeTreePropTypes {
111
111
  */
112
112
  export type IsHover = boolean
113
113
  export type ShowLine = boolean
114
+
115
+ export interface LineConfig {
116
+ /**
117
+ * 只对 showLine 有效,连接线的样式(实线、虚线、点线)
118
+ */
119
+ lineType?: 'solid' | 'dashed' | 'dotted' | '' | null
120
+ /**
121
+ * 只对 showLine 有效,连接线的宽度(单位 px)
122
+ */
123
+ lineWidth?: number | string
124
+ /**
125
+ * 只对 showLine 有效,连接线的颜色
126
+ */
127
+ lineColor?: string
128
+ /**
129
+ * 只对 showLine 有效,显示树的根节点连接线
130
+ */
131
+ showRootLine?: boolean
132
+ }
133
+
114
134
  export type Indent = number
115
135
  export type ExpandAll = boolean
116
136
  export type ExpandNodeKeys = string[] | number[]
@@ -388,7 +408,14 @@ export interface VxeTreeProps<D = any> {
388
408
  * @deprecated
389
409
  */
390
410
  isHover?: VxeTreePropTypes.IsHover
411
+ /**
412
+ * 是否显示连接线
413
+ */
391
414
  showLine?: VxeTreePropTypes.ShowLine
415
+ /**
416
+ * 连接线配置项
417
+ */
418
+ lineConfig?: VxeTreePropTypes.LineConfig
392
419
  indent?: VxeTreePropTypes.Indent
393
420
  showRadio?: VxeTreePropTypes.ShowRadio
394
421
  checkNodeKey?: VxeTreePropTypes.CheckNodeKey
@@ -851,6 +878,11 @@ export namespace VxeTreeDefines {
851
878
  $tree: VxeTreeConstructor<D>
852
879
  }
853
880
 
881
+ export interface NodeCacheTreeLineData {
882
+ type: string; // 'v', 'h', 'v cut-full', 'v cut-top', 'v cut-bottom'
883
+ style: Record<string, string>;
884
+ }
885
+
854
886
  export interface NodeCacheItem {
855
887
  item: any
856
888
  index: number
@@ -863,6 +895,8 @@ export namespace VxeTreeDefines {
863
895
  treeIndex: number
864
896
  lineCount: number
865
897
  treeLoaded: boolean
898
+ linesMask: number
899
+ treeLines?: NodeCacheTreeLineData[]
866
900
  }
867
901
 
868
902
  export interface NodeDragstartEventParams<D = any> {