From 3df37c4bddd4e397e7f72ac4ed692863d46e1a6d Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Mon, 26 Sep 2022 15:49:51 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-80444=20=E6=96=B0=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=E6=8E=A7=E4=BB=B6=E6=A0=B7=E5=BC=8F=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/creator/XCreatorUtils.java       | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java
index 5e7807698a..9b30a42d45 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java
@@ -19,6 +19,7 @@ import com.fr.design.designer.creator.cardlayout.XWCardTagLayout;
 import com.fr.design.designer.creator.cardlayout.XWCardTitleLayout;
 import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.fit.common.TemplateTool;
 import com.fr.design.fun.ChartWidgetOptionProvider;
 import com.fr.design.fun.FormWidgetOptionProvider;
 import com.fr.design.fun.ParameterWidgetOptionProvider;
@@ -39,6 +40,7 @@ import com.fr.form.ui.ComboCheckBox;
 import com.fr.form.ui.DateEditor;
 import com.fr.form.ui.EditorHolder;
 import com.fr.form.ui.ElementCaseEditor;
+import com.fr.form.ui.FieldEditor;
 import com.fr.form.ui.FileEditor;
 import com.fr.form.ui.FreeButton;
 import com.fr.form.ui.IframeEditor;
@@ -51,6 +53,7 @@ import com.fr.form.ui.Radio;
 import com.fr.form.ui.RadioGroup;
 import com.fr.form.ui.TextArea;
 import com.fr.form.ui.TextEditor;
+import com.fr.form.ui.ToggleButton;
 import com.fr.form.ui.TreeComboBoxEditor;
 import com.fr.form.ui.TreeEditor;
 import com.fr.form.ui.Widget;
@@ -236,14 +239,30 @@ public class XCreatorUtils {
     }
 
     public static XCreator createThemedXCreator(Widget widget) {
+
         JTemplate<?,?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
         TemplateTheme theme = template.getTemplateTheme();
         if (theme instanceof FormTheme) {
             widget = setupTemplateTheme(widget, true, (FormTheme) theme, TemplateThemeCompatible.NONE);
         }
+        if (TemplateTool.isCurrentEditingNewJForm()){
+            resetWidgetDefaultProperty(widget);
+        }
         return createXCreator(widget);
     }
 
+    /**
+     * 新表单下控件的字体默认都为9pt
+     * @param widget 控件
+     */
+    private static void resetWidgetDefaultProperty(Widget widget) {
+        if (widget.acceptType(FieldEditor.class)) {
+            ((FieldEditor) widget).setFontSize(Widget.DEFAULT_FONT_PT_SIZE);
+        } else if (widget.acceptType(ToggleButton.class)) {
+            ((ToggleButton) widget).setFontSize(Widget.DEFAULT_FONT_PT_SIZE);
+        }
+    }
+
     /**
      * 创建creator
      *