amis 1.4.2-beta.11 → 1.4.2-beta.16

package/scss/base/_common.scss

@@ -0,0 +1,3 @@
+.has-popover {
+  position: relative;
+}

package/scss/components/_anchor-nav.scss

@@ -104,6 +104,7 @@
     border: none;
     flex-grow: 1;
     overflow: auto;
+    scroll-behavior: smooth;
     background: var(--Tabs-content-bg);
 
     > .#{$ns}AnchorNav-section {

package/scss/components/_collapse-group.scss

@@ -0,0 +1,11 @@
+.#{$ns}CollapseGroup {
+
+  &.icon-position-right {
+    .#{$ns}Collapse-header {
+      .#{$ns}Collapse-arrow {
+        float: right;
+      }
+    }
+  }
+  
+}

package/scss/components/_collapse.scss

@@ -1,7 +1,7 @@
 .#{$ns}Collapse {
   border: var(--Collapse-border);
   padding: 0;
-  margin-bottom: var(--Form-item-gap);
+  line-height: px2rem(20px);
 
   &-header {
     font-size: var(--Collapse-header-fontSize);
@@ -10,6 +10,7 @@
     padding: var(--Collapse-header-padding);
     margin: 0;
     border-bottom: var(--borderWidth) solid var(--Collapse-border-color);
+    cursor: pointer;
     background: var(--Collapse-header-bg);
 
     &-wrapper {
@@ -30,8 +31,7 @@
     display: inline-block;
     width: px2rem(16px);
     text-align: center;
-    margin-right: px2rem(8px);
-    cursor: pointer;
+    margin-right: var(--gap-xs);
 
     &:before {
       content: '';
@@ -39,37 +39,50 @@
       display: inline-block;
       width: px2rem(6px);
       height: px2rem(6px);
-      top: px2rem(-4px);
+      top: px2rem(-2px);
       border-color: var(--text-color);
       border-style: solid;
       border-width: px2rem(1px) px2rem(1px) 0 0;
-      transform: rotate(135deg);
+      transform: rotate(45deg);
       transform-origin: 50% 50%;
     }
   }
 
-  &-TplField {
+  &-icon-tranform {
     display: inline-block;
+    width: px2rem(16px);
+    text-align: center;
+    margin-right: var(--gap-xs);
   }
 
-  &.is-collapsed &-arrow:before {
-    transform: rotate(45deg);
-    transform-origin: 0% 50%;
+  .#{$ns}TplField {
+    display: inline-block;
   }
-  &.is-collapsed &-header {
-    border-bottom: var(--Collapse-header-collapsed-border);
+
+  &.is-active &-arrow:before {
+    transform: rotate(135deg);
+    transform-origin: 50% 30%;
+  }
+  &.is-active &-icon-tranform {
+    transform: rotate(90deg);
   }
 
-  &--collapsable &-header {
-    cursor: pointer;
+  &--disabled &-header {
+    cursor: not-allowed;
     user-select: none;
+    color: var(--text--muted-color);
+    &:hover {
+      background-color: var(--Collapse-header-bg-disabled-color);
+    }
+  }
+
+  &--disabled &-arrow:before {
+    border-color: var(--text--muted-color);
   }
 
   // title 显示在底部的模式
   &--title-bottom &-header {
     text-align: center;
-    color: var(--link-color);
-    border-left: none;
     font-size: var(--fontSizeBase);
     border-top: var(--Collapse-header-collapsed-borderTop);
     border-bottom: var(--Collapse-header-collapsed-borderBottom);
@@ -80,15 +93,13 @@
   }
 
   &--title-bottom &-arrow:before {
-    top: px2rem(2px);
-    transform: rotate(-45deg);
-    transform-origin: 0% 50%;
+    top: px2rem(-4px);
+    transform: rotate(135deg);
   }
 
-  &--title-bottom.is-collapsed &-arrow:before {
-    top: px2rem(-6px);
-    transform: rotate(135deg);
-    transform-origin: 0% 50%;
+  &--title-bottom.is-active &-arrow:before {
+    top: 0;
+    transform: rotate(-45deg);
   }
 
   &-contentWrapper {

package/scss/components/_grid-nav.scss

@@ -0,0 +1,128 @@
+.u-hairline::after {
+  position: absolute;
+  box-sizing: border-box;
+  content: ' ';
+  pointer-events: none;
+  top: -50%;
+  right: -50%;
+  bottom: -50%;
+  left: -50%;
+  border: 0 solid var(--borderColorLight);
+  z-index: 1;
+  transform: scale(0.5);
+}
+
+.#{$ns}GridNav {
+  display: flex;
+  flex-wrap: wrap;
+
+  &-top {
+    position: relative;
+
+    &::after {
+      border-top-width: px2rem(1px);
+    }
+  }
+}
+
+.#{$ns}GridNavItem {
+  position: relative;
+  box-sizing: border-box;
+
+  &--square {
+    height: 0;
+    position: relative;
+  }
+
+  &-icon {
+    width: var(--rv-grid-item-icon-size);
+  }
+
+  &-text {
+    color: var(--text-color);
+    font-size: var(--fontSizeSm);
+    line-height: 1.5;
+    word-break: break-all;
+    flex-shrink: 0;
+  }
+
+  &-icon + &-text {
+    margin-top: px2rem(8px);
+  }
+
+  &-image {
+    display: inline-block;
+
+    svg,
+    img {
+      max-width: 100%;
+      display: block;
+      width: 60%;
+      margin: 0 auto;
+    }
+  }
+
+  &-content {
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    height: 100%;
+    padding: var(--gap-md) var(--gap-sm);
+    background-color: var(--white);
+    position: relative;
+
+    .#{$ns}Badge-text {
+      z-index: 10;
+    }
+
+    &--border::after {
+      border-width: 0 var(--borderWidth) var(--borderWidth) 0;
+    }
+
+    &--square {
+      position: absolute;
+      top: 0;
+      right: 0;
+      left: 0;
+    }
+
+    &--center {
+      align-items: center;
+      justify-content: center;
+    }
+
+    &--horizontal {
+      flex-direction: row;
+
+      .#{$ns}GridNavItem-text {
+        margin: 0 0 0 var(--gap-sm);
+      }
+    }
+
+    &--reverse {
+      flex-direction: column-reverse;
+
+      .#{$ns}GridNavItem-text {
+        margin: 0 0 var(--gap-sm);
+      }
+    }
+
+    &--horizontal &--reverse {
+      flex-direction: row-reverse;
+
+      .#{$ns}GridNavItem-text {
+        margin: 0 var(--gap-sm) 0 0;
+      }
+    }
+
+    &--surround {
+      &::after {
+        border-width: var(--borderWidth);
+      }
+    }
+
+    &--clickable {
+      cursor: pointer;
+    }
+  }
+}

