From 7caddf7dddb537180d30044263b8743a28c04c90 Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Wed, 18 Jul 2018 11:37:47 +0800
Subject: [PATCH] =?UTF-8?q?rtREPORT-9747=20=E3=80=9010.0=E4=BA=8C=E8=BD=AE?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92=E3=80=91=E4=BF=AE=E6=94=B9=E4=BB=A5=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84=E6=A8=A1=E6=9D=BF=E6=97=A0=E6=B3=95=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/mainframe/DesignerFrame.java  | 8 +-------
 .../src/main/java/com/fr/design/mainframe/JTemplate.java  | 7 +------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
index 279f399f8..0fb838090 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@@ -1009,13 +1009,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      */
     private void activeTemplate(FILE tplFile, JTemplate jt) {
         // 如果该模板已经打开，则进行激活就可以了
-        String fullName = StableUtils.pathJoin(new String[]{ProjectConstants.REPORTLETS_NAME, tplFile.getName()});
-        // 如果是从文件夹打开的文件，不是从设计器文件树打开的文件，则直接取path就行
-        if (tplFile instanceof FileFILE) {
-            fullName = tplFile.getPath();
-        }
-        fullName = OperatingSystem.isWindows() ? fullName.replaceAll("/", "\\\\") : fullName.replaceAll("\\\\", "/");
-        int index = HistoryTemplateListPane.getInstance().contains(fullName);
+        int index = HistoryTemplateListPane.getInstance().contains(tplFile.getPath());
         List<JTemplate<?, ?>> historyList = HistoryTemplateListPane.getInstance().getHistoryList();
         if (index != -1) {
             historyList.get(index).activeJTemplate(index, jt);
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 11edfcb83..b694137c1 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
@@ -200,12 +200,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
     public String getPath() {
-        String editingFileName = getEditingFILE().getPath();
-        if (OperatingSystem.isWindows()) {
-            return editingFileName.replaceAll("/", "\\\\");
-        } else {
-            return editingFileName.replaceAll("\\\\", "/");
-        }
+        return getEditingFILE().getPath();
     }
 
     protected abstract JComponent createCenterPane();