Merge branch 'master' of https://github.com/baidu/amis

docs/renderers/Form/City.md

@@ -44,7 +44,7 @@
 ]
 ```
 
-从上面的栗子可以看出来，值默认格式是编码（即 `code`），如果你想要详细点的信息，可以把 `extractValue` 设置成 `false`。
+从上面的例子可以看出来，值默认格式是编码（即 `code`），如果你想要详细点的信息，可以把 `extractValue` 设置成 `false`。
 
 ```schema:height="200" scope="form"
 [

docs/renderers/Form/Input-Group.md

@@ -0,0 +1,84 @@
+### Input-Group
+
+输入框组合选择器，可用于输入框与其他多个组件组合。
+
+-   `type` 请设置成 `input-group`
+-   `controls` 表单项集合
+-   更多配置请参考 [FormItem](./FormItem.md)
+
+```schema:height="250" scope="form"
+[
+    {
+        "type": "input-group",
+        "name": "input-group",
+        "inline": true,
+        "label": "input 组合",
+        "controls": [
+            {
+                "type": "text",
+                "placeholder": "搜索作业ID/名称",
+                "inputClassName": "b-r-none p-r-none",
+                "name": "input-group"
+            },
+            {
+                "type": "submit",
+                "label": "搜索",
+                "level": "primary"
+            }
+        ]
+    },
+    {
+        "type": "input-group",
+        "label": "各种组合",
+        "inline": true,
+        "controls": [
+            {
+                "type": "select",
+                "name": "memoryUnits",
+                "options": [
+                    {
+                        "label": "Gi",
+                        "value": "Gi"
+                    },
+                    {
+                        "label": "Mi",
+                        "value": "Mi"
+                    },
+                    {
+                        "label": "Ki",
+                        "value": "Ki"
+                    }
+                ],
+                "value": "Gi"
+            },
+            {
+                "type": "text",
+                "name": "memory"
+            },
+            {
+                "type": "select",
+                "name": "memoryUnits2",
+                "options": [
+                    {
+                        "label": "Gi",
+                        "value": "Gi"
+                    },
+                    {
+                        "label": "Mi",
+                        "value": "Mi"
+                    },
+                    {
+                        "label": "Ki",
+                        "value": "Ki"
+                    }
+                ],
+                "value": "Gi"
+            },
+            {
+                "type": "button",
+                "label": "Go"
+            }
+        ]
+    }
+]
+```

examples/components/Doc.jsx

@@ -147,6 +147,13 @@ export default {
                                 cb(null, makeMarkdownRenderer(doc));
                             }),
                         },
+                        {
+                            label: 'Input-Group',
+                            path: '/docs/renderers/Form/Input-Group',
+                            getComponent: (location, cb) => require(['../../docs/renderers/Form/Input-Group.md'], (doc) => {
+                                cb(null, makeMarkdownRenderer(doc));
+                            }),
+                        },
                         {
                             label: 'Textarea',
                             path: '/docs/renderers/Form/Textarea',

scss/_variables.scss

@@ -1316,7 +1316,7 @@ $Audio-play-width: px2rem(20px) !default;
 $Audio-play-top: px2rem(5px) !default;
 $Audio-times-width: px2rem(75px) !default;
 $Audio-times-margin: 0 px2rem(5px) !default;
-$Audio-process-width: px2rem(80px) !default;
+$Audio-process-minWidth: px2rem(80px) !default;
 $Audio-volume-width: px2rem(20px) !default;
 $Audio-volume-height: px2rem(50px) !default;
 $Audio-volume-lineHeight: px2rem(50px) !default;

scss/components/_audio.scss

@@ -17,8 +17,8 @@
         border-radius: 100%;
         cursor: pointer;
         background: $Audio-thumb-bg;
-        height: $Audio-thumb-width;
-        width: $Audio-thumb-height;
+        width: $Audio-thumb-width;
+        height: $Audio-thumb-height;
         margin-top: $Audio-thumb-marginTop;
     }
 }
@@ -101,6 +101,7 @@
     &-process {
         flex: auto;
         cursor: pointer;
+        min-width: $Audio-process-minWidth;
         margin-right: $Audio-item-margin;
 
         input[type="range"] {

scss/components/_drawer.scss

@@ -101,6 +101,17 @@
         .#{$ns}Button {
             margin-left: $gap-xs;
         }
+
+        .#{$ns}Drawer-info {
+            flex-basis: 0;
+            flex-grow: 1;
+            text-align: left;
+            align-self: center;
+        }
+
+        .#{$ns}Drawer-error {
+            color: $danger;
+        }
     }
 
     &.#{$ns}Drawer--noOverlay {
@@ -234,6 +245,18 @@
             margin-left: 0;
             margin-right: $gap-xs;
         }
+
+        .#{$ns}Drawer-info {
+            flex-basis: 0;
+            flex-grow: 1;
+            order: 10;
+            align-self: center;
+            text-align: right;
+        }
+
+        .#{$ns}Drawer-error {
+            color: $danger;
+        }
     }
 
     .#{$ns}Drawer-resizeCtrl {

src/renderers/Drawer.tsx

@@ -290,7 +290,7 @@ export default class Drawer extends React.Component<DrawerProps, object> {
                                   }
                               )
                             : null}
-                        {store.error ? <span className={cx('Drawer-msg')}>{store.msg}</span> : null}
+                        {store.error ? <span className={cx('Drawer-error')}>{store.msg}</span> : null}
                     </div>
                 ) : null}
                 {actions.map((action, key) =>