package/scss/components/_input-box.scss

@@ -1,5 +1,6 @@
 .#{$ns}InputBox {
   @include input-input();
+  @include input-border();
 
   &--inline {
     display: inline-flex;

package/scss/components/_nav.scss

@@ -75,8 +75,8 @@
           cursor: move;
           position: absolute;
           left: 0;
-          top: px2rem(11px);
           display: none;
+          line-height: 0;
           > .icon, > .#{$ns}Badge > .icon {
             color: var(--icon-color);
 

package/scss/components/_picker-columns.scss

@@ -49,6 +49,7 @@
   }
 
   &-columns {
+    touch-action: none;
     position: relative;
     display: flex;
     cursor: grab;

package/scss/components/_popover.scss

@@ -52,7 +52,3 @@
     margin-top: px2rem(-4px);
   }
 }
-
-.has-popover {
-  position: relative;
-}

package/scss/components/_result-box.scss

@@ -1,5 +1,6 @@
 .#{$ns}ResultBox {
   @include input-input();
+  @include input-border();
   flex-wrap: wrap;
   padding: 0 px2rem(3px);
   min-height: var(--Form-input-height);

package/scss/components/_spinner.scss

@@ -62,11 +62,12 @@
   &--icon {
     background: transparent;
     animation: spin 2s linear infinite;
-    width: var(--fontSizeLg);
-    height: var(--fontSizeLg);
+    width: 16px; // reload 那个 icon 必须用这个高宽
+    height: 16px;
     svg.icon {
-      width: var(--fontSizeLg);
-      height: var(--fontSizeLg);
+      width: 16px;
+      height: 16px;
+      top: 0;
     }
   }
 }

