From 71646c4285253314688aefac0ff88a7a6cada6d4 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 3 Dec 2020 15:12:31 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-43864=20=E5=8D=95=E5=85=83=E6=A0=BC?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7-=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=A2=E5=A4=B1=EF=BC=8C=E5=87=BA=E7=8E=B0=E5=A4=A7?=
 =?UTF-8?q?=E9=87=8F=E9=87=8D=E5=A4=8D=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/mainframe/App.java    | 11 +++++++++++
 .../com/fr/design/mainframe/JTemplateFactory.java     |  2 +-
 .../main/java/com/fr/design/mainframe/app/CptApp.java |  8 +++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/App.java b/designer-base/src/main/java/com/fr/design/mainframe/App.java
index 3cae10f6b..c941df8af 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/App.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/App.java
@@ -41,4 +41,15 @@ public interface App<T extends BaseBook> extends Mutable, Aftermath {
      * @return 报表
      */
     T asIOFile(FILE tplFile);
+
+
+    /**
+     * 输出workbook等对象
+     * @param tplFile 文件
+     * @param needCheck 是否需要check
+     * @return
+     */
+   default T asIOFile(FILE tplFile, boolean needCheck) {
+       return asIOFile(tplFile);
+   }
 }
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java
index 8019cc178..678b9bf84 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java
@@ -56,7 +56,7 @@ public final class JTemplateFactory {
             String[] defaultAppExtensions = app.defaultExtensions();
             for (String defaultAppExtension : defaultAppExtensions) {
                 if (defaultAppExtension.equalsIgnoreCase(fileExtension)) {
-                    BaseBook bb = app.asIOFile(file);
+                    BaseBook bb = app.asIOFile(file, false);
                     if (bb != null) {
                         return (T) bb;
                     }
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 cb6fb8d3e..adadab36d 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
@@ -42,7 +42,11 @@ class CptApp extends AbstractWorkBookApp {
 
     @Override
     public WorkBook asIOFile(FILE file) {
+        return asIOFile(file, true);
+    }
 
+    @Override
+    public WorkBook asIOFile(FILE file, boolean needCheck) {
         if (XMLEncryptUtils.isCptEncoded() &&
                 !XMLEncryptUtils.checkVaild(DesignerEnvManager.getEnvManager().getEncryptionKey())) {
             if (!new DecodeDialog(file).isPwdRight()) {
@@ -67,7 +71,9 @@ class CptApp extends AbstractWorkBookApp {
         } catch (Exception exp) {
             FineLoggerFactory.getLogger().error(Toolkit.i18nText("Fine-Design_Report_NS_Exception_ReadError") + file, exp);
         }
-        checkNameStyle(namestyle);
+        if (needCheck) {
+            checkNameStyle(namestyle);
+        }
         return tpl;
     }