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..f7cd1eb93 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,9 +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; import java.util.Arrays; @@ -28,23 +25,7 @@ public class ParaSelectEditorSettingPane extends ParaEditorSet } @Override - protected void populateEditorBean(EditorTheme editorTheme) { - ParaSelectEditorTheme paraSelectEditorTheme= new ParaSelectEditorTheme(editorTheme); - if (!editorTheme.isFollowTheme()) { - selectBgColorBox.setSelectObject(paraSelectEditorTheme.getSelectBoxBgColor()); - } - super.populateEditorBean(editorTheme); - } - - @Override - protected void updateEditorStyleBean(EditorTheme editorTheme) { - ParaSelectEditorTheme paraSelectEditorTheme= new ParaSelectEditorTheme(editorTheme); - paraSelectEditorTheme.setSelectBoxBgColor(selectBgColorBox.getSelectObject()); - super.updateEditorStyleBean(editorTheme); - } - - @Override - protected EditorTheme getEditorTheme() { - return new ParaSelectEditorTheme(); + protected String title4PopupWindow() { + return "paraSelectEditorSetting"; } } 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..5209a7baa 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 @@ -81,6 +81,7 @@ public class EditorSettingPane extends BaseStyleSettingPane } lineComboBox.setSelectedLineStyle(editorTheme.getBorderStyle().getLineType()); borderRadiusSpinner.setValue(editorTheme.getBorderStyle().getRadius()); + selectBgColorBox.setSelectObject(editorTheme.getSelectBoxBgColor()); assignFontSizePane(editorTheme); } switchCard(); @@ -106,6 +107,7 @@ public class EditorSettingPane extends BaseStyleSettingPane protected void updateEditorStyleBean(EditorTheme editorTheme) { editorTheme.setThemeColor(colorSelectBox.getSelectObject()); + editorTheme.setSelectBoxBgColor(selectBgColorBox.getSelectObject()); editorTheme.setStyleType(style1.isSelected() ? WidgetThemeDisplayConstants.STYLE_1 : WidgetThemeDisplayConstants.STYLE_2); editorTheme.setBorderStyle(new BorderStyle((int) borderRadiusSpinner.getValue(), lineComboBox.getSelectedLineStyle())); assignFontSizeStyle(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..c226852ba 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 @@ -2,11 +2,8 @@ package com.fr.design.widgettheme.common; import com.fr.design.widgettheme.StyleSetting; import com.fr.form.ui.Widget; -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; /** * 单元格下拉框编辑控件配置面板 @@ -32,25 +29,4 @@ public class SelectEditorSettingPane extends EditorSettingPan protected String title4PopupWindow() { return "selectEditorSetting"; } - - @Override - protected EditorTheme getEditorTheme() { - return new SelectEditTheme(); - } - - @Override - protected void populateEditorBean(EditorTheme editorTheme) { - SelectEditTheme selectEditTheme = new SelectEditTheme(editorTheme); - if (!selectEditTheme.isFollowTheme()) { - selectBgColorBox.setSelectObject(selectEditTheme.getSelectBoxBgColor()); - } - super.populateEditorBean(selectEditTheme); - } - - @Override - protected void updateEditorStyleBean(EditorTheme editorTheme) { - SelectEditTheme selectEditTheme = new SelectEditTheme(editorTheme); - selectEditTheme.setSelectBoxBgColor(selectBgColorBox.getSelectObject()); - super.updateEditorStyleBean(selectEditTheme); - } }