package/scss/components/_table.scss

@@ -549,6 +549,9 @@
       width: px2rem(1px);
       padding-right: 0;
       cursor: move;
+      > svg {
+        vertical-align: middle;
+      }
     }
 
     > tbody > tr > td.#{$ns}Table-expandCell {
@@ -879,6 +882,9 @@
       text-decoration: none;
       color: var(--icon-onHover-color);
     }
+    > svg {
+      vertical-align: -2px;
+    }
   }
 
   &-table > tbody > tr:hover .#{$ns}Table-dragBtn,

package/scss/components/form/_combo.scss

@@ -159,6 +159,8 @@
 
     .#{$ns}Combo-itemDrager {
       padding: var(--Combo--horizontal-dragger-top) px2rem(6px) 0 0;
+      display: flex;
+      align-items: center;
     }
   }
 
@@ -224,6 +226,8 @@
       position: absolute;
       top: var(--Combo--horizontal-dragger-top);
       left: px2rem(-30px);
+      display: flex;
+      align-items: center;
     }
 
     &.is-draggable {

package/scss/components/form/_file.scss

@@ -1,4 +1,15 @@
 .#{$ns}FileControl {
+  &-templateInfo {
+    display: block;
+    margin-bottom: var(--gap-base);
+    padding: var(--Button-paddingY) var(--Button-paddingX);
+    cursor: pointer;
+
+    > svg {
+      margin-right: var(--gap-xs);
+    }
+  }
+
   &-dropzone {
     outline: none;
   }

package/scss/components/form/_form.scss

@@ -358,3 +358,51 @@
 .#{$ns}Form--quickEdit {
   min-width: var(--Form-control-widthSm);
 }
+
+.#{$ns}Form--column {
+  display: flex;
+  flex-wrap: wrap;
+  margin-left: calc(var(--Form-group-gutterWidth) / -2);
+  margin-right: calc(var(--Form-group-gutterWidth) / -2);
+  > .#{$ns}Form-item {
+    flex-grow: 1;
+    padding-left: calc(var(--Form-group-gutterWidth) / 2);
+    padding-right: calc(var(--Form-group-gutterWidth) / 2);
+  }
+}
+
+.#{$ns}Form--column-2 > .#{$ns}Form-item {
+  width: 50%;
+}
+
+.#{$ns}Form--column-3 > .#{$ns}Form-item {
+  width: 33%;
+}
+
+.#{$ns}Form--column-4 > .#{$ns}Form-item {
+  width: 25%;
+}
+
+.#{$ns}Form--column-5 > .#{$ns}Form-item {
+  width: 20%;
+}
+
+.#{$ns}Form--column-6 > .#{$ns}Form-item {
+  width: 16.6%;
+}
+
+.#{$ns}Form--column-7 > .#{$ns}Form-item {
+  width: 14.2%;
+}
+
+.#{$ns}Form--column-8 > .#{$ns}Form-item {
+  width: 12.5%;
+}
+
+.#{$ns}Form-column-9 > .#{$ns}Form-item {
+  width: 11.1%;
+}
+
+.#{$ns}Form-column-10 > .#{$ns}Form-item {
+  width: 10%;
+}

package/scss/components/form/_tree.scss

