Browse Source

REPORT-55243:将JStreamWork合并到JWorkBook及JTemplate的流程中

research/11.0
fly.li 3 years ago
parent
commit
28b3259514
  1. 4
      designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
  2. 3
      designer-realize/src/main/java/com/fr/nx/app/designer/CptxApp.java

4
designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@ -718,7 +718,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
} }
protected void addShortCut(MenuDef exportMenuDef, MenuDef excelExportMenuDef) { protected void addShortCut(MenuDef exportMenuDef, MenuDef excelExportMenuDef) {
if (CptCompileUtil.isNewEngine(this.getTarget())){ if (CptCompileUtil.isNewEngine(this.getTarget(), getEditingFILE().getPath())){
exportMenuDef.addShortCut(excelExportMenuDef, new PDFExportAction(this), new WordExportAction(this), new SVGExportAction(this), exportMenuDef.addShortCut(excelExportMenuDef, new PDFExportAction(this), new WordExportAction(this), new SVGExportAction(this),
new CSVExportAction(this), new TextExportAction(this)); new CSVExportAction(this), new TextExportAction(this));
}else { }else {
@ -748,7 +748,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
*/ */
@Override @Override
public ShortCut[] shortcut4TemplateMenu() { public ShortCut[] shortcut4TemplateMenu() {
boolean isNewEngine = CptCompileUtil.isNewEngine(this.getTarget()); boolean isNewEngine = CptCompileUtil.isNewEngine(this.getTarget(), getEditingFILE().getPath());
ShortCut[] commonShortCut = ArrayUtils.addAll(new ShortCut[]{ ShortCut[] commonShortCut = ArrayUtils.addAll(new ShortCut[]{
new ReportWebAttrAction(this), new ReportWebAttrAction(this),
new ReportExportAttrAction(this), new ReportExportAttrAction(this),

3
designer-realize/src/main/java/com/fr/nx/app/designer/CptxApp.java

@ -3,6 +3,7 @@ package com.fr.nx.app.designer;
import com.fr.base.extension.FileExtension; import com.fr.base.extension.FileExtension;
import com.fr.design.mainframe.AbstractAppProvider; import com.fr.design.mainframe.AbstractAppProvider;
import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.JTemplate;
import com.fr.design.mainframe.JWorkBook;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.main.impl.WorkBook; import com.fr.main.impl.WorkBook;
@ -36,7 +37,7 @@ public class CptxApp extends AbstractAppProvider<WorkBook> {
*/ */
@Override @Override
public JTemplate<WorkBook, ?> openTemplate(FILE tplFile) { public JTemplate<WorkBook, ?> openTemplate(FILE tplFile) {
return new JStreamBook(asIOFile(tplFile), tplFile); return new JWorkBook(asIOFile(tplFile), tplFile);
} }
@Override @Override

Loading…
Cancel
Save