From 003c234bce787ca340ec7bce362970ebff07ccef Mon Sep 17 00:00:00 2001
From: "yaoh.wu" <yaoh.wu@fanruan.com>
Date: Thu, 24 Jan 2019 17:18:53 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-14515=20=E7=8E=AF=E5=A2=83=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=90=8E=E6=A8=A1=E6=9D=BF=E5=8F=A6=E5=AD=98=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E6=B2=A1=E6=9C=89=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/file/HistoryTemplateListCache.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
index e162fee3e..f790eca94 100644
--- a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
+++ b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java
@@ -372,6 +372,12 @@ public class HistoryTemplateListCache implements CallbackEvent {
                     JTemplate<?, ?> template = JTemplateFactory.createJTemplate(stashedFile);
                     if (template != null) {
                         historyList.set(i, template);
+                        // 替换当前正在编辑的模板，使用添加并激活的方式，以便使用统一的入口来处理监听事件
+                        if (isCurrentEditingFile(template.getPath())) {
+                            DesignerContext.getDesignerFrame().addAndActivateJTemplate(template);
+                            setCurrentEditingTemplate(template);
+                            FineLoggerFactory.getLogger().info("Env Change Current Editing Template.");
+                        }
                     }
                 } catch (Exception e) {
                     FineLoggerFactory.getLogger().error(e.getMessage(), e);