amis 1.9.1-beta.13 → 1.9.1-beta.17

package/scss/components/_formula.scss

@@ -65,13 +65,17 @@
     margin-top: #{px2rem(10px)};
   }
 
+  &-settings.only-variable {
+    height: #{px2rem(350px)};
+  }
+
   &-panel {
     display: flex;
     flex: 1;
     flex-flow: column nowrap;
     justify-content: space-between;
     align-items: stretch;
-    height: #{px2rem(250px)};
+    height: 100%;
     border-radius: var(--borderRadius);
     border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
 
@@ -91,10 +95,11 @@
       flex: 1;
       display: flex;
       flex-flow: column nowrap;
-      max-height: #{px2rem(220px)};
+      max-height: calc(100% - 30px);
+      overflow: hidden;
 
       &--tabs {
-        max-height: #{px2rem(250px)};
+        max-height: 100%;
       }
     }
   }
@@ -215,12 +220,18 @@
         vertical-align: middle;
         text-align: center;
         padding: 0 #{px2rem(8px)};
-        line-height: 17px;
         border-radius: var(--borderRadius);
         background: #f5f5f5;
         color: var(--black);
       }
     }
+    .#{$ns}GroupedSelection {
+      &-item {
+        &-tag {
+          line-height: 17px;
+        }
+      }
+    }
   }
 
   /* 函数列表 */
@@ -405,3 +416,33 @@
     }
   }
 }
+
+.#{$ns}FormulaPicker.is-input-group {
+  border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
+  padding: var(--Form-input-paddingY) var(--Form-input-paddingX);
+  border-radius: var(--borderRadius);
+  .#{$ns}FormulaPicker-input {
+    display: inline-block;
+    width: 100%;
+    background: none;
+    padding: 0;
+    border: 0;
+    margin: 0;
+    &:focus {
+      border: none;
+      outline: none;
+      box-sizing: none;
+    }
+  }
+  .#{$ns}FormulaPicker-toggler {
+    .icon-function {
+      transform: scale(1.6);
+    }
+    .icon-ellipsis-v {
+      transform: rotate(90deg);
+    }
+    &:hover {
+      cursor: pointer;
+    }
+  }
+}

package/scss/components/form/_checks.scss

@@ -230,14 +230,12 @@
         }
       }
 
-      &:checked[disabled] + i{
+      &:checked[disabled] + i {
         width: var(--Checkbox-inner-size);
         height: var(--Checkbox-inner-size);
         background: var(--Checkbox-onDisabled-bg);
       }
-
     }
-
   }
   &--button.#{$ns}Checkbox--checkbox {
     text-align: center;
@@ -256,67 +254,72 @@
     border-radius: calc(var(--Checkbox-borderRadius) * 2);
     min-width: var(--Checkbox-button-min-width);
 
