amis 1.3.5-beta.7 → 1.4.2-beta.11

package/scss/components/form/_selection.scss

@@ -0,0 +1,354 @@
+.#{$ns}Selection {
+  > .#{$ns}Checkbox {
+    display: block;
+    height: var(--Form-input-height);
+    line-height: var(--Form-input-lineHeight);
+    font-size: var(--Form-input-fontSize);
+    padding: calc(
+        (
+            var(--Form-input-height) - var(--Form-input-lineHeight) *
+              var(--Form-input-fontSize)
+          ) / 2
+      )
+      var(--gap-sm)
+      calc(
+        (
+            var(--Form-input-height) - var(--Form-input-lineHeight) *
+              var(--Form-input-fontSize)
+          ) / 2
+      )
+      calc(var(--gap-sm) + var(--Checkbox-size));
+  }
+
+  &--inline > .#{$ns}Checkbox {
+    display: inline-block;
+  }
+
+  &-addBtn {
+    display: block;
+    cursor: pointer;
+
+    &:hover {
+      text-decoration: none;
+    }
+
+    > svg {
+      width: px2rem(14px);
+      height: px2rem(14px);
+      margin-right: var(--Checkbox-gap);
+    }
+  }
+}
+
+.#{$ns}GroupedSelection {
+  &-group:not(:first-child) > &-itemLabel {
+    border-top: px2rem(1px) solid var(--ListMenu-divider-color);
+  }
+
+  &-group > &-itemLabel {
+    font-size: var(--fontSizeSm);
+    padding: var(--gap-xs) var(--gap-xs);
+    color: var(--text--muted-color);
+  }
+
+  &-item {
+    display: flex;
+    height: var(--Form-input-height);
+    line-height: var(--Form-input-lineHeight);
+    font-size: var(--Form-input-fontSize);
+    padding: calc(
+        (
+            var(--Form-input-height) - var(--Form-input-lineHeight) *
+              var(--Form-input-fontSize)
+          ) / 2
+      )
+      var(--gap-sm);
+    flex-direction: row;
+
+    > .#{$ns}Checkbox {
+      margin-right: 0;
+    }
+    cursor: pointer;
+    user-select: none;
+
+    &.is-active {
+      color: var(--Form-select-menu-onActive-color);
+      background: var(--Form-select-menu-onActive-bg);
+    }
+
+    &:hover {
+      background: var(--Tree-item-onHover-bg);
+    }
+
+    &.is-disabled {
+      pointer-events: none;
+      color: var(--text--muted-color);
+    }
+  }
+
+  &-group > &-items > &-item {
+    padding-left: var(--gap-base);
+  }
+
+  &-itemLabel {
+    flex-grow: 1;
+
+    span {
+      white-space: nowrap; // 避免在条件组合中折行
+    }
+  }
+
+  &-placeholder {
+    @include checkboxes-placeholder();
+  }
+}
+
+.#{$ns}TableSelection {
+  .#{$ns}Table-content {
+    border-top: var(--Table-borderWidth) solid var(--Table-borderColor);
+  }
+
+  .#{$ns}Table-table > thead > tr > th,
+  .#{$ns}Table-table > tbody > tr > td {
+    font-size: var(--fontSizeSm);
+    padding-top: var(--gap-xs);
+    padding-bottom: px2rem(6px);
+    vertical-align: middle;
+  }
+
+  .#{$ns}Table-table > thead > tr > th {
+    padding-top: px2rem(6px);
+  }
+
+  .#{$ns}Table-table > thead > tr > th:first-child,
+  .#{$ns}Table-table > tbody > tr > td:first-child {
+    padding-left: px2rem(10px);
+    padding-right: 0;
+  }
+
+  .#{$ns}Table-table > thead > tr > th:last-child,
+  .#{$ns}Table-table > tbody > tr > td:last-child {
+    padding-right: var(--gap-md);
+  }
+
+  .#{$ns}Table-table > tbody > tr {
+    cursor: pointer;
+  }
+
+  .#{$ns}Table-table > tbody > tr.is-active {
+    color: var(--Form-select-menu-onActive-color);
+    background: var(--Form-select-menu-onActive-bg);
+  }
+}
+
+.#{$ns}TreeSelection {
+  .#{$ns}Table-expandBtn {
+    color: var(--icon-color);
+    margin-right: 5px;
+  }
+
+  &-sublist {
+    position: relative;
+    margin: 0 0 0 px2rem(35px);
+    display: none;
+
+    &:before {
+      width: 1px;
+      content: '';
+      display: block;
+      position: absolute;
+      top: calc(var(--gap-xs) * -1);
+      bottom: calc(var(--Form-input-height) / 2);
+      left: -19px;
+      border-left: dashed 1px var(--icon-color);
+    }
+  }
+
+  &-item {
+    position: relative;
+  }
+  &-item.is-expanded > &-sublist {
+    display: block;
+  }
+
+  &-item:not(:last-child) > &-sublist:before {
+    bottom: 0;
+  }
+
+  &-sublist &-item:before {
+    height: 1px;
+    content: '';
+    display: block;
+    position: absolute;
+    top: calc(var(--Form-input-height) / 2);
+    width: 19px;
+    left: -19px;
+    border-top: dashed 1px var(--icon-color);
+  }
+
+  &-itemInner {
+    display: flex;
+    align-items: center;
+    height: var(--Form-input-height);
+    line-height: var(--Form-input-lineHeight);
+    font-size: var(--Form-input-fontSize);
+    padding: calc(
+        (
+            var(--Form-input-height) - var(--Form-input-lineHeight) *
+              var(--Form-input-fontSize)
+          ) / 2
+      )
+      var(--gap-sm);
+    flex-direction: row;
+
+    > .#{$ns}Checkbox {
+      margin-right: 0;
+      margin-left: var(--gap-sm);
+    }
+    cursor: pointer;
+    user-select: none;
+
+    position: relative;
+    & > * {
+      position: relative;
+      z-index: 2;
+    }
+
+    &:hover:after {
+      position: absolute;
+      content: '';
+      z-index: 1;
+      top: 0;
+      right: 0;
+      bottom: 0;
+      left: -99999px;
+      background: var(--Tree-item-onHover-bg);
+    }
+
+    &.is-active {
+      color: var(--Form-select-menu-onActive-color);
+    }
+
+    &.is-disabled {
+      pointer-events: none;
+      color: var(--text--muted-color);
+    }
+  }
+
+  &-itemLabel {
+    flex-grow: 1;
+  }
+
+  &-placeholder {
+    @include checkboxes-placeholder();
+  }
+}
+
+.#{$ns}ChainedSelection {
+  display: flex;
+  flex-direction: row;
+
+  &-col {
+    flex-grow: 1;
+    min-width: 150px;
+  }
+
+  &-col:not(:last-child) {
+    border-right: 1px solid var(--borderColor);
+  }
+
+  &-subTitle {
+    font-size: var(--fontSizeSm);
+    padding: var(--gap-xs) var(--gap-xs);
+    color: var(--text--muted-color);
+  }
+
+  &-item {
+    display: flex;
+    height: var(--Form-input-height);
+    line-height: var(--Form-input-lineHeight);
+    font-size: var(--Form-input-fontSize);
+    padding: calc(
+        (
+            var(--Form-input-height) - var(--Form-input-lineHeight) *
+              var(--Form-input-fontSize)
+          ) / 2
+      )
+      var(--gap-sm);
+    flex-direction: row;
+
+    > .#{$ns}Checkbox {
+      margin-right: 0;
+    }
+    cursor: pointer;
+    user-select: none;
+
+    &.is-active {
+      color: var(--Form-select-menu-onActive-color);
+      background: var(--Form-select-menu-onActive-bg);
+    }
+
+    &:hover {
+      background: var(--Tree-item-onHover-bg);
+    }
+
+    &.is-disabled {
+      pointer-events: none;
+      color: var(--text--muted-color);
+    }
+  }
+
+  &-itemLabel {
+    flex-grow: 1;
+  }
+
+  &-placeholder {
+    @include checkboxes-placeholder();
+  }
+}
+
+.#{$ns}AssociatedSelection {
+  display: flex;
+  flex-direction: row;
+
+  &-left,
+  &-right {
+    flex-grow: 1;
+    width: 0;
+    min-height: px2rem(200px);
+    max-height: px2rem(400px);
+    overflow: auto;
+  }
+
+  &-left {
+    border-right: 1px solid var(--borderColor);
+  }
+
+  &-reload {
+    text-align: center;
+    color: var(--info);
+    margin: 20px 0 0;
+
+    &.is-clickable {
+      cursor: pointer;
+    }
+  }
+
+  &-box {
+    line-height: var(--Form-input-lineHeight);
+    font-size: var(--fontSizeSm);
+    color: var(--text--muted-color);
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+
+    > p {
+      text-align: center;
+      margin: 10px 0 20px;
+      color: var(--text--muted-color);
+    }
+  }
+}

