amis 1.5.3 → 1.5.6-beta.4

package/schema.json

@@ -6765,7 +6765,7 @@
               "description": "标题"
             },
             "titleClassName": {
-              "type": "string"
+              "$ref": "#/definitions/SchemaClassName"
             },
             "subTitle": {
               "$ref": "#/definitions/SchemaTpl",
@@ -6786,7 +6786,7 @@
               "description": "描述占位内容"
             },
             "descriptionClassName": {
-              "type": "string",
+              "$ref": "#/definitions/SchemaClassName",
               "description": "描述占位类名"
             },
             "desc": {
@@ -6859,6 +6859,50 @@
           },
           "description": "内容区域"
         },
+        "media": {
+          "type": "object",
+          "properties": {
+            "className": {
+              "$ref": "#/definitions/SchemaClassName"
+            },
+            "type": {
+              "type": "string",
+              "enum": [
+                "image",
+                "video"
+              ],
+              "description": "多媒体类型"
+            },
+            "url": {
+              "$ref": "#/definitions/SchemaUrlPath",
+              "description": "多媒体链接地址"
+            },
+            "position": {
+              "type": "string",
+              "enum": [
+                "top",
+                "left",
+                "right",
+                "bottom"
+              ],
+              "description": "多媒体区域位置"
+            },
+            "autoPlay": {
+              "type": "boolean",
+              "description": "类型为video时是否自动播放"
+            },
+            "isLive": {
+              "type": "boolean",
+              "description": "类型为video时是否是直播"
+            },
+            "poster": {
+              "$ref": "#/definitions/SchemaUrlPath",
+              "description": "类型为video时视频封面"
+            }
+          },
+          "additionalProperties": false,
+          "description": "多媒体区域"
+        },
         "actions": {
           "type": "array",
           "items": {
@@ -6872,6 +6916,10 @@
             "$ref": "#/definitions/ActionSchema"
           },
           "description": "工具栏按钮"
+        },
+        "secondary": {
+          "$ref": "#/definitions/SchemaTpl",
+          "description": "次要说明"
         }
       },
       "required": [
@@ -7200,7 +7248,7 @@
                   "description": "标题"
                 },
                 "titleClassName": {
-                  "type": "string"
+                  "$ref": "#/definitions/SchemaClassName"
                 },
                 "subTitle": {
                   "$ref": "#/definitions/SchemaTpl",
@@ -7221,7 +7269,7 @@
                   "description": "描述占位内容"
                 },
                 "descriptionClassName": {
-                  "type": "string",
+                  "$ref": "#/definitions/SchemaClassName",
                   "description": "描述占位类名"
                 },
                 "desc": {
@@ -7294,6 +7342,50 @@
               },
               "description": "内容区域"
             },
+            "media": {
+              "type": "object",
+              "properties": {
+                "className": {
+                  "$ref": "#/definitions/SchemaClassName"
+                },
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "image",
+                    "video"
+                  ],
+                  "description": "多媒体类型"
+                },
+                "url": {
+                  "$ref": "#/definitions/SchemaUrlPath",
+                  "description": "多媒体链接地址"
+                },
+                "position": {
+                  "type": "string",
+                  "enum": [
+                    "top",
+                    "left",
+                    "right",
+                    "bottom"
+                  ],
+                  "description": "多媒体区域位置"
+                },
+                "autoPlay": {
+                  "type": "boolean",
+                  "description": "类型为video时是否自动播放"
+                },
+                "isLive": {
+                  "type": "boolean",
+                  "description": "类型为video时是否是直播"
+                },
+                "poster": {
+                  "$ref": "#/definitions/SchemaUrlPath",
+                  "description": "类型为video时视频封面"
+                }
+              },
+              "additionalProperties": false,
+              "description": "多媒体区域"
+            },
             "actions": {
               "type": "array",
               "items": {
@@ -7308,6 +7400,10 @@
               },
               "description": "工具栏按钮"
             },
