amis 1.5.6-beta.4 → 1.5.8-beta.2

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);
@@ -1144,7 +1152,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/_variables.scss

@@ -32,7 +32,7 @@ $colors: (
   primary: #007bff,
   secondary: #6c757d,
   success: #28a745,
-  info: #17a2b8,
+  info: #007bff,
   warning: #fad733,
   danger: #dc3545,
   light: #f8f9fa,

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,283 @@
     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: scroll;
+      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(200px);
+    &-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;
+    }
+  }
+}

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/_collapse-group.scss

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

package/scss/components/_formula.scss

@@ -0,0 +1,146 @@
+.#{$ns}FormulaEditor {
+  overflow: visible;
+  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(30px);
+    line-height: px2rem(30px);
+    padding: 0 #{px2rem(10px)};
+    box-sizing: border-box;
+    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;
+    padding: #{px2rem(10px)};
+    padding-right: 0;
+  }
+
+  &.is-error &-editor {
+    border-color: var(--Form-input-onError-borderColor);
+  }
+
+  &.is-focused &-editor {
+    border-color: var(--Form-input-onFocused-borderColor);
+  }
+
+  &-settings {
+    display: flex;
+    flex-direction: row;
+    align-items: stretch;
+    justify-content: space-between;
+    max-height: px2rem(350px);
+    margin: 0 -5px;
+
+    > div {
+      flex: 1;
+      padding: 0 5px;
+      display: flex;
+      flex-direction: column;
+
+      > h3 {
+        padding: 10px 0;
+        margin: 0;
+        flex-shrink: 0;
+      }
+
+      > div {
+        flex: 1;
+        min-height: 0;
+      }
+    }
+  }
+
+  .cm-field,
+  .cm-func {
+    border-radius: 2px;
+    color: #fff;
+    margin: 0 1px;
+    padding: 0 2px;
+  }
+  .cm-field {
+    background: #007bff;
+  }
+  .cm-func {
+    background: #17a2b8;
+  }
+}
+
+.#{$ns}FormulaFuncList {
+  display: flex;
+  flex-direction: column;
+
+  & > &-searchBox {
+    display: flex;
+    width: auto;
+    flex-shrink: 0;
+    margin-bottom: px2rem(8px);
+  }
+
+  &-columns {
+    flex: 1;
+    min-height: 0;
+    overflow: auto;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+
+    > div:first-child {
+      min-width: 200px;
+      flex-shrink: 0;
+    }
+  }
+  &-funcItem {
+    padding: 0 10px;
+    cursor: pointer;
+
+    &.is-active {
+      background: var(--Formula-funcItem-bgColor-onActive);
+    }
+  }
+  &-groupTitle {
+    padding: 5px 0;
+    background: transparent;
+  }
+  &-groupBody {
+    > div {
+      padding: 5px 0;
+    }
+  }
+  &-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)};
+  }
+}

package/scss/components/_modal.scss

@@ -231,3 +231,21 @@
     }
   }
 }
+
+/* 移动端样式调整 */
+@include media-breakpoint-down(sm) {
+  .#{$ns}Modal {
+    .#{$ns}Modal-footer {
+      display: flex;
+
+      > .#{$ns}Button {
+        flex: 1;
+        height: px2rem(44px);
+
+        &:first-child {
+          margin-left: 0;
+        }
+      }
+    }
+  }
+}

package/scss/components/_panel.scss

@@ -182,3 +182,48 @@
     }
   }
 }
+
+/* 移动端样式调整 */
+@include media-breakpoint-down(sm) {
+  .#{$ns}Panel--form {
+    border: none;
+    box-shadow: none;
+
+    margin: 0 calc(var(--Panel-bodyPadding) * -1)
+      calc(var(--Panel-marginBottom) / 2);
+
+    .#{$ns}Panel-body {
+      padding: 0 var(--gap-md) var(--gap-md);
+    }
+
+    > .#{$ns}Panel-heading {
+      background: none;
+      border: none;
+      border-radius: 0;
+
+      .#{$ns}Panel-title {
+        padding-left: var(--Panel-bodyPadding);
+        border-left: px2rem(3px) solid var(--primary);
+        font-size: var(--fontSizeLg);
+      }
+    }
+
+    .#{$ns}Panel-footerWrap {
+      padding-bottom: var(--Panel-bodyPadding);
+    }
+
+    .#{$ns}Panel-footer {
+      border-top: none;
+      display: flex;
+      padding: 0 var(--Panel-bodyPadding);
+
+      > .#{$ns}Button {
+        flex: 1;
+
+        &:first-child {
+          margin-left: 0;
+        }
+      }
+    }
+  }
+}