element-plus 1.2.0-beta.6 → 1.3.0-beta.1

package/theme-chalk/src/select-v2.scss

@@ -7,8 +7,9 @@
 @use './select-dropdown-v2.scss';
 @use './option-item.scss';
 @use './option-group.scss';
+@use './select/common.scss' as *;
 
-$input-inline-start: 15px !default;
+$input-inline-start: map.get($input-padding-horizontal, 'default') !default;
 
 @include b(select-v2) {
   @include set-component-css-var('select', $select);
@@ -20,9 +21,13 @@ $input-inline-start: 15px !default;
   font-size: map.get($input-font-size, 'default');
   $selector: &;
   @include e(wrapper) {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+
     box-sizing: border-box;
     cursor: pointer;
-    padding: 5px 30px 5px 0px;
+    padding: 2px 30px 2px 0;
     border: 1px solid var(--el-border-color-base);
     border-radius: var(--el-border-radius-base);
     transition: border-color var(--el-transition-duration-fast)
@@ -80,8 +85,8 @@ $input-inline-start: 15px !default;
     }
 
     #{$selector}__input-wrapper input {
-      line-height: map.get($input-height, 'medium') - 8px;
-      height: map.get($input-height, 'medium') - 8px;
+      line-height: map.get($input-height, 'default') - 8px;
+      height: map.get($input-height, 'default') - 8px;
 
       min-width: 4px;
       width: 100%;
@@ -99,12 +104,7 @@ $input-inline-start: 15px !default;
     }
   }
 
-  .#{$namespace}-select-v2__tags-text {
-    text-overflow: ellipsis;
-    display: inline-block;
-    overflow-x: hidden;
-    vertical-align: bottom;
-  }
+  @include select-common(select-v2);
 
   @include e(empty) {
     padding: 10px 0;
@@ -122,59 +122,20 @@ $input-inline-start: 15px !default;
     );
   }
 
-  @include m(medium) {
-    @include e(wrapper) {
-      padding: 3px 30px 3px 0px;
-      &,
-      #{$selector}__input-wrapper {
-        line-height: map.get($input-height, 'medium');
-      }
-    }
-    @include e(caret) {
-      line-height: map.get($input-height, 'medium');
-    }
-    @include e(suffix) {
-      height: map.get($input-height, 'medium');
-    }
-  }
-
-  @include m(small) {
-    @include e(wrapper) {
-      padding: 3px 30px 3px 0px;
-      line-height: map.get($input-height, 'small');
-      #{$selector}__input-wrapper {
-        line-height: map.get($input-height, 'small') - 8px;
-        input {
-          line-height: map.get($input-height, 'small') - 8px;
-          height: map.get($input-height, 'small') - 8px;
+  @each $size in (large, small) {
+    @include m($size) {
+      @include e(wrapper) {
+        &,
+        #{$selector}__input-wrapper {
+          height: map.get($input-height, $size);
         }
       }
-    }
-    @include e(caret) {
-      line-height: map.get($input-height, 'small');
-    }
-    @include e(suffix) {
-      height: map.get($input-height, 'small');
-    }
-  }
-
-  @include m(mini) {
-    @include e(wrapper) {
-      padding: 1px 30px 1px 0px;
-      line-height: map.get($input-height, 'mini');
-      #{$selector}__input-wrapper {
-        line-height: map.get($input-height, 'mini') - 4px;
-        input {
-          line-height: map.get($input-height, 'mini') - 4px;
-          height: map.get($input-height, 'mini') - 4px;
-        }
+      @include e(caret) {
+        height: map.get($input-height, $size);
+      }
+      @include e(suffix) {
+        height: map.get($input-height, $size);
       }
-    }
-    @include e(caret) {
-      line-height: map.get($input-height, 'mini');
-    }
-    @include e(suffix) {
-      height: map.get($input-height, 'mini');
     }
   }
 
@@ -214,7 +175,7 @@ $input-inline-start: 15px !default;
     appearance: none;
     height: 28px;
 
-    @include when(mini) {
+    @include when(small) {
       height: 14px;
     }
   }
@@ -235,11 +196,13 @@ $input-inline-start: 15px !default;
   }
 
   @include e(suffix) {
+    display: inline-flex;
     position: absolute;
-    right: 5px;
+    right: 12px;
     height: 40px;
     top: 50%;
     transform: translateY(-50%);
+    color: var(--el-input-icon-color, map.get($input, 'icon-color'));
   }
 
   @include e(caret) {

package/theme-chalk/src/select.scss

@@ -5,6 +5,7 @@
 @use 'mixins/var' as *;
 @use 'common/var' as *;
 @use './select-dropdown.scss';
+@use './select/common.scss' as *;
 
 @include b(select) {
   @include set-component-css-var('select', $select);
@@ -23,7 +24,7 @@
     );
   }
 
-  @each $size in (medium, small, mini) {
+  @each $size in (large, small) {
     @include m($size) {
       line-height: map.get($input-height, $size);
     }
@@ -39,12 +40,7 @@
     }
   }
 
-  .#{$namespace}-select__tags-text {
-    text-overflow: ellipsis;
-    display: inline-block;
-    overflow-x: hidden;
-    vertical-align: bottom;
-  }
+  @include select-common(select);
 
   .#{$namespace}-input__inner {
     cursor: pointer;