+            "secondary": {
+              "$ref": "#/definitions/SchemaTpl",
+              "description": "次要说明"
+            },
             "className": {
               "$ref": "#/definitions/SchemaClassName",
               "description": "容器 css 类名"
@@ -8052,7 +8148,7 @@
                   "description": "标题"
                 },
                 "titleClassName": {
-                  "type": "string"
+                  "$ref": "#/definitions/SchemaClassName"
                 },
                 "subTitle": {
                   "$ref": "#/definitions/SchemaTpl",
@@ -8073,7 +8169,7 @@
                   "description": "描述占位内容"
                 },
                 "descriptionClassName": {
-                  "type": "string",
+                  "$ref": "#/definitions/SchemaClassName",
                   "description": "描述占位类名"
                 },
                 "desc": {
@@ -8146,6 +8242,50 @@
               },
               "description": "内容区域"
             },
+            "media": {
+              "type": "object",
+              "properties": {
+                "className": {
+                  "$ref": "#/definitions/SchemaClassName"
+                },
+                "type": {
+                  "type": "string",
+                  "enum": [
+                    "image",
+                    "video"
+                  ],
+                  "description": "多媒体类型"
+                },
+                "url": {
+                  "$ref": "#/definitions/SchemaUrlPath",
+                  "description": "多媒体链接地址"
+                },
+                "position": {
+                  "type": "string",
+                  "enum": [
+                    "top",
+                    "left",
+                    "right",
+                    "bottom"
+                  ],
+                  "description": "多媒体区域位置"
+                },
+                "autoPlay": {
+                  "type": "boolean",
+                  "description": "类型为video时是否自动播放"
+                },
+                "isLive": {
+                  "type": "boolean",
+                  "description": "类型为video时是否是直播"
+                },
+                "poster": {
+                  "$ref": "#/definitions/SchemaUrlPath",
+                  "description": "类型为video时视频封面"
+                }
+              },
+              "additionalProperties": false,
+              "description": "多媒体区域"
+            },
             "actions": {
               "type": "array",
               "items": {
@@ -8160,6 +8300,10 @@
               },
               "description": "工具栏按钮"
             },
