amis 1.8.0-beta.3 → 1.8.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis",
-  "version": "1.8.0-beta.3",
+  "version": "1.8.0-beta.5",
   "description": "一种MIS页面生成工具",
   "main": "lib/index.js",
   "scripts": {

package/schema.json

@@ -1745,6 +1745,13 @@
                   "horizontal"
                 ],
                 "description": "配置当前表单项展示模式"
+              },
+              "optionType": {
+                "type": "string",
+                "enum": [
+                  "default",
+                  "button"
+                ]
               }
             }
           },
@@ -9354,6 +9361,18 @@
           "description": "每页个数，默认为 10，如果不是请设置。",
           "default": 10
         },
+        "orderBy": {
+          "type": "string",
+          "description": "默认排序字段"
+        },
+        "orderDir": {
+          "type": "string",
+          "enum": [
+            "asc",
+            "desc"
+          ],
+          "description": "默认排序方向"
+        },
         "defaultParams": {
           "$ref": "#/definitions/PlainObject",
           "description": "可以默认给定初始参数如： {\\\"perPage\\\": 24}"
@@ -9874,6 +9893,18 @@
           "description": "每页个数，默认为 10，如果不是请设置。",
           "default": 10
         },
+        "orderBy": {
+          "type": "string",
+          "description": "默认排序字段"
+        },
+        "orderDir": {
+          "type": "string",
+          "enum": [
+            "asc",
+            "desc"
+          ],
+          "description": "默认排序方向"
+        },
         "defaultParams": {
           "$ref": "#/definitions/PlainObject",
           "description": "可以默认给定初始参数如： {\\\"perPage\\\": 24}"
@@ -10556,6 +10587,18 @@
           "description": "每页个数，默认为 10，如果不是请设置。",
           "default": 10
         },
+        "orderBy": {
+          "type": "string",
+          "description": "默认排序字段"
+        },
+        "orderDir": {
+          "type": "string",
+          "enum": [
+            "asc",
+            "desc"
+          ],
+          "description": "默认排序方向"
+        },
         "defaultParams": {
           "$ref": "#/definitions/PlainObject",
           "description": "可以默认给定初始参数如： {\\\"perPage\\\": 24}"
@@ -14357,6 +14400,9 @@
               "const": "lg"
             }
           ]
+        },
+        "justify": {
+          "type": "boolean"
         }
       },
       "additionalProperties": false
