|
|
|
@ -42,6 +42,7 @@ import com.fr.design.actions.server.GlobalTableDataAction;
|
|
|
|
|
import com.fr.design.actions.server.PlatformManagerAction; |
|
|
|
|
import com.fr.design.actions.server.PluginManagerAction; |
|
|
|
|
import com.fr.design.base.mode.DesignModeContext; |
|
|
|
|
import com.fr.design.file.HistoryTemplateListCache; |
|
|
|
|
import com.fr.design.file.NewTemplatePane; |
|
|
|
|
import com.fr.design.fun.MenuHandler; |
|
|
|
|
import com.fr.design.fun.OemProcessor; |
|
|
|
@ -275,7 +276,10 @@ public abstract class ToolBarMenuDock {
|
|
|
|
|
insertTemplateExtendMenu(plus, menuDefs); |
|
|
|
|
|
|
|
|
|
// 添加模板菜单
|
|
|
|
|
menuList.addAll(Arrays.asList(menuDefs)); |
|
|
|
|
// 如果是JNullTemplate不能添加模板菜单,之前没有这个JNullTemplate所以没考虑
|
|
|
|
|
if (JTemplate.isValid(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate())) { |
|
|
|
|
menuList.addAll(Arrays.asList(menuDefs)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 添加服务器菜单
|
|
|
|
|
if (WorkContext.getCurrent() != null && WorkContext.getCurrent().isRoot()) { |
|
|
|
|