package/scss/components/form/_text.scss

@@ -268,4 +268,17 @@
   .has-error--maxLength &-counter {
     color: var(--danger);
   }
+
+  // yunshe4.0
+  &-input {
+    &:hover {
+      border-color: var(--Form-input-onHover-borderColor);
+    }
+  }
+}
+
+.#{$ns}TextControl.is-disabled {
+  &-input input {
+    color: var(--Form-input-onDisabled-color);
+  }
 }

package/scss/components/form/_textarea.scss

@@ -18,12 +18,22 @@
     &::placeholder {
       color: var(--Form-input-placeholderColor);
     }
+
+    // yunshe4.0
+    &:hover {
+      border-color: var(--Form-input-onHover-borderColor);
+    }
   }
 
   & > textarea:focus,
   &.is-focused > textarea {
     border-color: var(--Form-input-onFocused-borderColor);
     box-shadow: var(--Form-input-boxShadow);
+
+    // yunshe4.0
+    &:hover {
+      border-color: var(--Form-input-onFocused-borderColor);
+    }
   }
 
   &.is-disabled > textarea,

package/scss/components/form/_transfer.scss

@@ -24,6 +24,7 @@
       )
       var(--gap-sm);
     flex-direction: row;
+    border-radius: var(--borderRadius) var(--borderRadius) 0 0;
 
     &--light {
       background: transparent;
@@ -43,21 +44,22 @@
     border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
     display: flex;
     flex-direction: column;
+    border-radius: var(--borderRadius);
   }
 
