From d4aa48cd2b04bc514178671723e8d359a7ccca4c Mon Sep 17 00:00:00 2001
From: "Leo.Qin" <leo.qin@fanruan.com>
Date: Tue, 15 Oct 2024 19:21:32 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-135591=20=E6=8E=A7=E4=BB=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=A2=9E=E5=BC=BA=E4=B8=8D=E6=94=AF=E6=8C=81=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98=E6=8C=89=E9=92=AE=E7=BB=84=E6=8E=A7=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=20&&=20REPORT-125065=20=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E6=A0=B7=E5=BC=8F=E5=92=8C=E4=B8=BB=E9=A2=98=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=95=88=E6=9E=9C=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/widgettheme/ParaButtonSettingPane.java   | 2 ++
 .../com/fr/design/widgettheme/ParaTreeEditorSettingPane.java    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/ParaButtonSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/ParaButtonSettingPane.java
index 620af9a80e..7f656a4bfa 100644
--- a/designer-form/src/main/java/com/fr/design/widgettheme/ParaButtonSettingPane.java
+++ b/designer-form/src/main/java/com/fr/design/widgettheme/ParaButtonSettingPane.java
@@ -38,6 +38,7 @@ public class ParaButtonSettingPane<T extends Widget> extends ButtonSettingPane<T
         fontColorButton.setColor(textStyle.getFontColor());
         bold.setSelected(textStyle.isBold());
         italic.setSelected(textStyle.isItalic());
+        fontNameSelectBox.setSelectedItem(textStyle.getName());
     }
 
     @Override
@@ -48,6 +49,7 @@ public class ParaButtonSettingPane<T extends Widget> extends ButtonSettingPane<T
         textStyle.setFontColor(fontColorButton.getColor());
         textStyle.setBold(bold.isSelected());
         textStyle.setItalic(italic.isSelected());
+        textStyle.setName((String) fontNameSelectBox.getSelectedItem());
         paraButtonTheme.setTextStyle(textStyle);
     }
 
diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/ParaTreeEditorSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/ParaTreeEditorSettingPane.java
index fbebd58633..b1c54290fe 100644
--- a/designer-form/src/main/java/com/fr/design/widgettheme/ParaTreeEditorSettingPane.java
+++ b/designer-form/src/main/java/com/fr/design/widgettheme/ParaTreeEditorSettingPane.java
@@ -36,6 +36,7 @@ public class ParaTreeEditorSettingPane<T extends TreeEditor> extends TreeEditorS
         ThemeTextStyle textStyle = widgetTheme.getTextStyle();
         fontSizePane.setValue(textStyle.getFontSize());
         fontColorButton.setColor(textStyle.getFontColor());
+        fontNameSelectBox.setSelectedItem(textStyle.getName());
     }
 
     @Override
@@ -43,6 +44,7 @@ public class ParaTreeEditorSettingPane<T extends TreeEditor> extends TreeEditorS
         ThemeTextStyle textStyle = new ThemeTextStyle();
         textStyle.setFontSize(fontSizePane.getValue());
         textStyle.setFontColor(fontColorButton.getColor());
+        textStyle.setName((String) fontNameSelectBox.getSelectedItem());
         widgetTheme.setTextStyle(textStyle);
     }
 }