-    &:hover:not(:disabled){
+    &:hover:not(:disabled) {
       color: var(--Checkbox-onHover-color);
     }
 
     &:hover {
       input:checked + i {
         background: transparent;
-            border-color: var(--Button--primary-onHover-bg) transparent transparent var(--Button--primary-onHover-bg);
+        border-color: var(--Button--primary-onHover-bg) transparent transparent
+          var(--Button--primary-onHover-bg);
       }
     }
 
     &:active {
       input:checked + i {
         background: transparent;
-        border-color: var(--Switch-checked-onHover-bgColor) transparent transparent var(--Switch-checked-onHover-bgColor);
+        border-color: var(--Switch-checked-onHover-bgColor) transparent
+          transparent var(--Switch-checked-onHover-bgColor);
       }
     }
 
     input {
-        &:checked + i {
-          background: transparent;
+      &:checked + i {
+        background: transparent;
+        top: 0;
+        left: 0;
+        width: 0;
+        height: 0;
+        border-width: px2rem(8px);
+        border-color: var(--Checkbox-onHover-color) transparent transparent
+          var(--Checkbox-onHover-color);
+        border-radius: 0;
+
+        &:before {
+          position: absolute;
           top: 0;
           left: 0;
-          width: 0;
-          height: 0;
-          border-width: px2rem(8px);
-          border-color: var(--Checkbox-onHover-color) transparent transparent var(--Checkbox-onHover-color);
-          border-radius: 0;
-
-          &:before {
-            position: absolute;
-            top: 0;
-            left: 0;
-            width: var(--Checkbox--full-inner-size);
-            height: calc(var(--Checkbox--full-inner-size) / 2);
-            transform: translate(-80%, -160%) rotate(-50deg);
-            background: transparent;
-          }
-        }
-
-        &[disabled] + i {
-          border-color: var(--Checkbox-onDisabled-color);
+          width: var(--Checkbox--full-inner-size);
+          height: calc(var(--Checkbox--full-inner-size) / 2);
+          transform: translate(-80%, -160%) rotate(-50deg);
           background: transparent;
-            &:before {
-              background: transparent;
-          }
         }
+      }
 
-        &:checked[disabled] + i {
+      &[disabled] + i {
+        border-color: var(--Checkbox-onDisabled-color);
+        background: transparent;
+        &:before {
           background: transparent;
-          border-width: px2rem(8px);
-          border-color: var(--Checkbox-onHover-color) transparent transparent var(--Checkbox-onHover-color);
         }
+      }
+
+      &:checked[disabled] + i {
+        background: transparent;
+        border-width: px2rem(8px);
+        border-color: var(--Checkbox-onHover-color) transparent transparent
+          var(--Checkbox-onHover-color);
+      }
     }
     > i {
       position: absolute;
       top: 0;
-      left:0;
+      left: 0;
       margin-left: 0;
       border: 0;
       border-style: solid;
+      background: transparent;
 
       + span {
         max-width: px2rem(100px);
@@ -330,14 +333,14 @@
     border-color: var(--Checkbox-onHover-color);
     color: var(--Checkbox-onHover-color);
 
-      &:hover {
-        border-color: var(--menu-active-color);
-        color: var(--menu-active-color);
-      }
-      &:active {
-        border-color: var(--Switch-checked-onHover-bgColor);
-        color: var(--Switch-checked-onHover-bgColor);
-      }
+    &:hover {
+      border-color: var(--menu-active-color);
+      color: var(--menu-active-color);
+    }
+    &:active {
+      border-color: var(--Switch-checked-onHover-bgColor);
+      color: var(--Switch-checked-onHover-bgColor);
+    }
   }
   &--button--disabled--unchecked.#{$ns}Checkbox--checkbox.#{$ns}Checkbox--full {
     i {
@@ -391,7 +394,7 @@
       border-radius: 50%;
     }
 
-    &.#{$ns}Checkbox--button--disabled--unchecked.#{$ns}Checkbox--full{
+    &.#{$ns}Checkbox--button--disabled--unchecked.#{$ns}Checkbox--full {
       background: none;
 
       i {
@@ -464,7 +467,7 @@
     display: block;
     margin-bottom: var(--Form-label-paddingTop);
   }
-  
+
   .#{$ns}Checkbox--button {
     margin-bottom: 0;
 

package/scss/components/form/_date.scss

@@ -92,22 +92,22 @@
   display: flex;
 }
 
-.#{$ns}DateControl {
-  width: auto !important; // 因为这里要撑开父容器
-  &.is-date > .#{$ns}DatePicker {
-    min-width: calc(var(--DatePicker-minWidth) + var(--fontSizeLg) * 2);
-  }
+// .#{$ns}DateControl {
+//   width: auto !important; // 因为这里要撑开父容器
+//   &.is-date > .#{$ns}DatePicker {
+//     min-width: calc(var(--DatePicker-minWidth) + var(--fontSizeLg) * 2);
+//   }
 
-  &.is-datetime > .#{$ns}DatePicker {
-    min-width: calc(var(--DatePicker-minWidth) + var(--fontSizeLg) * 6);
-  }
-}
+//   &.is-datetime > .#{$ns}DatePicker {
+//     min-width: calc(var(--DatePicker-minWidth) + var(--fontSizeLg) * 6);
+//   }
+// }
 
 .#{$ns}DatePicker-shortcuts {
   margin: 0;
   padding-left: px2rem(10px);
   list-style: none;
-  background: #F7F7F9;
+  background: #f7f7f9;
   line-height: px2rem(32px);
 }
 
@@ -274,8 +274,8 @@
     .rdtDisabled.rdtToday,
     .rdtOld.rdtToday,
     .rdtNew.rdtToday {
-      >span {
-        border-color: #E8E9EB;
+      > span {
+        border-color: #e8e9eb;
       }
     }
 
@@ -290,7 +290,7 @@
       color: #151b26;
       > span {
         background: transparent;
-        border-color: #144BCC;
+        border-color: #144bcc;
       }
     }
 
