amis 1.5.6-beta.5 → 1.6.0

package/scss/_properties.scss

@@ -164,6 +164,14 @@
   --Audio-volumeControl-width: #{px2rem(110px)};
   --Avatar-bg: #{$gray300};
   --Avatar-width: #{px2rem(40px)};
+  --Avatar-size-large: #{px2rem(48px)};
+  // 兼容旧的size大小写法
+  --Avatar-size-default: var(--Avatar-width);
+  --Avatar-size-small: #{px2rem(32px)};
+  --Avatar-icon-size-large: #{px2rem(20px)};
+  // 兼容旧的icon大小写法
+  --Avatar-icon-size-default: var(--fontSizeLg);
+  --Avatar-icon-size-small: #{px2rem(12px)};
 
   --Badge-size: var(--gap-md);
   --Badge-color: var(--white);
@@ -618,10 +626,11 @@
   --DropDown-menu-paddingX: 0;
   --DropDown-menu-paddingY: var(--gap-xs);
   --DropDown-menuItem-onHover-bg: var(--ListMenu-item--onHover-bg);
-  --DropDown-menuItem-color: var(--text-color);
+  --DropDown-group-color: #848b99;
+  --DropDown-menuItem-color: #151a26;
   --DropDown-menuItem-onHover-color: var(--primary);
   --DropDown-menuItem-onActive-color: var(--primary);
-  --DropDown-menuItem-onDisabled-color: var(--text--muted-color);
+  --DropDown-menuItem-onDisabled-color: #b4b6ba;
   --DropDown-menuItem-paddingX: var(--gap-sm);
   --DropDown-menuItem-paddingY: calc(
     (var(--DropDown-menu-height) - var(--fontSizeBase) * var(--lineHeightBase)) /
@@ -1088,11 +1097,12 @@
   --PickerColumns-bg: white;
   --PickerColumns-toolbar-height: #{px2rem(50px)};
   --PickerColumns-title-fontSize: var(--fontSizeLg);
+  --PickerColumns-title-color: #222;
   --PickerColumns-title-lineHeight: 1.5;
-  --PickerColumns-action-padding: 0 var(--gap-sm);
-  --PickerColumns-action-fontSize: var(--fontSizeMd);
-  --PickerColumns-confirmAction-color: #{lighten($text-color, 25%)};
-  --PickerColumns-cancelAction-color: #{lighten($text-color, 50%)};
+  --PickerColumns-action-padding: 0 var(--gap-md);
+  --PickerColumns-action-fontSize: var(--fontSizeLg);
+  --PickerColumns-confirmAction-color: #2468f2;
+  --PickerColumns-cancelAction-color: #666;
   --PickerColumns-option-fontSize: var(--fontSizeLg);
   --PickerColumns-optionText-color: var(--text-color);
   --PickerColumns-optionDisabled-opacity: 0.3;
@@ -1103,6 +1113,8 @@
   --PopOverAble-iconColor: inherit;
   --PopOverAble-onHover-iconColor: inherit;
 
+  --PopUp-cancelAction-color: #666;
+
   --Property-title-bg: #f2f2f2;
   --Property-label-bg: #f7f7f7;
 
@@ -1144,7 +1156,9 @@
   --ResultBox-value-bg: #f5f5f5;
   --ResultBox-value-color: #000;
 
-  --Rating-onActive-color: var(--info);
+  --Rating-inactive-color: #e6e6e8;
+  --Rating-star-margin: #{px2rem(8px)};
+  --Rating-star-size: #{px2rem(24px)};
 
   --Satus-icon-width: var(--gap-lg);
   --Satus-icon-height: var(--Satus-icon-width);

package/scss/components/_avatar.scss

@@ -1,14 +1,37 @@
+@mixin avatar-size($size, $fontSize) {
+  width: $size;
+  height: $size;
+  line-height: $size;
+
+  i {
+    font-size: $fontSize;
+  }
+}
+
 .#{$ns}Avatar {
   background: var(--Avatar-bg);
-  width: var(--Avatar-width);
-  height: var(--Avatar-width);
-  line-height: var(--Avatar-width);
+  @include avatar-size(var(--Avatar-size-default), var(--Avatar-icon-size-default));
+  position: relative;
   display: inline-block;
   overflow: hidden;
   flex-shrink: 0;
   border-radius: 50%;
   text-align: center;
 
+  &--lg {
+    @include avatar-size(var(--Avatar-size-large), var(--Avatar-icon-size-large));
+  }
+
+  &--sm {
+    @include avatar-size(var(--Avatar-size-small), var(--Avatar-icon-size-small));
+  }
+
+  &--text {
+    position: absolute;
+    left: 50%;
+    transform-origin: 0 center;
+  }
+
   &--square {
     border-radius: 0%;
   }
@@ -17,18 +40,13 @@
     border-radius: 10%;
   }
 