+            "secondary": {
+              "$ref": "#/definitions/SchemaTpl",
+              "description": "次要说明"
+            },
             "className": {
               "$ref": "#/definitions/SchemaClassName",
               "description": "容器 css 类名"
@@ -39815,7 +39959,7 @@
           "$ref": "#/definitions/CardSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|header|body|actions|toolbar|label|labelClassName|name|popOver|quickEdit|copyable)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|header|body|media|actions|toolbar|secondary|label|labelClassName|name|popOver|quickEdit|copyable)$": {}
           }
         },
         {
@@ -40602,7 +40746,7 @@
           "$ref": "#/definitions/CardSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|header|body|actions|toolbar|label|labelClassName|name|popOver|quickEdit|copyable)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|header|body|media|actions|toolbar|secondary|label|labelClassName|name|popOver|quickEdit|copyable)$": {}
           }
         },
         {
@@ -41389,7 +41533,7 @@
           "$ref": "#/definitions/CardSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|header|body|actions|toolbar|label|fixed|name|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|labelClassName|filterable|breakpoint|remark|value|unique)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|header|body|media|actions|toolbar|secondary|label|fixed|name|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|labelClassName|filterable|breakpoint|remark|value|unique)$": {}
           }
         },
         {
@@ -42176,7 +42320,7 @@
           "$ref": "#/definitions/CardSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|header|body|actions|toolbar|x|y|w|h|width|height|align|valign|gridClassName)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|header|body|media|actions|toolbar|secondary|x|y|w|h|width|height|align|valign|gridClassName)$": {}
           }
         },
         {
@@ -42963,7 +43107,7 @@
           "$ref": "#/definitions/CardSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|header|body|actions|toolbar|rowClassName|cellClassName)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|header|body|media|actions|toolbar|secondary|rowClassName|cellClassName)$": {}
           }
         },
         {
@@ -43750,7 +43894,7 @@
           "$ref": "#/definitions/CardSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|header|body|actions|toolbar|unique|columnClassName)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|header|body|media|actions|toolbar|secondary|unique|columnClassName)$": {}
           }
         },
         {
@@ -44537,7 +44681,7 @@
           "$ref": "#/definitions/CardSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|header|body|actions|toolbar|columnClassName|columnRatio)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|header|body|media|actions|toolbar|secondary|columnClassName|columnRatio)$": {}
           }
         },
         {

package/scss/_properties.scss

@@ -68,6 +68,7 @@
 
   --fontWeightNormal: 400;
   --fontWeightBase: var(--fontWeightNormal);
+  --fontWeightMd: 500;
   --fontWeightBold: 700;
 
   --background: var(--white);
@@ -401,6 +402,15 @@
   --Calendar-shortcuts-height: #{px2rem(30px)};
   --Calendar-wLabel-color: #999;
 
+  --Calendar-icon-bottom: #{px2rem(-4px)};
+  --Calendar-icon-width: #{px2rem(10px)};
+  --Calendar-icon-height: #{px2rem(10px)};
+  --Calendar-borderWidth: #{px2rem(1px)};
+  --Calendar-rdt-day: #{px2rem(100px)};
+  --Calendar-schedule-content-padding: 0 #{px2rem(4px)};
+  --Calendar-schedule-content-height: #{px2rem(20px)};
+  --Calendar-schedule-content-color: #{$white};
+
   --Card-actions-borderColor: #{lighten($borderColor, 5%)};
   --Card-actions-fontSize: var(--fontSizeBase);
   --Card-actions-onChecked-onHover-bg: #{darken(#d9f3fb, 5%)};
@@ -411,6 +421,7 @@
   --Card-borderColor: var(--borderColor);
   --Card-borderRadius: var(--borderRadius);
   --Card-borderWidth: var(--borderWidth);
+  --Card-secondary-color: #83868c;
   --Card-onChecked-bg: #d9f3fb;
   --Card-onChecked-borderColor: #{darken(#d9f3fb, 10%)};
   --Card-onChecked-color: #{darken(#d9f3fb, 40%)};
@@ -1080,8 +1091,8 @@
   --PickerColumns-title-lineHeight: 1.5;
   --PickerColumns-action-padding: 0 var(--gap-sm);
   --PickerColumns-action-fontSize: var(--fontSizeMd);
-  --PickerColumns-confirmAction-color: var(--Button--info-bg);
-  --PickerColumns-cancelAction-color: var(--Button--light-bg);
+  --PickerColumns-confirmAction-color: #{lighten($text-color, 25%)};
+  --PickerColumns-cancelAction-color: #{lighten($text-color, 50%)};
   --PickerColumns-option-fontSize: var(--fontSizeLg);
   --PickerColumns-optionText-color: var(--text-color);
   --PickerColumns-optionDisabled-opacity: 0.3;

package/scss/components/_card.scss

@@ -13,8 +13,9 @@
   }
 
   &-title {
-    color: var(--text--loud-color);
+    color: var(--text-color);
     font-size: var(--fontSizeMd);
+    font-weight: var(--fontWeightMd);
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -37,15 +38,14 @@
   }
 
   &-dragBtn {
+    display: inline-block;
     cursor: pointer;
-    float: right;
-    margin: var(--gap-sm);
+    padding: 0 var(--gap-sm);
   }
 
   &-heading {
     display: flex;
-    flex-direction: row;
-    padding: var(--gap-sm) var(--gap-base);
+    padding: var(--gap-md);
     flex: 1 0 auto;
   }
 
@@ -72,7 +72,7 @@
     float: left;
     margin-right: var(--gap-base);
     font-size: var(--fontSizeXl);
