From d340a683efcf113b10ccbe59e983bf74105a8ba6 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Sat, 8 May 2021 14:33:32 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-51401=20=E6=89=93=E5=BC=80=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E8=AE=BE=E8=AE=A1=E5=99=A8=E4=B8=8A=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E9=A1=BA=E5=BA=8F=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/DesignerFrameFileDealerPane.java | 9 ++++++---
 .../com/fr/design/mainframe/app/AbstractWorkBookApp.java | 2 ++
 .../main/java/com/fr/design/mainframe/app/CptApp.java    | 2 --
 .../main/java/com/fr/design/mainframe/app/FormApp.java   | 3 +--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
index ad4726d66..fe2589028 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
@@ -181,9 +181,12 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         jt.requestFocus();
         jt.revert();
 
-        FineLoggerFactory.getLogger().info(
-                "\"" + jt.getEditingFILE().getName() + "\""
-                        + Toolkit.i18nText("Fine-Design_Basic_LOG_Has_Been_Openned") + "!");
+        // 打开为空占位模板时不输出
+        if (!jt.isOpening()) {
+            FineLoggerFactory.getLogger().info(
+                    "\"" + jt.getEditingFILE().getName() + "\""
+                            + Toolkit.i18nText("Fine-Design_Basic_LOG_Has_Been_Openned") + "!");
+        }
     }
 
     /**
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/app/AbstractWorkBookApp.java b/designer-realize/src/main/java/com/fr/design/mainframe/app/AbstractWorkBookApp.java
index 824fbf77d..3fd12d81a 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/app/AbstractWorkBookApp.java
+++ b/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.OpenWorker;
 import com.fr.file.FILE;
+import com.fr.log.FineLoggerFactory;
 import com.fr.main.impl.WorkBook;
 import com.fr.report.worksheet.WorkSheet;
 import java.util.concurrent.Callable;
@@ -42,6 +43,7 @@ abstract class AbstractWorkBookApp implements App<WorkBook> {
             }
         });
         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();
         if (result != null) {
             return new JWorkBook(result.getBaseBook(), tplFile);
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java b/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java
index 5733151c1..4e9980a49 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java
@@ -58,8 +58,6 @@ class CptApp extends AbstractWorkBookApp {
         }
 
         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();
         namestyle.clear();
         try {
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java b/designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java
index 616d4be07..05454fcbe 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java
+++ b/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);
             }
         });
+        FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Report_Template_Opening_And_Waiting", tplFile.getName()) + "...");
         worker.start(tplFile.getPath());
         OpenResult<Form, Parameter[]> result = worker.getResult();
         if (result != null) {
@@ -83,8 +84,6 @@ class FormApp extends AbstractAppProvider {
 
         // peter:打开新报表.
         Form tpl = new Form();
-        // richer:打开报表通知
-        FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Report_Template_Opening_And_Waiting", file.getName()) + "...");
         try {
             tpl.readStream(file.asInputStream());
         } catch (DecryptTemplateException | ChartNotFoundException e) {