@@ -100,10 +96,6 @@
     &.is-focus .#{$namespace}-input__inner {
       border-color: var(--el-select-input-focus-border-color);
     }
-
-    & .#{$namespace}-input__prefix-icon {
-      width: 25px;
-    }
   }
 
   @include e(input) {
@@ -116,9 +108,6 @@
     appearance: none;
     height: 28px;
     background-color: transparent;
-    @include when(mini) {
-      height: 14px;
-    }
   }
 
   @include e(close) {

package/theme-chalk/src/skeleton-item.scss

@@ -2,9 +2,7 @@
 @use 'common/var' as *;
 
 @include b(skeleton) {
-  @each $size in (small, medium, large) {
-    --el-skeleton-avatar-#{$size}-size: var(--el-avatar-#{$size}-size);
-  }
+  --el-skeleton-circle-size: var(--el-avatar-size);
 }
 
 @mixin circle-size($size) {
@@ -24,15 +22,10 @@
 
   @include e(circle) {
     border-radius: 50%;
-    @include circle-size(var(--el-skeleton-avatar-medium-size));
-
-    @include m(lg) {
-      @include circle-size(var(--el-skeleton-avatar-large-size));
-    }
 
-    @include m(md) {
-      @include circle-size(var(--el-skeleton-avatar-small-size));
-    }
+    width: var(--el-skeleton-circle-size);
+    height: var(--el-skeleton-circle-size);
+    line-height: var(--el-skeleton-circle-size);
   }
 
   @include e(button) {

package/theme-chalk/src/slider.scss

@@ -73,17 +73,13 @@
     margin-top: 3px;
     width: 130px;
 
-    &.#{$namespace}-input-number--mini {
-      margin-top: 5px;
-    }
-
-    &.#{$namespace}-input-number--medium {
-      margin-top: 0;
-    }
-
     &.#{$namespace}-input-number--large {
       margin-top: -2px;
     }
+
+    &.#{$namespace}-input-number--small {
+      margin-top: 5px;
+    }
   }
 
   @include e(bar) {
@@ -191,7 +187,7 @@
       transform: translateY(50%);
     }
     &.#{$namespace}-slider--with-input {
-      padding-bottom: #{map.get($input-height, 'medium') + 22px};
+      padding-bottom: #{map.get($input-height, 'default') + 22px};
       .#{$namespace}-slider__input {
         overflow: visible;
         float: none;

package/theme-chalk/src/table.scss

@@ -1,3 +1,5 @@
+@use 'sass:map';
+
 @use 'mixins/mixins' as *;
 @use 'mixins/var' as *;
 @use 'common/var' as *;
@@ -116,7 +118,7 @@
   }
 
   .#{$namespace}-table__cell {
-    padding: 12px 0;
+    padding: map.get($table-padding, 'default');
     min-width: 0;
     box-sizing: border-box;
     text-overflow: ellipsis;
@@ -146,23 +148,30 @@
     }
   }
 
-  @include m(medium) {
-    .#{$namespace}-table__cell {
-      padding: 10px 0;
-    }
-  }
+  .cell {
+    box-sizing: border-box;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: normal;
+    word-break: break-all;
+    line-height: 23px;
+    padding: 0 12px;
 
-  @include m(small) {
-    font-size: 12px;
-    .#{$namespace}-table__cell {
-      padding: 8px 0;
+    &.#{$namespace}-tooltip {
+      white-space: nowrap;
+      min-width: 50px;
     }
   }
 
-  @include m(mini) {
-    font-size: 12px;
-    .#{$namespace}-table__cell {
-      padding: 6px 0;
+  @each $size in (large, small) {
+    @include m($size) {
+      font-size: map.get($table-font-size, $size);
+      .#{$namespace}-table__cell {
+        padding: map.get($table-padding, $size);
+      }
+      .cell {
+        padding: map.get($table-cell-padding, $size);
+      }
     }
   }
 
