From 19df32d4b03f0e8fb935f9f2116364e1c6f8a7cb Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Fri, 7 Apr 2017 17:26:29 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-1916=20=E6=A8=A1=E6=9D=BF=E8=80=97?=
 =?UTF-8?q?=E6=97=B6=3D=E3=80=8B=E4=BF=AE=E5=A4=8D=E5=88=9D=E6=AC=A1?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=A8=A1=E6=9D=BF=E6=97=B6=EF=BC=8C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E4=BF=9D=E5=AD=98ID=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/mainframe/JTemplate.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/designer_base/src/com/fr/design/mainframe/JTemplate.java b/designer_base/src/com/fr/design/mainframe/JTemplate.java
index 92dd63e112..e28090299e 100644
--- a/designer_base/src/com/fr/design/mainframe/JTemplate.java
+++ b/designer_base/src/com/fr/design/mainframe/JTemplate.java
@@ -529,12 +529,13 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     }
     
     protected boolean saveNewFile(FILE editingFILE, String oldName){
-        this.editingFILE = editingFILE;
+        // 在保存之前，初始化 templateID
+        initForCollect();  // 如果保存新模板（新建模板直接保存，或者另存为），则添加 templateID
 
+        this.editingFILE = editingFILE;
         boolean result = this.saveFile();
         if (result) {
             DesignerFrameFileDealerPane.getInstance().refresh();
-            initForCollect();  // 如果保存新模板（新建模板直接保存，或者另存为），则添加 templateID
             collectInfo();
         }
         //更换最近打开