ele-admin-plus 1.1.8-beta.1 → 1.1.8-beta.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 (93) hide show
  1. package/es/ele-app/el.d.ts +7 -1
  2. package/es/ele-app/style/overwrite/cascader/index.scss +2 -1
  3. package/es/ele-app/style/overwrite/input/css-var.scss +5 -2
  4. package/es/ele-app/style/overwrite/input/index.scss +148 -59
  5. package/es/ele-app/style/overwrite/select/index.scss +57 -8
  6. package/es/ele-app/style/overwrite/tree-select/index.scss +11 -2
  7. package/es/ele-card/index.d.ts +2 -9
  8. package/es/ele-card/index.js +36 -49
  9. package/es/ele-card/props.d.ts +1 -4
  10. package/es/ele-card/props.js +1 -4
  11. package/es/ele-card/style/index.js +0 -1
  12. package/es/ele-card/style/index.scss +54 -67
  13. package/es/ele-cropper/style/index.scss +8 -0
  14. package/es/ele-data-table/index.d.ts +17 -12
  15. package/es/ele-data-table/props.d.ts +8 -5
  16. package/es/ele-data-table/props.js +4 -0
  17. package/es/ele-drawer/index.d.ts +2 -2
  18. package/es/ele-menus/index.d.ts +8 -0
  19. package/es/ele-menus/props.d.ts +3 -0
  20. package/es/ele-modal/index.d.ts +2 -2
  21. package/es/ele-page/style/index.scss +26 -21
  22. package/es/ele-pagination/style/index.scss +27 -13
  23. package/es/ele-pro-table/index.d.ts +16 -9
  24. package/es/ele-pro-table/index.js +24 -8
  25. package/es/ele-pro-table/props.d.ts +9 -6
  26. package/es/ele-pro-table/props.js +4 -0
  27. package/es/ele-pro-table/util.d.ts +18 -1
  28. package/es/ele-pro-table/util.js +19 -0
  29. package/es/ele-table/style/css-var.scss +46 -0
  30. package/es/ele-table/style/index.scss +7 -81
  31. package/es/ele-tour/index.js +2 -2
  32. package/es/ele-tour/util.d.ts +5 -0
  33. package/es/ele-tour/util.js +9 -1
  34. package/es/ele-upload-list/components/list-item.js +1 -1
  35. package/es/ele-upload-list/types.d.ts +2 -0
  36. package/es/ele-virtual-table/components/body-cell.d.ts +2 -2
  37. package/es/ele-virtual-table/components/body-row.d.ts +2 -2
  38. package/es/ele-virtual-table/index.d.ts +20 -12
  39. package/es/ele-virtual-table/index.js +14 -1
  40. package/es/ele-virtual-table/props.d.ts +6 -3
  41. package/es/ele-watermark/index.d.ts +9 -0
  42. package/es/ele-watermark/index.js +3 -5
  43. package/es/ele-watermark/props.d.ts +5 -0
  44. package/es/ele-watermark/props.js +5 -0
  45. package/es/style/themes/default.scss +16 -8
  46. package/es/style/util.scss +5 -0
  47. package/lib/ele-app/el.d.ts +7 -1
  48. package/lib/ele-app/style/overwrite/cascader/index.scss +2 -1
  49. package/lib/ele-app/style/overwrite/input/css-var.scss +5 -2
  50. package/lib/ele-app/style/overwrite/input/index.scss +148 -59
  51. package/lib/ele-app/style/overwrite/select/index.scss +57 -8
  52. package/lib/ele-app/style/overwrite/tree-select/index.scss +11 -2
  53. package/lib/ele-card/index.cjs +35 -48
  54. package/lib/ele-card/index.d.ts +2 -9
  55. package/lib/ele-card/props.cjs +1 -4
  56. package/lib/ele-card/props.d.ts +1 -4
  57. package/lib/ele-card/style/index.cjs +0 -1
  58. package/lib/ele-card/style/index.scss +54 -67
  59. package/lib/ele-cropper/style/index.scss +8 -0
  60. package/lib/ele-data-table/index.d.ts +17 -12
  61. package/lib/ele-data-table/props.cjs +4 -0
  62. package/lib/ele-data-table/props.d.ts +8 -5
  63. package/lib/ele-drawer/index.d.ts +2 -2
  64. package/lib/ele-menus/index.d.ts +8 -0
  65. package/lib/ele-menus/props.d.ts +3 -0
  66. package/lib/ele-modal/index.d.ts +2 -2
  67. package/lib/ele-page/style/index.scss +26 -21
  68. package/lib/ele-pagination/style/index.scss +27 -13
  69. package/lib/ele-pro-table/index.cjs +23 -7
  70. package/lib/ele-pro-table/index.d.ts +16 -9
  71. package/lib/ele-pro-table/props.cjs +4 -0
  72. package/lib/ele-pro-table/props.d.ts +9 -6
  73. package/lib/ele-pro-table/util.cjs +19 -0
  74. package/lib/ele-pro-table/util.d.ts +18 -1
  75. package/lib/ele-table/style/css-var.scss +46 -0
  76. package/lib/ele-table/style/index.scss +7 -81
  77. package/lib/ele-tour/index.cjs +1 -1
  78. package/lib/ele-tour/util.cjs +8 -0
  79. package/lib/ele-tour/util.d.ts +5 -0
  80. package/lib/ele-upload-list/components/list-item.cjs +1 -1
  81. package/lib/ele-upload-list/types.d.ts +2 -0
  82. package/lib/ele-virtual-table/components/body-cell.d.ts +2 -2
  83. package/lib/ele-virtual-table/components/body-row.d.ts +2 -2
  84. package/lib/ele-virtual-table/index.cjs +13 -0
  85. package/lib/ele-virtual-table/index.d.ts +20 -12
  86. package/lib/ele-virtual-table/props.d.ts +6 -3
  87. package/lib/ele-watermark/index.cjs +3 -5
  88. package/lib/ele-watermark/index.d.ts +9 -0
  89. package/lib/ele-watermark/props.cjs +5 -0
  90. package/lib/ele-watermark/props.d.ts +5 -0
  91. package/lib/style/themes/default.scss +16 -8
  92. package/lib/style/util.scss +5 -0
  93. package/package.json +20 -20
