From f43228b807801c55cb8d6a3c33002c8488d14a67 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Mon, 31 Oct 2016 13:59:26 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-419=20dev=E9=87=8C=E9=9D=A2=E8=BF=99?=
 =?UTF-8?q?=E5=9D=97=E4=BB=A3=E7=A0=81=E5=A5=BD=E5=83=8F=E6=B2=A1=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/toolbar/ToolBarMenuDock.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
index bb9b886e5d..65b504d7de 100644
--- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@@ -26,6 +26,7 @@ import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.menu.ToolBarDef;
+import com.fr.env.RemoteEnv;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
@@ -264,7 +265,7 @@ public abstract class ToolBarMenuDock {
         );
 
         if (!BaseUtils.isAuthorityEditing()) {
-            if (shouldShowPlugin()){
+            if (shouldShowPlugin() && !(FRContext.getCurrentEnv() instanceof RemoteEnv)) {
                 menuDef.addShortCut(
                         new PluginManagerAction()
                 );
@@ -518,6 +519,9 @@ public abstract class ToolBarMenuDock {
 
         for (MenuHandler handler : target) {
             int insertPosition = handler.insertPosition(menuDef.getShortCutCount());
+			if (insertPosition == MenuHandler.HIDE) {
+                return;
+            }
             ShortCut shortCut = action.methodAction(handler);
             if (shortCut == null){
                 continue;