amis-ui 6.13.0-beta.9 → 6.13.0

package/scss/_components.scss

@@ -1664,7 +1664,7 @@
   --Form-item-color: var(--colors-neutral-text-4);
   --Form-item-fontSize: var(--fonts-size-7);
   --Form-item-fontWeight: var(--fonts-weight-6);
-  --Form-item-lineHeight: var(--fonts-lineHeight-1);
+  --Form-item-lineHeight: var(--fonts-lineHeight-2);
   --Form-item-star-color: var(--colors-error-5);
   --Form-item-star-size: var(--sizes-size-7);
   --Form-description-color: var(--colors-neutral-text-5);
@@ -2874,7 +2874,7 @@
   --select-multiple-paddingLeft: var(--sizes-size-3);
   --select-multiple-paddingRight: var(--sizes-size-3);
   --select-multiple-marginTop: var(--sizes-size-0);
-  --select-multiple-marginBottom: var(--sizes-size-0);
+  --select-multiple-marginBottom: var(--sizes-size-3);
   --select-multiple-marginLeft: var(--sizes-size-0);
   --select-multiple-marginRight: var(--sizes-size-3);
   --select-multiple-color: var(--colors-neutral-text-2);
@@ -2970,17 +2970,14 @@
   --Form-selectValue-borderColor: var(--colors-brand-7);
   --Form-selectValue-color: var(--colors-brand-5);
   --Form-selectValue-fontSize: var(--select-multiple-fontSize);
-  --Form-selectValue-onDisable-bg: #{color.adjust(
-      color.adjust(color.adjust($info, $lightness: 40%), $saturation: 2.5%),
-      $lightness: 5%
-    )};
+  --Form-selectValue-onDisable-bg: var(--colors-neutral-fill-10);
   --Form-selectValue-onHover-bg: #{color.adjust(
       color.adjust(color.adjust($info, $lightness: 40%), $saturation: 2.5%),
       $lightness: -5%
     )};
   --Form-selectValue-onDisabled-color: var(--Form-select-caret-iconColor);
   --Form-selectValue-onInvalid-color: var(--danger);
-  --Form-valueLabel-maxWidth: #{px2rem(120px)};
+  --Form-valueLabel-maxWidth: #{px2rem(200px)};
   --Form-select-onFocus-boxShadow: none;
   --ResultBox-tag-height: #{px2rem(22px)};
   --ResultBox-tag-marginBottom: var(--select-multiple-marginBottom);

package/scss/_mixins.scss

@@ -687,6 +687,7 @@
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    flex-shrink: 0;
 
     &:hover {
       background: var(--Form-selectValue-onHover-bg);

package/scss/_properties.scss

@@ -395,7 +395,7 @@ $Table-strip-bg: transparent;
       ) / 2
   );
   --InputGroup-select-arrowColor: var(--colors-neutral-text-5);
-  --InputGroup-select-bg: var(--colors-neutral-fill-11);
+  --InputGroup-select-bg: var(--colors-neutral-fill-10);
   --InputGroup-select-borderColor: var(--borderColor);
   --InputGroup-select-borderRadius: var(--borders-radius-3);
   --InputGroup-select-borderWidth: var(--borders-width-2);

package/scss/components/_auto-folder.scss

@@ -0,0 +1,40 @@
+.#{$ns}AutoFoldedList {
+  white-space: nowrap !important;
+  flex-wrap: nowrap !important;
+
+  &-more {
+    display: inline-block;
+
+    &:empty {
+      display: none;
+    }
+
+    > span {
+      user-select: none;
+      cursor: pointer;
+      line-height: calc(
+        var(--Form-input-lineHeight) * var(--Form-input-fontSize) - #{px2rem(
+            2px
+          )}
+      );
+      display: inline-block;
+      vertical-align: middle;
+      font-size: var(--Form-selectValue-fontSize);
+      font-weight: var(--select-multiple-fontWeight);
+      color: var(--select-multiple-color);
+      background: var(--Form-select-value-bgColor);
+      border: px2rem(1px) solid var(--Form-select-value-borderColor);
+      border-radius: var(--select-multiple-top-left-border-radius)
+        var(--select-multiple-top-right-border-radius)
+        var(--select-multiple-bottom-right-border-radius)
+        var(--select-multiple-bottom-left-border-radius);
+      padding: var(--select-multiple-paddingTop)
+        var(--select-multiple-paddingRight) var(--select-multiple-paddingBottom)
+        var(--select-multiple-paddingLeft);
+
+      &:hover {
+        background-color: var(--Form-selectValue-onHover-bgColor);
+      }
+    }
+  }
+}

