From 2c91ce7fa4e1fe0d5d9bf6449d9ade611cc93cf6 Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Mon, 13 Apr 2020 14:01:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?MOBILE-26509=20=E8=81=94=E6=8E=92tab?=
 =?UTF-8?q?=E7=9A=84=E6=A0=87=E9=A2=98=E8=83=8C=E6=99=AF=E8=89=B2=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=BA=86"=E9=80=8F=E6=98=8E"=EF=BC=8C=E4=BD=86?=
 =?UTF-8?q?=E5=9C=A8=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=B8=8A=E7=9C=8B=E6=98=AF?=
 =?UTF-8?q?=E7=99=BD=E8=89=B2=E7=9A=84=EF=BC=8C=E5=BA=94=E8=AF=A5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAtab=E8=83=8C=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

设计文档修改为背景色选择器无透明项
---
 .../design/mainframe/mobile/ui/UniteStyleDefinePane.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePane.java
index 2f269b028d..527697501a 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/UniteStyleDefinePane.java
@@ -12,6 +12,7 @@ import com.fr.design.mainframe.widget.MobileTabFontConfPane;
 import com.fr.design.mainframe.widget.UITitleSplitLine;
 import com.fr.design.mainframe.widget.preview.MobileTemplatePreviewPane;
 import com.fr.design.style.color.ColorSelectBox;
+import com.fr.design.style.color.NewColorSelectBox;
 import com.fr.form.ui.container.cardlayout.WCardTagLayout;
 import com.fr.general.cardtag.mobile.MobileTemplateStyle;
 import com.fr.general.cardtag.mobile.TabFontConfig;
@@ -33,8 +34,8 @@ public class UniteStyleDefinePane extends MobileTemplateStyleDefinePane {
     private UnsignedIntUISpinner paddingLeftSpinner;
     private UnsignedIntUISpinner paddingRightSpinner;
 
-    private ColorSelectBox initialBackgroundColorBox;
-    private ColorSelectBox selectedBackgroundColorBox;
+    private NewColorSelectBox initialBackgroundColorBox;
+    private NewColorSelectBox selectedBackgroundColorBox;
 
     private LineComboBox borderWidthComboBox;
     private ColorSelectBox borderColorBox;
@@ -96,9 +97,9 @@ public class UniteStyleDefinePane extends MobileTemplateStyleDefinePane {
     }
 
     private JPanel createBackgroundColorConfPanel() {
-        this.initialBackgroundColorBox = new ColorSelectBox(LINE_COMPONENT_WIDTH);
+        this.initialBackgroundColorBox = new NewColorSelectBox(LINE_COMPONENT_WIDTH);
         this.initialBackgroundColorBox.setPreferredSize(new Dimension(LINE_COMPONENT_WIDTH, LINE_COMPONENT_HEIGHT));
-        this.selectedBackgroundColorBox = new ColorSelectBox(LINE_COMPONENT_WIDTH);
+        this.selectedBackgroundColorBox = new NewColorSelectBox(LINE_COMPONENT_WIDTH);
         this.selectedBackgroundColorBox.setPreferredSize(new Dimension(LINE_COMPONENT_WIDTH, LINE_COMPONENT_HEIGHT));
 
         UILabel initialBackgroundColorLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Init_Fill") + ":", SwingConstants.RIGHT);

From 82d69aa9cbc91db3f9bacde151531a7c7fde922b Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Mon, 13 Apr 2020 14:20:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?MOBILE-26514=20=E4=BE=A7=E8=BE=B9=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E8=AE=BE=E7=BD=AE=E4=BA=86=E9=80=8F=E6=98=8E=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

处理ColorSelectBox选择透明后返回空对象的问题
---
 .../ui/SidebarMobileBookMarkStyleCustomDefinePane.java    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java
index 817f299511..ae79160bbd 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java
@@ -358,9 +358,7 @@ public class SidebarMobileBookMarkStyleCustomDefinePane extends BasicBeanPane<Mo
         style.setGap((int) buttonGapSpinner.getValue());
         style.setBorderRadius((int) buttonBorderRadiusSpinner.getValue());
 
-        if (normalBackgroundColorBox.getSelectObject() != null) {
-            style.setBackgroundColor(normalBackgroundColorBox.getSelectObject());
-        }
+        style.setBackgroundColor(normalBackgroundColorBox.getSelectObject());
         style.setOpacity((int) normalOpacitySpinner.getValue());
         style.setBorderLineStyle(normalBorderWidthComBox.getSelectedLineStyle());
         style.setBorderColor(normalBorderColorBox.getSelectObject());
@@ -374,9 +372,7 @@ public class SidebarMobileBookMarkStyleCustomDefinePane extends BasicBeanPane<Mo
         style.setFontItalic(normalFontItalicButton.isSelected());
         style.setFontBold(normalFontBoldButton.isSelected());
 
-        if (selectedBackgroundColorBox.getSelectObject() != null) {
-            style.setSelectedBackgroundColor(selectedBackgroundColorBox.getSelectObject());
-        }
+        style.setSelectedBackgroundColor(selectedBackgroundColorBox.getSelectObject());
         style.setSelectedOpacity((int) selectedOpacitySpinner.getValue());
         style.setSelectedBorderLineStyle(selectedBorderWidthComBox.getSelectedLineStyle());
         style.setSelectedBorderColor(selectedBorderColorBox.getSelectObject());