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

Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0

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

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