Pull request #13574: REPORT-114548 【控件显示增强-按钮控件边框线型颜色】按钮控件的边框线型颜色自定义保存后，再打开颜色会变为跟随的主题色。且边框线型颜色展示异常

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

* commit 'e23a554484077fba542f891ee7b5888e3c6f5f37':
  REPORT-114548 【控件显示增强-按钮控件边框线型颜色】按钮控件的边框线型颜色自定义保存后，再打开颜色会变为跟随的主题色。且边框线型颜色展示异常

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

@@ -61,8 +61,10 @@ public class NormalButtonSettingPane<T extends Widget> extends BaseStyleSettingP
             styleSettingHead.setSelectedIndex(0);
         } else {
             styleSettingHead.setSelectedIndex(1);
-            lineComboBox.setSelectedLineStyle(widgetTheme.getBorderStyle().getLineType());
+            BorderStyle borderStyle = widgetTheme.getBorderStyle();
-            borderRadiusSpinner.setValue(widgetTheme.getBorderStyle().getRadius());
+            lineComboBox.setSelectedLineStyle(borderStyle.getLineType());
+            borderRadiusSpinner.setValue(borderStyle.getRadius());
+            borderColorSelectBox.setSelectObject(borderStyle.getBorderColor());
             assignFontPane(widgetTheme);
             buttonStyleDefinedPane.populate(ButtonBackground.create(widgetTheme.getButtonBackgroundStyle()));
         }