-    text-transform: uppercase;
+    text-transform: uppercase();
   }
 
   &-meta {
@@ -80,32 +80,30 @@
     flex-grow: 1;
     height: 100%;
     position: relative;
-    margin-right: var(--gap-md);
   }
-
+  &-meta + &-toolbar {
+    margin-left: var(--gap-md);
+  }
   &-toolbar {
-    margin-right: calc(-1 * var(--gap-base));
+    line-height: normal;
     text-align: right;
   }
-
   &-highlight {
     background: var(--success);
     width: px2rem(8px);
     height: px2rem(8px);
     border-radius: 100%;
     display: inline-block;
-    position: absolute;
-    top: var(--gap-xs);
-    right: px2rem(2px);
+    margin: 0 var(--gap-sm);
   }
 
   &-body {
-    padding: var(--gap-base);
+    padding: var(--gap-md);
     flex: 1 0 auto;
   }
 
   &-heading + &-body {
-    padding-top: var(--gap-xs);
+    padding-top: 0;
   }
 
   &-field {
@@ -134,6 +132,7 @@
     flex-direction: row;
     width: 100%;
     table-layout: fixed;
+    white-space: nowrap;
 
     > a {
       background: transparent;
@@ -216,4 +215,145 @@
   .is-dragging > & {
     opacity: var(--Card-onDragging-opacity);
   }
+
+  &-footer-wrapper {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  &-actions-wrapper {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    flex-wrap: wrap;
+  }
+  &-checkbox {
+    margin: 0 var(--gap-sm) !important;
+  }
+  &-secondary {
+    max-width: 12.5rem;
+    color: var(--Card-secondary-color);
+    padding: 0 var(--gap-md);
+    font-size: var(--fontSizeMd);
+    font-weight: var(--fontWeightBase);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  &-secondary + &-actions-wrapper {
+    .#{$ns}Card-actions {
+      margin-left: unset;
+      border: none;
+      width: unset;
+    }
+    .#{$ns}Card-actions > a {
+      border: none;
+    }
+  }
+  &-multiMedia--top,
+  &-multiMedia--bottom,
+  &-multiMedia--left,
+  &-multiMedia--right {
+    .#{$ns}Card-actions-wrapper {
+      .#{$ns}Card-actions {
+        margin-left: unset;
+        border: none;
+        width: unset;
+      }
+      .#{$ns}Card-actions > a {
+        border: none;
+      }
+    }
+  }
+  &-multiMedia--top {
+    display: block;
+    .#{$ns}Card-multiMedia-img {
+      border-bottom-left-radius: unset;
+      border-bottom-right-radius: unset;
+    }
+  }
+  &-multiMedia--bottom {
+    display: flex;
+    flex-direction: column-reverse;
+    .#{$ns}Card-actions {
+      border-bottom: var(--Card-borderWidth) solid
+        var(--Card-actions-borderColor);
+    }
+    .#{$ns}Card-multiMedia-img {
+      border-top-left-radius: unset;
+      border-top-right-radius: unset;
+    }
+  }
+  &-multiMedia--top,
+  &-multiMedia--bottom {
+    .#{$ns}Card-body {
+      padding-bottom: var(--gap-md);
+    }
+  }
+  &-multiMedia--left {
+    display: flex;
+    align-items: center;
+
+    .#{$ns}Card-actions {
+      margin-left: var(--gap-md);
+      border-left: var(--Card-borderWidth) solid var(--Card-actions-borderColor);
+    }
+
+    .#{$ns}Card-multiMedia-img,
+    .#{$ns}Card-multiMedia-video {
+      margin: var(--gap-md) 0 var(--gap-md) var(--gap-md);
+    }
+  }
+  &-multiMedia--right {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-direction: row-reverse;
+
+    .#{$ns}Card-actions {
+      margin-right: var(--gap-md);
+      border-right: var(--Card-borderWidth) solid
+        var(--Card-actions-borderColor);
+    }
+
+    .#{$ns}Card-multiMedia-img,
+    .#{$ns}Card-multiMedia-video {
+      margin: var(--gap-md) var(--gap-md) var(--gap-md) 0;
+    }
+  }
+  &-multiMedia-flex {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
+  &-multiMedia-img {
+    display: block;
+    width: 100%;
+    height: auto;
+    object-fit: cover;
+    border-radius: var(--Card-borderRadius);
+  }
+  &-multiMedia-video {
+    width: px2rem(180px);
+    height: px2rem(120px);
+    .#{$ns}Video {
+      width: 100%;
+      height: 100%;
+      min-width: unset;
+      border-radius: var(--Card-borderRadius);
+      overflow: hidden;
+      .#{$ns}Video-player {
+        width: 100%;
+        height: 100%;
+        .video-react {
+          width: 100%;
+          height: 100%;
+          padding-top: unset !important;
+        }
+      }
+    }
+  }
 }

