From c77aa20e1e7c5c44c07106aafbbfc9050277fdb4 Mon Sep 17 00:00:00 2001
From: qkiroc <qkiroc@126.com>
Date: Thu, 16 Mar 2023 20:31:50 +0800
Subject: [PATCH] =?UTF-8?q?amis-saas-10220=20tpl=E5=A4=96=E8=A7=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Idafaa5c9894a5559ed7fcbdc2038efaf34fb72d4
---
 .../src/plugin/Layout/FlexPluginBase.tsx      |  4 +-
 packages/amis-editor/src/plugin/Tpl.tsx       |  5 +-
 packages/amis-editor/src/tpl/style.tsx        | 58 ++++++++++---------
 3 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/packages/amis-editor/src/plugin/Layout/FlexPluginBase.tsx b/packages/amis-editor/src/plugin/Layout/FlexPluginBase.tsx
index 464fb3348..8df1cbb78 100644
--- a/packages/amis-editor/src/plugin/Layout/FlexPluginBase.tsx
+++ b/packages/amis-editor/src/plugin/Layout/FlexPluginBase.tsx
@@ -312,9 +312,7 @@ export class FlexPluginBase extends BasePlugin {
         {
           title: '外观',
           className: 'p-none',
-          body: getSchemaTpl('collapseGroup', [
-            ...getSchemaTpl('theme:common', [])
-          ])
+          body: getSchemaTpl('collapseGroup', [...getSchemaTpl('theme:common')])
         }
       ])
     ];
diff --git a/packages/amis-editor/src/plugin/Tpl.tsx b/packages/amis-editor/src/plugin/Tpl.tsx
index b622aac26..e623e6fea 100644
--- a/packages/amis-editor/src/plugin/Tpl.tsx
+++ b/packages/amis-editor/src/plugin/Tpl.tsx
@@ -216,10 +216,7 @@ export class TplPlugin extends BasePlugin {
       {
         title: '外观',
         body: getSchemaTpl('collapseGroup', [
-          ...getSchemaTpl('style:common', ['layout']),
-          getSchemaTpl('style:classNames', {
-            isFormItem: false
-          })
+          ...getSchemaTpl('theme:common', ['layout'], ['font'])
         ])
       },
       {
diff --git a/packages/amis-editor/src/tpl/style.tsx b/packages/amis-editor/src/tpl/style.tsx
index 1e8314a27..81da7611a 100644
--- a/packages/amis-editor/src/tpl/style.tsx
+++ b/packages/amis-editor/src/tpl/style.tsx
@@ -567,15 +567,39 @@ setSchemaTpl('theme:shadow', (option: any = {}) => {
 
 setSchemaTpl(
   'theme:common',
-  (exclude: string[] | string, include: string[] | string) => {
+  (exclude: string[] | string, include: string[]) => {
     // key统一转换成Kebab case，eg: boxShadow => bos-shadow
     exclude = (
       exclude ? (Array.isArray(exclude) ? exclude : [exclude]) : []
     ).map((key: string) => kebabCase(key));
 
-    include = (
-      include ? (Array.isArray(include) ? include : [include]) : []
-    ).map((key: string) => kebabCase(key));
+    const moreStyle =
+      include?.map(key =>
+        getSchemaTpl(`theme:${key}`, {
+          name: 'style'
+        })
+      ) || [];
+    const styles = moreStyle.concat([
+      getSchemaTpl('theme:border', {
+        name: 'style'
+      }),
+      getSchemaTpl('theme:radius', {
+        name: 'style.radius'
+      }),
+      getSchemaTpl('theme:paddingAndMargin', {
+        name: 'style'
+      }),
+      getSchemaTpl('theme:colorPicker', {
+        name: 'style.background',
+        label: '背景',
+        needCustom: true,
+        needGradient: true,
+        labelMode: 'input'
+      }),
+      getSchemaTpl('theme:shadow', {
+        name: 'style.boxShadow'
+      })
+    ]);
     return [
       {
         header: '布局',
@@ -590,27 +614,7 @@ setSchemaTpl(
       },
       {
         title: '自定义样式',
-        body: [
-          getSchemaTpl('theme:border', {
-            name: 'style'
-          }),
-          getSchemaTpl('theme:radius', {
-            name: 'style.radius'
-          }),
-          getSchemaTpl('theme:paddingAndMargin', {
-            name: 'style'
-          }),
-          getSchemaTpl('theme:colorPicker', {
-            name: 'style.background',
-            label: '背景',
-            needCustom: true,
-            needGradient: true,
-            labelMode: 'input'
-          }),
-          getSchemaTpl('theme:shadow', {
-            name: 'style.boxShadow'
-          })
-        ]
+        body: styles
       },
       {
         title: '样式源码',
@@ -622,8 +626,6 @@ setSchemaTpl(
           }
         ]
       }
-    ].filter(item =>
-      include.length ? ~include.indexOf(item.key) : !~exclude.indexOf(item.key)
-    );
+    ].filter(item => !~exclude.indexOf(item.key || ''));
   }
 );