-  i {
-    font-size: var(--fontSizeLg);
-  }
-
   img {
-    color: transparent;
     width: 100%;
     height: 100%;
-    object-fit: cover;
   }
 
   &:hover {
+
     img,
     i {
       transform: scale(1.1);

package/scss/components/_calendar.scss

@@ -79,3 +79,290 @@
     position: relative;
   }
 }
+
+.#{$ns}CalendarMobile {
+  height: 100%;
+  overflow: scroll;
+
+  &-pop {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100vw;
+    height: 90vh;
+    background: #fff;
+    border-radius: px2rem(16px) px2rem(16px) 0 0;
+    overflow: hidden;
+    border-width: 0;
+  }
+
+  &-wrap {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+
+  &-header {
+    flex-shrink: 0;
+    box-shadow: 0 2px 10px rgb(125 126 128 / 16%);
+    position: relative;
+
+    .subtitle-text {
+      display: inline-block;
+      width: px2rem(110px);
+      position: relative;
+    }
+
+    .rdtPrev {
+      width: px2rem(20px);
+      height: px2rem(44px);
+      display: block;
+      position: absolute;
+      top: 0;
+      left: px2rem(-20px);
+    }
+    .rdtNext {
+      width: px2rem(20px);
+      height: px2rem(44px);
+      display: block;
+      position: absolute;
+      top: 0;
+      right: px2rem(-20px);
+    }
+  }
+
+  &-title,
+  &-subtitle {
+    height: px2rem(44px);
+    font-weight: 500;
+    line-height: px2rem(44px);
+    text-align: center;
+  }
+
+  &-title {
+    font-size: var(--fontSizeLg);
+  }
+
+  &-weekdays {
+    display: flex;
+
+    .weekday {
+      flex: 1;
+      line-height: px2rem(30px);
+      text-align: center;
+    }
+  }
+
+  &-close {
+    position: absolute;
+    z-index: 1;
+    color: #c8c9cc;
+    font-size: px2rem(16px);
+    cursor: pointer;
+    top: px2rem(11px);
+    right: px2rem(16px);
+  }
+
+  &-body::-webkit-scrollbar {
+    width: 0;
+  }
+
+  &-body {
+    flex: 1;
+    overflow-y: scroll;
+
+    table {
+      border-spacing: 0 px2rem(4px);
+    }
+
+    .rdt .rdtPicker td.rdtActive, .rdt .rdtPicker td.rdtActive:hover {
+      background: transparent;
+      color: var(--Calendar-color);
+      text-shadow: none;
+    }
+
+    .rdt .rdtPicker tr td.rdtDisabled, .rdt .rdtPicker tr td.rdtDisabled:hover {
+      color: #999;
+    }
+
+    .rdtOldNone td.rdtOld {
+      display: none;
+    }
+
+    .rdtPicker td {
+      height: px2rem(56px);
+      position: relative;
+    }
+
+    .rdt .rdtPicker {
+      td.rdtDay,
+      td.rdtDay:hover,
+      td.rdtDisabled,
+      td.rdtDisabled:hover {
+        background: transparent;
+      }
+    }
+
+    .calendar-wrap {
+      position: relative;
+      width: px2rem(50px);
+      height: 100%;
+      text-align: center;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: px2rem(4px);
+    }
+  }
+
+  &-embed &-body {
+    .calendar-wrap {
+      width: auto;
+      max-width: px2rem(50px);
+    }
+  }
+
+  &-footer {
+    flex-shrink: 0;
+
+    .date-range-confirm {
+      height: px2rem(36px);
+      margin: px2rem(7px) 0;
+      border-radius: var(--borderRadiusMd);
+      display: block;
+    }
+    .is-disabled {
+      opacity: 0.5;
+      color: var(--Button--primary-color);
+      background: var(--Button--primary-bg);
+      border-color: var(--Button--primary-bg);
+      filter: none;
+    }
+    &-toolbar {
+      padding: 0 px2rem(16px);
+    }
+    &-ranges {
+      background: #fff;
+      box-shadow: 0 0 2px 2px rgba(0,0,0,0.02);
+      border-radius: 24px;
+      overflow-x: auto;
+      position: relative;
+      height: px2rem(48px);
+      line-height: px2rem(48px);
+    }
+    .#{$ns}DateRangePicker-rangers {
+      position: absolute;
+      white-space: nowrap;
+      .#{$ns}DateRangePicker-ranger {
+        margin: 0 px2rem(25px);
+      }
+    }
+  }
+
+  &-calendar-wrap {
+    padding: var(--gap-sm) 0;
+  }
+
+  & &-calendar-wrap &-calendar .rdtPicker {
+      width: 100%;
+      padding: 0;
+    .rdtOld {
+      visibility: hidden;
+    }
+    .rdtNew {
+      display: none;
+    }
+    .rdtBetween {
+      background: var(--Calendar-cell-onBetween-bg) !important;
+      color: var(--Button--primary-bg);
+    }
+    .rdtRangeStart,
+    .rdtRangeStart:hover,
+    .rdtRangeEnd,
+    .rdtRangeEnd:hover {
+      .calendar-wrap {
+        background: var(--Calendar-cell-onActive-bg) !important;
+        color: #fff;
+        text-shadow: 0 -1px 0 rgb(0 0 0 / 25%);
+      }
+    }
+
+    .rdtRangeHasEnd,
+    .rdtRangeHasEnd:hover {
+      background: linear-gradient(to right, transparent 0%, transparent 50%, var(--Calendar-cell-onBetween-bg) 51%, var(--Calendar-cell-onBetween-bg) 100%) !important;
+    }
+
+    .rdtRangeEnd,
+    .rdtRangeEnd:hover {
+      background: linear-gradient(to right, var(--Calendar-cell-onBetween-bg) 0%, var(--Calendar-cell-onBetween-bg) 50%, transparent 51%, transparent 100%) !important;
+    }
+  }
+
+  &-calendar-header {
+    height: px2rem(30px);
+    line-height: px2rem(30px);
+    text-align: center;
+  }
+
+  &-range-text {
+    position: absolute;
+    right: 0;
+    left: 0;
+    bottom: 0;
+    color: #fff;
+    font-size: var(--fontSizeSm);
+    white-space: nowrap;
+  }
+
+  &-calendar-wrap {
+    position: relative;
+  }
+
+  &-calendar-mark {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    z-index: 0;
+    color: rgba(242, 243, 245, 0.8);
+    font-size: px2rem(160px);
+    transform: translate(-50%, -50%);
+    pointer-events: none;
+  }
+
+  &-toast {
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: px2rem(136px);
+    height: px2rem(36px);
+    background: rgba(0, 0, 0, .9);
+    border-radius: 4px;
+    color: #fff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  &-time {
+    height: px2rem(180px);
+    &-title {
+      border: var(--Calendar-borderWidth) solid var(--borderColorDarken);
+      border-left: none;
+      border-right: none;
+      text-align: center;
+      height: px2rem(30px);
+      line-height: px2rem(30px);
+    }
+    .rdtPicker {
+      margin: 0 auto;
+    }
+  }
+  .#{$ns}CalendarTime {
+    height: px2rem(130px);
+    overflow: hidden;
+  }
+  .#{$ns}PickerColumns-header {
+    display: none;
+  }
+}