@@ -21061,9 +21107,19 @@
           "description": "远端校验表单项接口"
         },
         "trueValue": {
+          "type": [
+            "boolean",
+            "string",
+            "number"
+          ],
           "description": "勾选值"
         },
         "falseValue": {
+          "type": [
+            "boolean",
+            "string",
+            "number"
+          ],
           "description": "未勾选值"
         },
         "option": {
@@ -21073,6 +21129,19 @@
         "badge": {
           "$ref": "#/definitions/BadgeSchema",
           "description": "角标"
+        },
+        "partial": {
+          "type": "boolean"
+        },
+        "optionType": {
+          "type": "string",
+          "enum": [
+            "default",
+            "button"
+          ]
+        },
+        "checked": {
+          "type": "boolean"
         }
       },
       "required": [
@@ -60877,7 +60946,7 @@
           "$ref": "#/definitions/CheckboxControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(onEvent|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|trueValue|falseValue|option|badge|popOver|quickEdit|copyable)$": {}
+            "^(onEvent|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|trueValue|falseValue|option|badge|partial|optionType|checked|popOver|quickEdit|copyable)$": {}
           }
         },
         {
@@ -61685,7 +61754,7 @@
           "$ref": "#/definitions/CheckboxControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(onEvent|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|trueValue|falseValue|option|badge|popOver|quickEdit|copyable)$": {}
+            "^(onEvent|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|trueValue|falseValue|option|badge|partial|optionType|checked|popOver|quickEdit|copyable)$": {}
           }
         },
         {
@@ -62493,7 +62562,7 @@
           "$ref": "#/definitions/CheckboxControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(onEvent|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|trueValue|falseValue|option|badge|fixed|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|filterable|breakpoint|unique)$": {}
+            "^(onEvent|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|trueValue|falseValue|option|badge|partial|optionType|checked|fixed|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|filterable|breakpoint|unique)$": {}
           }
         },
         {
@@ -63301,7 +63370,7 @@
           "$ref": "#/definitions/CheckboxControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(onEvent|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|trueValue|falseValue|option|badge|x|y|w|h|width|height|align|valign|gridClassName)$": {}
+            "^(onEvent|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|trueValue|falseValue|option|badge|partial|optionType|checked|x|y|w|h|width|height|align|valign|gridClassName)$": {}
           }
         },
         {
@@ -64109,7 +64178,7 @@
           "$ref": "#/definitions/CheckboxControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(onEvent|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|trueValue|falseValue|option|badge|rowClassName|cellClassName)$": {}
+            "^(onEvent|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|trueValue|falseValue|option|badge|partial|optionType|checked|rowClassName|cellClassName)$": {}
           }
         },
         {
@@ -64917,7 +64986,7 @@
           "$ref": "#/definitions/CheckboxControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(onEvent|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|trueValue|falseValue|option|badge|unique|columnClassName)$": {}
+            "^(onEvent|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|trueValue|falseValue|option|badge|partial|optionType|checked|unique|columnClassName)$": {}
           }
         },
         {
@@ -65725,7 +65794,7 @@
           "$ref": "#/definitions/CheckboxControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(onEvent|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|trueValue|falseValue|option|badge|columnClassName|columnRatio)$": {}
+            "^(onEvent|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|trueValue|falseValue|option|badge|partial|optionType|checked|columnClassName|columnRatio)$": {}
           }
         },
         {

package/scss/_properties.scss

@@ -493,6 +493,12 @@
   --Checkbox-onHover-color: var(--info);
   --Checkbox-onDisabled-bg: #e5e7eb;
   --Checkbox-onDisabled-color: var(--text--muted-color);
+  --Checkbox-inner-onDisabled-bg: #D4D6D9;
+  --Checkbox-disabled-unchecked-bg: #F2F3F3;
+  --Checkbox-border-width: var(--Form-input-borderWidth);
+  --Checkbox-paddingX: #{px2rem(12px)};
+  --Checkbox-button-height: #{px2rem(32px)};
+  --Checkbox-button-line-height: #{px2rem(30px)};
 
   --ColorPicker-bg: var(--white);
   --ColorPicker-borderColor: var(--Form-input-borderColor);
@@ -663,6 +669,9 @@
   --Form--horizontal-label-widthSm: #{px2rem(90px)};
   --Form--horizontal-label-widthXs: #{px2rem(60px)};
 
+  --Form--horizontal-justify-label-align: left;
+  --Form--horizontal-justify-value-align: right;
+
   --Form-control-widthBase: #{px2rem(200px)};
   --Form-control-widthLg: #{px2rem(320px)};
   --Form-control-widthMd: #{px2rem(240px)};
@@ -856,7 +865,7 @@
   --InputRange-padding: #{px2rem(20px)};
   --InputRange-onDisabled-color: var(--light);
   --InputRange-primaryColor: var(--primary);
-  --InputRange-track-height: #{px2rem(6px)};
+  --InputRange-track-height: #{px2rem(4px)};
   --InputRange-track-bg: #{$gray100};
   --InputRange-track-onDisabled-bg: var(--InputRange-onDisabled-color);
   --InputRange-track-onActive-bg: var(--InputRange-primaryColor);

package/scss/components/form/_checks.scss

@@ -152,12 +152,123 @@
         transition: width var(--animation-duration),
           height var(--animation-duration), transform var(--animation-duration);
         border-width: 0 0 px2rem(2px) px2rem(2px);
-        transform: translate(-50%, -60%) rotate(-40deg);
+        transform: translate(-50%, -90%) rotate(-40deg);
         border-style: solid;
       }
     }
   }
 
