From 47806c617bb1253904452f80571d248bf8121821 Mon Sep 17 00:00:00 2001
From: ju <ju@finereport.com>
Date: Thu, 12 Jul 2018 17:28:22 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-9505=20=E4=BF=AE=E6=94=B9=E6=9D=A5?=
 =?UTF-8?q?=E8=87=AA=E6=A1=8C=E9=9D=A2=E7=9A=84=E6=96=87=E4=BB=B6=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/mainframe/JTemplate.java    | 6 +-----
 designer-base/src/main/java/com/fr/file/FileNodeFILE.java   | 6 ++----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
index 575aea91b..804ea550b 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
@@ -55,13 +55,11 @@ import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.UUID;
 import com.fr.stable.project.ProjectConstants;
-import com.fr.workspace.WorkContext;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.undo.UndoManager;
 import java.awt.*;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -656,9 +654,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             return false;
         }
         try {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            this.getTarget().export(out);
-            WorkContext.getWorkResource().write(editingFILE.getPath(), out.toByteArray());
+            this.getTarget().export(editingFILE.asOutputStream());
         } catch (Exception e) {
             FRContext.getLogger().error(e.getMessage(), e);
             JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(), "Save Error", JOptionPane.ERROR_MESSAGE);
diff --git a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java
index 66a3c03bd..61e385e07 100644
--- a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java
+++ b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java
@@ -13,6 +13,7 @@ import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.workspace.WorkContext;
+import com.fr.workspace.resource.WorkResourceOutputStream;
 
 import javax.swing.*;
 import java.io.ByteArrayInputStream;
@@ -337,10 +338,7 @@ public class FileNodeFILE implements FILE {
         if (!envPath.startsWith(ProjectConstants.REPORTLETS_NAME)) {
             return null;
         }
-        return FRContext.getCommonOperator().writeBean(
-            envPath.substring(ProjectConstants.REPORTLETS_NAME.length() + 1),
-            ProjectConstants.REPORTLETS_NAME
-        );
+        return new WorkResourceOutputStream(envPath);
     }
     
     /**