diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
index 33eeca3059..e4ec79ec5d 100644
--- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
@@ -687,6 +687,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         TemplateTreePane.getInstance().refreshDockingView();
         DesignTableDataManager.clearGlobalDs();
         EastRegionContainerPane.getInstance().refreshDownPane();
+        JTemplate template = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+        if (template != null) {
+            template.refreshToolArea();
+        }
     }
 
     /**
diff --git a/designer_base/src/com/fr/design/mainframe/JTemplate.java b/designer_base/src/com/fr/design/mainframe/JTemplate.java
index 1da72d5f79..38b0086dc6 100644
--- a/designer_base/src/com/fr/design/mainframe/JTemplate.java
+++ b/designer_base/src/com/fr/design/mainframe/JTemplate.java
@@ -68,6 +68,7 @@ import java.util.regex.Pattern;
  * 报表设计和表单设计的编辑区域(设计器编辑的IO文件)
  */
 public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> extends TargetComponent<T> implements ToolBarMenuDockPlus, JTemplateProvider {
+
     // TODO ALEX_SEP editingFILE这个属性一定要吗?如果非要不可,有没有可能保证不为null
     private static final int PREFIX_NUM = 3000;
     private FILE editingFILE = null;
diff --git a/designer_base/src/com/fr/design/mainframe/TemplatePane.java b/designer_base/src/com/fr/design/mainframe/TemplatePane.java
index c178616d80..edd9cc55fb 100644
--- a/designer_base/src/com/fr/design/mainframe/TemplatePane.java
+++ b/designer_base/src/com/fr/design/mainframe/TemplatePane.java
@@ -39,23 +39,6 @@ public class TemplatePane extends JPanel implements MouseListener {
     private static final long NUM = 1L;
     private static int NUM200 = 200;
 
-    static {
-        GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
-            @Override
-            public void on(PluginEvent event) {
-                JTemplate template = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-                if (template != null) {
-                    template.refreshToolArea();
-                }
-            }
-        }, new PluginFilter() {
-            @Override
-            public boolean accept(PluginContext context) {
-                return context.contain(DesignerFrameUpButtonProvider.XML_TAG);
-            }
-        });
-    }
-
     public static TemplatePane getInstance() {
         return HOLDER.singleton;
     }
diff --git a/designer_form/src/com/fr/design/mainframe/JForm.java b/designer_form/src/com/fr/design/mainframe/JForm.java
index a754fdacf7..ff15e6dc75 100644
--- a/designer_form/src/com/fr/design/mainframe/JForm.java
+++ b/designer_form/src/com/fr/design/mainframe/JForm.java
@@ -1,6 +1,7 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignState;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.actions.file.WebPreviewUtils;
@@ -22,7 +23,6 @@ import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.designer.properties.FormWidgetAuthorityEditPane;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
-import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.frpane.HyperlinkGroupPane;
 import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
 import com.fr.design.gui.ilable.UILabel;
@@ -60,17 +60,8 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.bridge.StableFactory;
 
-import javax.swing.BorderFactory;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Font;
+import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
@@ -137,7 +128,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
         return processInfo;
     }
 
-    public FormECCompositeProvider getReportComposite(){
+    public FormECCompositeProvider getReportComposite() {
         return this.reportComposite;
     }
 
@@ -200,7 +191,8 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
      */
     public ShortCut[] shortcut4FileMenu() {
         return (ShortCut[]) ArrayUtils.addAll(
-                super.shortcut4FileMenu(), new ShortCut[]{this.createWorkBookExportMenu()}
+                super.shortcut4FileMenu(),
+                DesignerMode.isVcsMode() ? new ShortCut[0] : new ShortCut[]{this.createWorkBookExportMenu()}
         );
     }
 
@@ -253,6 +245,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
         });
         formDesign.addDesignerEditListener(new DesignerEditListener() {
             private XComponent lastAffectedCreator;
+
             @Override
             public void fireCreatorModified(DesignerEvent evt) {
                 if (evt.getCreatorEventID() == DesignerEvent.CREATOR_CUTED