package/scss/components/_nav.scss

@@ -182,7 +182,7 @@
         &.is-active > .#{$ns}Badge > a {
           color: var(--Nav-item-onActive-color);
           position: relative;
-          background: var(--Nav-item-onActive-bg);
+          background: var(--Nav-item-onActive-bg) !important;
 
           &::after {
             transform: scaleY(1);

package/scss/components/_picker-columns.scss

@@ -2,14 +2,9 @@
   position: relative;
   background-color: var(--PickerColumns-bg);
   user-select: none;
-
-  &-popOver {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    padding: 0 var(--gap-sm);
-  }
+  flex: 1;
+  overflow: hidden;
+  font-size: var(--PickerColumns-option-fontSize);
 
   &-toolbar {
     display: flex;
@@ -30,6 +25,9 @@
     &:active {
       opacity: 0.7;
     }
+    &:hover {
+      background-color: none !important;
+    }
   }
 
   &-confirm {
@@ -77,8 +75,22 @@
     z-index: 2;
     transform: translateY(-50%);
     pointer-events: none;
+
+    &::after {
+      position: absolute;
+      content: '';
+      border-bottom: 1px solid var(--borderColor);
+      border-top: 1px solid var(--borderColor);
+      top: -50%;
+      right: -50%;
+      left: -50%;
+      bottom: -50%;
+      transform: scale(0.5);
+    }
   }
 
+  
+
   &-mask {
     position: absolute;
     top: 0;
@@ -98,12 +110,6 @@
     pointer-events: none;
   }
 
-  &-column {
-    flex: 1;
-    overflow: hidden;
-    font-size: var(--PickerColumns-option-fontSize);
-  }
-
   &-columnWrapper {
     margin: 0;
     padding: 0;

package/scss/components/form/_file.scss

@@ -15,8 +15,9 @@
   }
 
   &-selectBtn {
-    display: flex;
+    display: inline-flex;
     align-items: center;
+    margin-right: 10px;
 
     > svg {
       width: px2rem(14px);
@@ -40,7 +41,6 @@
   // }
 
   &-description {
-    margin-left: 10px;
     color: #999;
     font-size: 12px;
   }

package/scss/components/form/_selection.scss

@@ -41,6 +41,10 @@
 }
 
 .#{$ns}GroupedSelection {
+  max-height: px2rem(300px);
+  overflow: auto;
+  user-select: none;
+
   &-group:not(:first-child) > &-itemLabel {
     border-top: px2rem(1px) solid var(--ListMenu-divider-color);
   }

package/scss/components/form/_switch.scss

@@ -26,6 +26,12 @@
     font-style: normal;
     font-weight: bold;
     transition: all var(--animation-duration);
+
+    > svg {
+      width: var(--fontSizeSm);
+      height: var(--fontSizeSm);
+      margin-top: calc((var(--Switch-height) - var(--fontSizeSm)) / 2);
+    }
   }
 
   .slider {