package/scss/components/_cascader.scss

@@ -81,7 +81,11 @@
       flex: 1;
       min-width: 0;
       min-height: 0;
-      white-space: nowrap;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      line-clamp: 2;
+      box-orient: vertical;
       overflow: hidden;
       text-overflow: ellipsis;
       user-select: none;
@@ -91,12 +95,28 @@
       }
     }
 
-    &-arrow {
+    & > .#{$ns}Checkbox {
       flex: 1;
       min-width: 0;
+      display: flex;
+      flex-direction: row;
+      margin: 0;
+      align-items: center;
+      justify-content: flex-start;
+
+      > i + span {
+        flex: 1;
+        min-width: 0;
+      }
+    }
+
+    &-arrow {
+      flex-shrink: 0;
+      min-width: 0;
       min-height: 0;
       text-align: right;
       padding-right: px2rem(6px);
+      width: 20px;
       > svg {
         transform: scale(0.8);
         transition: transform var(--animation-duration);

package/scss/components/_condition-builder.scss

@@ -79,6 +79,7 @@
 
       &-valueWrap {
         padding-right: 0;
+        justify-content: center;
       }
 
       &-arrow {

package/scss/components/_crud.scss

@@ -14,6 +14,38 @@
     gap: var(--gap-xs);
     line-height: 1;
 
+    > .#{$ns}AutoFoldedList-more > span {
+      line-height: calc(
+        var(--Form-input-lineHeight) * var(--Form-input-fontSize) - #{px2rem(
+            2px
+          )}
+      );
+      font-size: var(--Pick-base-value-fontSize);
+      color: var(--Pick-base-value-color);
+      font-weight: var(--Pick-base-value-fontWeight);
+      background: var(--Pick-base-value-bgColor);
+      border-width: var(--Pick-base-value-top-border-width)
+        var(--Pick-base-value-right-border-width)
+        var(--Pick-base-value-bottom-border-width)
+        var(--Pick-base-value-left-border-width);
+      border-style: var(--Pick-base-value-top-border-style)
+        var(--Pick-base-value-right-border-style)
+        var(--Pick-base-value-bottom-border-style)
+        var(--Pick-base-value-left-border-style);
+      border-color: var(--Pick-base-value-top-border-color)
+        var(--Pick-base-value-right-border-color)
+        var(--Pick-base-value-bottom-border-color)
+        var(--Pick-base-value-left-border-color);
+      border-radius: var(--Pick-base-top-left-border-radius)
+        var(--Pick-base-top-right-border-radius)
+        var(--Pick-base-bottom-right-border-radius)
+        var(--Pick-base-bottom-left-border-radius);
+
+      &:hover {
+        background: var(--Form-selectValue-onHover-bg);
+      }
+    }
+
     &-overflow {
       &-wrapper {
         display: flex;

package/scss/components/_modal.scss

@@ -64,6 +64,12 @@
       animation-name: modalOut;
     }
   }
+  &-fullScreen {
+    width: 100% !important;
+    height: 100% !important;
+    max-width: 100% !important;
+    margin: auto;
+  }
 
   &-draggable > &-header {
     cursor: move;
@@ -97,6 +103,10 @@
     border-bottom: var(--Modal-body-borderTop);
     border-top-left-radius: var(--Modal-content-borderRadius);
     border-top-right-radius: var(--Modal-content-borderRadius);
+    &-icons {
+      position: absolute;
+      right: 24px;
+    }
   }
 
   &-title {
@@ -138,6 +148,9 @@
       }
     }
   }
