amis-ui 6.9.0-rc.2 → 6.9.0-rc.3

package/scss/components/_json-schema-editor.scss

@@ -134,16 +134,14 @@
   &-info {
     min-width: 0;
     min-height: 0;
-
-    @include input-input();
-    @include input-border();
-
     flex: 1;
-
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
+
+    @include input-input();
+    @include input-border();
   }
   &-typeLabel {
     color: var(--Form-input-placeholderColor);

package/scss/components/_result-box.scss

@@ -1,6 +1,4 @@
 .#{$ns}ResultBox {
-  @include input-input();
-  @include input-border();
   flex-wrap: nowrap;
   padding: 0 px2rem(12px);
   min-height: var(--Form-input-height);
@@ -24,6 +22,8 @@
     var(--select-base-default-paddingBottom)
     var(--select-base-default-paddingLeft);
 
+  @include input-input();
+  @include input-border();
   &.is-error {
     border-color: var(--Form-input-onError-borderColor);
     background: var(--Form-input-onError-bg);

package/scss/components/_tag.scss

@@ -26,14 +26,13 @@
   }
 
   &--normal {
-    &--hasColor {
-      color: var(--white);
-    }
-
     border-width: var(--Tag-normal-borderWidth);
     border-radius: var(--Tag-normal-borderRadius);
     border-color: var(--Tag-normal-borderColor);
 
+    &--hasColor {
+      color: var(--white);
+    }
     &--inactive {
       color: var(--Tag-inactive-color);
       background: var(--Tag-inactive-bg-color);

package/scss/components/_toast.scss

@@ -59,12 +59,6 @@
   justify-content: space-between;
   align-items: flex-start;
 
-  &-wrap {
-    pointer-events: none;
-    position: fixed;
-    z-index: $zindex-toast;
-  }
-
   max-width: var(--Toast-width);
   pointer-events: auto;
   margin-bottom: var(--gap-xs);
@@ -83,6 +77,12 @@
   transform: translateZ(0);
   width: px2rem(400px);
 
+  &-wrap {
+    pointer-events: none;
+    position: fixed;
+    z-index: $zindex-toast;
+  }
+
   &.in,
   &.out {
     animation-fill-mode: both;

package/scss/components/form/_image.scss

@@ -26,20 +26,6 @@
     cursor: pointer;
     margin-right: var(--gap-base);
 
-    &-bg {
-      position: absolute;
-      z-index: 0;
-      overflow: hidden;
-      left: 0;
-      right: 0;
-      top: 0;
-      bottom: 0;
-
-      .#{$ns}Image {
-        border: 0;
-      }
-    }
-
     @include button-variant(
       var(--ImageControl-addBtn-bg),
       var(--ImageControl-addBtn-color),
@@ -103,6 +89,20 @@
       var(--shadows-shadow-none)
     );
 
+    &-bg {
+      position: absolute;
+      z-index: 0;
+      overflow: hidden;
+      left: 0;
+      right: 0;
+      top: 0;
+      bottom: 0;
+
+      .#{$ns}Image {
+        border: 0;
+      }
+    }
+
     svg {
       top: 0;
       margin-bottom: var(--inputImage-base-default-icon-margin);

package/scss/components/form/_list.scss

@@ -122,14 +122,6 @@
       border-color: var(--ListControl-item-onActive-borderColor);
       color: var(--ListControl-item-onActive-color);
 
-      &:hover {
-        background: var(--ListControl-item-onActive-onHover-bg);
-      }
-
-      .b-inherit {
-        border-color: var(--ListControl-item-onActive-color);
-      }
-
       border-width: var(--listSelect-base-active-top-border-width)
         var(--listSelect-base-active-right-border-width)
         var(--listSelect-base-active-bottom-border-width)
@@ -148,6 +140,14 @@
         var(--listSelect-base-active-bottom-left-border-radius);
       background: var(--listSelect-base-active-bg-color);
 
+      &:hover {
+        background: var(--ListControl-item-onActive-onHover-bg);
+      }
+
+      .b-inherit {
+        border-color: var(--ListControl-item-onActive-color);
+      }
+
       &:before {
         content: '';
         position: absolute;

package/scss/components/form/_picker.scss

@@ -1,6 +1,6 @@
 .#{$ns}Picker {
-  @include input-text();
   outline: none;
+  @include input-text();
 
   &-input:hover {
     background: var(--Pick-status-hover-bgColor);

package/scss/components/form/_select.scss

@@ -45,9 +45,6 @@
     }
   }
 
-  &--block {
-    display: flex;
-  }
   vertical-align: middle;
   text-align: left;
   align-items: center;
@@ -72,6 +69,10 @@
   color: var(--Form-select-color);
   transition: all var(--animation-duration) ease-in-out;
 
+  &--block {
+    display: flex;
+  }
+
   &:hover {
     background: var(--Form-select-onHover-bg);
     border-width: var(--select-base-hover-top-border-width)

package/scss/components/form/_textarea.scss

@@ -1,9 +1,9 @@
 .#{$ns}TextareaControl {
-  @include input-text();
   --Form-input-clearBtn-padding: #{px2rem(2px)};
-
   position: relative;
 
+  @include input-text();
+
   > textarea.#{$ns}TextareaControl-input--counter {
     // 23 px 是计数器 counter 的高度
     padding-bottom: px2rem(23px);
@@ -12,8 +12,6 @@
   }
 
   > textarea {
-    @include input-border();
-
     border: 1px solid var(--Form-input-borderColor);
     border-radius: var(--Form-input-borderRadius);
     color: var(--colors-neutral-text-2);
@@ -27,6 +25,8 @@
     outline: none;
     resize: vertical;
 
+    @include input-border();
+
     &::placeholder {
       color: var(--Form-input-placeholderColor);
     }

package/scss/components/form/_tree-select.scss

@@ -15,8 +15,8 @@
 }
 
 .#{$ns}TreeSelect {
-  @include input-text();
   outline: none;
+  @include input-text();
 
   &.is-opened {
     border-color: var(--Form-input-onFocused-borderColor);