From cdf1c3c1a630c908229ba06871678a62f0d09862 Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Tue, 19 Dec 2023 17:28:21 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-111562=20=E3=80=90=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A2=9E=E5=BC=BA=E3=80=91=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E8=89=B2-=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=97=A0=E6=B3=95=E6=8C=81=E4=B9=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/widgettheme/ParaSelectEditorSettingPane.java  | 9 ++++-----
 .../fr/design/widgettheme/common/EditorSettingPane.java  | 9 +++++----
 .../widgettheme/common/SelectEditorSettingPane.java      | 5 ++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/ParaSelectEditorSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/ParaSelectEditorSettingPane.java
index 33f070485..cb59df6cc 100644
--- a/designer-form/src/main/java/com/fr/design/widgettheme/ParaSelectEditorSettingPane.java
+++ b/designer-form/src/main/java/com/fr/design/widgettheme/ParaSelectEditorSettingPane.java
@@ -1,7 +1,6 @@
 package com.fr.design.widgettheme;
 
 import com.fr.form.ui.Widget;
-import com.fr.widgettheme.theme.widget.theme.ParaEditorTheme;
 import com.fr.widgettheme.theme.widget.theme.ParaSelectEditorTheme;
 import com.fr.widgettheme.theme.widget.theme.cell.EditorTheme;
 
@@ -30,17 +29,17 @@ public class ParaSelectEditorSettingPane<T extends Widget> extends ParaEditorSet
     @Override
     protected void populateEditorBean(EditorTheme editorTheme) {
         ParaSelectEditorTheme paraSelectEditorTheme= new ParaSelectEditorTheme(editorTheme);
-        if (!editorTheme.isFollowTheme()) {
+        if (!paraSelectEditorTheme.isFollowTheme()) {
             selectBgColorBox.setSelectObject(paraSelectEditorTheme.getSelectBoxBgColor());
         }
-        super.populateEditorBean(editorTheme);
+        super.populateEditorBean(paraSelectEditorTheme);
     }
 
     @Override
-    protected void updateEditorStyleBean(EditorTheme editorTheme) {
+    protected EditorTheme updateEditorStyleBean(EditorTheme editorTheme) {
         ParaSelectEditorTheme paraSelectEditorTheme= new ParaSelectEditorTheme(editorTheme);
         paraSelectEditorTheme.setSelectBoxBgColor(selectBgColorBox.getSelectObject());
-        super.updateEditorStyleBean(editorTheme);
+        return super.updateEditorStyleBean(paraSelectEditorTheme);
     }
 
     @Override
diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java
index 320f6e05d..3ab7d6136 100644
--- a/designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java
+++ b/designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java
@@ -95,21 +95,22 @@ public class EditorSettingPane<T extends Widget> extends BaseStyleSettingPane<T>
     @Override
     public void updateBean(T t) {
         EditorTheme widgetTheme = initEditorTheme(t);
-        updateEditorBean(widgetTheme);
+        t.setWidgetTheme(updateEditorBean(widgetTheme));
     }
 
-    protected void updateEditorBean(EditorTheme editorTheme) {
+    protected EditorTheme updateEditorBean(EditorTheme editorTheme) {
         int selectIndex = styleSettingHead.getSelectedIndex();
         editorTheme.setFollowTheme(selectIndex == 0);
-        updateEditorStyleBean(editorTheme);
+        return updateEditorStyleBean(editorTheme);
     }
 
-    protected void updateEditorStyleBean(EditorTheme editorTheme) {
+    protected EditorTheme updateEditorStyleBean(EditorTheme editorTheme) {
         editorTheme.setThemeColor(colorSelectBox.getSelectObject());
         editorTheme.setStyleType(style1.isSelected() ? WidgetThemeDisplayConstants.STYLE_1 : WidgetThemeDisplayConstants.STYLE_2);
         editorTheme.setBorderStyle(new BorderStyle((int) borderRadiusSpinner.getValue(), lineComboBox.getSelectedLineStyle()));
         assignFontSizeStyle(editorTheme);
         switchCard();
+        return editorTheme;
     }
 
 }
diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/common/SelectEditorSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/common/SelectEditorSettingPane.java
index f30645e97..2ae07a3cd 100644
--- a/designer-form/src/main/java/com/fr/design/widgettheme/common/SelectEditorSettingPane.java
+++ b/designer-form/src/main/java/com/fr/design/widgettheme/common/SelectEditorSettingPane.java
@@ -6,7 +6,6 @@ import com.fr.widgettheme.theme.widget.theme.cell.EditorTheme;
 import com.fr.widgettheme.theme.widget.theme.cell.SelectEditTheme;
 
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * 单元格下拉框编辑控件配置面板
@@ -48,9 +47,9 @@ public class SelectEditorSettingPane <T extends Widget> extends EditorSettingPan
     }
 
     @Override
-    protected void updateEditorStyleBean(EditorTheme editorTheme) {
+    protected EditorTheme updateEditorStyleBean(EditorTheme editorTheme) {
         SelectEditTheme selectEditTheme = new SelectEditTheme(editorTheme);
         selectEditTheme.setSelectBoxBgColor(selectBgColorBox.getSelectObject());
-        super.updateEditorStyleBean(selectEditTheme);
+        return super.updateEditorStyleBean(selectEditTheme);
     }
 }