package/scss/components/_card.scss

@@ -331,7 +331,7 @@
   }
   &-multiMedia-img {
     display: block;
-    width: 100%;
+    width: auto;
     height: auto;
     object-fit: cover;
     border-radius: var(--Card-borderRadius);

package/scss/components/_cascader.scss

@@ -0,0 +1,102 @@
+.#{$ns}Cascader-tabs {
+  display: flex;
+  &.scrollable {
+    display: block;
+    overflow-x: auto;
+    white-space: nowrap;
+    &::-webkit-scrollbar {
+      display: none;
+    }
+  }
+}
+.#{$ns}Cascader-tab {
+  flex: 1;
+  width: calc((100vw - 20px) / 3);
+  height: px2rem(370px);
+  overflow-y: auto;
+  display: inline-block;
+  &::-webkit-scrollbar {
+    display: none;
+  }
+}
+.#{$ns}Cascader {
+  width: 100%;
+  padding: 0 10px;
+  &-Nav {
+    overflow-x: auto;
+    &Item {
+      display: inline-block;
+      margin-right: px2rem(10px);
+      list-style: none;
+      cursor: pointer;
+      user-select: none;
+      padding: 0 px2rem(6px);
+    }
+  }
+  &-btnGroup {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    height: px2rem(60px);
+  }
+  &-options {
+    box-sizing: border-box;
+    height: var(--Cascader-option-height);
+    padding-top: px2rem(6px);
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch;
+    margin: 0;
+    padding: 0;
+  }
+  &-option {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: px2rem(6px) 0;
+    font-size: var(--fontSizeMd);
+    line-height: var(--Cascader-option-lineHeight);
+    cursor: pointer;
+    position: relative;
+    &.selected {
+      span {
+        color: var(--primary);
+      }
+    }
+    &.disabled {
+      span {
+        color: gray;
+      }
+    }
+    &--text {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      user-select: none;
+    }
+    &-selectedNum {
+      min-width: px2rem(16px);
+      height: px2rem(16px);
+      line-height: px2rem(16px);
+      border-radius: 100%;
+      text-align: center;
+      background: var(--Form-select-menu-onActive-color);
+      color: var(--white) !important;
+      font-size: var(--fontSizeSm);
+      display: inline-block;
+      position: absolute;
+      right: 0;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+  }
+  &-icon {
+    color: var(--primary);
+  }
+  &-tab {
+    padding: 0;
+  }
+
+  &-btnCancel {
+    color: var(--PopUp-cancelAction-color);
+  }
+}