+  &-screen {
+    margin-right: #{px2rem(16px)};
+  }
 
   &-content > &-close {
     position: absolute;

package/scss/components/_page.scss

@@ -1,6 +1,5 @@
 .#{$ns}Page {
   width: 100%;
-  height: 100%;
   background: var(--Page-main-bg);
   display: flex;
   flex-direction: row;

package/scss/components/_pagination.scss

@@ -178,7 +178,7 @@
     }
     &-right {
       display: inline-block;
-      width: px2rem(32px);
+      min-width: px2rem(32px);
       height: var(--Pagination-height);
       line-height: var(--Pagination-height);
       border: var(--borderWidth) solid var(--borderColor);
@@ -299,7 +299,6 @@
     .#{$ns}Pagination-simplego {
       &-input {
         min-width: px2rem(32px);
-        width: px2rem(32px);
       }
     }
   }

package/scss/components/_result-box.scss

@@ -1,5 +1,4 @@
 .#{$ns}ResultBox {
-  flex-wrap: nowrap;
   padding: 0 px2rem(12px);
   min-height: var(--Form-input-height);
   align-items: center;
@@ -24,6 +23,13 @@
 
   @include input-input();
   @include input-border();
+
+  flex-wrap: nowrap;
+
+  input {
+    flex-shrink: 0;
+  }
+
   &.is-error {
     border-color: var(--Form-input-onError-borderColor);
     background: var(--Form-input-onError-bg);
@@ -121,6 +127,14 @@
     display: flex;
     align-items: center;
     flex-wrap: wrap;
+    gap: var(--sizes-size-3);
+
+    > .#{$ns}AutoFoldedList {
+      flex-grow: 5;
+      display: flex;
+      align-items: center;
+      gap: var(--sizes-size-3);
+    }
   }
 
   &-actions {
@@ -197,8 +211,6 @@
     padding: var(--select-multiple-paddingTop)
       var(--select-multiple-paddingRight) var(--select-multiple-paddingBottom)
       var(--select-multiple-paddingLeft);
-    margin: var(--select-multiple-marginTop) var(--select-multiple-marginRight)
-      var(--ResultBox-tag-marginBottom) var(--select-multiple-marginLeft);
     user-select: none;
     border-radius: var(--select-multiple-top-left-border-radius)
       var(--select-multiple-top-right-border-radius)

package/scss/components/form/_combo.scss

@@ -70,6 +70,19 @@
     margin-bottom: var(--Combo-items-marginBottom);
   }
 
+  &-toolbar {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    &:empty {
+      display: none;
+    }
+  }
+
+  // &-pager {
+
+  // }
+
   &-item {
     background: var(--combo-bg-color);
   }

package/scss/components/form/_form.scss

@@ -285,7 +285,20 @@
         margin: 0;
         margin-right: var(--Form--horizontal-label-gap);
         flex-shrink: 0;
-
+        .#{$ns}Form-ellipsis {
+          max-width: 100%;
+          display: inline-block;
+          .fr-view span{
+            max-width: 100%;
+            display: inline-block;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+          .#{$ns}Remark{
+            margin-top: px2rem(-24px);
+          }
+        }
         .#{$ns}Form-star {
           position: absolute;
           left: px2rem(-6px);

package/scss/components/form/_icon-picker.scss

@@ -18,6 +18,7 @@
     white-space: nowrap;
     width: 100%;
     position: relative;
+    display: flex;
 
     > input {
       display: inline-block;

package/scss/components/form/_input-group.scss

@@ -87,6 +87,7 @@
     flex-grow: 1;
     min-width: 0;
     display: inline-flex;
+    margin: 0;
 
     &:not(:first-child) {
       border-top-left-radius: 0;
@@ -101,7 +102,28 @@
     }
   }
 
