element-plus 2.1.9 → 2.1.10

package/theme-chalk/src/tag.scss

@@ -21,19 +21,14 @@ $tag-icon-span-gap: map.merge(
 );
 
 @function returnVarList($var, $type: 'primary') {
-  $list: ('color', 'white');
+  $list: ('fill-color', 'blank');
   @if $var != false {
     $list: ('color', $type, $var);
   }
   @return $list;
 }
 // false mean --el-color-white
-@mixin genTheme(
-  $backgroundColorWeight,
-  $borderColorWeight,
-  $textColorWeight,
-  $hoverColorWeight
-) {
+@mixin genTheme($backgroundColorWeight, $borderColorWeight, $hoverColorWeight) {
   @include css-var-from-global(
     ('tag', 'bg-color'),
     returnVarList($backgroundColorWeight)
@@ -42,17 +37,13 @@ $tag-icon-span-gap: map.merge(
     ('tag', 'border-color'),
     returnVarList($borderColorWeight)
   );
-  @include css-var-from-global(
-    ('tag', 'text-color'),
-    returnVarList($textColorWeight)
-  );
   @include css-var-from-global(
     ('tag', 'hover-color'),
     returnVarList($hoverColorWeight)
   );
 
   @each $type in $types {
-    &.#{$namespace}-tag--#{$type} {
+    &.#{bem('tag', '', $type)} {
       @include css-var-from-global(
         ('tag', 'bg-color'),
         returnVarList($backgroundColorWeight, $type)
@@ -61,10 +52,6 @@ $tag-icon-span-gap: map.merge(
         ('tag', 'border-color'),
         returnVarList($borderColorWeight, $type)
       );
-      @include css-var-from-global(
-        ('tag', 'text-color'),
-        returnVarList($textColorWeight, $type)
-      );
       @include css-var-from-global(
         ('tag', 'hover-color'),
         returnVarList($hoverColorWeight, $type)
@@ -74,7 +61,15 @@ $tag-icon-span-gap: map.merge(
 }
 
 @include b(tag) {
-  @include genTheme('light-9', 'light-8', '', '');
+  @include genTheme('light-9', 'light-8', '');
+
+  @include css-var-from-global(('tag', 'text-color'), ('color', 'primary'));
+  @each $type in $types {
+    &.#{bem('tag', '', $type)} {
+      @include css-var-from-global(('tag', 'text-color'), ('color', $type));
+    }
+  }
+
   @include when(hit) {
     border-color: getCssVar('color', 'primary');
   }
@@ -83,7 +78,7 @@ $tag-icon-span-gap: map.merge(
   }
 
   .#{$namespace}-tag__close {
-    color: var(--el-tag-text-color);
+    color: getCssVar('tag', 'text-color');
     &:hover {
       color: var(--el-color-white);
       background-color: var(--el-tag-hover-color);
@@ -126,11 +121,20 @@ $tag-icon-span-gap: map.merge(
   }
 
   @include m(dark) {
-    @include genTheme('', '', false, 'light-3');
+    @include genTheme('', '', 'light-3');
+    @include css-var-from-global(('tag', 'text-color'), ('color', 'white'));
+
+    @include css-var-from-global(('tag', 'text-color'), ('color', 'white'));
+    @each $type in $types {
+      &.#{bem('tag', '', $type)} {
+        @include css-var-from-global(('tag', 'text-color'), ('color', 'white'));
+      }
+    }
   }
 
   @include m(plain) {
-    @include genTheme(false, 'light-5', '', '');
+    @include genTheme(false, 'light-5', '');
+    @include css-var-from-global(('tag', 'bg-color'), ('fill-color', 'blank'));
   }
 
   &.is-closable {

package/theme-chalk/src/upload.scss

@@ -314,7 +314,7 @@
     .#{bem('upload-list', 'item')} {
       overflow: hidden;
       background-color: getCssVar('fill-color', 'blank');
-      border: 1px solid #c0ccda;
+      border: 1px solid getCssVar('border-color');
       border-radius: 6px;
       box-sizing: border-box;
       width: getCssVar('upload-list', 'picture-card', 'size');
@@ -420,7 +420,7 @@
       overflow: hidden;
       z-index: 0;
       background-color: getCssVar('fill-color', 'blank');
-      border: 1px solid #c0ccda;
+      border: 1px solid getCssVar('border-color');
       border-radius: 6px;
       box-sizing: border-box;
       margin-top: 10px;

package/theme-chalk/src/virtual-list.scss

@@ -28,6 +28,9 @@
 @include b(virtual-scrollbar) {
   opacity: 0;
   transition: opacity 340ms ease-out;
+  &.always-on {
+    opacity: 1;
+  }
 }
 
 @include b(vg) {