From 49a7825ed2d0de30a15a3b14c89f807c935e57fe Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Wed, 9 Feb 2022 17:09:13 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-66378=20=E3=80=90=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E9=A3=8E=E6=A0=BC=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=95=86=E5=9F=8E=EF=BC=8C=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E4=B8=8B=E5=A5=97=E7=94=A8=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81=E5=B1=8F?=
 =?UTF-8?q?=E8=94=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
国际化下屏蔽mini商城窗口，屏蔽条件与在线组件库保持一直

【改动思路】
同上
---
 .../com/fr/design/mainframe/share/ComponentShareUtil.java     | 4 ++++
 .../main/java/com/fr/design/mainframe/FormParaWidgetPane.java | 3 ++-
 .../design/mainframe/share/ui/online/OnlineWidgetTabPane.java | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java b/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java
index cec7fbc8f..244582612 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java
@@ -34,6 +34,10 @@ public class ComponentShareUtil {
         return localeMark.getValue();
     }
 
+    public static boolean isShowMiniShopWindow() {
+        return isShowOnlineWidgetRepoPane();
+    }
+
     /**
      * 判断是否可触达
      *
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
index 85a074384..2f78a98f0 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
@@ -18,6 +18,7 @@ import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.share.ComponentShareUtil;
 import com.fr.design.mainframe.share.ui.online.OnlineWidgetRepoPane;
 import com.fr.design.mainframe.share.ui.online.mini.MiniComponentShopDialog;
 import com.fr.design.mainframe.share.util.OnlineShopUtils;
@@ -265,7 +266,7 @@ public class FormParaWidgetPane extends JPanel {
         jPanel.addMouseListener(new MouseListener() {
             @Override
             public void mouseClicked(MouseEvent e) {
-                if (OnlineShopUtils.testConnection()) {
+                if (OnlineShopUtils.testConnection() && ComponentShareUtil.isShowMiniShopWindow()) {
                     MiniComponentShopDialog.getInstance().show();
                 } else {
                     OnlineWidgetRepoPane.getInstance().switch2InternetErrorPane();
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java
index c7a25be00..1ab2cec12 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java
@@ -103,7 +103,7 @@ public class OnlineWidgetTabPane extends JPanel {
         button.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                if (OnlineShopUtils.testConnection()) {
+                if (OnlineShopUtils.testConnection() && ComponentShareUtil.isShowMiniShopWindow()) {
                     MiniComponentShopDialog.getInstance().show();
                     FormWidgetDetailPane.getInstance().switch2Local();
                     FormWidgetDetailPane.getInstance().enterWidgetLib();