Merge remote-tracking branch 'amis/master'

examples/components/Form/Mode.jsx

@@ -263,7 +263,8 @@ export default {
               mode: 'inline',
               placeholder: '请输入邮箱地址',
               label: '邮箱',
-              size: 'full'
+              size: 'full',
+              columnClassName: 'v-bottom'
             },
             {
               type: 'password',
@@ -293,7 +294,8 @@ export default {
               label: '密码',
               placeholder: '请输入密码',
               mode: 'inline',
-              size: 'full'
+              size: 'full',
+              columnClassName: 'v-bottom'
             }
           ]
         },

examples/loader.ts

@@ -22,7 +22,7 @@ const mapping: {
   'amis': __moduleId('../src'),
   'amis/embed': __moduleId('./embed.tsx'),
   'prop-types': __moduleId('prop-types'),
-  'async': __moduleId('async'),
+  'async/mapLimit': __moduleId('async/mapLimit'),
   'qs': __moduleId('qs')
 };
 

scss/_utilities.scss

@@ -1324,11 +1324,21 @@
   }
 }
 
+.v-top {
+  vertical-align: top !important;
+  align-self: flex-start;
+}
+
 .v-middle {
   vertical-align: middle !important;
   align-self: center;
 }
 
+.v-bottom {
+  vertical-align: bottom !important;
+  align-self: flex-end;
+}
+
 .scrollable {
   overflow-x: hidden;
   overflow-y: auto;

scss/components/form/_file.scss

@@ -74,7 +74,7 @@
 
   &-itemInfoText {
     white-space: nowrap;
-    max-width: 180px;
+    max-width: 170px;
     overflow: hidden;
     text-overflow: ellipsis;
     display: inline-block;

scss/components/form/_form.scss

@@ -30,9 +30,6 @@
 .#{$ns}Form-star {
   color: $red;
   font-size: $fontSizeXs;
-  position: absolute;
-  left: px2rem(-6px);
-  top: px2rem(3px);
   line-height: 1;
 }
 
@@ -89,6 +86,12 @@
   &--normal {
     > .#{$ns}Form-label {
       display: block;
+
+      .#{$ns}Form-star {
+        position: absolute;
+        left: px2rem(-6px);
+        top: px2rem(3px);
+      }
     }
   }
 
@@ -202,6 +205,12 @@
       > .#{$ns}Form-label {
         padding-top: $Form-label-paddingTop;
         margin-bottom: 0;
+
+        .#{$ns}Form-star {
+          position: absolute;
+          left: px2rem(-6px);
+          top: px2rem(3px);
+        }
       }
 
       .#{$ns}Form-itemColumn--xs {

src/renderers/Form/File.tsx

@@ -4,7 +4,8 @@ import cx from 'classnames';
 import qs from 'qs';
 import find from 'lodash/find';
 import isPlainObject from 'lodash/isPlainObject';
-import {mapLimit} from 'async';
+// @ts-ignore
+import mapLimit from 'async/mapLimit';
 import ImageControl from './Image';
 import {Payload, ApiObject, ApiString} from '../../types';
 import {filter} from '../../utils/tpl';
@@ -718,8 +719,8 @@ export default class FileControl extends React.Component<FileProps, FileState> {
         };
 
         mapLimit(tasks, 3, uploadPartFile(state, config), function (
-          err,
-          results
+          err: any,
+          results: any
         ) {
           if (err) {
             reject(err);