iov-design 2.15.56 → 2.15.58

package/packages/theme-chalk/src/cascader.scss

@@ -1,213 +1,252 @@
-@import "mixins/mixins";
-@import "common/var";
-@import "./input";
-@import "./popper";
-@import "./tag";
-@import "./cascader-panel";
-
-@include b(cascader) {
-  display: block;
-  position: relative;
-  font-size: $--input-font-size;
-  line-height: $--input-height;
-
-  &:not(.is-disabled):hover {
-    .el-input__inner {
-      cursor: pointer;
-      border-color: $--input-hover-border;
-    }
-  }
-
-  .el-input {
-    cursor: pointer;
-
-    .el-input__suffix {
-      right: 8px;
-    }
-    .el-input__inner {
-      text-overflow: ellipsis;
-
-      &:focus {
-        border-color: $--input-focus-border;
-      }
-    }
-
-    .iov-icon-arrow-up {
-      padding-right: 0;
-      color: $--color-fill-5;
-      font-size: $--select-icon-size;
-      transition: transform .3s;
-      transform: rotateZ(180deg);
-
-      @include when(reverse) {
-        transform: rotateZ(0deg);
-      }
-    }
-
-    .el-icon-circle-close:hover {
-      color: $--input-clear-hover-color;
-    }
-
-    @include when(focus) {
-      .el-input__inner {
-        border-color: $--input-focus-border;
-      }
-    }
-  }
-
-  .el-tag {
-    height: $--input-height - 8px;
-    line-height: $--input-height - 8px;
-  }
-
-  @include m(medium) {
-    font-size: $--input-medium-font-size;
-    line-height: $--input-medium-height;
-    .el-tag--medium {
-      height: $--input-medium-height - 8px;
-      line-height: $--input-medium-height - 8px;
-    }
-  }
-
-  @include m(small) {
-    font-size: $--input-small-font-size;
-    line-height: $--input-small-height;
-    .el-tag--small {
-      height: $--input-small-height - 8px;
-      line-height: $--input-small-height - 8px;
-    }
-  }
-
-  @include m(mini) {
-    font-size: $--input-mini-font-size;
-    line-height: $--input-mini-height;
-    .el-tag--mini {
-      height: $--input-mini-height - 8px;
-      line-height: $--input-mini-height - 8px;
-    }
-  }
-
-  @include when(disabled) {
-    .el-cascader__label {
-      z-index: #{$--index-normal + 1};
-      color: $--disabled-color-base;
-    }
-  }
-
-  @include e(dropdown) {
-    margin: 4px 0;
-    font-size: $--cascader-menu-font-size;
-    background: $--cascader-menu-fill;
-    border: $--cascader-menu-border;
-    border-radius: $--cascader-menu-radius;
-    box-shadow: $--cascader-menu-shadow;
-    .popper__arrow {
-      display: none;
-    }
-  }
-
-  @include e(tags) {
-    position: absolute;
-    left: 0;
-    right: 30px;
-    top: 50%;
-    transform: translateY(-50%);
-    display: flex;
-    flex-wrap: wrap;
-    line-height: normal;
-    text-align: left;
-    box-sizing: border-box;
-    z-index: 3;
-    align-items: center;
-    // pointer-events: none;
-
-    .el-tag {
-      display: inline-flex;
-      align-items: center;
-      max-width: 100%;
-      margin: 2px 6px 2px 0;
-      text-overflow: ellipsis;
-      color: $--color-text-6;
-      pointer-events: auto;
-
-      &.is-disabled {
-        color: $--color-text-3;
-        background: $--color-fill-3;
-      }
-
-      &:not(.is-hit) {
-        border-color: transparent;
-      }
-
-      > span {
-        flex: 1;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      .iov-icon-close {
-        flex: none;
-      }
-    }
-  }
-
-  @include e(suggestion-panel) {
-    border-radius: $--cascader-menu-radius;
-  }
-
-  @include e(suggestion-list) {
-    max-height: 204px;
-    margin: 0;
-    padding: 4px;
-    font-size: $--font-size-base;
-    color: $--cascader-menu-font-color;
-    text-align: center;
-  }
-
-  @include e(suggestion-item) {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    height: 32px;
-    padding: 0 12px;
-    text-align: left;
-    outline: none;
-    cursor: pointer;
-    border-radius: 2px;
-
-    &:hover, &:focus {
-      background: $--cascader-node-background-hover;
-    }
-
-    &.is-checked {
-      color: $--cascader-menu-selected-font-color;
-      font-weight: 500;
-      background: $--color-primary-1;
-    }
-
-    > span {
-      margin-right: 10px;
-    }
-  }
-
-  @include e(empty-text) {
-    margin: 8px 0;
-    color: $--cascader-color-empty;
-  }
-
-  @include e(search-input) {
-    flex: 1;
-    height: 24px;
-    min-width: 10px;
-    margin: 2px 0;
-    padding: 0;
-    color: $--cascader-menu-font-color;
-    border: none;
-    outline: none;
-    box-sizing: border-box;
-
-    &::placeholder {
-      color: $--color-text-placeholder;
-    }
-  }
-}
+@import "mixins/mixins";
+@import "common/var";
+@import "./input";
+@import "./popper";
+@import "./tag";
+@import "./cascader-panel";
+
+@include b(cascader) {
+  display: block;
+  position: relative;
+  font-size: $--input-font-size;
+  line-height: $--input-height;
+
+  &:not(.is-disabled):hover {
+    .el-input__inner {
+      cursor: pointer;
+      border-color: $--input-hover-border;
+    }
+  }
+
+  .el-input {
+    cursor: pointer;
+
+    .el-input__suffix {
+      right: 8px;
+    }
+    .el-input__inner {
+      text-overflow: ellipsis;
+
+      &:focus {
+        border-color: $--input-focus-border;
+      }
+    }
+
+    .iov-icon-arrow-up {
+      padding-right: 0;
+      color: $--color-fill-5;
+      font-size: $--select-icon-size;
+      transition: transform .3s;
+      transform: rotateZ(180deg);
+
+      @include when(reverse) {
+        transform: rotateZ(0deg);
+      }
+    }
+
+    .el-icon-circle-close:hover {
+      color: $--input-clear-hover-color;
+    }
+
+    @include when(focus) {
+      .el-input__inner {
+        border-color: $--input-focus-border;
+      }
+    }
+  }
+
+  .el-tag {
+    height: $--input-height - 8px;
+    line-height: $--input-height - 8px;
+  }
+
+  @include m(medium) {
+    font-size: $--input-medium-font-size;
+    line-height: $--input-medium-height;
+    .el-tag--medium {
+      height: $--input-medium-height - 8px;
+      line-height: $--input-medium-height - 8px;
+      &.el-cascader__tags-count-fixed {
+        min-width: $--input-medium-height - 8px;
+      }
+    }
+  }
+
+  @include m(small) {
+    font-size: $--input-small-font-size;
+    line-height: $--input-small-height;
+    .el-tag--small {
+      height: $--input-small-height - 8px;
+      line-height: $--input-small-height - 8px;
+      &.el-cascader__tags-count-fixed {
+        min-width: $--input-small-height - 8px;
+      }
+    }
+  }
+
+  @include m(mini) {
+    font-size: $--input-mini-font-size;
+    line-height: $--input-mini-height;
+    .el-tag--mini {
+      height: $--input-mini-height - 8px;
+      line-height: $--input-mini-height - 8px;
+      &.el-cascader__tags-count-fixed {
+        min-width: $--input-mini-height - 8px;
+      }
+    }
+  }
+
+  @include when(disabled) {
+    .el-cascader__label {
+      z-index: #{$--index-normal + 1};
+      color: $--disabled-color-base;
+    }
+  }
+
+  @include e(dropdown) {
+    margin: 4px 0;
+    font-size: $--cascader-menu-font-size;
+    background: $--cascader-menu-fill;
+    border: $--cascader-menu-border;
+    border-radius: $--cascader-menu-radius;
+    box-shadow: $--cascader-menu-shadow;
+    .popper__arrow {
+      display: none;
+    }
+  }
+
+  @include e(tags) {
+    position: absolute;
+    left: 0;
+    right: 30px;
+    top: 50%;
+    transform: translateY(-50%);
+    display: flex;
+    flex-wrap: wrap;
+    line-height: normal;
+    text-align: left;
+    box-sizing: border-box;
+    z-index: 3;
+    align-items: center;
+    // pointer-events: none;
+
+    .el-cascader__tags-count-fixed {
+      min-width: $--input-height - 8px;
+      border-radius: 50%;
+      text-align: center;
+      position: absolute;
+      right: 0;
+      justify-content: center;
+    }
+    .el-tag {
+      box-sizing: border-box;
+      border-color: transparent;
+      margin: 2px 0 2px 4px;
+      padding: 0 6px;
+      border-radius: 2px;
+      display: flex;
+      max-width: 100%;
+      align-items: center;
+      pointer-events: auto;
+      &.el-cascader__tags-count-fixed {
+        border-radius: 50%;
+      }
+      &.el-tag--info {
+        background: $--color-fill-2;
+        color: $--color-text-6;
+        border: 0 none;
+        &.is-disabled {
+          background: $--color-fill-3;
+        }
+      }
+      // display: inline-flex;
+      // align-items: center;
+      // max-width: 100%;
+      // padding: 0 6px;
+      // margin: 2px 4px 2px 0;
+      // border-radius: 2px;
+      // text-overflow: ellipsis;
+      // color: $--color-text-6;
+      // pointer-events: auto;
+
+      // &.is-disabled {
+      //   color: $--color-text-3;
+      //   background: $--color-fill-3;
+      // }
+
+      // &:not(.is-hit) {
+      //   border-color: transparent;
+      // }
+
+      // > span {
+      //   flex: 1;
+      //   overflow: hidden;
+      //   text-overflow: ellipsis;
+      // }
+
+      // .iov-icon-close {
+      //   flex: none;
+      // }
+    }
+  }
+
+  @include e(suggestion-panel) {
+    border-radius: $--cascader-menu-radius;
+  }
+
+  @include e(suggestion-list) {
+    max-height: 204px;
+    margin: 0;
+    padding: 4px;
+    font-size: $--font-size-base;
+    color: $--cascader-menu-font-color;
+    text-align: center;
+  }
+
+  @include e(suggestion-item) {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: 32px;
+    padding: 0 12px;
+    text-align: left;
+    outline: none;
+    cursor: pointer;
+    border-radius: 2px;
+
+    &:hover, &:focus {
+      background: $--cascader-node-background-hover;
+    }
+
+    &.is-checked {
+      color: $--cascader-menu-selected-font-color;
+      font-weight: 500;
+      background: $--color-primary-1;
+    }
+
+    > span {
+      margin-right: 10px;
+    }
+  }
+
+  @include e(empty-text) {
+    margin: 8px 0;
+    color: $--cascader-color-empty;
+  }
+
+  @include e(search-input) {
+    flex: 1;
+    height: 24px;
+    min-width: 10px;
+    margin: 2px 0;
+    padding: 0;
+    color: $--cascader-menu-font-color;
+    border: none;
+    outline: none;
+    box-sizing: border-box;
+
+    &::placeholder {
+      color: $--color-text-placeholder;
+    }
+  }
+}

package/packages/theme-chalk/src/date-picker/picker.scss

@@ -94,7 +94,7 @@
     text-align: center;
     font-size: $--input-font-size;
     align-items: center;
-    color: $--input-font-color;
+    color: $--color-fill-5;
   }
 }
 

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