+  &--partial.#{$ns}Checkbox--checkbox {
+    input {
+      margin-left: calc(var(--Checkbox-size) * -1);
+
+      & + i {
+        border-color: var(--Checkbox-onHover-color);
+
+        &:before {
+          width: var(--Checkbox-inner-size);
+          height: var(--Checkbox-inner-size);
+          background: var(--Checkbox-onHover-color);
+        }
+      }
+
+      &[disabled] + i {
+        border-color: var(--Checkbox-onDisabled-color);
+
+        &:before {
+          width: var(--Checkbox-inner-size);
+          height: var(--Checkbox-inner-size);
+          background: var(--Checkbox-inner-onDisabled-bg);
+        }
+      }
+
+      &: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;
+    height: var(--Checkbox-button-height);
+    line-height: var(--Checkbox-button-line-height);
+    padding-left: var(--Checkbox-paddingX);
+    padding-right: var(--Checkbox-paddingX);
+    font-size: var(--fontSizeSm);
+    border: var(--Checkbox-border-width) solid;
+    cursor: pointer;
+    position: relative;
+    display: inline-block;
+    background-color: var(--Checkbox-gb);
+    border-color: var(--Checkbox-color);
+    margin-right: 0;
+
+    &:hover:not(:disabled){
+      color: var(--Checkbox-onHover-color);
+    }
+
+    input {
+        &: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: px2rem(8px);
+            height: px2rem(6px);
+            transform: translate(-80%, -120%) rotate(-50deg);
+            background: transparent;
+          }
+        }
+
+        &[disabled] + i {
+          border-color: var(--Checkbox-onDisabled-color);
+          background: transparent;
+            &:before {
+              background: transparent;
+          }
+        }
+
+        &: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;
+      margin-left: 0;
+      border: 0;
+      border-style: solid;
+
+      + span {
+        max-width: px2rem(100px);
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+      }
+    }
+  }
+  &--button--checked.#{$ns}Checkbox--checkbox {
+    border-color: var(--Checkbox-onHover-color);
+    color: var(--Checkbox-onHover-color);
+  }
+  &--button--disabled--unchecked.#{$ns}Checkbox--checkbox {
+    background: var(--Checkbox-disabled-unchecked-bg);
+  }
   &--radio {
     padding-left: var(--Radio-size);
 
@@ -265,11 +376,21 @@
     display: block;
     margin-bottom: var(--Form-label-paddingTop);
   }
+  
+  .#{$ns}Checkbox--button {
+    margin-bottom: 0;
+  }
 
   &.is-inline .#{$ns}Checkbox {
     display: inline-block;
     margin-right: var(--gap-md);
   }
+
+  &.is-inline .#{$ns}Checkbox--button {
+    display: inline-block;
+    margin-right: 0;
+    margin-bottom: 0;
+  }
 }
 
 .#{$ns}RadiosControl-group,

package/scss/components/form/_form.scss

@@ -122,6 +122,22 @@
     }
   }
 
+  &--horizontal-justify {
+    justify-content: space-between;
+
+    > .#{$ns}Form-label {
+      text-align: var(--Form--horizontal-justify-label-align);
+      white-space: var(--Form--horizontal-justify-label-whiteSpace);
+    }
+    > .#{$ns}Form-value {
+      text-align: var(--Form--horizontal-justify-value-align);
+
+      > * {
+        text-align: initial;
+      }
+    }
+  }
+
   &--normal {
     > .#{$ns}Form-label {
       display: block;

package/sdk/ang-ie11.css

@@ -37499,10 +37499,121 @@ readers do not read off random characters that represent icons */
   border-color: transparent;
   transition: width 0s, height 0s, transform 0s;
   border-width: 0 0 0.125rem 0.125rem;
-  transform: translate(-50%, -60%) rotate(-40deg);
+  transform: translate(-50%, -90%) rotate(-40deg);
   border-style: solid;
 }
 
