From 4b80630c253c21afd5370268ee761c0b83f90fb9 Mon Sep 17 00:00:00 2001
From: kerry <kerry@finereport.com>
Date: Sun, 9 Oct 2016 14:30:24 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-419=20=E6=9B=B4=E6=96=B0=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E5=9C=A8=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E7=A6=81?=
 =?UTF-8?q?=E6=AD=A2=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/fun/MenuHandler.java           | 1 +
 .../src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/designer_base/src/com/fr/design/fun/MenuHandler.java b/designer_base/src/com/fr/design/fun/MenuHandler.java
index 9573b11ddf..a6aaa4e8b1 100644
--- a/designer_base/src/com/fr/design/fun/MenuHandler.java
+++ b/designer_base/src/com/fr/design/fun/MenuHandler.java
@@ -18,6 +18,7 @@ public interface MenuHandler extends Mutable {
 
 
     int LAST = -1;
+    int HIDE =-2;
 
     String HELP = "help";
     String SERVER = "server";
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 e27aa9c198..2ea102c545 100644
--- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@@ -525,6 +525,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;