Browse Source

REPORT-51401 打开模板,设计器上日志顺序不对

feature/10.0
hades 4 years ago
parent
commit
d340a683ef
  1. 3
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
  2. 2
      designer-realize/src/main/java/com/fr/design/mainframe/app/AbstractWorkBookApp.java
  3. 2
      designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java
  4. 3
      designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java

3
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@ -181,10 +181,13 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
jt.requestFocus(); jt.requestFocus();
jt.revert(); jt.revert();
// 打开为空占位模板时不输出
if (!jt.isOpening()) {
FineLoggerFactory.getLogger().info( FineLoggerFactory.getLogger().info(
"\"" + jt.getEditingFILE().getName() + "\"" "\"" + jt.getEditingFILE().getName() + "\""
+ Toolkit.i18nText("Fine-Design_Basic_LOG_Has_Been_Openned") + "!"); + Toolkit.i18nText("Fine-Design_Basic_LOG_Has_Been_Openned") + "!");
} }
}
/** /**
* 刷新菜单 * 刷新菜单

2
designer-realize/src/main/java/com/fr/design/mainframe/app/AbstractWorkBookApp.java

@ -7,6 +7,7 @@ import com.fr.design.mainframe.JWorkBook;
import com.fr.design.worker.open.OpenResult; import com.fr.design.worker.open.OpenResult;
import com.fr.design.worker.open.OpenWorker; import com.fr.design.worker.open.OpenWorker;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.log.FineLoggerFactory;
import com.fr.main.impl.WorkBook; import com.fr.main.impl.WorkBook;
import com.fr.report.worksheet.WorkSheet; import com.fr.report.worksheet.WorkSheet;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
@ -42,6 +43,7 @@ abstract class AbstractWorkBookApp implements App<WorkBook> {
} }
}); });
worker.start(tplFile.getPath()); worker.start(tplFile.getPath());
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Opening_And_Waiting", tplFile.getName()) + "...");
OpenResult<WorkBook, Parameter[]> result = worker.getResult(); OpenResult<WorkBook, Parameter[]> result = worker.getResult();
if (result != null) { if (result != null) {
return new JWorkBook(result.getBaseBook(), tplFile); return new JWorkBook(result.getBaseBook(), tplFile);

2
designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java

@ -58,8 +58,6 @@ class CptApp extends AbstractWorkBookApp {
} }
WorkBook tpl = new WorkBook(); WorkBook tpl = new WorkBook();
// richer:打开报表通知
FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Opening_And_Waiting", file.getName()) + "...");
TempNameStyle namestyle = TempNameStyle.getInstance(); TempNameStyle namestyle = TempNameStyle.getInstance();
namestyle.clear(); namestyle.clear();
try { try {

3
designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java

@ -61,6 +61,7 @@ class FormApp extends AbstractAppProvider {
new Object[]{result.getBaseBook(), tplFile, result.getRef()}, classType, BaseJForm.class); new Object[]{result.getBaseBook(), tplFile, result.getRef()}, classType, BaseJForm.class);
} }
}); });
FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Report_Template_Opening_And_Waiting", tplFile.getName()) + "...");
worker.start(tplFile.getPath()); worker.start(tplFile.getPath());
OpenResult<Form, Parameter[]> result = worker.getResult(); OpenResult<Form, Parameter[]> result = worker.getResult();
if (result != null) { if (result != null) {
@ -83,8 +84,6 @@ class FormApp extends AbstractAppProvider {
// peter:打开新报表. // peter:打开新报表.
Form tpl = new Form(); Form tpl = new Form();
// richer:打开报表通知
FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Report_Template_Opening_And_Waiting", file.getName()) + "...");
try { try {
tpl.readStream(file.asInputStream()); tpl.readStream(file.asInputStream());
} catch (DecryptTemplateException | ChartNotFoundException e) { } catch (DecryptTemplateException | ChartNotFoundException e) {

Loading…
Cancel
Save