From 202b0292698974c1a148ec201a2a7f02356c02d9 Mon Sep 17 00:00:00 2001
From: lucian <author@corpmail.com>
Date: Wed, 24 Feb 2021 10:56:25 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-48228=20=E6=8F=92=E4=BB=B6=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E7=9A=84=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=97shouldShowPlugin=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/toolbar/ToolBarMenuDock.java      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
index d9a7ecf3c0..33a2aaadfc 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@@ -489,11 +489,7 @@ public abstract class ToolBarMenuDock {
         }
 
         if (!DesignerMode.isAuthorityEditing()) {
-            if (shouldShowPlugin()) {
-                menuDef.addShortCut(
-                        createPluginManagerAction()
-                );
-            }
+            addPluginManagerAction(menuDef);
             menuDef.addShortCut(
                     new FunctionManagerAction(),
                     new GlobalParameterAction()
@@ -504,16 +500,21 @@ public abstract class ToolBarMenuDock {
         return menuDef;
     }
 
-    private ShortCut createPluginManagerAction() {
+    private void addPluginManagerAction(MenuDef menuDef) {
         Set<PluginManagerProvider> providers = ExtraDesignClassManager.getInstance().getArray(PluginManagerProvider.MARK_STRING);
         if (providers != null) {
             for (PluginManagerProvider provider : providers) {
                 if (provider.selector().accept(new ObjectHolder())) {
-                    return provider.pluginManagerAction();
+                    menuDef.addShortCut(provider.pluginManagerAction());
+                    return;
                 }
             }
         }
-        return new PluginManagerAction();
+        if (shouldShowPlugin()) {
+            menuDef.addShortCut(
+                    new PluginManagerAction()
+            );
+        }
     }
 
     private ShortCut createGlobalTDAction() {