Browse Source

REPORT-114501 【控件显示增强-边框颜色】边框颜色传到前端为null

release/11.0
obo 9 months ago
parent
commit
a411e490e7
  1. 2
      designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java

2
designer-form/src/main/java/com/fr/design/widgettheme/common/EditorSettingPane.java

@ -78,6 +78,7 @@ public class EditorSettingPane<T extends Widget> extends BaseStyleSettingPane<T>
colorSelectBox.setSelectObject(editorTheme.getThemeColor()); colorSelectBox.setSelectObject(editorTheme.getThemeColor());
lineComboBox.setSelectedLineStyle(editorTheme.getBorderStyle().getLineType()); lineComboBox.setSelectedLineStyle(editorTheme.getBorderStyle().getLineType());
borderRadiusSpinner.setValue(editorTheme.getBorderStyle().getRadius()); borderRadiusSpinner.setValue(editorTheme.getBorderStyle().getRadius());
borderColorSelectBox.setSelectObject(editorTheme.getBorderStyle().getBorderColor());
widgetBgColorSelectBox.setSelectObject(ColorUtils.ignoreColorAlpha(editorTheme.getWidgetBackground().getColor())); widgetBgColorSelectBox.setSelectObject(ColorUtils.ignoreColorAlpha(editorTheme.getWidgetBackground().getColor()));
widgetBgAlphaDragPane.populateBean(ColorUtils.roundColorAlphaDouble(editorTheme.getWidgetBackground().getColor())); widgetBgAlphaDragPane.populateBean(ColorUtils.roundColorAlphaDouble(editorTheme.getWidgetBackground().getColor()));
iconColorSelectBox.setSelectObject(editorTheme.getIconColor()); iconColorSelectBox.setSelectObject(editorTheme.getIconColor());
@ -110,6 +111,7 @@ public class EditorSettingPane<T extends Widget> extends BaseStyleSettingPane<T>
editorTheme.setSelectBoxBgColor(selectBgColorBox.getSelectObject()); editorTheme.setSelectBoxBgColor(selectBgColorBox.getSelectObject());
editorTheme.setBorderStyle(new BorderStyle((int) borderRadiusSpinner.getValue(), lineComboBox.getSelectedLineStyle(), borderColorSelectBox.getSelectObject())); editorTheme.setBorderStyle(new BorderStyle((int) borderRadiusSpinner.getValue(), lineComboBox.getSelectedLineStyle(), borderColorSelectBox.getSelectObject()));
editorTheme.setWidgetBackground(ColorUtils.createColorBackgroundWithAlpha(widgetBgColorSelectBox.getSelectObject(), widgetBgAlphaDragPane.updateBean())); editorTheme.setWidgetBackground(ColorUtils.createColorBackgroundWithAlpha(widgetBgColorSelectBox.getSelectObject(), widgetBgAlphaDragPane.updateBean()));
editorTheme.setIconColor(iconColorSelectBox.getSelectObject());
assignFontSizeStyle(editorTheme); assignFontSizeStyle(editorTheme);
switchCard(); switchCard();
} }

Loading…
Cancel
Save