package/scss/components/_city-area.scss

@@ -0,0 +1,27 @@
+.#{$ns}CityArea {
+  &-popup {
+    height: px2rem(280px);
+  }
+  &-Input {
+    margin-top: var(--gap-xs);
+    outline: none;
+    vertical-align: top;
+    border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
+    border-radius: var(--Form-input-borderRadius);
+    line-height: var(--Form-input-lineHeight);
+    padding: var(--Form-input-paddingY) var(--Form-input-paddingX);
+    font-size: var(--Form-input-fontSize);
+    display: inline-flex !important;
+
+    &::placeholder {
+      color: var(--Form-input-placeholderColor);
+      user-select: none;
+    }
+
+    &:focus {
+      border-color: var(--Form-input-onFocused-borderColor);
+      box-shadow: var(--Form-input-boxShadow);
+      background: var(--Form-input-onFocused-bg);
+    }
+  }
+}

package/scss/components/_collapse-group.scss

@@ -1,5 +1,4 @@
 .#{$ns}CollapseGroup {
-
   .#{$ns}Collapse:not(:last-child) {
     border-bottom: none;
   }
@@ -11,5 +10,4 @@
       }
     }
   }
-  
-}
+}

package/scss/components/_dropdown.scss

@@ -34,20 +34,28 @@
   }
 
   &-menu {
-    position: absolute;
-    z-index: $zindex-dropdown;
-    top: 100%;
-    left: 0;
-    margin: px2rem(1px) 0 0;
     background: var(--DropDown-menu-bg);
     list-style: none;
     padding: var(--DropDown-menu-paddingY) var(--DropDown-menu-paddingX);
-    border: var(--DropDown-menu-borderWidth) solid
-      var(--DropDown-menu-borderColor);
-    border-radius: var(--DropDown-menu-borderRadius);
-    box-shadow: var(--DropDown-menu-boxShadow);
     min-width: var(--DropDown-menu-minWidth);
     text-align: left;
+    border: none;
+    user-select: none;
+
+    &-root {
+      position: absolute;
+      z-index: $zindex-dropdown;
+      top: 100%;
+      left: 0;
+      margin: px2rem(1px) 0 0;
+      border: none;
+      border-radius: var(--DropDown-menu-borderRadius);
+      box-shadow: var(--DropDown-menu-boxShadow);
+      min-width: var(--DropDown-menu-minWidth);
+      overflow-y: auto;
+      overflow-x: hidden;
+      max-height: px2rem(300px);
+    }
   }
 
   &--alignRight &-menu {
@@ -95,6 +103,28 @@
       background: var(--DropDown-menu-borderColor);
       padding: 0;
     }
