amis 1.4.2-beta.13 → 1.4.2-beta.18

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

@@ -38,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';
@@ -69,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

@@ -72,6 +72,8 @@ $R7: px2rem(16px);
 $R8: 50%;
 
 // yunshe4.0 box-shadow
+$L1: 0px 4px 6px 0px rgba(8, 14, 26, 0.06),
+  0px 1px 10px 0px rgba(8, 14, 26, 0.05), 0px 2px 4px -1px rgba(8, 14, 26, 0.04);
 
 :root {
   --borderColor: #eceff8;
@@ -81,7 +83,7 @@ $R8: 50%;
 
   --text--muted-color: #{$G6};
   --text--loud-color: #333;
-  --link-onHover-decoration: underline;
+  --link-onHover-decoration: none;
 
   --icon-color: #999;
   --icon-onHover-color: var(--primary);
@@ -228,16 +230,16 @@ $R8: 50%;
   --ColorPicker-placeholderColor: #999;
   --ColorPicker-onDisabled-bg: #f5f5f5;
   --ColorPicker-onDisabled-color: #999;
+  --ColorPicker-boxShadow: #{$L1};
 
   --Collapse-border: #{px2rem(1px)} solid #{$G8};
   --Collapse-border-color: #{$G8};
   --Collapse-header-fontSize: #{$T3};
-  --Collapse-header-fontWeight: #{$W3};
+  --Collapse-header-fontWeight: #{$W2};
   --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-bg-disabled-color: #{$G10};
   --Collapse-header-collapsed-borderBottom: none;
   --Collapse-header-wrapper-direction: row-reverse;
   --Collapse-content-padding: #{px2rem(16px)};
@@ -501,6 +503,9 @@ $R8: 50%;
   --TransferSelect-heading-borderBottom: 0;
 
   // Alert
+  --Alert-fontColor: #{$G4};
+  --Alert-title-fontColor: #{$G2};
+
   --Alert-height: #{px2rem(40px)};
   --Alert-paddingX: #{px2rem(16px)};
   --Alert-fontSize: #{$T2};

package/scss/themes/cxd.scss

@@ -148,13 +148,6 @@
   }
 }
 
-.#{$ns}ColorPicker {
-  .#{$ns}PopOver {
-    border: none;
-    box-shadow: var(--boxShadow);
-  }
-}
-
 .#{$ns}IconPickerControl {
   .#{$ns}IconPickerControl-input--withAC {
     .#{$ns}IconPickerControl-sugsPanel {
@@ -291,6 +284,7 @@
           svg {
             width: #{px2rem(12px)};
             height: #{px2rem(12px)};
+            top: 0;
           }
         }