From 7186d89bb2c9f5eeb26c9057eb36787f8535d163 Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Mon, 29 Apr 2019 17:38:27 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-16527=20@xiaoxia=20=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E9=A2=84=E8=A7=88=E8=A7=A6=E5=8F=91=E7=9A=84?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E4=BF=9D=E5=AD=98=EF=BC=8C=E8=AF=A5=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E4=B8=8D=E4=BC=9A=E4=BF=9D=E5=AD=98=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/mainframe/JTemplate.java   | 3 +++
 designer-realize/src/main/java/com/fr/start/Designer.java  | 7 -------
 2 files changed, 3 insertions(+), 7 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 d256da8ae..a8ec61abc 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
@@ -687,7 +687,10 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         this.saved = true;
         this.authoritySaved = true;
         DesignerContext.getDesignerFrame().setTitle();
+        if (DesignerEnvManager.getEnvManager().getVcsConfigManager().isVcsEnable()) {
+            VcsHelper.dealWithVcs(this);
 
+        }
         this.fireJTemplateSaved();
         return true;
     }
diff --git a/designer-realize/src/main/java/com/fr/start/Designer.java b/designer-realize/src/main/java/com/fr/start/Designer.java
index 142b1bdfa..2c8e030e3 100644
--- a/designer-realize/src/main/java/com/fr/start/Designer.java
+++ b/designer-realize/src/main/java/com/fr/start/Designer.java
@@ -30,7 +30,6 @@ import com.fr.design.mainframe.alphafine.component.AlphaFinePane;
 import com.fr.design.mainframe.bbs.UserInfoLabel;
 import com.fr.design.mainframe.bbs.UserInfoPane;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
-import com.fr.design.mainframe.vcs.common.VcsHelper;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
@@ -221,9 +220,6 @@ public class Designer extends BaseDesigner {
                 jt.stopEditing();
                 jt.saveTemplate();
                 jt.requestFocus();
-                if (DesignerEnvManager.getEnvManager().getVcsConfigManager().isVcsEnable()) {
-                    VcsHelper.dealWithVcs(jt);
-                }
             }
         });
         return saveButton;
@@ -281,9 +277,6 @@ public class Designer extends BaseDesigner {
                 if (jt == null) {
                     return;
                 }
-                if (DesignerEnvManager.getEnvManager().getVcsConfigManager().isVcsEnable() && saveButton.isEnabled()) {
-                    VcsHelper.dealWithVcs(jt);
-                }
                 WebPreviewUtils.preview(jt);
             }