Merge branch 'master' into pre-release

Change-Id: I45f0d7ef51b53c9641d67e2238a889d1b693eb0f

packages/amis-editor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "5.2.1-beta.31",
+  "version": "5.2.1-beta.32",
   "description": "amis 可视化编辑器",
   "main": "lib/index.js",
   "module": "esm/index.js",

packages/amis-editor/src/locale/en-US.ts

@@ -3545,5 +3545,6 @@ extendLocale('en-US', {
   'a2b62974f4d7564bb68b570116f25a10': 'Minimum width',
   '2bd921d0ea7a73b77ee0fcddb1afcc84': 'Minimum height',
   'eb7366583485f478e3d8c2b105ea51ff':
-    'Defines the magnification of the item. If it is set to 0, it will not be magnified even if there is space left in the parent container.'
+    'Defines the magnification of the item. If it is set to 0, it will not be magnified even if there is space left in the parent container.',
+  '5d3d48de1ba22368eacdc1c69fb044ce': 'Component inner layer CSS class name'
 });

packages/amis-editor/src/locale/zh-CN.ts

@@ -3132,5 +3132,6 @@ extendLocale('zh-CN', {
   'a2b62974f4d7564bb68b570116f25a10': '最小宽度',
   '2bd921d0ea7a73b77ee0fcddb1afcc84': '最小高度',
   'eb7366583485f478e3d8c2b105ea51ff':
-    '定义项目的放大比例，如果设置为0，即使父容器存在剩余空间，也不放大。'
+    '定义项目的放大比例，如果设置为0，即使父容器存在剩余空间，也不放大。',
+  '5d3d48de1ba22368eacdc1c69fb044ce': '组件内层 CSS 类名'
 });

packages/amis-editor/src/plugin/Image.tsx

@@ -173,6 +173,11 @@ export class ImagePlugin extends BasePlugin {
               autoComplete: false
             }),
 
+            getSchemaTpl('className', {
+              name: 'innerClassName',
+              label: '组件内层 CSS 类名'
+            }),
+
             getSchemaTpl('className', {
               name: 'imageClassName',
               label: '图片 CSS 类名'

packages/amis-editor/src/tpl/layout.tsx

@@ -270,6 +270,7 @@ setSchemaTpl(
           form.setValueByName('style.flexDirection', undefined);
           form.setValueByName('style.justifyContent', undefined);
           form.setValueByName('style.alignItems', undefined);
+          form.setValueByName('style.flexWrap', undefined);
         }
       },
     };