Pull request #13566: REPORT-111619 控件增强-更多的样式配置--报表支撑 自测问题修复3

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

* commit 'eddf184747f7a5cd0a08450aa121cc7fdf267c45':
  REPORT-111619 控件增强-更多的样式配置--报表支撑 自测问题修复3

designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/FileEditorMobileStyleDefinePane.java

@@ -37,6 +37,7 @@ public class FileEditorMobileStyleDefinePane extends DisplayEnhanceMobileStyleDe
             }
             borderType.setSelectedLineStyle(style.getBorderType());
             borderRadius.setValue(style.getBorderRadius());
+            borderColorSelectBox.setSelectObject(style.getBorderColor());
         }
         this.customBeanPane.populateBean(ob);
     }

designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/FreeButtonMobileStyleDefinePane.java

@@ -6,9 +6,6 @@ import com.fr.form.ui.Widget;
 import com.fr.form.ui.mobile.MobileStyle;
 import com.fr.util.ColorUtils;
 import com.fr.widgettheme.theme.widget.theme.WidgetThemeDisplayConstants;
-import com.fr.widgettheme.util.WidgetThemeDesignerUtils;
-
-import java.awt.Color;
 
 /**
  * 按钮控件通用属性面板
@@ -39,7 +36,7 @@ public class FreeButtonMobileStyleDefinePane extends DisplayEnhanceMobileStyleDe
     @Override
     protected void initBackgroundColor() {
         widgetBackgroundSelectBox.setSelectObject(getCurrentTemplateThemeColor());
-        widgetBgAlphaDragPane.populateBean(0);
+        widgetBgAlphaDragPane.populateBean(1);
     }
 
     @Override