-  &-select > &-checkboxes,
-  &-result > &-selections {
+  &-select > &-selection,
+  &-result > &-value {
     flex-grow: 1;
     max-height: 100%;
     overflow: auto;
     position: relative; // 貌似不加 relative 会有 bug。
   }
 
-  &-search + &-checkboxes {
+  &-search + &-selection {
     border-top: 1px solid var(--borderColor);
   }
 
-  &-checkboxes .#{$ns}ListCheckboxes-placeholder {
+  &-selection .#{$ns}ListSelection-placeholder {
     height: 100%;
     display: flex;
     align-items: center;
@@ -103,6 +105,24 @@
       color: var(--text--muted-color);
     }
   }
+}
+
+.#{$ns}TabsTransfer {
+  .#{$ns}Transfer-title {
+    height: 40px;
+  }
+
+  // .#{$ns}Transfer-result {
+  //   flex-grow: unset;
+  // }
+
+  &-placeholder {
+    @include checkboxes-placeholder();
+  }
+
+  &-tab {
+    padding: 0;
+  }
 
   &-tabs {
     display: flex;
@@ -139,18 +159,19 @@
 
     > .#{$ns}Tabs-content {
       flex-grow: 1;
+      min-height: 0;
       position: relative;
       padding: 5px 0 0;
 
       > .#{$ns}Tabs-pane {
         position: relative;
-        min-height: 100%;
+        height: 100%;
 
         &.is-active {
           display: flex;
           flex-direction: column;
 
-          > .#{$ns}Transfer-checkboxes {
+          > .#{$ns}Transfer-selection {
             flex-grow: 1;
             max-height: 100%;
             overflow: auto;
@@ -161,24 +182,62 @@
   }
 }
 
-.#{$ns}TabsTransfer {
-  .#{$ns}Transfer-title {
-    height: 40px;
+.#{$ns}TransferControl {
+  position: relative;
+
+  &.is-inline {
+    display: inline-block;
   }
+}
 
-  // .#{$ns}Transfer-result {
-  //   flex-grow: unset;
-  // }
+.#{$ns}TransferPicker {
+  &-icon {
+    transition: transform var(--animation-duration) ease-out;
+    margin: 5px 5px 5px auto;
+    display: flex;
+    color: var(--Form-select-caret-iconColor);
+    &:hover {
+      color: var(--Form-select-caret-onHover-iconColor);
+    }
 
-  &-placeholder {
-    @include checkboxes-placeholder();
+    > svg {
+      width: px2rem(12px);
+      height: px2rem(12px);
+      top: 0;
+    }
   }
 }
 