+
+    &.#{$ns}DropDown-groupTitle {
+      height: inherit;
+      font-size: var(--fontSizeSm);
+      padding: var(--gap-xs) var(--gap-xs);
+      padding-left: var(--gap-sm);
+      color: var(--DropDown-group-color);
+      flex-grow: 1;
+      cursor: default;
+
+      &:hover {
+        background: none;
+      }
+
+      span {
+        white-space: nowrap;
+      }
+
+      & ~ .#{$ns}DropDown-button {
+        padding-left: var(--gap-lg);
+      }
+    }
   }
 
   &-menu > li a {

package/scss/components/_formula.scss

@@ -3,20 +3,30 @@
   max-width: 100%;
   box-sizing: content-box;
 
+  &-content {
+    border-radius: var(--borderRadius);
+    border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
+  }
+
   &-header {
     width: 100%;
-    height: px2rem(40px);
-    line-height: px2rem(40px);
-    padding-left: px2rem(10px);
+    height: px2rem(30px);
+    line-height: px2rem(30px);
+    padding: 0 #{px2rem(10px)};
     box-sizing: border-box;
-    background: #f3f8fb;
+    background: var(--Formula-header-bgColor);
+    border-radius: var(--borderRadius) var(--borderRadius) 0 0;
+    border-bottom: var(--Form-input-borderWidth) solid
+      var(--Form-input-borderColor);
+    font-weight: 500;
   }
 
   &-editor {
     min-height: px2rem(238px);
     max-height: px2rem(320px);
     height: auto;
-    border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
+    padding: #{px2rem(10px)};
+    padding-right: 0;
   }
 
   &.is-error &-editor {
@@ -98,7 +108,7 @@
     cursor: pointer;
 
     &.is-active {
-      color: var(--primary);
+      background: var(--Formula-funcItem-bgColor-onActive);
     }
   }
   &-groupTitle {
@@ -112,11 +122,25 @@
   }
   &-funcDetail {
     padding: 10px 20px;
+
+    pre {
+      white-space: pre-wrap;
+      word-wrap: break-word;
+      background: var(--Formula-header-bgColor);
+      padding: #{px2rem(10px)};
+      border-radius: var(--borderRadius);
+      margin-top: 0;
+    }
+
+    div {
+      color: var(--text--loud-color);
+    }
   }
 }
 
 .#{$ns}FormulaPicker {
   &-icon {
     margin-left: auto;
+    margin-right: #{px2rem(5px)};
   }
 }