@@ -23,6 +23,60 @@
     }
   }
 
+  &.is-fill {
+    background: $--color-fill-1;
+    border-radius: 4px;
+    .el-input-group--prefix,
+    .el-input-group--suffix {
+      background: $--color-fill-1;
+      border-color: $--color-fill-1;
+      &:hover,
+      &.is-focus {
+        border-color: $--input-focus-border;
+      }
+      &.is-disabled {
+        border-color: $--color-fill-1;
+      }
+    }
+    .el-input__inner {
+      background: $--color-fill-1;
+      border-color: $--color-fill-1;
+    }
+    .el-input {
+      &.is-focus {
+        .el-input__suffix,
+        .el-input__inner,
+        .el-input-group--prefix,
+        .el-input-group--suffix {
+          background: #fff;
+          border-color: $--input-focus-border;
+        }
+        .el-input-group--prefix,
+        .el-input-group--suffix {
+          box-shadow: $--input-box-shadow;
+        }
+      }
+    }
+    .el-input__suffix {
+      background: $--color-fill-1;
+    }
+    &:hover {
+      .el-input__inner {
+        border-color: $--select-border-color-hover;
+      }
+    }
+    .el-select__tags {
+      &.is-focus {
+        .el-tag.el-tag--info {
+          background: $--color-fill-2;
+        }
+      }
+    }
+    .el-tag.el-tag--info {
+      background: #fff;
+    }
+  }
+
   .el-input__inner {
     cursor: pointer;
     padding-right: 35px;
@@ -168,6 +222,7 @@
     border-color: transparent;
     margin: 2px 0 2px 4px;
     padding: 0 6px;
+    border-radius: 2px;
     display: flex;
     max-width: 100%;
     align-items: center;
@@ -176,6 +231,7 @@
     line-height: $--input-height - 8px;
     &.el-select__tags-count-fixed {
       min-width: $--input-height - 8px;
+      border-radius: 50%;
     }
     &.el-tag--info {
       background: $--color-fill-2;

package/packages/theme-chalk/src/table.scss

@@ -39,6 +39,7 @@
 
   // 跨页选择
   @include e(cross-page-selection) {
+    margin-left: 2px;
     .iov-icon-arrow-down {
       color: $--color-fill-4;
       cursor: pointer;
@@ -144,6 +145,14 @@
     position: relative;
     text-align: left;
 
+    @include when(top) {
+      vertical-align: top;
+    }
+
+    @include when(bottom) {
+      vertical-align: bottom;
+    }
+
     @include when(center) {
       text-align: center;
     }
@@ -306,7 +315,7 @@
 
     .has-gutter {
       .el-table__cell {
-        border-bottom: 0 none;
+        // border-bottom: 0 none;
         &:nth-last-child(2) {
           border-right: 0 none;
         }

package/src/index.js

@@ -212,7 +212,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '2.15.56',
+  version: '2.15.58',
   locale: locale.use,
   i18n: locale.i18n,
   install,