Browse Source

REPORT-419 dev里面这块代码好像没合

master
kerry 8 years ago
parent
commit
f43228b807
  1. 6
      designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

6
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;

Loading…
Cancel
Save