@@ -222,22 +231,6 @@
     }
   }
 
-  .cell {
-    box-sizing: border-box;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: normal;
-    word-break: break-all;
-    line-height: 23px;
-    padding-left: 10px;
-    padding-right: 10px;
-
-    &.#{$namespace}-tooltip {
-      white-space: nowrap;
-      min-width: 50px;
-    }
-  }
-
   // 拥有多级表头
   @include m((group, border)) {
     border: var(--el-table-border);
@@ -280,10 +273,6 @@
 
     .#{$namespace}-table__cell {
       border-right: var(--el-table-border);
-
-      &:first-child .cell {
-        padding-left: 10px;
-      }
     }
 
     th.#{$namespace}-table__cell.gutter:last-of-type {

package/theme-chalk/src/tag.scss

@@ -8,6 +8,18 @@
   @include set-component-css-var('tag', $tag);
 }
 
+$tag-border-width: 1px;
+
+$tag-icon-span-gap: () !default;
+$tag-icon-span-gap: map.merge(
+  (
+    'large': 8px,
+    'default': 6px,
+    'small': 4px,
+  ),
+  $tag-icon-span-gap
+);
+
 @mixin genTheme(
   $backgroundColorWeight,
   $borderColorWeight,
@@ -83,32 +95,33 @@
 
 @include b(tag) {
   @include genTheme(10%, 20%, 100%, 100%);
-  display: inline-block;
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+
   height: map.get($tag-height, 'default');
-  padding: var(--el-tag-padding);
-  line-height: map.get($tag-height, 'default') - 2px;
+  padding: 0 map.get($tag-padding, 'default') - $border-width-base;
   font-size: var(--el-tag-font-size);
-  border-width: 1px;
+  line-height: 1;
+  border-width: $tag-border-width;
   border-style: solid;
   border-radius: var(--el-tag-border-radius);
   box-sizing: border-box;
   white-space: nowrap;
 
+  --el-icon-size: 14px;
+
   .#{$namespace}-icon {
     border-radius: 50%;
     text-align: center;
     position: relative;
     cursor: pointer;
-    font-size: 12px;
-    height: 16px;
-    width: 16px;
-    line-height: 16px;
-    vertical-align: middle;
-    top: -1px;
-
-    &::before {
-      display: block;
-    }
+
+    font-size: calc(var(--el-icon-size) - 2px);
+
+    height: var(--el-icon-size);
+    width: var(--el-icon-size);
+    line-height: var(--el-icon-size);
 
     svg {
       margin: 2px;
@@ -116,7 +129,7 @@
   }
 
   .#{$namespace}-tag__close {
-    right: -5px;
+    margin-left: map.get($tag-icon-span-gap, 'default');
   }
 
   @include m(dark) {
@@ -127,31 +140,30 @@
     @include genTheme(0, 40%, 100%, 100%);
   }
 
-  @each $size in (medium, small, mini) {
+  &.is-closable {
+    padding-right: map.get($tag-icon-span-gap, 'default') - $border-width-base;
+  }
+
+  @each $size in (large, small) {
     @include m($size) {
+      padding: 0 map.get($tag-padding, $size) - $tag-border-width;
       height: map.get($tag-height, $size);
-      line-height: map.get($tag-height, $size) - 2px;
-    }
-  }
 
-  @include m(medium) {
-    .#{$namespace}-icon-close {
-      transform: scale(0.8);
+      --el-icon-size: #{map.get($tag-icon-size, $size)};
+
+      .#{$namespace}-tag__close {
+        margin-left: map.get($tag-icon-span-gap, $size);
+      }
+
+      &.is-closable {
+        padding-right: map.get($tag-icon-span-gap, $size) - $border-width-base;
+      }
     }
   }
 
   @include m(small) {
-    padding: 0 8px;
     .#{$namespace}-icon-close {
       transform: scale(0.8);
     }
   }
-
-  @include m(mini) {
-    padding: 0 5px;
-    .#{$namespace}-icon-close {
-      margin-left: -3px;
-      transform: scale(0.7);
-    }
-  }
 }

package/theme-chalk/src/upload.scss

@@ -313,6 +313,7 @@
     .#{$namespace}-upload-list__item-thumbnail {
       width: 100%;
       height: 100%;
+      object-fit: contain;
     }
 
     .#{$namespace}-upload-list__item-status-label {