-  .#{$ns}SelectControl {
+  .#{$ns}MixedInput-input {
+    flex-basis: 0;
+    flex-grow: 1;
+    min-width: 0;
+    display: inline-flex;
+    margin: 0;
+
+    &:not(:first-child) > * {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
+      border-left: none;
+    }
+
+    &:not(:last-child) > * {
+      border-right-width: 0;
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+    }
+  }
+
+  .#{$ns}SelectControl,
+  .#{$ns}MixedInput-select {
     .#{$ns}Select {
       background: var(--InputGroup-select-bg);
       border: var(--InputGroup-select-borderWidth) solid
@@ -116,7 +138,6 @@
     &:first-child .#{$ns}Select {
       border-top-left-radius: var(--InputGroup-select-borderRadius);
       border-bottom-left-radius: var(--InputGroup-select-borderRadius);
-      background-color: var(--colors-neutral-fill-10);
     }
 
     &:last-child .#{$ns}Select {

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

@@ -14,6 +14,12 @@
 
   &.is-mobile {
     text-align: right;
+
+    .#{$ns}ResultBox-value-wrap {
+      min-width: 0;
+      flex-wrap: wrap !important;
+      flex: 1;
+    }
   }
 
   &-optionArrowRight {
@@ -86,6 +92,10 @@
       color: var(--select-base-default-option-color);
       background: var(--select-base-default-option-bg-color);
 
+      & > .#{$ns}Checkbox {
+        margin: 0;
+      }
+
       > .#{$ns}NestedSelect-optionLabel {
         min-width: 0;
         min-height: 0;

package/scss/components/form/_picker.scss

@@ -107,6 +107,7 @@
 
   &-valueWrap {
     flex-grow: 1;
+    min-width: 0;
     position: relative;
     padding: var(--Form-input-paddingY) var(--Form-input-paddingX);
 
@@ -114,6 +115,38 @@
       width: px2rem(16px);
       display: inline-block;
     }
+
+    > .#{$ns}AutoFoldedList-more > span {
+      line-height: calc(
+        var(--Form-input-lineHeight) * var(--Form-input-fontSize) - #{px2rem(
+            2px
+          )}
+      );
+      font-size: var(--Pick-base-value-fontSize);
+      color: var(--Pick-base-value-color);
+      font-weight: var(--Pick-base-value-fontWeight);
+      background: var(--Pick-base-value-bgColor);
+      border-width: var(--Pick-base-value-top-border-width)
+        var(--Pick-base-value-right-border-width)
+        var(--Pick-base-value-bottom-border-width)
+        var(--Pick-base-value-left-border-width);
+      border-style: var(--Pick-base-value-top-border-style)
+        var(--Pick-base-value-right-border-style)
+        var(--Pick-base-value-bottom-border-style)
+        var(--Pick-base-value-left-border-style);
+      border-color: var(--Pick-base-value-top-border-color)
+        var(--Pick-base-value-right-border-color)
+        var(--Pick-base-value-bottom-border-color)
+        var(--Pick-base-value-left-border-color);
+      border-radius: var(--Pick-base-top-left-border-radius)
+        var(--Pick-base-top-right-border-radius)
+        var(--Pick-base-bottom-right-border-radius)
+        var(--Pick-base-bottom-left-border-radius);
+
+      &:hover {
+        background: var(--Form-selectValue-onHover-bg);
+      }
+    }
   }
 
   .#{$ns}Picker-valueWrap {

package/scss/components/form/_select.scss

@@ -6,6 +6,7 @@
     .#{$ns}Select-value {
       position: static;
       white-space: normal;
