From 91923d2a67474afe06355ecf36f997d0f693548f Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Fri, 12 Mar 2021 11:11:59 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-48324=20=E8=81=9A=E5=90=88=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E8=B6=85=E9=93=BE=E5=9C=A8=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E4=B8=AD=E5=88=87=E6=8D=A2=E6=A8=A1=E6=9D=BF=E5=90=8E?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/mainframe/DesignerFrame.java  | 4 ++++
 1 file changed, 4 insertions(+)

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 490b4e7e9..b826931b6 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
@@ -977,6 +977,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @param jt 添加的模板.
      */
     public void addAndActivateJTemplate(JTemplate<?, ?> jt) {
+        JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (currentEditingTemplate != null) {
+            currentEditingTemplate.stopEditing();
+        }
         //切换文件后清空FixedPopupPane面板
         EastRegionContainerPane.getInstance().clearCurrentPopupPane();
         //释放模板对象