-.#{$ns}TransferControl {
-  position: relative;
+.#{$ns}TransferDropDown {
+  &-icon {
+    transition: transform var(--animation-duration) ease-out;
+    margin: 5px 5px 5px auto;
+    display: flex;
+    color: var(--Form-select-caret-iconColor);
+    &:hover {
+      color: var(--Form-select-caret-onHover-iconColor);
+    }
 
-  &.is-inline {
-    display: inline-block;
+    > svg {
+      width: px2rem(10px);
+      height: px2rem(10px);
+      top: 0;
+    }
+  }
+
+  &.is-active &-icon {
+    transform: rotate(180deg);
+  }
+}
+.#{$ns}TransferDropDown-content {
+  min-height: px2rem(200px);
+  display: flex;
+  flex-direction: column;
+
+  & > .#{$ns}Transfer-selection {
+    flex-grow: 1;
+    max-height: 100%;
+    overflow: auto;
+    position: relative; // 貌似不加 relative 会有 bug。
   }
 }

package/scss/themes/_common.scss

@@ -17,6 +17,7 @@
 @import '../components/tooltip';
 @import '../components/tpl';
 @import '../components/popover';
+@import '../components/picker-columns';
 @import '../components/toast';
 @import '../components/alert';
 @import '../components/app';
@@ -42,6 +43,7 @@
 @import '../components/wizard';
 @import '../components/crud';
 @import '../components/table';
+@import '../components/column-toggler';
 @import '../components/list';
 @import '../components/cards';
 @import '../components/card';
@@ -65,6 +67,7 @@
 @import '../components/json';
 @import '../components/icon';
 @import '../components/steps';
+@import '../components/portlet';
 
 @import '../components/form/fieldset';
 @import '../components/form/group';
@@ -72,6 +75,7 @@
 @import '../components/form/text';
 @import '../components/form/textarea';
 @import '../components/form/checks';
+@import '../components/form/selection';
 @import '../components/form/city';
 @import '../components/form/switch';
 @import '../components/form/number';
@@ -106,5 +110,8 @@
 @import '../components/form/icon-picker';
 @import '../components/form/form';
 @import '../components/anchor-nav';
+@import '../components/markdown';
+@import '../components/link';
+@import '../components/mapping';
 
 @import '../utilities';

package/scss/themes/_cxd-colors.scss

@@ -0,0 +1,56 @@
+// yunshe4.0
+$B1: #e9f0fd;
+$B2: #d3e0fc;
+$B3: #a7c2f9;
+$B4: #7ba4f7;
+$B5: #4f86f4;
+$B6: #2468f2;
+$B7: #1c53c1;
+$B8: #153e91;
+$B9: #0e2960;
+$B10: #091a3c;
+
+$E1: #fdf0ee;
+$E2: #fce0dc;
+$E3: #fac1ba;
+$E4: #f8a397;
+$E5: #f68475;
+$E6: #e8684a;
+$E7: #c35142;
+$E8: #923d31;
+$E9: #612821;
+$E10: #3d1914;
+
+$S1: #e7f9f2;
+$S2: #cff2de;
+$S3: #a0e5bd;
+$S4: #71d99c;
+$S5: #42cc7b;
+$S6: #0bc286;
+$S7: #0f9948;
+$S8: #0b7336;
+$S9: #074c24;
+$S10: #004d25;
+
+$W1: #fff7e6;
+$W2: #ffefcc;
+$W3: #ffe099;
+$W4: #ffd066;
+$W5: #ffc133;
+$W6: #ffb200;
+$W7: #cc8e00;
+$W8: #996a00;
+$W9: #664700;
+$W10: #332300;
+
+$G1: #080e1a;
+$G2: #151a26;
+$G3: #2d323c;
+$G4: #5e626a;
+$G5: #83868c;
+$G6: #b4b6ba;
+$G7: #cecfd1;
+$G8: #dadbdd;
+$G9: #e6e6e8;
+$G10: #f2f2f4;
+$G11: #ffffff;