From a992039144f20522d64e707de1da6ec46e4bed2c Mon Sep 17 00:00:00 2001
From: "Henry.Wang" <Henry.Wang@fanruan.com>
Date: Wed, 17 Nov 2021 17:20:27 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-62554=20=E5=86=8D=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E6=A8=A1=E6=9D=BF=E4=BC=9A=E7=A9=BA?=
 =?UTF-8?q?=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/app/FormApp.java     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

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 286890303e..29f56d143c 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
@@ -73,15 +73,13 @@ class FormApp extends AbstractAppProvider {
                 @Override
                 public JTemplate<?, ?> call() throws Exception {
                     OpenResult<Form, Parameter[]> result = worker.getResult();
-                    return (JTemplate<Form, ?>) StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG,
-                            new Object[]{result.getBaseBook(), tplFile, result.getRef()}, classType, BaseJForm.class);
+                    return getJForm(result.getBaseBook(), tplFile, result.getRef());
                 }
             });
             worker.start(tplFile.getPath());
             OpenResult<Form, Parameter[]> result = worker.getResult();
             if (result != null) {
-                return (JTemplate<Form, ?>) StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG,
-                        new Object[]{result.getBaseBook(), tplFile, new Parameter[0]}, classType, BaseJForm.class);
+                return getJForm(result.getBaseBook(), tplFile, result.getRef());
             }
             return emptyForm;
         } else {
@@ -90,6 +88,16 @@ class FormApp extends AbstractAppProvider {
         }
     }
 
+    @Nullable
+    private JForm getJForm(Form form, FILE file, Parameter[] parameters) {
+        try {
+            return new JForm(form, file, parameters);
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e, e.getMessage());
+            return null;
+        }
+    }
+
     @Nullable
     private Form getForm(FILE tplFile) {
         ReadXmlTypeLocalManager.setReadXmlType(ReadXmlType.DESIGN);