Merge pull request #547 in BA/design from ~PLOUGH/design:dev to dev

* commit '2686f1f4661893c3ce75f8243d25e2aa22d4f7e9':
  REPORT-881 远程设计，非管理员连接，不应该看到菜单栏的“服务器”选项

designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -133,7 +133,9 @@ public abstract class ToolBarMenuDock {
         menuList.addAll(Arrays.asList(menuDefs));
 
         // 添加服务器菜单
-        menuList.add(createServerMenuDef(plus));
+        if (FRContext.getCurrentEnv() != null && FRContext.getCurrentEnv().isRoot()) {
+            menuList.add(createServerMenuDef(plus));
+        }
 
         // 添加帮助菜单
         menuList.add(createHelpMenuDef());
@@ -245,11 +247,6 @@ public abstract class ToolBarMenuDock {
     protected MenuDef createServerMenuDef(ToolBarMenuDockPlus plus) {
         MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_M-Server"), 'S');
 
-        if (FRContext.getCurrentEnv() == null || !FRContext.getCurrentEnv().isRoot()) {
-            menuDef.addShortCut(new ConnectionListAction());
-            return menuDef;
-        }
-
         if (!BaseUtils.isAuthorityEditing()) {
             menuDef.addShortCut(
                     new ConnectionListAction(),