From d1c716958798b25dbb9e22d29643bc023983b411 Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Mon, 25 Dec 2023 14:34:08 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-111549=20=E6=A0=87=E7=AD=BE=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=AD=97=E4=BD=93=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E6=A0=B7=E5=BC=8F=E7=AD=89=EF=BC=8C=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E5=A2=9E=E5=BC=BA=EF=BC=8C=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=B8=A2=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/widgettheme/LabelSettingPane.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/LabelSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/LabelSettingPane.java
index 0241b01000..8edba113cb 100644
--- a/designer-form/src/main/java/com/fr/design/widgettheme/LabelSettingPane.java
+++ b/designer-form/src/main/java/com/fr/design/widgettheme/LabelSettingPane.java
@@ -38,6 +38,11 @@ public class LabelSettingPane<T extends Widget> extends BaseStyleSettingPane<T>
         LabelTheme widgetTheme = (LabelTheme) t.getWidgetTheme();
         if (widgetTheme == null) {
             widgetTheme = new LabelTheme();
+            Label label = (Label) t;
+            if (!FRFont.getInstance().equals(label.getFont())) {
+                widgetTheme.setFollowTheme(false);
+                widgetTheme.setFontStyle(new FontStyle((label.getFont())));
+            }
             t.setWidgetTheme(widgetTheme);
         }
         return widgetTheme;