+.amis-scope .a-Checkbox--partial.a-Checkbox--checkbox input {
+  margin-left: calc(0.875rem * -1);
+}
+
+.amis-scope .a-Checkbox--partial.a-Checkbox--checkbox input + i {
+  border-color: #23b7e5;
+}
+
+.amis-scope .a-Checkbox--partial.a-Checkbox--checkbox input + i:before {
+  width: calc(0.875rem / 2);
+  height: calc(0.875rem / 2);
+  background: #23b7e5;
+}
+
+.amis-scope .a-Checkbox--partial.a-Checkbox--checkbox input[disabled] + i {
+  border-color: #99a6ad;
+}
+
+.amis-scope .a-Checkbox--partial.a-Checkbox--checkbox input[disabled] + i:before {
+  width: calc(0.875rem / 2);
+  height: calc(0.875rem / 2);
+  background: #D4D6D9;
+}
+
+.amis-scope .a-Checkbox--partial.a-Checkbox--checkbox input:checked[disabled] + i {
+  width: calc(0.875rem / 2);
+  height: calc(0.875rem / 2);
+  background: #e5e7eb;
+}
+
+.amis-scope .a-Checkbox--button.a-Checkbox--checkbox {
+  text-align: center;
+  height: 2rem;
+  line-height: 1.875rem;
+  padding-left: 0.75rem;
+  padding-right: 0.75rem;
+  font-size: 0.75rem;
+  border: 0.0625rem solid;
+  cursor: pointer;
+  position: relative;
+  display: inline-block;
+  background-color: #fff;
+  border-color: #d1d5db;
+  margin-right: 0;
+}
+
+.amis-scope .a-Checkbox--button.a-Checkbox--checkbox:hover:not(:disabled) {
+  color: #23b7e5;
+}
+
+.amis-scope .a-Checkbox--button.a-Checkbox--checkbox input:checked + i {
+  background: transparent;
+  top: 0;
+  left: 0;
+  width: 0;
+  height: 0;
+  border-width: 0.5rem;
+  border-color: #23b7e5 transparent transparent #23b7e5;
+  border-radius: 0;
+}
+
+.amis-scope .a-Checkbox--button.a-Checkbox--checkbox input:checked + i:before {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 0.5rem;
+  height: 0.375rem;
+  transform: translate(-80%, -120%) rotate(-50deg);
+  background: transparent;
+}
+
+.amis-scope .a-Checkbox--button.a-Checkbox--checkbox input[disabled] + i {
+  border-color: #99a6ad;
+  background: transparent;
+}
+
+.amis-scope .a-Checkbox--button.a-Checkbox--checkbox input[disabled] + i:before {
+  background: transparent;
+}
+
+.amis-scope .a-Checkbox--button.a-Checkbox--checkbox input:checked[disabled] + i {
+  background: transparent;
+  border-width: 0.5rem;
+  border-color: #23b7e5 transparent transparent #23b7e5;
+}
+
+.amis-scope .a-Checkbox--button.a-Checkbox--checkbox > i {
+  position: absolute;
+  top: 0;
+  left: 0;
+  margin-left: 0;
+  border: 0;
+  border-style: solid;
+}
+
+.amis-scope .a-Checkbox--button.a-Checkbox--checkbox > i + span {
+  max-width: 6.25rem;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.amis-scope .a-Checkbox--button--checked.a-Checkbox--checkbox {
+  border-color: #23b7e5;
+  color: #23b7e5;
+}
+
+.amis-scope .a-Checkbox--button--disabled--unchecked.a-Checkbox--checkbox {
+  background: #F2F3F3;
+}
+
 .amis-scope .a-Checkbox--radio {
   padding-left: 0.875rem;
 }
@@ -37604,12 +37715,24 @@ readers do not read off random characters that represent icons */
   );
 }
 
+.amis-scope .a-RadiosControl .a-Checkbox--button,
+.amis-scope .a-CheckboxesControl .a-Checkbox--button {
+  margin-bottom: 0;
+}
+
 .amis-scope .a-RadiosControl.is-inline .a-Checkbox,
 .amis-scope .a-CheckboxesControl.is-inline .a-Checkbox {
   display: inline-block;
   margin-right: 1rem;
 }
 
+.amis-scope .a-RadiosControl.is-inline .a-Checkbox--button,
+.amis-scope .a-CheckboxesControl.is-inline .a-Checkbox--button {
+  display: inline-block;
+  margin-right: 0;
+  margin-bottom: 0;
+}
+
 .amis-scope .a-RadiosControl-group:not(:first-child),
 .amis-scope .a-CheckboxesControl-group:not(:first-child) {
   margin-top: 0.625rem;
@@ -40952,7 +41075,7 @@ readers do not read off random characters that represent icons */
   border-radius: 0.25rem;
   cursor: pointer;
   display: block;
-  height: 0.375rem;
+  height: 0.25rem;
   position: relative;
   transition: left 0s ease-out,
     width 0s ease-out;
@@ -40973,7 +41096,7 @@ readers do not read off random characters that represent icons */
 
 .amis-scope .a-InputRange-track--background {
   left: 0.5rem;
-  margin-top: calc(-0.5 * 0.375rem);
+  margin-top: calc(-0.5 * 0.25rem);
   position: absolute;
   right: 0.5rem;
   top: 50%;
@@ -43332,6 +43455,23 @@ readers do not read off random characters that represent icons */
   white-space: "normal";
 }
 
+.amis-scope .a-Form-item--horizontal-justify {
+  justify-content: space-between;
+}
+
+.amis-scope .a-Form-item--horizontal-justify > .a-Form-label {
+  text-align: left;
+  white-space: var(--Form--horizontal-justify-label-whiteSpace);
+}
+
+.amis-scope .a-Form-item--horizontal-justify > .a-Form-value {
+  text-align: right;
+}
+
+.amis-scope .a-Form-item--horizontal-justify > .a-Form-value > * {
+  text-align: initial;
+}
+
 .amis-scope .a-Form-item--normal > .a-Form-label {
   display: block;
 }