From dcc454b0c6c7b5df8de37d997000dc55fd2202c9 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Mon, 7 Jun 2021 10:15:41 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-53328=20&&=20REPORT-53314=20=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=92=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controlpane/UIListGroupControlPane.java   | 19 ++++++++++++++++---
 .../mainframe/FormWidgetDetailPane.java       |  6 +++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java
index 6e0313ec7..bb7fee0a3 100644
--- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java
@@ -12,6 +12,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.widget.EventCreator;
 import com.fr.form.event.Listener;
 import com.fr.form.ui.Widget;
+import com.fr.general.FRFont;
 import com.fr.general.NameObject;
 import com.fr.report.web.util.ReportEngineEventMapping;
 import com.fr.stable.ArrayUtils;
@@ -26,10 +27,13 @@ import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import java.awt.AlphaComposite;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.lang.reflect.Constructor;
@@ -456,7 +460,7 @@ public abstract class UIListGroupControlPane  extends UIControlPane implements L
         getHelper().popupEditDialog(null, this.selectNameEdList, this);
     }
 
-    protected String getWrapperLabelText(){
+    protected String getWrapperLabelText() {
         return StringUtils.EMPTY;
     }
 
@@ -466,9 +470,18 @@ public abstract class UIListGroupControlPane  extends UIControlPane implements L
 
         public ListWrapperPane(String labelText, UINameEdList nameEdList) {
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
-            UILabel label = new UILabel(labelText + getWrapperLabelText());
+            UILabel label = new UILabel(labelText + getWrapperLabelText()) {
+                @Override
+                public void paint(Graphics g) {
+                    ((Graphics2D) g).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.7f));
+                    super.paint(g);
+                }
+            };
             label.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 0));
-            label.setBackground(Color.decode("#FFFFFF"));
+            label.setOpaque(true);
+            label.setBackground(Color.WHITE);
+            label.setForeground(Color.decode("#333334"));
+            label.setFont(label.getFont().deriveFont(10F));
             label.setPreferredSize(new Dimension(224, 26));
             this.nameEdList = nameEdList;
             this.add(label, BorderLayout.NORTH);
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java
index 170704aa6..8fbc4d06d 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java
@@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIHeadGroup;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
 import com.fr.design.mainframe.share.collect.ComponentCollector;
 import com.fr.design.mainframe.share.ui.local.LocalWidgetRepoPane;
 import com.fr.design.mainframe.share.ui.online.OnlineWidgetRepoPane;
@@ -89,7 +90,7 @@ public class FormWidgetDetailPane extends FormDockView{
                 cardLayout.show(centerPane, paneList.get(newSelectedIndex).getTitle());
             }
         };
-        headGroup.setSelectedIndex(ONLINE_TAB);
+        headGroup.setSelectedIndex(ComponentReuseNotificationInfo.getInstance().isClickedWidgetLib() ? 0 : ONLINE_TAB);
         this.add(headGroup, BorderLayout.NORTH);
         this.add(centerPane, BorderLayout.CENTER);
     }
@@ -105,12 +106,11 @@ public class FormWidgetDetailPane extends FormDockView{
     }
 
 
-    public void enterWidgetLib() {
+    public  void enterWidgetLib() {
         EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_LIB);
         ComponentReuseNotifyUtil.enterWidgetLibExtraAction(false);
     }
 
-
     /**
      * 定位
      *