+      flex-shrink: 0;
       user-select: none;
       line-height: calc(
         var(--Form-input-lineHeight) * var(--Form-input-fontSize) - #{px2rem(
@@ -26,11 +27,12 @@
       padding: var(--select-multiple-paddingTop)
         var(--select-multiple-paddingRight) var(--select-multiple-paddingBottom)
         var(--select-multiple-paddingLeft);
-      margin: var(--select-multiple-marginTop)
-        var(--select-multiple-marginRight) var(--ResultBox-tag-marginBottom)
-        var(--select-multiple-marginLeft);
 
-      &:hover {
+      &.is-disabled {
+        background-color: var(--Form-selectValue-onDisable-bg);
+      }
+
+      &:not(.is-disabled):hover {
         background-color: var(--Form-selectValue-onHover-bgColor);
       }
     }
@@ -178,12 +180,17 @@
     user-select: none;
     position: relative;
     flex-grow: 1;
+    min-width: 0;
     width: auto;
     max-width: 100%;
     overflow: hidden;
     padding-right: px2rem(4px);
+    display: flex;
+    flex-wrap: wrap;
+    gap: var(--select-multiple-marginRight);
   }
   &-valuesNoWrap {
+    flex-wrap: nowrap;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
@@ -443,6 +450,11 @@
       text-overflow: ellipsis;
       // display: inline-block;
       max-width: 100%;
+
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: center;
     }
 
     &.is-mobile {
@@ -478,6 +490,14 @@
         }
       }
     }
+
+    &-disabledTip {
+      margin-left: var(--gap-xs);
+      color: #ff9326;
+      &:hover {
+        color: #ff9326;
+      }
+    }
   }
 
   &-noResult {
@@ -587,6 +607,12 @@
   }
 }
 
+.#{$ns}Select-overflow-wrapper {
+  .#{$ns}Select-value {
+    margin-bottom: var(--gap-xs);
+  }
+}
+
 .#{$ns}Select-popover {
   background: var(--Form-select-menu-bg);
   color: var(--Form-select-menu-color);

package/scss/components/form/_selection.scss

@@ -76,6 +76,7 @@
     flex-direction: row;
 
     > .#{$ns}Checkbox {
+      margin-top: 0;
       margin-right: px2rem(10px);
     }
     cursor: pointer;
@@ -330,6 +331,7 @@
     flex-direction: row;
 
     > .#{$ns}Checkbox {
+      margin-top: 0;
       margin-right: 0;
     }
     cursor: pointer;

package/scss/components/form/_tree.scss

@@ -57,6 +57,7 @@
 
   &-item {
     line-height: var(--Tree-itemHeight);
+    padding-left: calc(var(--Tree-depth) * var(--Tree-indent));
     position: relative;
 
     > div {
@@ -107,12 +108,7 @@
     &:before {
       position: absolute;
       top: -8px;
-      left: calc(
-        (
-            var(--Tree-icon-gap) + var(--Tree-itemArrowWidth) +
-              var(--Tree-icon-margin-right)
-          ) / 2 - var(--Tree-indent)
-      );
+      left: calc(var(--Tree-depth) * var(--Tree-indent));
       bottom: 0px;
       border-left: 1px solid var(--borderColor);
       content: '';
@@ -139,7 +135,7 @@
     align-items: center;
     position: relative;
     user-select: none;
-    margin-bottom: px2rem(4px);
+    // margin-bottom: px2rem(4px);
     padding-left: var(--Tree-icon-gap);
     & > * {
       position: relative;
@@ -174,6 +170,7 @@
 
     .#{$ns}Checkbox {
       margin-right: var(--inputTree-checkboxes-size-marginRight);
+      margin-top: 0;
     }
   }
 
@@ -352,8 +349,10 @@
   }
 
   &-itemArrowPlaceholder {
-    display: inline-block;
-    width: calc(var(--Tree-itemArrowWidth) + var(--Tree-icon-gap));
+    display: inline-flex;
+    width: var(--Tree-itemArrowWidth);
+    flex-shrink: 0;
+    margin-right: var(--inputTree-base-size-expandMarginRight);
   }
 
   &-itemDrager {

package/scss/layout/_layout.scss

@@ -426,6 +426,7 @@ body {
 
       .#{$ns}Layout-brandBar {
         position: static;
+        padding-right: 17px;
       }
 
       .#{$ns}Layout-asideWrap {

package/scss/themes/_common.scss

@@ -35,6 +35,7 @@
 @import '../components/chart';
 @import '../components/video';
 @import '../components/audio';
+@import '../components/auto-folder';
 @import '../components/panel';
 @import '../components/service';
 @import '../components/sparkline';