@@ -59,6 +59,10 @@
     pointer-events: none;
   }
 
+  &.is-draggable {
+    position: relative;
+  }
+
   &--outline &-sublist &-item--isLeaf {
     &:before {
       position: absolute;
@@ -101,6 +105,10 @@
     }
   }
 
+  &.is-draggable &-itemLabel:hover::after {
+    display: none;
+  }
+
   &-item-icons {
     visibility: hidden;
     transition: visibility var(--animation-duration) ease;
@@ -227,6 +235,11 @@
     width: calc(var(--Tree-itemArrowWidth) + var(--gap-xs));
   }
 
+  &-itemDrager {
+    cursor: move;
+    color: var(--icon-color);
+  }
+
   &-spinner {
     margin-right: var(--gap-xs);
   }
@@ -274,4 +287,33 @@
   &-placeholder {
     color: var(--text--muted-color);
   }
+
+  &-dropIndicator {
+    position: absolute;
+    height: px2rem(2px);
+    background-color: var(--Tree-itemLabel--onChecked-color);
+    border-radius: px2rem(1px);
+    z-index: 1;
+
+    &::after {
+      position: absolute;
+      top: px2rem(-3px);
+      left: px2rem(-6px);
+      width: px2rem(8px);
+      height: px2rem(8px);
+      background-color: transparent;
+      border: px2rem(2px) solid var(--Tree-itemLabel--onChecked-color);
+      border-radius: 50%;
+      content: '';
+    }
+
+    &--hover {
+      border-radius: 0;
+      background-color: var(--Tree-item-onHover-bg);
+
+      &::after {
+        display: none;
+      }
+    }
+  }
 }

package/scss/themes/_common.scss

@@ -2,6 +2,7 @@
 @import '../base/reset';
 @import '../base/normalize';
 @import '../base/typography';
+@import '../base/common';
 
 @import '../layout/layout';
 @import '../layout/grid';
@@ -37,6 +38,7 @@
 @import '../components/dropdown';
 @import '../components/each';
 @import '../components/collapse';
+@import '../components/collapse-group';
 @import '../components/color';
 @import '../components/condition-builder';
 @import '../components/context-menu';
@@ -68,6 +70,7 @@
 @import '../components/icon';
 @import '../components/steps';
 @import '../components/portlet';
+@import '../components/grid-nav';
 
 @import '../components/form/fieldset';
 @import '../components/form/group';

package/scss/themes/_cxd-variables.scss

@@ -229,15 +229,14 @@ $R8: 50%;
   --ColorPicker-onDisabled-bg: #f5f5f5;
   --ColorPicker-onDisabled-color: #999;
 
-  --Collapse-border: #{px2rem(1px)} solid #{$G8};
-  --Collapse-border-color: #{$G8};
+  --Collapse-border: #{px2rem(1px)} solid #EBEDF5;
+  --Collapse-border-color: #EBEDF5;
   --Collapse-header-fontSize: #{$T3};
   --Collapse-header-fontWeight: #{$W3};
-  --Collapse-header-padding: #{px2rem(16px)};
-  --Collapse-header-bg: #{$G10};
-  --Collapse-header-onHover-bg: #{$G9};
-  --Collapse-header-collapsed-border: none;
-  --Collapse-header-collapsed-borderTop: none;
+  --Collapse-header-padding: #{px2rem(14px)};
+  --Collapse-header-bg: #F6F7FA;
+  --Collapse-header-onHover-bg: #F3F9FE;
+  --Collapse-header-bg-disabled-color: #F6F7FA;
   --Collapse-header-collapsed-borderBottom: none;
   --Collapse-header-wrapper-direction: row-reverse;
   --Collapse-content-padding: #{px2rem(16px)};

package/scss/themes/cxd.scss

@@ -291,6 +291,7 @@
           svg {
             width: #{px2rem(12px)};
             height: #{px2rem(12px)};
+            top: 0;
           }
         }