From d943917c95c42fd5f28996be395995153fc08d94 Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Fri, 2 Feb 2024 16:35:59 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-111619=20=E6=8E=A7=E4=BB=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=BA-=E6=9B=B4=E5=A4=9A=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE--=E6=8A=A5=E8=A1=A8=E6=94=AF=E6=92=91=20?=
 =?UTF-8?q?=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widget/mobile/pane/FileEditorMobileStyleDefinePane.java  | 1 +
 .../widget/mobile/pane/FreeButtonMobileStyleDefinePane.java  | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/FileEditorMobileStyleDefinePane.java b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/FileEditorMobileStyleDefinePane.java
index a56e84aaa..58e255b05 100644
--- a/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/FileEditorMobileStyleDefinePane.java
+++ b/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);
     }
diff --git a/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/FreeButtonMobileStyleDefinePane.java b/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/FreeButtonMobileStyleDefinePane.java
index e172a5666..7c3af9b12 100644
--- a/designer-base/src/main/java/com/fr/widgettheme/widget/mobile/pane/FreeButtonMobileStyleDefinePane.java
+++ b/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