From 0790058ea9c3ae47113f3ca2e866318b8773fd6e Mon Sep 17 00:00:00 2001
From: wibetter <365533093@qq.com>
Date: Mon, 14 Nov 2022 13:09:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(amis-saas-4371):=20=E5=89=94=E9=99=A4?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=AE=B9=E5=99=A8=E4=B8=AD=E5=A4=96=E8=A7=82?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=9D=A2=E6=9D=BF=E4=B8=AD=E7=9A=84=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I2c284de8c4c2de395f5e876a990d12426807d345
---
 packages/amis-editor/src/plugin/Container.tsx | 5 ++---
 packages/amis-editor/src/plugin/Wrapper.tsx   | 2 +-
 packages/amis-editor/src/tpl/layout.tsx       | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/amis-editor/src/plugin/Container.tsx b/packages/amis-editor/src/plugin/Container.tsx
index f0b0691e3..35845b81d 100644
--- a/packages/amis-editor/src/plugin/Container.tsx
+++ b/packages/amis-editor/src/plugin/Container.tsx
@@ -164,7 +164,7 @@ export class ContainerPlugin extends BasePlugin {
         title: '外观',
         className: 'p-none',
         body: getSchemaTpl('collapseGroup', [
-          ...getSchemaTpl('style:common', [], ['layout']),
+          ...getSchemaTpl('style:common', ['layout']),
           getSchemaTpl('style:classNames', {
             isFormItem: false,
             schema: [
@@ -173,8 +173,7 @@ export class ContainerPlugin extends BasePlugin {
                 label: '内容区'
               })
             ]
-          }),
-          ...getSchemaTpl('style:common', ['layout']),
+          })
         ])
       }
     ]);
diff --git a/packages/amis-editor/src/plugin/Wrapper.tsx b/packages/amis-editor/src/plugin/Wrapper.tsx
index 18ca1c766..eb1fb336d 100644
--- a/packages/amis-editor/src/plugin/Wrapper.tsx
+++ b/packages/amis-editor/src/plugin/Wrapper.tsx
@@ -199,7 +199,7 @@ export class WrapperPlugin extends BasePlugin {
           title: '外观',
           className: 'p-none',
           body: getSchemaTpl('collapseGroup', [
-            ...getSchemaTpl('style:common'),
+            ...getSchemaTpl('style:common', ['layout']),
             {
               title: 'CSS 类名',
               body: [
diff --git a/packages/amis-editor/src/tpl/layout.tsx b/packages/amis-editor/src/tpl/layout.tsx
index c3efe660c..cc6ef1d58 100644
--- a/packages/amis-editor/src/tpl/layout.tsx
+++ b/packages/amis-editor/src/tpl/layout.tsx
@@ -193,7 +193,7 @@ setSchemaTpl(
     }
 });
 
-// 展示模式
+// 显示类型
 setSchemaTpl(
   'layout:display',
   (config?: {
@@ -207,7 +207,7 @@ setSchemaTpl(
   }) => {
     const configSchema = {
       type: 'select',
-      label: config?.label || tipedLabel('展示模式', '默认为块级，可设置为弹性布局模式（flex布局容器）'),
+      label: config?.label || tipedLabel('显示类型', '默认为块级，可设置为弹性布局模式（flex布局容器）'),
       name: config?.name || 'style.display',
       value: config?.value || 'block',
       visibleOn: config?.visibleOn,