@@ -584,7 +584,6 @@
 td.rdtMonth,
 td.rdtYear,
 td.rdtQuarter {
-
   > span {
     display: inline-block;
   }
@@ -607,21 +606,31 @@ td.rdtQuarter {
   &.rdtDisabled,
   &.rdtDisabled:hover {
     background: var(--Calendar-cell-onDisabled-bg);
-    color: #B8BABF;
+    color: #b8babf;
   }
-  
 }
 
 .#{$ns}DateRangePicker-start {
   .rdtPicker .rdtActive.rdtBetween {
-    background: linear-gradient(to right, transparent 0%, transparent 50%, var(--Calendar-cell-onBetween-bg) 51%, var(--Calendar-cell-onBetween-bg) 100%);
+    background: linear-gradient(
+      to right,
+      transparent 0%,
+      transparent 50%,
+      var(--Calendar-cell-onBetween-bg) 51%,
+      var(--Calendar-cell-onBetween-bg) 100%
+    );
   }
 }
 
-
 .#{$ns}DateRangePicker-end {
   .rdtPicker .rdtActive.rdtBetween {
-    background: linear-gradient(to right, var(--Calendar-cell-onBetween-bg) 0%, var(--Calendar-cell-onBetween-bg) 50%, transparent 51%, transparent 100%);
+    background: linear-gradient(
+      to right,
+      var(--Calendar-cell-onBetween-bg) 0%,
+      var(--Calendar-cell-onBetween-bg) 50%,
+      transparent 51%,
+      transparent 100%
+    );
   }
 }
 

package/scss/components/form/_select.scss

