|
|
@ -19,7 +19,6 @@ import com.fr.design.ExtraDesignClassManager; |
|
|
|
import com.fr.design.actions.TableDataSourceAction; |
|
|
|
import com.fr.design.actions.TableDataSourceAction; |
|
|
|
import com.fr.design.actions.edit.RedoAction; |
|
|
|
import com.fr.design.actions.edit.RedoAction; |
|
|
|
import com.fr.design.actions.edit.UndoAction; |
|
|
|
import com.fr.design.actions.edit.UndoAction; |
|
|
|
import com.fr.design.actions.file.BatchCompileAction; |
|
|
|
|
|
|
|
import com.fr.design.actions.file.SaveAsTemplateAction; |
|
|
|
import com.fr.design.actions.file.SaveAsTemplateAction; |
|
|
|
import com.fr.design.actions.file.SaveTemplateAction; |
|
|
|
import com.fr.design.actions.file.SaveTemplateAction; |
|
|
|
import com.fr.design.actions.file.WebPreviewUtils; |
|
|
|
import com.fr.design.actions.file.WebPreviewUtils; |
|
|
@ -974,7 +973,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>> |
|
|
|
} else if (DesignerMode.isAuthorityEditing()) { |
|
|
|
} else if (DesignerMode.isAuthorityEditing()) { |
|
|
|
return new ShortCut[]{new SaveTemplateAction(this), new UndoAction(this), new RedoAction(this)}; |
|
|
|
return new ShortCut[]{new SaveTemplateAction(this), new UndoAction(this), new RedoAction(this)}; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
return new ShortCut[]{new SaveTemplateAction(this), new SaveAsTemplateAction(this), new BatchCompileAction(), new UndoAction(this), new RedoAction(this)}; |
|
|
|
return new ShortCut[]{new SaveTemplateAction(this), new SaveAsTemplateAction(this), new UndoAction(this), new RedoAction(this)}; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
@ -1411,9 +1410,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>> |
|
|
|
* @return 按钮组 |
|
|
|
* @return 按钮组 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public UIButton[] createExtraButtons() { |
|
|
|
public UIButton[] createExtraButtons() { |
|
|
|
UIButton[] uiButtons = new UIButton[]{ |
|
|
|
UIButton[] uiButtons = new UIButton[0]; |
|
|
|
(UIButton) new CompileAction().createToolBarComponent() |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
Set<DesignerFrameUpButtonProvider> providers = ExtraDesignClassManager.getInstance().getArray(DesignerFrameUpButtonProvider.XML_TAG); |
|
|
|
Set<DesignerFrameUpButtonProvider> providers = ExtraDesignClassManager.getInstance().getArray(DesignerFrameUpButtonProvider.XML_TAG); |
|
|
|
for (DesignerFrameUpButtonProvider provider : providers) { |
|
|
|
for (DesignerFrameUpButtonProvider provider : providers) { |
|
|
|
uiButtons = ArrayUtils.addAll(uiButtons, provider.getUpButtons(getMenuState())); |
|
|
|
uiButtons = ArrayUtils.addAll(uiButtons, provider.getUpButtons(getMenuState())); |
|
|
|