amis 1.6.2 → 1.6.3

package/scss/components/_formula.scss

@@ -3,30 +3,50 @@
   max-width: 100%;
   box-sizing: content-box;
 
-  &-content {
-    border-radius: var(--borderRadius);
-    border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
+  @mixin scrollbar {
+    &::-webkit-scrollbar {
+      width: 6px;
+      height: 6px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      border-radius: 3px;
+      background: rgba(0, 0, 0, 0.3);
+    }
   }
 
-  &-header {
+  @mixin panel-header {
     width: 100%;
     height: px2rem(30px);
     line-height: px2rem(30px);
     padding: 0 #{px2rem(10px)};
     box-sizing: border-box;
-    background: var(--Formula-header-bgColor);
+    background: var(--InputFormula-header-bgColor);
     border-radius: var(--borderRadius) var(--borderRadius) 0 0;
     border-bottom: var(--Form-input-borderWidth) solid
       var(--Form-input-borderColor);
     font-weight: 500;
   }
 
+  &-content {
+    border-radius: var(--borderRadius);
+    border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
+  }
+
+  &-header {
+    @include panel-header();
+  }
+
   &-editor {
-    min-height: px2rem(238px);
-    max-height: px2rem(320px);
-    height: auto;
-    padding: #{px2rem(10px)};
+    @include scrollbar();
+    height: px2rem(200px);
+    padding: #{px2rem(5px)};
     padding-right: 0;
+
+    .CodeMirror {
+      width: 100%;
+      height: 100%;
+    }
   }
 
   &.is-error &-editor {
@@ -39,108 +59,261 @@
 
   &-settings {
     display: flex;
-    flex-direction: row;
+    flex-flow: row nowrap;
     align-items: stretch;
     justify-content: space-between;
-    max-height: px2rem(350px);
-    margin: 0 -5px;
+    height: #{px2rem(250px)};
+    margin-top: #{px2rem(10px)};
+  }
+
+  &-panel {
+    display: flex;
+    flex-flow: column nowrap;
+    justify-content: space-between;
+    align-items: stretch;
+    height: #{px2rem(250px)};
+    width: #{px2rem(220px)};
+    border-radius: var(--borderRadius);
+    border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
+
+    &:not(:last-child) {
+      margin-right: #{px2rem(10px)};
+    }
+
+    &:last-child {
+      flex: 1;
+    }
 
-    > div {
+    &-header {
+      @include panel-header();
+    }
+
+    &-body {
       flex: 1;
-      padding: 0 5px;
       display: flex;
-      flex-direction: column;
+      flex-flow: column nowrap;
+      max-height: #{px2rem(220px)};
+    }
+  }
+
+  /* 变量列表 */
+  &-VariableList {
+    &-root {
+      max-height: #{px2rem(220px)};
+    }
+
+    &-root.is-scrollable {
+      @include scrollbar();
+      overflow-x: hidden;
+      overflow-y: auto;
+    }
+
+    &-base {
+      --Form-input-fontSize: var(--fontSizeSm);
+      max-width: inherit;
+      overflow: hidden;
+    }
+
+    &-tabs {
+      --Tabs-linkFontSize: var(--fontSizeSm);
+      --Tabs--card-linkPadding: #{px2rem(5px)};
+
+      max-height: #{px2rem(220px)};
+      display: flex;
+      flex-flow: column nowrap;
+      justify-content: space-between;
+
+      & > ul {
+        border-top: none;
+      }
+
+      & > div {
+        @include scrollbar();
+        overflow-x: hidden;
+        overflow-y: auto;
+        flex: 1;
+        border-radius: var(--borderRadius);
+      }
+    }
+
+    &-tab {
+      padding: 0;
+    }
+
+    &-item {
+      display: flex;
+      flex-flow: row nowrap;
+      justify-content: space-between;
+      white-space: nowrap;
+
+      & > label {
+        white-space: nowrap;
+      }
+
+      &-tag {
+        vertical-align: middle;
+        text-align: center;
+        padding: 0 #{px2rem(8px)};
+        line-height: 17px;
+        border-radius: var(--borderRadius);
+        background: #f5f5f5;
+        color: var(--black);
+      }
+    }
+  }
+
+  /* 函数列表 */
+  &-FuncList {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    align-items: stretch;
+    flex: 1;
+
+    &:not(:last-child) {
+      margin-right: #{px2rem(10px)};
+    }
+
+    &-searchBox {
+      display: flex;
+      width: auto;
+      flex-shrink: 0;
+      padding: #{px2rem(8px)};
 
-      > h3 {
-        padding: 10px 0;
-        margin: 0;
-        flex-shrink: 0;
+      & > div {
+        flex: 1;
+        font-size: var(--fontSizeSm);
+        height: var(--gap-xl);
       }
+    }
+
+    &-body {
+      @include scrollbar();
+      flex: 1;
+      overflow-x: hidden;
+      overflow-y: auto;
+    }
 
+    &-collapseGroup {
+      .#{$ns}FormulaEditor-FuncList-collapse {
+        border: none;
+
+        .#{$ns}FormulaEditor-FuncList-expandIcon {
+          font-size: var(--fontSizeSm);
+          line-height: var(--fontSizeXl);
+          transform-origin: #{px2rem(7px)} #{px2rem(9px)};
+          transition: transform 0.2s;
+        }
+      }
+    }
+
+    &-groupTitle {
+      display: flex;
+      flex-flow: row nowrap;
+      justify-content: flex-start;
+      align-items: unset;
+      padding: #{px2rem(5px)} #{px2rem(10px)};
+      background: transparent;
+      font-size: var(--fontSizeSm);
+      font-weight: bold;
+    }
+
+    &-groupBody {
       > div {
+        padding: 5px 0;
+      }
+    }
+
+    &-item {
+      cursor: pointer;
+      padding: 0 var(--gap-lg);
+      height: var(--gap-xl);
+      line-height: var(--gap-xl);
+
+      &.is-active {
+        background: var(--Tree-item-onHover-bg);
+      }
+    }
+
+    &-doc {
+      display: flex;
+      flex-flow: column nowrap;
+      padding: #{px2rem(10px)};
+      max-height: #{px2rem(200px)};
+
+      pre {
+        white-space: pre-wrap;
+        word-wrap: break-word;
+        background: var(--InputFormula-code-bgColor);
+        padding: #{px2rem(5px)} #{px2rem(10px)};
+        border-radius: var(--borderRadius);
+        margin-top: 0;
+
+        code {
+          color: #2468f2;
+        }
+      }
+
+      &-desc {
+        @include scrollbar();
+        color: var(--text--loud-color);
+        overflow-x: hidden;
+        overflow-y: auto;
         flex: 1;
-        min-height: 0;
       }
     }
   }
 
   .cm-field,
   .cm-func {
-    border-radius: 2px;
+    border-radius: 3px;
     color: #fff;
     margin: 0 1px;
     padding: 0 2px;
   }
+
+  .cm-field {
+    padding: 3px 5px;
+  }
+
   .cm-field {
     background: #007bff;
   }
   .cm-func {
-    background: #17a2b8;
+    color: #ae4597;
+    font-weight: bold;
+    line-height: 14px;
   }
 }
 
-.#{$ns}FormulaFuncList {
+.#{$ns}FormulaPicker {
   display: flex;
-  flex-direction: column;
+  flex-flow: row nowrap;
+  justify-content: space-between;
+  align-items: center;
 
-  & > &-searchBox {
-    display: flex;
-    width: auto;
-    flex-shrink: 0;
-    margin-bottom: px2rem(8px);
+  &-input {
+    flex: 1;
+    margin-right: #{px2rem(10px)};
   }
 
-  &-columns {
-    flex: 1;
-    min-height: 0;
-    overflow: auto;
+  &-action {
     display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-
-    > div:first-child {
-      min-width: 200px;
-      flex-shrink: 0;
-    }
+    justify-content: center;
+    align-items: center;
   }
-  &-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;
+  &-icon {
+    top: 0 !important;
+    font-size: var(--InputFormula-icon-size);
 
-    pre {
-      white-space: pre-wrap;
-      word-wrap: break-word;
-      background: var(--Formula-header-bgColor);
-      padding: #{px2rem(10px)};
-      border-radius: var(--borderRadius);
-      margin-top: 0;
+    &:not(:last-child) {
+      margin-right: var(--fontSizeSm);
     }
 
-    div {
-      color: var(--text--loud-color);
+    &.is-filled {
+      fill: var(--InputFormula-icon-color-onActive);
+      color: var(--InputFormula-icon-color-onActive);
     }
   }
 }
-
-.#{$ns}FormulaPicker {
-  &-icon {
-    margin-left: auto;
-    margin-right: #{px2rem(5px)};
-  }
-}

package/scss/components/_result-box.scss

@@ -51,19 +51,6 @@
 
   &-clear {
     @include input-clear();
-    width: px2rem(26px);
-    height: px2rem(26px);
-    margin: 0 px2rem(-2px);
-    margin-left: auto;
-
-    &:hover {
-      background: var(--ResultBox-value-bg);
-    }
-
-    > svg {
-      width: px2rem(12px);
-      height: px2rem(12px);
-    }
   }
 
   > svg {

package/scss/components/form/_color.scss

@@ -74,8 +74,6 @@
 
   &-clear {
     @include input-clear();
-    display: inline-block;
-    line-height: 1;
   }
 
   &-arrow {

package/scss/components/form/_date-range.scss

@@ -55,19 +55,26 @@
   }
 
   &-toggler {
-    cursor: pointer;
-    color: var(--DatePicker-iconColor);
-    display: inline-flex;
-    align-items: center;
+    @include input-clear();
+    line-height: 1;
 
-    &:hover {
-      color: var(--DatePicker-onHover-iconColor);
+    svg {
+      polyline,
+      circle {
+        stroke: var(--DatePicker-iconColor);
+      }
+    }
+
+    &:hover svg {
+      polyline,
+      circle {
+        stroke: var(--DatePicker-onHover-iconColor);
+      }
     }
   }
 
   &-clear {
     @include input-clear();
-    display: inline-block;
     line-height: 1;
     margin-right: var(--gap-xs);
   }

package/scss/components/form/_date.scss

@@ -56,18 +56,25 @@
   }
 
   &-toggler {
-    cursor: pointer;
-    color: var(--DatePicker-iconColor);
-    display: inline-flex;
-    align-items: center;
+    @include input-clear();
+    line-height: 1;
 
-    &:hover {
-      color: var(--DatePicker-onHover-iconColor);
+    svg {
+      polyline,
+      circle {
+        stroke: var(--DatePicker-iconColor);
+      }
+    }
+
+    &:hover svg {
+      polyline,
+      circle {
+        stroke: var(--DatePicker-onHover-iconColor);
+      }
     }
   }
 
   &-clear {
-    display: inline-block;
     @include input-clear();
     line-height: 1;
     margin-right: var(--gap-xs);

package/scss/components/form/_form.scss

@@ -367,6 +367,7 @@
   margin-left: calc(var(--Form-group-gutterWidth) / -2);
   margin-right: calc(var(--Form-group-gutterWidth) / -2);
   > .#{$ns}Form-item {
+    flex-shrink: 0;
     flex-grow: 1;
     padding-left: calc(var(--Form-group-gutterWidth) / 2);
     padding-right: calc(var(--Form-group-gutterWidth) / 2);

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

@@ -12,6 +12,8 @@
   }
 
   &-valueWrap {
+    display: flex;
+    justify-content: space-between;
     flex-grow: 1;
     line-height: 1;
     white-space: nowrap;

package/scss/components/form/_location.scss

@@ -63,7 +63,6 @@
   }
 
   &-clear {
-    display: inline-block;
     @include input-clear();
     line-height: 1;
     margin-right: var(--gap-xs);

package/scss/components/form/_picker.scss

@@ -87,7 +87,6 @@
   }
 
   &-clear {
-    display: inline-block;
     @include input-clear();
     line-height: 1;
     margin-right: var(--gap-xs);

package/scss/components/form/_text.scss

@@ -46,7 +46,6 @@
     flex-basis: 1;
     flex-grow: 1;
     min-width: 0;
-
     border-radius: 0;
 
     &:first-child {
@@ -103,16 +102,16 @@
     }
 
     &:first-child .#{$ns}Button {
-      @if var(--InputGroup-button-borderRadius) {
-        border-top-left-radius: var(--InputGroup-button-borderRadius);
-        border-bottom-left-radius: var(--InputGroup-button-borderRadius);
+      @if var(--InputGroup-addOn-borderRadius) {
+        border-top-left-radius: var(--InputGroup-addOn-borderRadius);
+        border-bottom-left-radius: var(--InputGroup-addOn-borderRadius);
       }
     }
 
     &:last-child .#{$ns}Button {
-      @if var(--InputGroup-button-borderRadius) {
-        border-top-right-radius: var(--InputGroup-button-borderRadius);
-        border-bottom-right-radius: var(--InputGroup-button-borderRadius);
+      @if var(--InputGroup-addOn-borderRadius) {
+        border-top-right-radius: var(--InputGroup-addOn-borderRadius);
+        border-bottom-right-radius: var(--InputGroup-addOn-borderRadius);
       }
     }
   }

package/scss/components/form/_textarea.scss

@@ -1,4 +1,6 @@
 .#{$ns}TextareaControl {
+  --Form-input-clearBtn-padding: #{px2rem(2px)};
+
   position: relative;
 
   > textarea {
@@ -62,9 +64,23 @@
       color: #666;
       background: rgba(0, 0, 0, 0.4);
     }
+
+    &.is-clearable {
+      right: calc(
+        var(--Form-input-paddingX) + var(--Form-input-clearBtn-size) +
+          var(--Form-input-clearBtn-padding) * 2 + #{px2rem(5px)}
+      );
+    }
   }
 
   .has-error--maxLength &-counter {
     background: var(--danger);
   }
+
+  &-clear {
+    @include input-clear();
+    position: absolute;
+    right: var(--Form-input-paddingX);
+    bottom: var(--Form-input-paddingY);
+  }
 }

package/scss/components/form/_transfer.scss

@@ -232,11 +232,12 @@
 }
 .#{$ns}TransferDropDown-content {
   min-height: px2rem(200px);
+  min-width: px2rem(400px);
   display: flex;
   flex-direction: column;
 
   &.is-mobile {
-     width: 100%;
+    width: 100%;
   }
   & > .#{$ns}Transfer-selection {
     flex-grow: 1;

package/scss/themes/_cxd-variables.scss

@@ -148,6 +148,9 @@ $L1: 0px 4px 6px 0px rgba(8, 14, 26, 0.06),
   --Form-input-addOnColor: #666;
   --Form-input-onFocus-addOnColor: var(--primary);
   --Form-input-addOnDividerBorderWidth: 0;
+  --Form-input-clearBtn-color: #{$G7};
+  --Form-input-clearBtn-color-onHover: #{$G4};
+  --Form-input-clearBtn-color-onActive: #{$G3};
 
   --Form-select-borderWidth: #{px2rem(1px)};
   --Form-select-borderRadius: #{$R3};
@@ -179,7 +182,7 @@ $L1: 0px 4px 6px 0px rgba(8, 14, 26, 0.06),
   --InputGroup-select-arrowColor: #999;
   --InputGroup-select-onFocused-arrowColor: var(--primary);
   --InputGroup-button-borderWidth: #{px2rem(1px)};
-  --InputGroup-button-borderRadius: 0;
+  --InputGroup-button-borderRadius: #{$R3};
 
   // $Number-bg: #eaf6fe;
   --Number-borderWidth: #{px2rem(1px)};
@@ -659,6 +662,5 @@ $L1: 0px 4px 6px 0px rgba(8, 14, 26, 0.06),
   --Timeline--danger-bg: var(--danger);
 
   // Formula
-  --Formula-header-bgColor: #{$G10};
-  --Formula-funcItem-bgColor-onActive: #{$light};
+  --InputFormula-code-bgColor: #{$G10};
 }

package/scss/themes/cxd.scss

@@ -106,19 +106,6 @@
   }
 }
 
-.#{$ns}InputGroup {
-  // .#{$ns}TextControl-input {
-  // }
-  .#{$ns}InputGroup-btn .#{$ns}Button {
-    border-radius: px2rem(3px);
-  }
-
-  .#{$ns}InputGroup-btn:last-child .#{$ns}Button {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-}
-
 .#{$ns}Button--iconOnly {
   min-width: var(--Button-height);
 }