@@ -261,6 +261,7 @@
     }
 
     > input {
+      width: 100%;
       outline: none;
       border: none;
       flex-grow: 1;
@@ -272,7 +273,7 @@
 
   &-option {
     cursor: pointer;
-    min-width: px2rem(120px);
+    // min-width: px2rem(120px);
     padding: calc(
         (
             var(--Form-select-menu-height) - var(--Form-input-lineHeight) *
@@ -401,7 +402,7 @@
   box-shadow: var(--Form-select-outer-boxShadow);
   border-top-left-radius: 0;
   border-top-right-radius: 0;
-  min-width: px2rem(100px);
+  // min-width: px2rem(100px);
 
   // PopOver 上已经配置了，这个要是配置就会覆盖，所以先干掉好了
   // z-index: 10;

package/sdk/ang-ie11.css

@@ -13451,7 +13451,6 @@ readers do not read off random characters that represent icons */
   outline: none;
   /* Prevent dragging from highlighting the element */
   position: relative;
-  z-index: 0;
 }
 
 .amis-scope .CodeMirror-sizer {
@@ -41201,6 +41200,7 @@ readers do not read off random characters that represent icons */
   margin-left: 0;
   border: 0;
   border-style: solid;
+  background: transparent;
 }
 
 .amis-scope .a-Checkbox--button.a-Checkbox--checkbox > i + span {
@@ -42462,6 +42462,7 @@ readers do not read off random characters that represent icons */
 }
 
 .amis-scope .a-Select-input > input {
+  width: 100%;
   outline: none;
   border: none;
   flex-grow: 1;
@@ -42472,7 +42473,6 @@ readers do not read off random characters that represent icons */
 
 .amis-scope .a-Select-option {
   cursor: pointer;
-  min-width: 7.5rem;
   padding: calc( ( 1.875rem - 1.4285714286 * 0.875rem ) / 2 ) 0.5rem;
 }
 
@@ -42576,7 +42576,6 @@ readers do not read off random characters that represent icons */
   box-shadow: none;
   border-top-left-radius: 0;
   border-top-right-radius: 0;
-  min-width: 6.25rem;
 }
 
 .amis-scope .a-Select-popover.a-PopOver--leftTopLeftBottom {
@@ -43270,29 +43269,11 @@ readers do not read off random characters that represent icons */
   display: flex;
 }
 
-.amis-scope .a-DateControl {
-  width: auto !important;
-}
-
-.amis-scope .a-DateControl.is-date > .a-DatePicker {
-  min-width: calc(calc(
-    1rem * 5 + 0.75rem * 2 +
-      0.875rem * 2
-  ) + 1rem * 2);
-}
-
-.amis-scope .a-DateControl.is-datetime > .a-DatePicker {
-  min-width: calc(calc(
-    1rem * 5 + 0.75rem * 2 +
-      0.875rem * 2
-  ) + 1rem * 6);
-}
-
 .amis-scope .a-DatePicker-shortcuts {
   margin: 0;
   padding-left: 0.625rem;
   list-style: none;
-  background: #F7F7F9;
+  background: #f7f7f9;
   line-height: 2rem;
 }
 
@@ -43461,7 +43442,7 @@ readers do not read off random characters that represent icons */
 .amis-scope .rdt .rdtPicker .rdtDisabled.rdtToday > span,
 .amis-scope .rdt .rdtPicker .rdtOld.rdtToday > span,
 .amis-scope .rdt .rdtPicker .rdtNew.rdtToday > span {
-  border-color: #E8E9EB;
+  border-color: #e8e9eb;
 }
 
 .amis-scope .rdt .rdtPicker td.rdtActive > span,
@@ -43475,7 +43456,7 @@ readers do not read off random characters that represent icons */
 
 .amis-scope .rdt .rdtPicker .rdtActive.rdtToday > span {
   background: transparent;
-  border-color: #144BCC;
+  border-color: #144bcc;
 }
 
 .amis-scope .rdt .rdtPicker td.rdtDisabled > span,
@@ -43840,7 +43821,7 @@ readers do not read off random characters that represent icons */
 .amis-scope td.rdtQuarter.rdtDisabled,
 .amis-scope td.rdtQuarter.rdtDisabled:hover {
   background: #F7F7F9;
-  color: #B8BABF;
+  color: #b8babf;
 }
 
 .amis-scope .a-DateRangePicker-start .rdtPicker .rdtActive.rdtBetween {
@@ -48966,13 +48947,17 @@ readers do not read off random characters that represent icons */
   margin-top: 0.625rem;
 }
 
+.amis-scope .a-FormulaEditor-settings.only-variable {
+  height: 21.875rem;
+}
+
 .amis-scope .a-FormulaEditor-panel {
   display: flex;
   flex: 1;
   flex-flow: column nowrap;
   justify-content: space-between;
   align-items: stretch;
-  height: 15.625rem;
+  height: 100%;
   border-radius: 0.142rem;
   border: 0.0625rem solid #d1d5db;
 }
@@ -49001,11 +48986,12 @@ readers do not read off random characters that represent icons */
   flex: 1;
   display: flex;
   flex-flow: column nowrap;
-  max-height: 13.75rem;
+  max-height: calc(100% - 30px);
+  overflow: hidden;
 }
 
 .amis-scope .a-FormulaEditor-panel-body--tabs {
-  max-height: 15.625rem;
+  max-height: 100%;
 }
 
 .amis-scope .a-FormulaEditor-VariableList-root {
@@ -49150,12 +49136,15 @@ readers do not read off random characters that represent icons */
   vertical-align: middle;
   text-align: center;
   padding: 0 0.5rem;
-  line-height: 17px;
   border-radius: 0.142rem;
   background: #f5f5f5;
   color: #1c2b36;
 }
 
+.amis-scope .a-FormulaEditor-VariableList .a-GroupedSelection-item-tag {
+  line-height: 17px;
+}
+
 .amis-scope .a-FormulaEditor-FuncList {
   display: flex;
   flex-flow: row nowrap;
@@ -49354,6 +49343,44 @@ readers do not read off random characters that represent icons */
   padding: 0 2px;
 }
 
+.amis-scope .a-FormulaPicker.is-input-group {
+  border: 0.0625rem solid #d1d5db;
+  padding: calc(
+    (
+        1.875rem - 1.4285714286 *
+          0.875rem - 0.125rem
+      ) / 2
+  ) 0.5rem;
+  border-radius: 0.142rem;
+}
+
+.amis-scope .a-FormulaPicker.is-input-group .a-FormulaPicker-input {
+  display: inline-block;
+  width: 100%;
+  background: none;
+  padding: 0;
+  border: 0;
+  margin: 0;
+}
+
+.amis-scope .a-FormulaPicker.is-input-group .a-FormulaPicker-input:focus {
+  border: none;
+  outline: none;
+  box-sizing: none;
+}
+
+.amis-scope .a-FormulaPicker.is-input-group .a-FormulaPicker-toggler .icon-function {
+  transform: scale(1.6);
+}
+
+.amis-scope .a-FormulaPicker.is-input-group .a-FormulaPicker-toggler .icon-ellipsis-v {
+  transform: rotate(90deg);
+}
+
+.amis-scope .a-FormulaPicker.is-input-group .a-FormulaPicker-toggler:hover {
+  cursor: pointer;
+}
+
 .amis-scope .a-Timeline-vertical {
   display: flex;
   flex-flow: column;