From 6394044df6f4f02d3cd61bbecb523de468acbe0a Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Thu, 10 Mar 2022 16:41:58 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-67329=20=E5=A1=AB=E6=8A=A5-web=E7=AB=AF?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88-10=E5=8D=87=E7=BA=A711=EF=BC=8C=E9=80=8F?=
 =?UTF-8?q?=E6=98=8E=E7=9A=84=E7=BA=B8=E5=BC=A0=E8=83=8C=E6=99=AF=E5=8F=98?=
 =?UTF-8?q?=E6=88=90=E4=BA=86=E7=99=BD=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gui/style/ReportBackgroundSpecialPane.java      |  2 +-
 .../backgroundpane/ColorBackgroundQuickPane.java    |  9 ++++++---
 .../fr/design/style/color/NewColorSelectBox.java    | 13 ++++++++++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/style/ReportBackgroundSpecialPane.java b/designer-base/src/main/java/com/fr/design/gui/style/ReportBackgroundSpecialPane.java
index aeb2938a27..257e090c20 100644
--- a/designer-base/src/main/java/com/fr/design/gui/style/ReportBackgroundSpecialPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/style/ReportBackgroundSpecialPane.java
@@ -29,7 +29,7 @@ public class ReportBackgroundSpecialPane extends BackgroundPane {
     protected BackgroundQuickPane[] supportKindsOfBackgroundUI() {
         NullBackgroundQuickPane nullBackgroundPane = new NullBackgroundQuickPane();
 
-        ColorBackgroundQuickPane colorBackgroundPane = new ColorBackgroundQuickPane();
+        ColorBackgroundQuickPane colorBackgroundPane = new ColorBackgroundQuickPane(true);
         colorBackgroundPane.registerChangeListener(new UIObserverListener() {
             @Override
             public void doChange() {
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java
index 9d9eb0058c..086a07da48 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java
@@ -16,10 +16,9 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane {
 
     private NewColorSelectBox colorSelectBox;
 
-
-    public ColorBackgroundQuickPane() {
+    public ColorBackgroundQuickPane(boolean supportTransparent) {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        colorSelectBox = new NewColorSelectBox(100) {
+        colorSelectBox = new NewColorSelectBox(100, supportTransparent) {
             @Override
             public boolean shouldResponseChangeListener() {
                 // ColorBackgroundQuickPane注册监听器ChangeListenerImpl的逻辑不能丢，因为里面有修改字段backgroundChange的逻辑.
@@ -33,6 +32,10 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane {
         this.add(colorSelectBox, BorderLayout.NORTH);
     }
 
+    public ColorBackgroundQuickPane() {
+        this(false);
+    }
+
     public void populateBean(Background background) {
         ColorBackground colorBackgroud = (ColorBackground) background;
         populateColor(colorBackgroud.getColor());
diff --git a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectBox.java b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectBox.java
index 04d368e6bc..59ef1e6e43 100644
--- a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectBox.java
+++ b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectBox.java
@@ -20,13 +20,20 @@ public class NewColorSelectBox extends AbstractSelectBox<Color> implements UIObs
     private static final long serialVersionUID = 2782150678943960557L;
 
     private Color color;
-    private NewColorSelectPane colorPane = new NewColorSelectPane(false);
+    private NewColorSelectPane colorPane;
     private UIObserverListener uiObserverListener;
     private String newColorSelectBoxName = "";
     private GlobalNameListener globalNameListener = null;
+    private boolean supportTransparent;
 
     public NewColorSelectBox(int preferredWidth) {
-    	initBox(preferredWidth);
+    	this(preferredWidth, false);
+    }
+
+    public NewColorSelectBox(int preferredWidth, boolean supportTransparent) {
+        this.colorPane = new NewColorSelectPane(supportTransparent);
+        this.supportTransparent = supportTransparent;
+        initBox(preferredWidth);
         iniListener();
     }
 
@@ -58,7 +65,7 @@ public class NewColorSelectBox extends AbstractSelectBox<Color> implements UIObs
      */
     public JPanel initWindowPane(double preferredWidth) {
     	// 下拉的时候重新生成面板，以刷新最近使用颜色
-    	colorPane = new NewColorSelectPane(false);
+    	colorPane = new NewColorSelectPane(this.supportTransparent);
     	colorPane.setColor(this.getSelectObject());
     	colorPane.addChangeListener(new ChangeListener() {
     		public void stateChanged(ChangeEvent e) {