@@ -20,6 +20,7 @@ import type {
20
20
  MenuItemProps,
21
21
  SubMenuProps,
22
22
  MenuItemGroupProps,
23
+ FormItemProps,
23
24
  BadgeProps,
24
25
  LinkProps,
25
26
  DialogProps,
@@ -43,7 +44,8 @@ import type {
43
44
  ElTabs,
44
45
  ElImage,
45
46
  ElScrollbar,
46
- ElTreeV2
47
+ ElTreeV2,
48
+ ElFormItem
47
49
  } from 'element-plus';
48
50
  import type { dropdownProps } from 'element-plus';
49
51
  import type { dropdownItemProps } from 'element-plus';
@@ -102,6 +104,8 @@ export type ElSubMenuProps = ComponentProps<SubMenuProps>;
102
104
 
103
105
  export type ElMenuItemGroupProps = ComponentProps<MenuItemGroupProps>;
104
106
 
107
+ export type ElFormItemProps = ComponentProps<FormItemProps>;
108
+
105
109
  export type ElBadgeProps = ComponentProps<BadgeProps>;
106
110
 
107
111
  export type ElLinkProps = ComponentProps<LinkProps>;
@@ -156,3 +160,5 @@ export type ElImageInstance = InstanceType<typeof ElImage> | null;
156
160
  export type ElScrollbarInstance = InstanceType<typeof ElScrollbar> | null;
157
161
 
158
162
  export type ElTreeV2Instance = InstanceType<typeof ElTreeV2> | null;
163
+
164
+ export type ElFormItemInstance = InstanceType<typeof ElFormItem> | null;
@@ -23,7 +23,8 @@
23
23
  border-radius: eleVar('cascader', 'item-radius');
24
24
  transition: (color $ele-transition, background-color $ele-transition);
25
25
 
26
- & > .el-checkbox {
26
+ & > .el-checkbox,
27
+ & > .el-radio {
27
28
  margin-right: 8px;
28
29
  }
29
30
 
@@ -4,16 +4,19 @@
4
4
  @mixin set-el-input-var($var) {
5
5
  .el-input,
6
6
  .el-textarea,
7
+ .el-select,
7
8
  .el-range-editor {
8
9
  @include set-ele-var('input', $var);
9
10
  @include set-ele-var('input-error', $var);
10
11
  }
11
12
 
12
- .el-input--small {
13
+ .el-input--small,
14
+ .el-select--small {
13
15
  @include set-ele-var('input-sm', $var);
14
16
  }
15
17
 
16
- .el-input--large {
18
+ .el-input--large,
19
+ .el-select--large {
17
20
  @include set-ele-var('input-lg', $var);
18
21
  }
19
22
 
@@ -6,31 +6,35 @@
6
6
 
7
7
  /* Input */
8
8
  .el-input .el-input__wrapper,
9
+ .el-textarea .el-textarea__inner,
10
+ .el-select .el-select__wrapper,
9
11
  .el-date-editor.el-range-editor.el-input__wrapper {
10
12
  border: eleVar('input', 'border');
11
13
  background: eleVar('input', 'bg');
12
14
  border-radius: eleVar('input', 'radius');
13
- padding: eleVar('input', 'padding');
15
+ padding-top: 0;
16
+ padding-bottom: 0;
17
+ padding-left: eleVar('input', 'padding-left');
18
+ padding-right: eleVar('input', 'padding-right');
14
19
  transition: all $ele-transition;
15
20
  box-sizing: border-box;
16
21
  position: relative;
17
22
  box-shadow: none;
23
+ gap: 0;
18
24
  }
19
25
 
20
26
  .el-textarea .el-textarea__inner {
21
- background: eleVar('input', 'bg');
22
- padding: eleVar('textarea', 'padding');
27
+ padding-top: eleVar('textarea', 'padding-top');
28
+ padding-bottom: eleVar('textarea', 'padding-bottom');
23
29
  min-height: elVar('component-size') !important;
24
- border-radius: eleVar('input', 'radius');
25
- border: eleVar('input', 'border');
26
- transition: all $ele-transition;
27
- box-shadow: none;
28
30
  }
29
31
 
30
32
  /* Hover */
31
33
  .el-input .el-input__wrapper:hover,
32
34
  .el-textarea .el-textarea__inner:hover,
33
35
  .el-select:not(.el-select--disabled):hover .el-input .el-input__wrapper,
36
+ .el-select .el-select__wrapper:not(.is-disabled):hover,
37
+ .el-select .el-select__wrapper:not(.is-disabled).is-hovering,
34
38
  .el-cascader:not(.is-disabled):hover .el-input .el-input__wrapper,
35
39
  .el-range-editor.el-input__wrapper:not(.is-disabled):hover,
36
40
  body .el-input-number:not(.is-disabled):hover .el-input .el-input__wrapper {
@@ -42,6 +46,7 @@ body .el-input-number:not(.is-disabled):hover .el-input .el-input__wrapper {
42
46
  /* Focus */
43
47
  .el-input .el-input__wrapper.is-focus,
44
48
  .el-textarea .el-textarea__inner:focus,
49
+ .el-select .el-select__wrapper:not(.is-disabled).is-focused,
45
50
  .el-cascader .el-input.el-input--suffix .el-input__wrapper.is-focus,
46
51
  .el-cascader .el-input.el-input--suffix.is-focus .el-input__wrapper,
47
52
  .el-range-editor.el-input__wrapper.is-active:not(.is-disabled),
@@ -79,6 +84,7 @@ body .el-input-number:not(.is-disabled) .el-input .el-input__wrapper.is-focus {
79
84
  /* 图标 */
80
85
  .el-input .el-input__wrapper .el-input__icon,
81
86
  .el-select .el-input .el-input__wrapper .el-select__icon,
87
+ .el-select .el-select__wrapper .el-select__icon,
82
88
  .el-range-editor .el-input__icon.el-range__icon,
83
89
  .el-range-editor .el-input__icon.el-range__close-icon,
84
90
  .el-input .el-input__wrapper .el-input__prefix-icon {
@@ -100,6 +106,10 @@ body .el-input-number:not(.is-disabled) .el-input .el-input__wrapper.is-focus {
100
106
  margin-left: eleVar('input', 'icon-space');
101
107
  }
102
108
 
109
+ .el-select .el-select__suffix {
110
+ gap: 0;
111
+ }
112
+
103
113
  /* 密码图标 */
104
114
  .el-input .el-input__wrapper .el-input__password {
105
115
  margin: eleVar('input', 'eye-margin');
@@ -112,6 +122,7 @@ body .el-input-number:not(.is-disabled) .el-input .el-input__wrapper.is-focus {
112
122
  /* 清空图标 */
113
123
  .el-input .el-input__wrapper .el-input__clear,
114
124
  .el-select .el-input .el-select__caret,
125
+ .el-select .el-select__wrapper .el-select__caret,
115
126
  .el-cascader .el-input__icon.icon-circle-close,
116
127
  .el-cascader .el-input__icon.icon-arrow-down,
117
128
  .el-date-editor .el-input__icon.clear-icon,
@@ -138,9 +149,13 @@ body .el-input-number:not(.is-disabled) .el-input .el-input__wrapper.is-focus {
138
149
  }
139
150
  }
140
151
 
141
- /* 状态图标 */
142
- .el-input .el-input__wrapper .el-input__validateIcon {
152
+ /* 表单验证状态图标 */
153
+ .el-input .el-input__wrapper .el-input__validateIcon,
154
+ .el-select .el-select__wrapper .el-input__validateIcon {
143
155
  margin: eleVar('input', 'status-margin');
156
+ font-size: eleVar('input', 'status-size');
157
+ background: eleVar('input', 'status-color');
158
+ border-radius: 50%;
144
159
  }
145
160
 
146
161
  .el-input .el-input__clear + .el-input__validateIcon,
@@ -149,6 +164,18 @@ body .el-input-number:not(.is-disabled) .el-input .el-input__wrapper.is-focus {
149
164
  display: none;
150
165
  }
151
166
 
167
+ .el-input__validateIcon > svg > path {
168
+ fill: none;
169
+ stroke: elVar('bg-color', 'overlay');
170
+ stroke-width: 100;
171
+ stroke-linecap: round;
172
+ #{'d'}: path('M755 364 426 700 254 529');
173
+
174
+ &:last-child {
175
+ #{'d'}: path('');
176
+ }
177
+ }
178
+
152
179
  /* 清空图标和验证失败图标修改 */
153
180
  .el-input__clear > svg > path,
154
181
  .el-input__icon.icon-circle-close > svg > path,
@@ -172,26 +199,7 @@ body .el-input-number:not(.is-disabled) .el-input .el-input__wrapper.is-focus {
172
199
  }
173
200
  }
174
201
 
175
- /* 验证通过图标修改 */
176
- .el-input .el-input__validateIcon {
177
- font-size: eleVar('input', 'status-size');
178
- background: eleVar('input', 'status-color');
179
- border-radius: 50%;
180
- }
181
-
182
- .el-input__validateIcon > svg > path {
183
- fill: none;
184
- stroke: elVar('bg-color', 'overlay');
185
- stroke-width: 100;
186
- stroke-linecap: round;
187
- #{'d'}: path('M755 364 426 700 254 529');
188
-
189
- &:last-child {
190
- #{'d'}: path('');
191
- }
192
- }
193
-
194
- /* 下拉箭头图标修改 */
202
+ /* 下拉的箭头图标修改 */
195
203
  .el-select__caret,
196
204
  .el-input__icon.icon-arrow-down {
197
205
  & > svg > path {
@@ -209,11 +217,12 @@ body .el-input-number:not(.is-disabled) .el-input .el-input__wrapper.is-focus {
209
217
  }
210
218
 
211
219
  .el-select .el-input .el-input__wrapper .el-select__caret.is-reverse,
220
+ .el-select .el-select__wrapper .el-select__caret.is-reverse,
212
221
  .el-cascader .el-input .el-input__icon.icon-arrow-down.is-reverse {
213
222
  transform: none;
214
223
  }
215
224
 
216
- /* 下拉清空图标修改 */
225
+ /* 下拉的清空图标修改 */
217
226
  .el-select__caret {
218
227
  & > svg > path[d^='m466'] {
219
228
  stroke: none;
@@ -281,10 +290,18 @@ body .el-input-number:not(.is-disabled) .el-input .el-input__wrapper.is-focus {
281
290
 
282
291
  .el-input.el-input-group.el-input-group--prepend > .el-input-group__prepend,
283
292
  .el-input.el-input-group.el-input-group--append > .el-input-group__append {
284
- & > .el-select > .select-trigger > .el-input > .el-input__wrapper {
293
+ & > .el-select > .select-trigger > .el-input > .el-input__wrapper,
294
+ & > .el-select > .el-select__wrapper {
285
295
  background: none;
286
- box-shadow: none !important;
287
296
  border-color: transparent;
297
+ box-shadow: none !important;
298
+ }
299
+ }
300
+
301
+ .el-input-group__prepend,
302
+ .el-input-group__append {
303
+ & > .el-select .el-input__validateIcon {
304
+ display: none;
288
305
  }
289
306
  }
290
307
 
@@ -292,6 +309,7 @@ body .el-input-number:not(.is-disabled) .el-input .el-input__wrapper.is-focus {
292
309
  body .el-input.is-disabled .el-input__wrapper,
293
310
  body .el-textarea.is-disabled .el-textarea__inner,
294
311
  body .el-select.el-select--disabled .el-input.is-disabled .el-input__wrapper,
312
+ .el-select .el-select__wrapper.is-disabled,
295
313
  .el-date-editor.el-range-editor.is-disabled.el-input__wrapper {
296
314
  cursor: not-allowed;
297
315
  border: eleVar('input', 'disabled-border');
@@ -301,19 +319,30 @@ body .el-select.el-select--disabled .el-input.is-disabled .el-input__wrapper,
301
319
 
302
320
  .el-input.is-disabled .el-input__wrapper .el-input__inner,
303
321
  body .el-textarea.is-disabled .el-textarea__inner,
322
+ .el-select__wrapper.is-disabled .el-select__placeholder,
304
323
  .el-range-editor.is-disabled.el-input__wrapper input {
305
324
  color: eleVar('input', 'disabled-color');
306
325
  -webkit-text-fill-color: eleVar('input', 'disabled-color');
307
326
  }
308
327
 
309
328
  /* 小尺寸 */
310
- .el-input.el-input--small .el-input__wrapper {
311
- padding: eleVar('input-sm', 'padding');
329
+ .el-input.el-input--small .el-input__wrapper,
330
+ .el-textarea.el-input--small .el-textarea__inner,
331
+ .el-select.el-select--small .el-select__wrapper {
332
+ padding-top: 0;
333
+ padding-bottom: 0;
334
+ padding-left: eleVar('input-sm', 'padding-left');
335
+ padding-right: eleVar('input-sm', 'padding-right');
312
336
  }
313
337
 
314
338
  /* 大尺寸 */
315
- .el-input.el-input--large .el-input__wrapper {
316
- padding: eleVar('input-lg', 'padding');
339
+ .el-input.el-input--large .el-input__wrapper,
340
+ .el-textarea.el-input--large .el-textarea__inner,
341
+ .el-select.el-select--large .el-select__wrapper {
342
+ padding-top: 0;
343
+ padding-bottom: 0;
344
+ padding-left: eleVar('input-lg', 'padding-left');
345
+ padding-right: eleVar('input-lg', 'padding-right');
317
346
  }
318
347
 
319
348
  /* Textarea */
@@ -329,12 +358,14 @@ body .el-textarea .el-input__count {
329
358
  }
330
359
 
331
360
  .el-textarea.el-input--small .el-textarea__inner {
332
- padding: eleVar('textarea-sm', 'padding');
361
+ padding-top: eleVar('textarea-sm', 'padding-top');
362
+ padding-bottom: eleVar('textarea-sm', 'padding-bottom');
333
363
  min-height: elVar('component-size', 'small') !important;
334
364
  }
335
365
 
336
366
  .el-textarea.el-input--large .el-textarea__inner {
337
- padding: eleVar('textarea-lg', 'padding');
367
+ padding-top: eleVar('textarea-lg', 'padding-top');
368
+ padding-bottom: eleVar('textarea-lg', 'padding-bottom');
338
369
  min-height: elVar('component-size', 'large') !important;
339
370
  }
340
371
 
@@ -357,46 +388,99 @@ body .el-textarea .el-input__count {
357
388
  }
358
389
 
359
390
  /* InputNumber */
360
- body .el-input-number.is-disabled .el-input-number__increase,
361
- body .el-input-number.is-disabled .el-input-number__decrease {
362
- color: elVar('disabled', 'text-color');
363
- border-color: elVar('disabled', 'border-color');
391
+ .el-input-number {
392
+ .el-input-number__increase,
393
+ .el-input-number__decrease {
394
+ width: elVar('component-size');
395
+ transition: color $ele-transition;
396
+ bottom: 0.8px;
397
+ top: 0.8px;
398
+ }
364
399
 
365
- &:hover {
366
- color: elVar('disabled', 'text-color');
400
+ .el-input-number__increase {
401
+ right: 0.8px;
402
+ }
403
+
404
+ .el-input-number__decrease {
405
+ left: 0.8px;
367
406
  }
368
407
  }
369
408
 
370
- .el-input-number__increase,
371
- .el-input-number__decrease {
372
- transition: color $ele-transition;
409
+ body .el-input-number.is-controls-right {
410
+ .el-input-number__increase {
411
+ bottom: auto;
412
+ }
413
+
414
+ .el-input-number__decrease {
415
+ right: 0.8px;
416
+ left: auto;
417
+ top: auto;
418
+ }
373
419
  }
374
420
 
375
421
  body .el-input-number .el-input .el-input__wrapper {
376
- padding: eleVar('input', 'padding');
377
- padding-right: calc(32px + #{eleVar('input', 'icon-space')});
378
- }
422
+ padding-top: 0;
423
+ padding-bottom: 0;
424
+ padding-left: eleVar('input', 'padding-left');
425
+ padding-right: calc(
426
+ #{elVar('component-size')} + #{eleVar('input', 'icon-space')}
427
+ );
428
+ }
429
+
430
+ .el-input-number.el-input-number--small {
431
+ .el-input-number__increase,
432
+ .el-input-number__decrease {
433
+ width: elVar('component-size', 'small');
434
+ }
379
435
 
380
- body .el-input-number--small .el-input .el-input__wrapper {
381
- padding: eleVar('input-sm', 'padding');
382
- padding-right: calc(24px + #{eleVar('input', 'icon-space')});
436
+ .el-input .el-input__wrapper {
437
+ padding-left: eleVar('input-sm', 'padding-left');
438
+ padding-right: calc(
439
+ #{elVar('component-size', 'small')} + #{eleVar('input', 'icon-space')}
440
+ );
441
+ }
383
442
  }
384
443
 
385
- body .el-input-number--large .el-input .el-input__wrapper {
386
- padding: eleVar('input-lg', 'padding');
387
- padding-right: calc(40px + #{eleVar('input', 'icon-space')});
444
+ .el-input-number.el-input-number--large {
445
+ .el-input-number__increase,
446
+ .el-input-number__decrease {
447
+ width: elVar('component-size', 'large');
448
+ }
449
+
450
+ .el-input .el-input__wrapper {
451
+ padding-left: eleVar('input-lg', 'padding-left');
452
+ padding-right: calc(
453
+ #{elVar('component-size', 'large')} + #{eleVar('input', 'icon-space')}
454
+ );
455
+ }
388
456
  }
389
457
 
390
458
  .el-input-number:not(.is-controls-right) .el-input .el-input__wrapper {
391
- padding-left: calc(32px + #{eleVar('input', 'icon-space')});
459
+ padding-left: calc(
460
+ #{elVar('component-size')} + #{eleVar('input', 'icon-space')}
461
+ );
392
462
  }
393
463
 
394
464
  .el-input-number--small:not(.is-controls-right) .el-input .el-input__wrapper {
395
- padding-left: calc(24px + #{eleVar('input', 'icon-space')});
465
+ padding-left: calc(
466
+ #{elVar('component-size', 'small')} + #{eleVar('input', 'icon-space')}
467
+ );
396
468
  }
397
469
 
398
470
  .el-input-number--large:not(.is-controls-right) .el-input .el-input__wrapper {
399
- padding-left: calc(40px + #{eleVar('input', 'icon-space')});
471
+ padding-left: calc(
472
+ #{elVar('component-size', 'large')} + #{eleVar('input', 'icon-space')}
473
+ );
474
+ }
475
+
476
+ body .el-input-number.is-disabled .el-input-number__increase,
477
+ body .el-input-number.is-disabled .el-input-number__decrease {
478
+ color: elVar('disabled', 'text-color');
479
+ border-color: elVar('disabled', 'border-color');
480
+
481
+ &:hover {
482
+ color: elVar('disabled', 'text-color');
483
+ }
400
484
  }
401
485
 
402
486
  /* 表单验证 */
@@ -404,6 +488,7 @@ body .el-input-number--large .el-input .el-input__wrapper {
404
488
  .el-input .el-input__wrapper,
405
489
  .el-textarea .el-textarea__inner,
406
490
  .el-select .select-trigger .el-input .el-input__wrapper,
491
+ .el-select .el-select__wrapper,
407
492
  .el-cascader .el-input .el-input__wrapper,
408
493
  .el-range-editor.el-input__wrapper,
409
494
  .el-input-number .el-input:not(.is-disabled) .el-input__wrapper {
@@ -415,6 +500,8 @@ body .el-input-number--large .el-input .el-input__wrapper {
415
500
  .el-input .el-input__wrapper:hover,
416
501
  .el-textarea .el-textarea__inner:hover,
417
502
  .el-select .select-trigger .el-input .el-input__wrapper:hover,
503
+ .el-select .el-select__wrapper:hover,
504
+ .el-select .el-select__wrapper.is-hovering,
418
505
  .el-cascader .el-input .el-input__wrapper:hover,
419
506
  .el-range-editor.el-input__wrapper:hover,
420
507
  .el-input-number:hover .el-input .el-input__wrapper {
@@ -425,6 +512,7 @@ body .el-input-number--large .el-input .el-input__wrapper {
425
512
 
426
513
  .el-input .el-input__wrapper.is-focus,
427
514
  .el-select .select-trigger .el-input.is-focus .el-input__wrapper,
515
+ .el-select .el-select__wrapper.is-focused,
428
516
  .el-cascader .select-trigger .el-input.is-focus .el-input__wrapper {
429
517
  border: eleVar('input-error', 'focus-border');
430
518
  background: eleVar('input-error', 'focus-bg');
@@ -442,6 +530,7 @@ body .el-input-number--large .el-input .el-input__wrapper {
442
530
  .el-input.is-disabled .el-input__wrapper,
443
531
  .el-textarea.is-disabled .el-textarea__inner,
444
532
  .el-select .select-trigger .el-input.is-disabled .el-input__wrapper,
533
+ .el-select .el-select__wrapper.is-disabled,
445
534
  .el-cascader .el-input.is-disabled .el-input__wrapper,
446
535
  .el-range-editor.el-input__wrapper.is-disabled,
447
536
  .el-input-number.is-disabled .el-input .el-input__wrapper {
@@ -34,12 +34,14 @@
34
34
  margin-top: eleVar('select', 'item-margin');
35
35
  }
36
36
 
37
- &.selected {
37
+ &.selected,
38
+ &.is-selected {
38
39
  background: eleVar('select', 'item-active-bg');
39
40
  font-weight: eleVar('select', 'item-active-font-weight');
40
41
 
41
42
  &:hover,
42
- &.hover {
43
+ &.hover,
44
+ &.is-hovering {
43
45
  background: eleVar('select', 'item-active-hover-bg');
44
46
  }
45
47
  }
@@ -49,11 +51,13 @@
49
51
  font-size: inherit;
50
52
  }
51
53
 
52
- .el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
54
+ .el-select-dropdown.is-multiple .el-select-dropdown__item.selected,
55
+ .el-select-dropdown.is-multiple .el-select-dropdown__item.is-selected {
53
56
  background: eleVar('select', 'item-active-bg');
54
57
 
55
58
  &:hover,
56
- &.hover {
59
+ &.hover,
60
+ &.is-hovering {
57
61
  background: eleVar('select', 'item-active-hover-bg');
58
62
  }
59
63
 
@@ -84,13 +88,14 @@
84
88
 
85
89
  /* 多选标签 */
86
90
  .el-select-tags-wrapper .el-tag__content,
87
- .el-select__collapse-tag .el-tag__content {
91
+ .el-select__collapse-tag .el-tag__content,
92
+ .el-select__selected-item .el-tag__content {
88
93
  display: inline-flex;
89
94
  align-items: center;
90
95
  }
91
96
 
92
97
  .el-select .el-tag__content .el-select__tags-text {
93
- line-height: 14px;
98
+ line-height: 1;
94
99
  }
95
100
 
96
101
  .el-select .el-select-tags-wrapper.has-prefix {
@@ -104,6 +109,13 @@
104
109
  left: 0;
105
110
  }
106
111
 
112
+ .el-select .el-select__selection.is-near {
113
+ gap: 0;
114
+ margin: 0 0 0 calc(0px - #{eleVar('input', 'padding-left', 12px)});
115
+ padding: 1px 0 1px 3px;
116
+ box-sizing: border-box;
117
+ }
118
+
107
119
  .el-select .el-select__tags .el-tag,
108
120
  .el-select__collapse-tags .el-select__collapse-tag .el-tag {
109
121
  flex-shrink: 0;
@@ -116,6 +128,17 @@
116
128
  margin: 0 0 0 5.8px !important;
117
129
  }
118
130
 
131
+ .el-select__selection.is-near > .el-select__selected-item,
132
+ .el-popper > .el-select__selection > .el-select__selected-item {
133
+ flex-shrink: 0;
134
+ margin: 2px 4px 2px 0;
135
+ }
136
+
137
+ .el-select__selection .el-select__selected-item > .el-tag {
138
+ height: calc(elVar('component-size') - 4px - 4px);
139
+ border: none;
140
+ }
141
+
119
142
  /* 小尺寸 */
120
143
  .el-select--small .el-select__tags .el-tag--small,
121
144
  .el-select__collapse-tags .el-select__collapse-tag .el-tag--small {
@@ -123,6 +146,20 @@
123
146
  height: calc(elVar('component-size', 'small') - 4px - 2px);
124
147
  }
125
148
 
149
+ .el-select--small .el-select__selection.is-near {
150
+ margin: 0 0 0 calc(0px - #{eleVar('input-sm', 'padding-left', 8px)});
151
+ padding: 1px 0 1px 3px;
152
+ }
153
+
154
+ .el-select--small .el-select__selection.is-near > .el-select__selected-item {
155
+ margin: 1px 4px 1px 0;
156
+ }
157
+
158
+ .el-select--small .el-select__selected-item > .el-tag,
159
+ .el-popper > .el-select__selection .el-tag--small {
160
+ height: calc(elVar('component-size', 'small') - 4px - 2px);
161
+ }
162
+
126
163
  .el-select--small .el-select__tags .el-select__input {
127
164
  margin: 0 0 0 3.8px !important;
128
165
  }
@@ -132,10 +169,19 @@
132
169
  padding: 1px 0 1px 6px;
133
170
  }
134
171
 
135
- .el-select--large .el-select__tags .el-tag {
172
+ .el-select--large .el-select__selection.is-near {
173
+ padding: 3px 0 3px 5px;
174
+ }
175
+
176
+ .el-select--large .el-select__tags .el-tag,
177
+ .el-select--large .el-select__selected-item > .el-tag {
136
178
  height: calc(elVar('component-size', 'large') - 8px - 4px);
137
179
  }
138
180
 
181
+ .el-select--large .el-select__selection.is-near {
182
+ margin: 0 0 0 calc(0px - #{eleVar('input-lg', 'padding-left', 16px)});
183
+ }
184
+
139
185
  .el-select--large .el-select__tags .el-select__input {
140
186
  margin: 0 0 0 7.8px !important;
141
187
  }
@@ -146,9 +192,12 @@
146
192
  }
147
193
 
148
194
  /* 标签溢出气泡 */
149
- .el-popper > .el-select__collapse-tags {
195
+ .el-popper > .el-select__collapse-tags,
196
+ .el-popper > .el-select__selection {
150
197
  margin: -5px -11px;
151
198
  padding: 8px 10px;
152
199
  background: inherit;
153
200
  border-radius: inherit;
201
+ box-sizing: border-box;
202
+ gap: 0;
154
203
  }
@@ -58,7 +58,8 @@
58
58
 
59
59
  /* 选中 */
60
60
  .el-tree-node > .el-tree-node__content {
61
- .el-select-dropdown__item.selected {
61
+ .el-select-dropdown__item.selected,
62
+ .el-select-dropdown__item.is-selected {
62
63
  color: eleVar('tree', 'item-active-color');
63
64
  font-weight: eleVar('tree', 'item-active-weight');
64
65
 
@@ -67,7 +68,8 @@
67
68
  }
68
69
  }
69
70
 
70
- &:hover .el-select-dropdown__item.selected::before {
71
+ &:hover .el-select-dropdown__item.selected::before,
72
+ &:hover .el-select-dropdown__item.is-selected::before {
71
73
  background: eleVar('tree', 'item-active-hover-bg');
72
74
  }
73
75
  }
@@ -81,6 +83,13 @@
81
83
  }
82
84
  }
83
85
 
86
+ /* 有复选框时去掉右侧选中图标 */
87
+ .el-tree-node.is-checked > .el-tree-node__content {
88
+ & > .el-select-dropdown__item.is-selected::after {
89
+ display: none;
90
+ }
91
+ }
92
+
84
93
  /* 禁用 */
85
94
  .el-tree-node > .el-tree-node__content .el-select-dropdown__item.is-disabled {
86
95
  color: eleVar('tree-select', 'item-disabled-color');
@@ -3,10 +3,7 @@ declare const _default: import("vue").DefineComponent<{
3
3
  footer: StringConstructor;
4
4
  bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
5
5
  bodyClass: StringConstructor;
6
- shadow: {
7
- type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "always" | "never", unknown> | undefined>;
8
- default: string;
9
- };
6
+ shadow: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "always" | "never", unknown> | undefined>;
10
7
  bordered: BooleanConstructor;
11
8
  headerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
12
9
  titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
@@ -17,17 +14,13 @@ declare const _default: import("vue").DefineComponent<{
17
14
  footer: StringConstructor;
18
15
  bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
19
16
  bodyClass: StringConstructor;
20
- shadow: {
21
- type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "always" | "never", unknown> | undefined>;
22
- default: string;
23
- };
17
+ shadow: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "always" | "never", unknown> | undefined>;
24
18
  bordered: BooleanConstructor;
25
19
  headerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
26
20
  titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
27
21
  footerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
28
22
  flexTable: BooleanConstructor;
29
23
  }>>, {
30
- shadow: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "hover" | "always" | "never", unknown> | undefined;
31
24
  bordered: boolean;
32
25
  flexTable: boolean;
33
26
  }, {}>;