From c5e7643d33a20ece84bffe1386d313dacf857204 Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Mon, 4 Dec 2017 09:44:45 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E5=8A=A0token=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/SiteCenterToken.java    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 designer_base/src/com/fr/design/mainframe/SiteCenterToken.java

diff --git a/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java b/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java
new file mode 100644
index 0000000000..16af4c3654
--- /dev/null
+++ b/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java
@@ -0,0 +1,17 @@
+package com.fr.design.mainframe;
+
+import com.fr.stable.CodeUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+/**
+ * Created by hzzz on 2017/12/4.
+ */
+public class SiteCenterToken {
+
+    public static String generateToken() {
+        String date = new SimpleDateFormat("yyyy-MM-dd").format(Calendar.getInstance().getTime());
+        return CodeUtils.md5Encode(date, "", "MD5");
+    }
+}

From 5ec9dbb21c9f51be0d828bf7595805a840111698 Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Tue, 5 Dec 2017 13:37:22 +0800
Subject: [PATCH 02/11] .

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

diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
index 6b3606ff95..175463b1d4 100644
--- a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
@@ -52,6 +52,10 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
     private CardLayout card;
     private JPanel cardPane;
 
+    public FileOperations getSelectedOperation() {
+        return selectedOperation;
+    }
+
     private FileOperations selectedOperation;
     private UIToolbar toolBar;
 

From e603a4b39020f26c758e85daa687b65d93f1e730 Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Tue, 5 Dec 2017 13:37:27 +0800
Subject: [PATCH 03/11] .:

---
 designer_base/src/com/fr/.DS_Store            | Bin 0 -> 6148 bytes
 designer_base/src/com/fr/design/.DS_Store     | Bin 0 -> 6148 bytes
 .../fun/TemplateTreeShortCutProvider.java     |  13 +++++++++++
 .../AbstractTemplateTreeShortCutProvider.java |  22 ++++++++++++++++++
 .../src/com/fr/design/images/.DS_Store        | Bin 0 -> 18436 bytes
 .../com/fr/design/images/m_format/.DS_Store   | Bin 0 -> 6148 bytes
 6 files changed, 35 insertions(+)
 create mode 100644 designer_base/src/com/fr/.DS_Store
 create mode 100644 designer_base/src/com/fr/design/.DS_Store
 create mode 100644 designer_base/src/com/fr/design/fun/TemplateTreeShortCutProvider.java
 create mode 100644 designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java
 create mode 100644 designer_base/src/com/fr/design/images/.DS_Store
 create mode 100644 designer_base/src/com/fr/design/images/m_format/.DS_Store

diff --git a/designer_base/src/com/fr/.DS_Store b/designer_base/src/com/fr/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5d56e9d7e4999b4eea93fc8e20aa9a7f0581d12d
GIT binary patch
literal 6148
zcmeHKI|>3Z5S>vG!N$@uSMUZw^aNhOLJ>h$P_*94b9pr1d>UQtw2?P3dC6p6LSC`6
zBO*G#Y-S=85gEY^<z_?IY~Q?Ny^JUjjx%=BTvw;&aBOy+?DqlV4rL=-Im`ZqZ+kQ<
zKn17(6`%rC;JXTBeI1Rzdn`|*0#x7+6tM3@fg9GuHqbvE7`z1l4iI+3+<OUNu>i0p
zwt<MiG^oI!YPJ{}bi_;M)x<V1=%U$tXx^;Zp{U=E^NXj8)<BL_fC@Y-(2wQB>i-h{
zq5pp-aYY5Fz+Wk#gT-nw$CI+Qb{=Q7w!qhL%elkNFn0<DFULSH$5>c7o_bQ`6`Nzf
VCbof2N8IT^{tTEdG%E0G1s=-46_x-1

literal 0
HcmV?d00001

diff --git a/designer_base/src/com/fr/design/.DS_Store b/designer_base/src/com/fr/design/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..bb15f22be07cfce721efea32e3bc367372f5ffe1
GIT binary patch
literal 6148
zcmeHK&2G~`5S~o~c%ec@;!q?GD{<hGLjo<mTA}5H1i}?P@RP3Pg;+A{%5j=Q6v^rX
z^a0??&wBt5!HaNbW_N?AQmz$6Gt%rgo}HPszqR%U0K{;b4*+5Sh)@YT5}PxG`bk%$
z6Fh{%)p!FnXm|%Eo2^8%<6mTe=1$^_X(+(LAM-ak%*ram-k;fFSxlOK|A*+TbuV4M
z63MG_U0#>#uhMZfOB>xxCqrG2;@fGFn@rdHMc$0}jNL8Gk+Dze$GS1~3ku$=suBad
zt+VHanT_I`4=dZ~!kXIE^EF=X7dEeE!)j{tiHi@#o&8idW2__ZB<8@eDkC|HH|F!r
z!B$V*+Zrr-YQDYQ@2SoE4;Bj<MYrxgdiHvHeDeOo$4{TXeEsIKK;Uod<VL_Hd`II9
zT8`4%mX&>rz01sH1|u`T3@`&1h=H(#Mb|FSJM*hD1I)nrFhJ{rLM2QBwjSNmfejrW
zslQ7|f;QbH2vxu&VCxZkP=rrK^r<3TF@#S?zY1|lz}BNr2jND>I$>lHZYaWyj(+9B
zK_nizWd@jm(+sTn$C&p2-M`=ePbcvcGr$b|R}6^mPP#M1PYQeM%E!@Ot56S6Nhq%M
m_&Ws+w-sY7ZN(d?PSCH&KuiL*9?^rs2LVR|H_X7fGVlxZ=3{37

literal 0
HcmV?d00001

diff --git a/designer_base/src/com/fr/design/fun/TemplateTreeShortCutProvider.java b/designer_base/src/com/fr/design/fun/TemplateTreeShortCutProvider.java
new file mode 100644
index 0000000000..661dad64ce
--- /dev/null
+++ b/designer_base/src/com/fr/design/fun/TemplateTreeShortCutProvider.java
@@ -0,0 +1,13 @@
+package com.fr.design.fun;
+
+import com.fr.stable.fun.mark.Aftermath;
+import com.fr.stable.fun.mark.Mutable;
+
+/**
+ * Created by hzzz on 2017/11/30.
+ */
+public interface TemplateTreeShortCutProvider extends Mutable, Aftermath {
+    String XML_TAG = "TemplateTreeShortCut";
+
+    int CURRENT_LEVEL = 1;
+}
diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java
new file mode 100644
index 0000000000..a67d72f811
--- /dev/null
+++ b/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java
@@ -0,0 +1,22 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.actions.UpdateAction;
+import com.fr.design.fun.TemplateTreeShortCutProvider;
+import com.fr.stable.fun.mark.API;
+
+/**
+ * Created by hzzz on 2017/11/30.
+ */
+@API(level = TemplateTreeShortCutProvider.CURRENT_LEVEL)
+public abstract class AbstractTemplateTreeShortCutProvider extends UpdateAction implements TemplateTreeShortCutProvider {
+
+    @Override
+    public int currentAPILevel() {
+        return TemplateTreeShortCutProvider.CURRENT_LEVEL;
+    }
+
+    @Override
+    public String mark4Provider() {
+        return getClass().getName();
+    }
+}
diff --git a/designer_base/src/com/fr/design/images/.DS_Store b/designer_base/src/com/fr/design/images/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..1edf73653f6f5c96508d9c51d0c8f3c46556fddc
GIT binary patch
literal 18436
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

literal 0
HcmV?d00001

diff --git a/designer_base/src/com/fr/design/images/m_format/.DS_Store b/designer_base/src/com/fr/design/images/m_format/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ce7b7ed854bf01f022825195dfb73ac5bf7ad6cc
GIT binary patch
literal 6148
zcmeHKyGjE=6g{IU0$QZgayr4nkUv<$+DRI*QcO&uF_3IR9w;_hZ2bT~!N2gctSmft
z?kFxUma@pbVdl)-=j?&Z1AuF<hb^E1pw1@fWKbfaE;VgMXF(To++d7r3~_{cNunyM
zWbM0{V#ZaE@qPUnM)OtwWW8K1=;LvQCBJRKzKL5rgkKXWBkz!5LcC%QS}!hp2haV{
z=KTHfkiH38xF`NzrxWY!aTNpR%FvZO=nh^wZ%?lq&Z(QR{*-klfnlz&ij>-#i~(c7
z7%&DZ&H&GBk@}9J^~QiPU<`aQAp3)76HFrJiec+uC)a1O*91j4mbZkUkC;Tv6=|V3
z4JB%*i%$%v;ne%+mqg4JH5@KfW}aC2^YP+Bb?SX^hf5T#HwKJ>A_LnxZOHk5%)d<O
zBfl78Gh@IQ_-72bT6&tc`BCv~{qcEn)_S%cn~3=3GN5o=xCC$_`^bJUs@=<&eo4e!
VQL>0WgcI!|5D2l(82AGQJ^&f}I1~T?

literal 0
HcmV?d00001


From 6da16636ca95871657ca92d28f1dff09908564ad Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Mon, 18 Dec 2017 15:26:00 +0800
Subject: [PATCH 04/11] .

---
 .../fun/impl/AbstractTemplateTreeShortCutProvider.java | 10 +++++++++-
 .../src/com/fr/design/gui/ilist/ArrayListModel.java    |  8 ++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java
index a67d72f811..f23f7f8d3f 100644
--- a/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java
+++ b/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java
@@ -12,11 +12,19 @@ public abstract class AbstractTemplateTreeShortCutProvider extends UpdateAction
 
     @Override
     public int currentAPILevel() {
-        return TemplateTreeShortCutProvider.CURRENT_LEVEL;
+        return 1;
     }
 
     @Override
     public String mark4Provider() {
         return getClass().getName();
     }
+
+    @Override
+    public void process() {
+    }
+
+    @Override
+    public void undo() {
+    }
 }
diff --git a/designer_base/src/com/fr/design/gui/ilist/ArrayListModel.java b/designer_base/src/com/fr/design/gui/ilist/ArrayListModel.java
index 62a360694d..7abd152e34 100644
--- a/designer_base/src/com/fr/design/gui/ilist/ArrayListModel.java
+++ b/designer_base/src/com/fr/design/gui/ilist/ArrayListModel.java
@@ -4,15 +4,15 @@ import javax.swing.AbstractListModel;
 
 public class ArrayListModel extends AbstractListModel {
 	private Object[] array;
-	
+
 	public ArrayListModel() {
-		
+
 	}
-	
+
 	public ArrayListModel(Object[] array) {
 		this.array = array;
 	}
-	
+
 	public Object getElementAt(int index) {
 		return array != null ? array[index] : null;
 	}

From 7672bead48dcfbc55164f35281b047f5c00cad35 Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Wed, 27 Dec 2017 16:45:24 +0800
Subject: [PATCH 05/11] 1227

---
 .../com/fr/design/mainframe/JWorkBook.java    |  38 ++++++--
 designer_base/src/com/fr/.DS_Store            | Bin 6148 -> 6148 bytes
 .../design/actions/file/WebPreviewUtils.java  |  30 +++---
 .../fr/design/file/MutilTempalteTabPane.java  |  12 ++-
 .../DesignerFrameFileDealerPane.java          |   3 +-
 .../com/fr/design/mainframe/JTemplate.java    |  90 +++++++++++-------
 .../mainframe/toolbar/ToolBarMenuDock.java    |  36 +++----
 designer_base/src/com/fr/env/RemoteEnv.java   |   4 +-
 8 files changed, 126 insertions(+), 87 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/JWorkBook.java b/designer/src/com/fr/design/mainframe/JWorkBook.java
index 82d796a30d..c7996e84f9 100644
--- a/designer/src/com/fr/design/mainframe/JWorkBook.java
+++ b/designer/src/com/fr/design/mainframe/JWorkBook.java
@@ -1,12 +1,25 @@
 package com.fr.design.mainframe;
 
-import com.fr.base.*;
+import com.fr.base.BaseUtils;
+import com.fr.base.DynamicUnitList;
+import com.fr.base.FRContext;
+import com.fr.base.Parameter;
+import com.fr.base.ScreenResolution;
+import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.AllowAuthorityEditAction;
 import com.fr.design.actions.ExitAuthorityEditAction;
 import com.fr.design.actions.file.WebPreviewUtils;
-import com.fr.design.actions.file.export.*;
+import com.fr.design.actions.file.export.CSVExportAction;
+import com.fr.design.actions.file.export.EmbeddedExportExportAction;
+import com.fr.design.actions.file.export.ExcelExportAction;
+import com.fr.design.actions.file.export.PDFExportAction;
+import com.fr.design.actions.file.export.PageExcelExportAction;
+import com.fr.design.actions.file.export.PageToSheetExcelExportAction;
+import com.fr.design.actions.file.export.SVGExportAction;
+import com.fr.design.actions.file.export.TextExportAction;
+import com.fr.design.actions.file.export.WordExportAction;
 import com.fr.design.actions.report.ReportExportAttrAction;
 import com.fr.design.actions.report.ReportMobileAttrAction;
 import com.fr.design.actions.report.ReportParameterAction;
@@ -30,7 +43,11 @@ import com.fr.design.mainframe.cell.QuickEditorRegion;
 import com.fr.design.mainframe.templateinfo.JWorkBookProcessInfo;
 import com.fr.design.mainframe.templateinfo.TemplateProcessInfo;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
-import com.fr.design.menu.*;
+import com.fr.design.menu.KeySetUtils;
+import com.fr.design.menu.MenuDef;
+import com.fr.design.menu.NameSeparator;
+import com.fr.design.menu.ShortCut;
+import com.fr.design.menu.ToolBarDef;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.parameter.ParameterDefinitePane;
 import com.fr.design.parameter.ParameterInputPane;
@@ -62,7 +79,6 @@ import com.fr.poly.PolyDesigner;
 import com.fr.poly.creator.BlockCreator;
 import com.fr.privilege.finegrain.WorkSheetPrivilegeControl;
 import com.fr.report.ReportHelper;
-import com.fr.report.elementcase.ElementCase;
 import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.report.poly.PolyWorkSheet;
 import com.fr.report.worksheet.WorkSheet;
@@ -73,11 +89,13 @@ import com.fr.stable.module.Module;
 import com.fr.stable.project.ProjectConstants;
 
 import javax.swing.*;
-import javax.swing.Icon;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.FileOutputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * JWorkBook used to edit WorkBook.
@@ -570,9 +588,11 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
      * @return 子菜单
      */
     public ShortCut[] shortcut4FileMenu() {
-        return (ShortCut[]) ArrayUtils.addAll(
-                super.shortcut4FileMenu(),
-                BaseUtils.isAuthorityEditing() || (FRContext.getCurrentEnv() instanceof RemoteEnv) ? new ShortCut[0] : new ShortCut[]{this.createWorkBookExportMenu()}
+        boolean showWorkBookExportMenu = DesignerMode.isVcsMode()
+                || BaseUtils.isAuthorityEditing()
+                || (FRContext.getCurrentEnv() instanceof RemoteEnv);
+        return (ShortCut[]) ArrayUtils.addAll(super.shortcut4FileMenu(),
+                showWorkBookExportMenu ? new ShortCut[0] : new ShortCut[]{this.createWorkBookExportMenu()}
         );
     }
 
diff --git a/designer_base/src/com/fr/.DS_Store b/designer_base/src/com/fr/.DS_Store
index 5d56e9d7e4999b4eea93fc8e20aa9a7f0581d12d..6e731bbc204812931e09b2a9eb135c362f37e3f0 100644
GIT binary patch
delta 346
zcmZoMXfc=|#>B)qu~2NHo}wr-0|Nsi1A_nqLq0=ZQh9MfQcix-#*NDv>p?PX49P(8
zTp&b}1&W_YD#*z!E-^5;&d9{f!pg?Z!3l)C9I?R}`Q^bSi6y1QPKia)AYMRXNk$Ts
z9g?4)17{~Dg=MCe#|wx!=jW9qX6B_9fi-8Qqym-1gx6>0rR0}8<(KBA6oU;4hRA>{
z;*1v%udX&R&`~fkFsjv2s5UnTv5n1YYdJZ@RSj)D6LKr7s%vWNW&j-v1dKp0f&o92
zhEX$t3=~h61sCPz<maU`Z0!8UvYDNOp92_H8#jJup3E<zD+1C6GO7VWgH7EWBC>&b
HVgm~R_`6vL

delta 86
zcmZoMXfc=|#>CJzu~2NHo}wrt0|NsP3otOGGvt*87v<&T=cP|9RNu_a{D)<;19Jn@
lW_AvK4xon3hRolYC-aNwa)R_60Ahy8HayasV?>rP0|2E16!icA

diff --git a/designer_base/src/com/fr/design/actions/file/WebPreviewUtils.java b/designer_base/src/com/fr/design/actions/file/WebPreviewUtils.java
index 0947d4323a..f682f7ddf1 100644
--- a/designer_base/src/com/fr/design/actions/file/WebPreviewUtils.java
+++ b/designer_base/src/com/fr/design/actions/file/WebPreviewUtils.java
@@ -1,5 +1,6 @@
 package com.fr.design.actions.file;
 
+import com.fr.base.vcs.DesignerMode;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.utils.DesignUtils;
@@ -11,6 +12,8 @@ import com.fr.general.web.ParameterConsts;
 import com.fr.stable.project.ProjectConstants;
 
 import javax.swing.*;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
 public final class WebPreviewUtils {
@@ -28,11 +31,15 @@ public final class WebPreviewUtils {
             return;
         }
 
+        if (map == null || map == Collections.EMPTY_MAP) {
+            map = new HashMap<>();
+        }
+        map.put("mode", DesignerMode.getMode().toString());
         DesignerContext.getDesignerFrame().refreshToolbar();
 
         jt.stopEditing();
         /*
-		 * alex:如果没有保存,先保存到Env
+         * alex:如果没有保存,先保存到Env
 		 * 
 		 * 如果保存失败,不执行下面的WebPreview
 		 */
@@ -68,20 +75,19 @@ public final class WebPreviewUtils {
             String path = currentTemplate.getPath();
             if (path.startsWith(ProjectConstants.REPORTLETS_NAME)) {
                 path = path.substring(ProjectConstants.REPORTLETS_NAME.length() + 1);
+            }
+            java.util.List<String> parameterNameList = new java.util.ArrayList<String>();
+            java.util.List<String> parameterValueList = new java.util.ArrayList<String>();
 
-                java.util.List<String> parameterNameList = new java.util.ArrayList<String>();
-                java.util.List<String> parameterValueList = new java.util.ArrayList<String>();
-
-                parameterNameList.add(actionType);
-                parameterValueList.add(path);
-                if (map != null) {
-                    for (String key : map.keySet()) {
-                        parameterNameList.add(key);
-                        parameterValueList.add(GeneralUtils.objectToString(map.get(key)));
-                    }
+            parameterNameList.add(actionType);
+            parameterValueList.add(path);
+            if (map != null) {
+                for (String key : map.keySet()) {
+                    parameterNameList.add(key);
+                    parameterValueList.add(GeneralUtils.objectToString(map.get(key)));
                 }
-                DesignUtils.visitEnvServerByParameters(parameterNameList.toArray(new String[parameterNameList.size()]), parameterValueList.toArray(new String[parameterValueList.size()]));
             }
+            DesignUtils.visitEnvServerByParameters(parameterNameList.toArray(new String[parameterNameList.size()]), parameterValueList.toArray(new String[parameterValueList.size()]));
         } else {
             int selVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Web_Preview_Message"),
                     Inter.getLocText("Preview_ToolTips"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
diff --git a/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java b/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java
index 4237c182fd..6bdfe711ee 100644
--- a/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java
+++ b/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java
@@ -3,12 +3,12 @@ package com.fr.design.file;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
+import com.fr.base.vcs.DesignerMode;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIScrollPopUpMenu;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
-import com.fr.design.mainframe.JVirtualTemplate;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.file.FILE;
@@ -102,6 +102,8 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
     // 模板时，模板B会自动关闭
     private JTemplate<?, ?> temTemplate = null;
 
+    //版本管理时候不允许切换tab
+    private boolean isVcsMode = false;
 
     private AWTEventListener awt = new AWTEventListener() {
         public void eventDispatched(AWTEvent event) {
@@ -632,6 +634,12 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
      * @param e 鼠标事件
      */
     public void mousePressed(MouseEvent e) {
+        //如果在版本管理情况下，不允许切换tab
+        if (DesignerMode.isVcsMode()) {
+            //TODO hzzz 国际化
+            JOptionPane.showMessageDialog(null, "版本管理不允许切换", Inter.getLocText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE);
+            return;
+        }
 
         int evtX = e.getX();
         int evtY = e.getY();
@@ -952,6 +960,4 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
             }
         }
     }
-
-
 }
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
index 175463b1d4..701f5c85d0 100644
--- a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
@@ -174,7 +174,8 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
     /*
      * Open Report Action
      */
-    private class OpenReportAction extends UpdateAction {
+    private class
+    OpenReportAction extends UpdateAction {
 
         public OpenReportAction() {
             this.setName(KeySetUtils.OPEN_TEMPLATE.getMenuKeySetName());
diff --git a/designer_base/src/com/fr/design/mainframe/JTemplate.java b/designer_base/src/com/fr/design/mainframe/JTemplate.java
index 18f5b88ab0..e9790ab23b 100644
--- a/designer_base/src/com/fr/design/mainframe/JTemplate.java
+++ b/designer_base/src/com/fr/design/mainframe/JTemplate.java
@@ -1,8 +1,13 @@
 package com.fr.design.mainframe;
 
-import com.fr.base.*;
+import com.fr.base.BaseUtils;
+import com.fr.base.ConfigManager;
+import com.fr.base.FRContext;
+import com.fr.base.Parameter;
+import com.fr.base.ScreenResolution;
 import com.fr.base.io.IOFile;
 import com.fr.base.iofileattr.TemplateIdAttrMark;
+import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;
@@ -52,7 +57,6 @@ import com.fr.stable.core.UUID;
 import com.fr.stable.project.ProjectConstants;
 
 import javax.swing.*;
-import javax.swing.Icon;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.undo.UndoManager;
 import java.awt.*;
@@ -86,7 +90,8 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     private StringBuilder process = new StringBuilder("");  // 制作模板的过程
     public int resolution = ScreenResolution.getScreenResolution();
 
-    public JTemplate() {}
+    public JTemplate() {
+    }
 
     public JTemplate(T t, String defaultFileName) {
         this(t, new MemFILE(newTemplateNameByIndex(defaultFileName)), true);
@@ -128,6 +133,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
             openTime = System.currentTimeMillis();
         }
     }
+
     private void collectInfo() {  // 执行收集操作
         if (openTime == 0) {  // 旧模板，不收集数据
             return;
@@ -410,7 +416,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         fireSuperTargetModified();
     }
 
-    protected boolean accept(Object o){
+    protected boolean accept(Object o) {
         return true;
     }
 
@@ -520,7 +526,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         if (!editingFILE.exists()) {
             return saveAsTemplate(isShowLoc);
         }
-        if (!FRContext.getCurrentEnv().hasFileFolderAllow(this.getEditingFILE().getPath()) ) {
+        if (!FRContext.getCurrentEnv().hasFileFolderAllow(this.getEditingFILE().getPath())) {
             JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_No-Privilege") + "!", Inter.getLocText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
             return false;
         }
@@ -528,12 +534,12 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         return this.saveFile();
     }
 
-    private boolean isCancelOperation(int operation){
+    private boolean isCancelOperation(int operation) {
         return operation == FILEChooserPane.CANCEL_OPTION ||
                 operation == FILEChooserPane.JOPTIONPANE_CANCEL_OPTION;
     }
 
-    private boolean isOkOperation(int operation){
+    private boolean isOkOperation(int operation) {
         return operation == FILEChooserPane.JOPTIONPANE_OK_OPTION ||
                 operation == FILEChooserPane.OK_OPTION;
     }
@@ -555,7 +561,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         }
 
         if (isOkOperation(chooseResult)) {
-            if (!FRContext.getCurrentEnv().hasFileFolderAllow(fileChooser.getSelectedFILE().getPath()) ) {
+            if (!FRContext.getCurrentEnv().hasFileFolderAllow(fileChooser.getSelectedFILE().getPath())) {
                 JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_No-Privilege") + "!", Inter.getLocText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
                 return false;
             }
@@ -567,7 +573,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         return saveNewFile(editingFILE, oldName);
     }
 
-    protected boolean saveNewFile(FILE editingFILE, String oldName){
+    protected boolean saveNewFile(FILE editingFILE, String oldName) {
         // 在保存之前，初始化 templateID
         initForCollect();  // 如果保存新模板（新建模板直接保存，或者另存为），则添加 templateID
 
@@ -582,7 +588,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         return result;
     }
 
-    protected void mkNewFile(FILE file){
+    protected void mkNewFile(FILE file) {
         try {
             file.mkfile();
         } catch (Exception e) {
@@ -594,16 +600,16 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      * 将模板另存为可以分享出去的混淆后内置数据集模板
      *
      * @return 是否另存成功
-     *
      */
-    public boolean saveShareFile(){
+    public boolean saveShareFile() {
         return true;
     }
-    public Widget getSelectElementCase(){
+
+    public Widget getSelectElementCase() {
         return new NoneWidget();
     }
 
-    protected FILEChooserPane getFILEChooserPane(boolean isShowLoc){
+    protected FILEChooserPane getFILEChooserPane(boolean isShowLoc) {
         return new FILEChooserPane(true, isShowLoc);
     }
 
@@ -684,6 +690,8 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     public ShortCut[] shortcut4FileMenu() {
         if (BaseUtils.isAuthorityEditing()) {
             return new ShortCut[]{new SaveTemplateAction(this), new UndoAction(this), new RedoAction(this)};
+        } else if (DesignerMode.isVcsMode()) {
+            return new ShortCut[]{new UndoAction(this), new RedoAction(this)};
         } else {
             return new ShortCut[]{new SaveTemplateAction(this), new SaveAsTemplateAction(this), new UndoAction(this), new RedoAction(this)};
         }
@@ -803,7 +811,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     }
 
-    private int getVersionCompare(String versionString){
+    private int getVersionCompare(String versionString) {
         if (StringUtils.isBlank(versionString)) {
             return 0;
         }
@@ -813,7 +821,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     }
 
-    private int getVersionCompareHBB(String versionString){
+    private int getVersionCompareHBB(String versionString) {
         if (StringUtils.isBlank(versionString)) {
             return 0;
         }
@@ -835,7 +843,8 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     /**
      * 判断是否是新版设计器
-     * @return    是返回true
+     *
+     * @return 是返回true
      */
     public boolean isNewDesigner() {
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
@@ -897,41 +906,46 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     /**
      * 激活指定的template
-     *
      */
     public void activeJTemplate(int index, JTemplate jt) {
         DesignerContext.getDesignerFrame().activateJTemplate(this);
-    };
+    }
+
+    ;
 
     /**
      * 激活已存在的模板
-     *
      */
     public void activeOldJTemplate() {
         DesignerContext.getDesignerFrame().activateJTemplate(this);
-    };
+    }
+
+    ;
 
     /**
      * 激活新的模板
-     *
      */
     public void activeNewJTemplate() {
         DesignerContext.getDesignerFrame().addAndActivateJTemplate(this);
-    };
+    }
+
+    ;
 
     /**
      * 后台关闭template
-     *
      */
     public void closeOverLineTemplate(int index) {
         JTemplate overTemplate = HistoryTemplateListPane.getInstance().getHistoryList().get(index);
         HistoryTemplateListPane.getInstance().closeVirtualSelectedReport(overTemplate);
         HistoryTemplateListPane.getInstance().getHistoryList().set(index, new JVirtualTemplate(overTemplate.getEditingFILE()));
-    };
+    }
+
+    ;
 
 
     /**
      * 返回当前支持的超链界面pane
+     *
      * @return 超链连接界面
      */
     public abstract HyperlinkGroupPane getHyperLinkPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider);
@@ -939,6 +953,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     /**
      * 返回当前支持的超链界面pane
      * 没有悬浮弹窗，显示为两列
+     *
      * @return 超链连接界面
      */
     public abstract HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider);
@@ -948,7 +963,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      *
      * @return 默认不是
      */
-    public boolean isChartBook(){
+    public boolean isChartBook() {
         return false;
     }
 
@@ -1000,11 +1015,9 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      * 创建内置sql提交的pane
      *
      * @return 内置sql提交的pane
-     *
-     *
      * @date 2014-10-14-下午7:39:27
      */
-    public DBManipulationPane createDBManipulationPane(){
+    public DBManipulationPane createDBManipulationPane() {
         return new DBManipulationPane();
     }
 
@@ -1012,22 +1025,22 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      * 创建控件事件里内置sql提交的pane
      *
      * @return 内置sql提交的pane
-     *
-     *
      * @date 2014-10-14-下午7:39:27
      */
-    public DBManipulationPane createDBManipulationPaneInWidget(){
+    public DBManipulationPane createDBManipulationPaneInWidget() {
         return new DBManipulationInWidgetEventPane();
     }
 
     /**
      * 取小图标，主要用于多TAB标签栏
+     *
      * @return 图表
      */
     public abstract Icon getIcon();
 
     /**
      * 导出菜单项
+     *
      * @return 菜单项
      */
     public ShortCut[] shortcut4ExportMenu() {
@@ -1037,12 +1050,13 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     /**
      * 复制JS代码
      */
-    public void copyJS(){}
+    public void copyJS() {
+    }
 
     /**
      * 系列风格改动
      */
-    public void styleChange(){
+    public void styleChange() {
 
     }
 
@@ -1050,14 +1064,14 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      * 创建分享模板的按钮, 目前只有jworkbook实现了
      *
      * @return 分享模板按钮
-     *
      */
-    public UIButton[] createShareButton(){
+    public UIButton[] createShareButton() {
         return new UIButton[0];
     }
 
     /**
      * 略
+     *
      * @param provider 预览模式
      */
     public void previewMenuActionPerformed(PreviewProvider provider) {
@@ -1066,6 +1080,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     /**
      * 支持的预览模式
+     *
      * @return 预览模式
      */
     public PreviewProvider[] supportPreview() {
@@ -1074,6 +1089,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     /**
      * 预览模式转换
+     *
      * @param typeCode 类型
      * @return 预览模式
      */
@@ -1097,6 +1113,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     /**
      * 加载插件中的按钮
+     *
      * @return 按钮组
      */
     public UIButton[] createExtraButtons() {
@@ -1111,6 +1128,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     /**
      * 由于老版本的模板没有模板ID，当勾选使用参数模板时候，就加一个模板ID attr
+     *
      * @param isUseParamTemplate 是否使用参数模板
      */
     public void needAddTemplateIdAttr(boolean isUseParamTemplate) {
diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
index f43419d47f..4ad6b67fac 100644
--- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@@ -5,6 +5,7 @@ package com.fr.design.mainframe.toolbar;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
+import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignState;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
@@ -58,7 +59,6 @@ import com.fr.plugin.observer.PluginEvent;
 import com.fr.plugin.observer.PluginEventListener;
 import com.fr.plugin.observer.PluginEventType;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -315,21 +315,23 @@ public abstract class ToolBarMenuDock {
     }
 
     public MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) {
+        boolean notVcs = !DesignerMode.isVcsMode();
         MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_File"), 'F');
 
         ShortCut[] scs = new ShortCut[0];
-        if (!BaseUtils.isAuthorityEditing()) {
+        if (!BaseUtils.isAuthorityEditing() && notVcs) {
             scs = createNewFileShortCuts();
         }
         if (!ArrayUtils.isEmpty(scs)) {
             menuDef.addShortCut(scs);
         }
 
-        menuDef.addShortCut(openTemplateAction());
-
-        menuDef.addShortCut(new OpenRecentReportMenuDef());
+        if (notVcs) {
+            menuDef.addShortCut(openTemplateAction());
+            menuDef.addShortCut(new OpenRecentReportMenuDef());
+            addCloseCurrentTemplateAction(menuDef);
+        }
 
-        addCloseCurrentTemplateAction(menuDef);
 
         scs = plus.shortcut4FileMenu();
         if (!ArrayUtils.isEmpty(scs)) {
@@ -340,8 +342,9 @@ public abstract class ToolBarMenuDock {
 
         addPreferenceAction(menuDef);
 
-        addSwitchExistEnvAction(menuDef);
-
+        if (notVcs) {
+            addSwitchExistEnvAction(menuDef);
+        }
         menuDef.addShortCut(new ExitDesignerAction());
 
         insertMenu(menuDef, MenuHandler.FILE);
@@ -573,22 +576,7 @@ public abstract class ToolBarMenuDock {
     }
 
     public NewTemplatePane getNewTemplatePane() {
-        return new NewTemplatePane() {
-            @Override
-            public Icon getNew() {
-                return BaseUtils.readIcon("/com/fr/design/images/buttonicon/addicon.png");
-            }
-
-            @Override
-            public Icon getMouseOverNew() {
-                return BaseUtils.readIcon("/com/fr/design/images/buttonicon/add_press.png");
-            }
-
-            @Override
-            public Icon getMousePressNew() {
-                return BaseUtils.readIcon("/com/fr/design/images/buttonicon/add_press.png");
-            }
-        };
+        return ToolBarNewTemplatePane.getInstance();
     }
 
     protected void insertMenu(MenuDef menuDef, String anchor) {
diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java
index 65733b1dfd..05737e7c35 100644
--- a/designer_base/src/com/fr/env/RemoteEnv.java
+++ b/designer_base/src/com/fr/env/RemoteEnv.java
@@ -1009,8 +1009,8 @@ public class RemoteEnv extends AbstractEnv {
         }
         try {
             HashMap<String, String> para = new HashMap<String, String>();
-            para.put("op", "fr_remote_design");
-            para.put("cmd", "delete_file");
+            para.put("op", "fs_remote_vcs");
+            para.put("cmd", "hzzz");
             para.put("file_path", filePath);
 
             HttpClient client = createHttpMethod(para);

From 45055ef26e2c87aeb01e2b91aaaa9fe0b0b3d1ba Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Wed, 27 Dec 2017 16:45:29 +0800
Subject: [PATCH 06/11] 1227

---
 designer_base/src/com/fr/common/.DS_Store     | Bin 0 -> 6148 bytes
 .../toolbar/ToolBarNewTemplatePane.java       |  36 ++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 designer_base/src/com/fr/common/.DS_Store
 create mode 100644 designer_base/src/com/fr/design/mainframe/toolbar/ToolBarNewTemplatePane.java

diff --git a/designer_base/src/com/fr/common/.DS_Store b/designer_base/src/com/fr/common/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..fdab04a1728168ded7857fc9b8e3b3e52e28b275
GIT binary patch
literal 6148
zcmeHKyH3ME5ZomxBGIIzyp}S5U`6H&B6=iS3I&!UL8x89U+`J^p3FXYM5m;rfLUp8
ze7iemdkU{tM0CCHS0YOhS-=hD-Im%cZ(i9|M&>}ZGgg~!9ClURrGRl~@+zG?KW!_1
zW`?nC`~6ENa@c;n-QRw5hOs}B**#XLU3w1Yr~nn90#tws{1*k#v&|OQfn2Eo6`%rN
z3fT9dzzv(kDbPP1SbPKk+HbrYu6>pO77GBI#3>LFm<AOXRLv1XgN}H~x+ZZ747z9z
zADVa8oKV#7j`NF`i#CB=sQ?u?RbUp|rS<<i_?h|tl*AnspaOqN0iCy-c8yoc-deq!
w_1Xe|fPWfly&Q|TVxYHTY^)XE{HQB-jeL_h1v(vZrvv#TV7kz#z;7sU1cT%xTL1t6

literal 0
HcmV?d00001

diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarNewTemplatePane.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarNewTemplatePane.java
new file mode 100644
index 0000000000..47fc884fe9
--- /dev/null
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarNewTemplatePane.java
@@ -0,0 +1,36 @@
+package com.fr.design.mainframe.toolbar;
+
+import com.fr.base.BaseUtils;
+import com.fr.design.file.NewTemplatePane;
+
+import javax.swing.*;
+
+/**
+ * Created by hzzz on 2017/12/26.
+ */
+public class ToolBarNewTemplatePane extends NewTemplatePane {
+
+    private static final ToolBarNewTemplatePane instance = new ToolBarNewTemplatePane();
+
+    private ToolBarNewTemplatePane() {
+    }
+
+    public static NewTemplatePane getInstance() {
+        return instance;
+    }
+
+    @Override
+    public Icon getNew() {
+        return BaseUtils.readIcon("/com/fr/design/images/buttonicon/addicon.png");
+    }
+
+    @Override
+    public Icon getMouseOverNew() {
+        return BaseUtils.readIcon("/com/fr/design/images/buttonicon/add_press.png");
+    }
+
+    @Override
+    public Icon getMousePressNew() {
+        return BaseUtils.readIcon("/com/fr/design/images/buttonicon/add_press.png");
+    }
+}

From 63de3615be1e3e27ec7542b4a7cc5f331037a212 Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Wed, 27 Dec 2017 16:49:16 +0800
Subject: [PATCH 07/11] remove ds_store

---
 designer_base/src/com/fr/.DS_Store              | Bin 6148 -> 0 bytes
 designer_base/src/com/fr/common/.DS_Store       | Bin 6148 -> 0 bytes
 designer_base/src/com/fr/design/.DS_Store       | Bin 6148 -> 0 bytes
 .../src/com/fr/design/images/.DS_Store          | Bin 18436 -> 0 bytes
 .../src/com/fr/design/images/m_format/.DS_Store | Bin 6148 -> 0 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 designer_base/src/com/fr/.DS_Store
 delete mode 100644 designer_base/src/com/fr/common/.DS_Store
 delete mode 100644 designer_base/src/com/fr/design/.DS_Store
 delete mode 100644 designer_base/src/com/fr/design/images/.DS_Store
 delete mode 100644 designer_base/src/com/fr/design/images/m_format/.DS_Store

diff --git a/designer_base/src/com/fr/.DS_Store b/designer_base/src/com/fr/.DS_Store
deleted file mode 100644
index 6e731bbc204812931e09b2a9eb135c362f37e3f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!A`<J5S<0Y5@Y0Gg2!IGaR4Q9GHDPG-b`xrpaxn?pb2yhEfTGmeun;$f8g&p
zv%8QWdNan5nP%n<vopKd*JhUi0MVKRb$~JeSg3@#5}I#>#z|KsXCiq-q2`bf`P2B`
zA4-2En*;xm0eW{uxC03ze3sweyMI3n<D^#m5V?F|qqu36@Y%L*-GQ9CiI+^`mN&kp
zU*}#j@Qr^V<#6G9{$<#kcFMaaGD^HK>Wx)#81yjZ<|>Q=Ic>>F6vS#CR}auSrB1n$
zrj1(FZqyEDRXc4q$v-@r%}Q2fzkYny9X&p!&$E|TO{~CgP|1$LIlQ5>w8sZ`91UgE
z$2ip#A%Gsl5JDfKFJtpL7?}ZPfEidP2F!VBZLQO$crVNVGw>@6(D`7a5;_Jmjq2z?
zqgnvO0)~~KPrU@y*ajVgnMNEz5xNvnmkQHj2wjeG+vGV0GmW|&glRs6Sy`A4MX1$r
zep{u3a5S=I2AF|m2B`N#DbxLb`g8xUlGrc<%)ojwAPQ}_-NL<@yLDxkbl2LbT~rdv
o%QP-Z&{0=0=F(NXhpGhQHaUon!Av7YQ2394qJa%F@TUxX0_YZ47ytkO

diff --git a/designer_base/src/com/fr/common/.DS_Store b/designer_base/src/com/fr/common/.DS_Store
deleted file mode 100644
index fdab04a1728168ded7857fc9b8e3b3e52e28b275..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKyH3ME5ZomxBGIIzyp}S5U`6H&B6=iS3I&!UL8x89U+`J^p3FXYM5m;rfLUp8
ze7iemdkU{tM0CCHS0YOhS-=hD-Im%cZ(i9|M&>}ZGgg~!9ClURrGRl~@+zG?KW!_1
zW`?nC`~6ENa@c;n-QRw5hOs}B**#XLU3w1Yr~nn90#tws{1*k#v&|OQfn2Eo6`%rN
z3fT9dzzv(kDbPP1SbPKk+HbrYu6>pO77GBI#3>LFm<AOXRLv1XgN}H~x+ZZ747z9z
zADVa8oKV#7j`NF`i#CB=sQ?u?RbUp|rS<<i_?h|tl*AnspaOqN0iCy-c8yoc-deq!
w_1Xe|fPWfly&Q|TVxYHTY^)XE{HQB-jeL_h1v(vZrvv#TV7kz#z;7sU1cT%xTL1t6

diff --git a/designer_base/src/com/fr/design/.DS_Store b/designer_base/src/com/fr/design/.DS_Store
deleted file mode 100644
index bb15f22be07cfce721efea32e3bc367372f5ffe1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK&2G~`5S~o~c%ec@;!q?GD{<hGLjo<mTA}5H1i}?P@RP3Pg;+A{%5j=Q6v^rX
z^a0??&wBt5!HaNbW_N?AQmz$6Gt%rgo}HPszqR%U0K{;b4*+5Sh)@YT5}PxG`bk%$
z6Fh{%)p!FnXm|%Eo2^8%<6mTe=1$^_X(+(LAM-ak%*ram-k;fFSxlOK|A*+TbuV4M
z63MG_U0#>#uhMZfOB>xxCqrG2;@fGFn@rdHMc$0}jNL8Gk+Dze$GS1~3ku$=suBad
zt+VHanT_I`4=dZ~!kXIE^EF=X7dEeE!)j{tiHi@#o&8idW2__ZB<8@eDkC|HH|F!r
z!B$V*+Zrr-YQDYQ@2SoE4;Bj<MYrxgdiHvHeDeOo$4{TXeEsIKK;Uod<VL_Hd`II9
zT8`4%mX&>rz01sH1|u`T3@`&1h=H(#Mb|FSJM*hD1I)nrFhJ{rLM2QBwjSNmfejrW
zslQ7|f;QbH2vxu&VCxZkP=rrK^r<3TF@#S?zY1|lz}BNr2jND>I$>lHZYaWyj(+9B
zK_nizWd@jm(+sTn$C&p2-M`=ePbcvcGr$b|R}6^mPP#M1PYQeM%E!@Ot56S6Nhq%M
m_&Ws+w-sY7ZN(d?PSCH&KuiL*9?^rs2LVR|H_X7fGVlxZ=3{37

diff --git a/designer_base/src/com/fr/design/images/.DS_Store b/designer_base/src/com/fr/design/images/.DS_Store
deleted file mode 100644
index 1edf73653f6f5c96508d9c51d0c8f3c46556fddc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18436
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

diff --git a/designer_base/src/com/fr/design/images/m_format/.DS_Store b/designer_base/src/com/fr/design/images/m_format/.DS_Store
deleted file mode 100644
index ce7b7ed854bf01f022825195dfb73ac5bf7ad6cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKyGjE=6g{IU0$QZgayr4nkUv<$+DRI*QcO&uF_3IR9w;_hZ2bT~!N2gctSmft
z?kFxUma@pbVdl)-=j?&Z1AuF<hb^E1pw1@fWKbfaE;VgMXF(To++d7r3~_{cNunyM
zWbM0{V#ZaE@qPUnM)OtwWW8K1=;LvQCBJRKzKL5rgkKXWBkz!5LcC%QS}!hp2haV{
z=KTHfkiH38xF`NzrxWY!aTNpR%FvZO=nh^wZ%?lq&Z(QR{*-klfnlz&ij>-#i~(c7
z7%&DZ&H&GBk@}9J^~QiPU<`aQAp3)76HFrJiec+uC)a1O*91j4mbZkUkC;Tv6=|V3
z4JB%*i%$%v;ne%+mqg4JH5@KfW}aC2^YP+Bb?SX^hf5T#HwKJ>A_LnxZOHk5%)d<O
zBfl78Gh@IQ_-72bT6&tc`BCv~{qcEn)_S%cn~3=3GN5o=xCC$_`^bJUs@=<&eo4e!
VQL>0WgcI!|5D2l(82AGQJ^&f}I1~T?


From f9b8d5c17942df8fcaefb2def075b5ada813ad1e Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Wed, 27 Dec 2017 16:57:12 +0800
Subject: [PATCH 08/11] 1227

---
 .../fr/design/file/MutilTempalteTabPane.java  |  5 +-
 .../fun/TemplateTreeShortCutProvider.java     |  1 +
 .../AbstractTemplateTreeShortCutProvider.java |  1 +
 .../com/fr/design/locale/designer.properties  |  1 +
 .../design/locale/designer_en_US.properties   |  1 +
 .../design/locale/designer_ja_JP.properties   |  1 +
 .../design/locale/designer_ko_KR.properties   |  1 +
 .../design/locale/designer_zh_CN.properties   |  3 +-
 .../design/locale/designer_zh_TW.properties   |  1 +
 .../DesignerFrameFileDealerPane.java          |  3 +-
 .../com/fr/design/mainframe/JTemplate.java    | 87 ++++++++-----------
 .../fr/design/mainframe/SiteCenterToken.java  | 17 ----
 designer_base/src/com/fr/env/RemoteEnv.java   | 20 ++---
 13 files changed, 57 insertions(+), 85 deletions(-)
 delete mode 100644 designer_base/src/com/fr/design/mainframe/SiteCenterToken.java

diff --git a/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java b/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java
index 6bdfe711ee..f3d62601d9 100644
--- a/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java
+++ b/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java
@@ -102,8 +102,6 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
     // 模板时，模板B会自动关闭
     private JTemplate<?, ?> temTemplate = null;
 
-    //版本管理时候不允许切换tab
-    private boolean isVcsMode = false;
 
     private AWTEventListener awt = new AWTEventListener() {
         public void eventDispatched(AWTEvent event) {
@@ -636,8 +634,7 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
     public void mousePressed(MouseEvent e) {
         //如果在版本管理情况下，不允许切换tab
         if (DesignerMode.isVcsMode()) {
-            //TODO hzzz 国际化
-            JOptionPane.showMessageDialog(null, "版本管理不允许切换", Inter.getLocText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE);
+            JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Vcs_tab_click"), Inter.getLocText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE);
             return;
         }
 
diff --git a/designer_base/src/com/fr/design/fun/TemplateTreeShortCutProvider.java b/designer_base/src/com/fr/design/fun/TemplateTreeShortCutProvider.java
index 661dad64ce..f5c9e09c6a 100644
--- a/designer_base/src/com/fr/design/fun/TemplateTreeShortCutProvider.java
+++ b/designer_base/src/com/fr/design/fun/TemplateTreeShortCutProvider.java
@@ -4,6 +4,7 @@ import com.fr.stable.fun.mark.Aftermath;
 import com.fr.stable.fun.mark.Mutable;
 
 /**
+ * 左上角目录树上边工具条的插件接口
  * Created by hzzz on 2017/11/30.
  */
 public interface TemplateTreeShortCutProvider extends Mutable, Aftermath {
diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java
index f23f7f8d3f..b8568dd615 100644
--- a/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java
+++ b/designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java
@@ -5,6 +5,7 @@ import com.fr.design.fun.TemplateTreeShortCutProvider;
 import com.fr.stable.fun.mark.API;
 
 /**
+ * 左上角目录树上边工具条的插件接口
  * Created by hzzz on 2017/11/30.
  */
 @API(level = TemplateTreeShortCutProvider.CURRENT_LEVEL)
diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties
index bbed62b646..db4c469eec 100644
--- a/designer_base/src/com/fr/design/locale/designer.properties
+++ b/designer_base/src/com/fr/design/locale/designer.properties
@@ -2149,3 +2149,4 @@ FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
 FR-Designer_Env_Des_Https=If HTTPS is enabled or the HTTPS configuration (certificate path, HTTPS key) is modified, you must restart the designer to take effect.
 FR-Designer_Format_JavaScript=Format Code
+FR-Designer-Vcs_tab_click=Please exit the version management status and then switch the template
diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties
index e5608bf896..4f8e68c121 100644
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
@@ -2148,3 +2148,4 @@ FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
 FR-Designer_Env_Des_Https=If HTTPS is enabled or the HTTPS configuration (certificate path, HTTPS key) is modified, you must restart the designer to take effect.
 FR-Designer_Format_JavaScript=Format Code
+FR-Designer-Vcs_tab_click=Please exit the version management status and then switch the template
diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
index bb5cfc1712..4814712b69 100644
--- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
@@ -2149,3 +2149,4 @@ FR-Designer_Decimal_Places=\u5C0F\u6570\u67A0\u6570:
 FR-Base-Load_Resource_File=\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9
 FR-Designer_Env_Des_Https=
 FR-Designer_Format_JavaScript=Format Code
+FR-Designer-Vcs_tab_click=
diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
index d25124d98e..a159de118c 100644
--- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
@@ -2149,3 +2149,4 @@ FR-Designer_Export_Background=
 FR-Designer_Print_Background=
 FR-Designer_Env_Des_Https=
 FR-Designer_Format_JavaScript=Format Code
+FR-Designer-Vcs_tab_click=
diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
index f7b8d3a3cd..67a7b7ec5f 100644
--- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
@@ -2148,4 +2148,5 @@ FR-Designer_Sheet_Label_Page_Display_Position=
 FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
 FR-Designer_Env_Des_Https=\u82E5\u542F\u7528https\u6216\u4FEE\u6539https\u914D\u7F6E\uFF08\u8BC1\u4E66\u8DEF\u5F84\u3001https\u79D8\u94A5\uFF09\uFF0C\u5FC5\u987B\u91CD\u542F\u8BBE\u8BA1\u5668\u624D\u80FD\u751F\u6548\u3002
-FR-Designer_Format_JavaScript=\u683C\u5F0F\u5316\u4EE3\u7801
\ No newline at end of file
+FR-Designer_Format_JavaScript=\u683C\u5F0F\u5316\u4EE3\u7801
+FR-Designer-Vcs_tab_click=\u8BF7\u5148\u9000\u51FA\u7248\u672C\u7BA1\u7406\u72B6\u6001\u518D\u5207\u6362\u6A21\u677F
\ No newline at end of file
diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
index 42817879ea..c83ca01dba 100644
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
@@ -2148,3 +2148,4 @@ FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
 FR-Designer_Env_Des_Https=\u82E5\u555F\u7528https\u6216\u4FEE\u6539https\u914D\u7F6E\uFF08\u8B49\u66F8\u8DEF\u5F91\u3001https\u7955\u9470\uFF09\uFF0C\u5FC5\u9808\u91CD\u555F\u8A2D\u8A08\u5668\u624D\u80FD\u751F\u6548\u3002
 FR-Designer_Format_JavaScript=Format Code
+FR-Designer-Vcs_tab_click=
diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
index 701f5c85d0..175463b1d4 100644
--- a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
+++ b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
@@ -174,8 +174,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
     /*
      * Open Report Action
      */
-    private class
-    OpenReportAction extends UpdateAction {
+    private class OpenReportAction extends UpdateAction {
 
         public OpenReportAction() {
             this.setName(KeySetUtils.OPEN_TEMPLATE.getMenuKeySetName());
diff --git a/designer_base/src/com/fr/design/mainframe/JTemplate.java b/designer_base/src/com/fr/design/mainframe/JTemplate.java
index e9790ab23b..9afe6d802e 100644
--- a/designer_base/src/com/fr/design/mainframe/JTemplate.java
+++ b/designer_base/src/com/fr/design/mainframe/JTemplate.java
@@ -1,10 +1,6 @@
 package com.fr.design.mainframe;
 
-import com.fr.base.BaseUtils;
-import com.fr.base.ConfigManager;
-import com.fr.base.FRContext;
-import com.fr.base.Parameter;
-import com.fr.base.ScreenResolution;
+import com.fr.base.*;
 import com.fr.base.io.IOFile;
 import com.fr.base.iofileattr.TemplateIdAttrMark;
 import com.fr.base.vcs.DesignerMode;
@@ -57,6 +53,7 @@ import com.fr.stable.core.UUID;
 import com.fr.stable.project.ProjectConstants;
 
 import javax.swing.*;
+import javax.swing.Icon;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.undo.UndoManager;
 import java.awt.*;
@@ -90,8 +87,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     private StringBuilder process = new StringBuilder("");  // 制作模板的过程
     public int resolution = ScreenResolution.getScreenResolution();
 
-    public JTemplate() {
-    }
+    public JTemplate() {}
 
     public JTemplate(T t, String defaultFileName) {
         this(t, new MemFILE(newTemplateNameByIndex(defaultFileName)), true);
@@ -133,7 +129,6 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
             openTime = System.currentTimeMillis();
         }
     }
-
     private void collectInfo() {  // 执行收集操作
         if (openTime == 0) {  // 旧模板，不收集数据
             return;
@@ -416,7 +411,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         fireSuperTargetModified();
     }
 
-    protected boolean accept(Object o) {
+    protected boolean accept(Object o){
         return true;
     }
 
@@ -526,7 +521,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         if (!editingFILE.exists()) {
             return saveAsTemplate(isShowLoc);
         }
-        if (!FRContext.getCurrentEnv().hasFileFolderAllow(this.getEditingFILE().getPath())) {
+        if (!FRContext.getCurrentEnv().hasFileFolderAllow(this.getEditingFILE().getPath()) ) {
             JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_No-Privilege") + "!", Inter.getLocText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
             return false;
         }
@@ -534,12 +529,12 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         return this.saveFile();
     }
 
-    private boolean isCancelOperation(int operation) {
+    private boolean isCancelOperation(int operation){
         return operation == FILEChooserPane.CANCEL_OPTION ||
                 operation == FILEChooserPane.JOPTIONPANE_CANCEL_OPTION;
     }
 
-    private boolean isOkOperation(int operation) {
+    private boolean isOkOperation(int operation){
         return operation == FILEChooserPane.JOPTIONPANE_OK_OPTION ||
                 operation == FILEChooserPane.OK_OPTION;
     }
@@ -561,7 +556,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         }
 
         if (isOkOperation(chooseResult)) {
-            if (!FRContext.getCurrentEnv().hasFileFolderAllow(fileChooser.getSelectedFILE().getPath())) {
+            if (!FRContext.getCurrentEnv().hasFileFolderAllow(fileChooser.getSelectedFILE().getPath()) ) {
                 JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_No-Privilege") + "!", Inter.getLocText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
                 return false;
             }
@@ -573,7 +568,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         return saveNewFile(editingFILE, oldName);
     }
 
-    protected boolean saveNewFile(FILE editingFILE, String oldName) {
+    protected boolean saveNewFile(FILE editingFILE, String oldName){
         // 在保存之前，初始化 templateID
         initForCollect();  // 如果保存新模板（新建模板直接保存，或者另存为），则添加 templateID
 
@@ -588,7 +583,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         return result;
     }
 
-    protected void mkNewFile(FILE file) {
+    protected void mkNewFile(FILE file){
         try {
             file.mkfile();
         } catch (Exception e) {
@@ -600,16 +595,16 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      * 将模板另存为可以分享出去的混淆后内置数据集模板
      *
      * @return 是否另存成功
+     *
      */
-    public boolean saveShareFile() {
+    public boolean saveShareFile(){
         return true;
     }
-
-    public Widget getSelectElementCase() {
+    public Widget getSelectElementCase(){
         return new NoneWidget();
     }
 
-    protected FILEChooserPane getFILEChooserPane(boolean isShowLoc) {
+    protected FILEChooserPane getFILEChooserPane(boolean isShowLoc){
         return new FILEChooserPane(true, isShowLoc);
     }
 
@@ -811,7 +806,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     }
 
-    private int getVersionCompare(String versionString) {
+    private int getVersionCompare(String versionString){
         if (StringUtils.isBlank(versionString)) {
             return 0;
         }
@@ -821,7 +816,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     }
 
-    private int getVersionCompareHBB(String versionString) {
+    private int getVersionCompareHBB(String versionString){
         if (StringUtils.isBlank(versionString)) {
             return 0;
         }
@@ -843,8 +838,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     /**
      * 判断是否是新版设计器
-     *
-     * @return 是返回true
+     * @return    是返回true
      */
     public boolean isNewDesigner() {
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
@@ -906,46 +900,41 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     /**
      * 激活指定的template
+     *
      */
     public void activeJTemplate(int index, JTemplate jt) {
         DesignerContext.getDesignerFrame().activateJTemplate(this);
-    }
-
-    ;
+    };
 
     /**
      * 激活已存在的模板
+     *
      */
     public void activeOldJTemplate() {
         DesignerContext.getDesignerFrame().activateJTemplate(this);
-    }
-
-    ;
+    };
 
     /**
      * 激活新的模板
+     *
      */
     public void activeNewJTemplate() {
         DesignerContext.getDesignerFrame().addAndActivateJTemplate(this);
-    }
-
-    ;
+    };
 
     /**
      * 后台关闭template
+     *
      */
     public void closeOverLineTemplate(int index) {
         JTemplate overTemplate = HistoryTemplateListPane.getInstance().getHistoryList().get(index);
         HistoryTemplateListPane.getInstance().closeVirtualSelectedReport(overTemplate);
         HistoryTemplateListPane.getInstance().getHistoryList().set(index, new JVirtualTemplate(overTemplate.getEditingFILE()));
-    }
-
-    ;
+    };
 
 
     /**
      * 返回当前支持的超链界面pane
-     *
      * @return 超链连接界面
      */
     public abstract HyperlinkGroupPane getHyperLinkPane(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider);
@@ -953,7 +942,6 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     /**
      * 返回当前支持的超链界面pane
      * 没有悬浮弹窗，显示为两列
-     *
      * @return 超链连接界面
      */
     public abstract HyperlinkGroupPane getHyperLinkPaneNoPop(HyperlinkGroupPaneActionProvider hyperlinkGroupPaneActionProvider);
@@ -963,7 +951,7 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      *
      * @return 默认不是
      */
-    public boolean isChartBook() {
+    public boolean isChartBook(){
         return false;
     }
 
@@ -1015,9 +1003,11 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      * 创建内置sql提交的pane
      *
      * @return 内置sql提交的pane
+     *
+     *
      * @date 2014-10-14-下午7:39:27
      */
-    public DBManipulationPane createDBManipulationPane() {
+    public DBManipulationPane createDBManipulationPane(){
         return new DBManipulationPane();
     }
 
@@ -1025,22 +1015,22 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      * 创建控件事件里内置sql提交的pane
      *
      * @return 内置sql提交的pane
+     *
+     *
      * @date 2014-10-14-下午7:39:27
      */
-    public DBManipulationPane createDBManipulationPaneInWidget() {
+    public DBManipulationPane createDBManipulationPaneInWidget(){
         return new DBManipulationInWidgetEventPane();
     }
 
     /**
      * 取小图标，主要用于多TAB标签栏
-     *
      * @return 图表
      */
     public abstract Icon getIcon();
 
     /**
      * 导出菜单项
-     *
      * @return 菜单项
      */
     public ShortCut[] shortcut4ExportMenu() {
@@ -1050,13 +1040,12 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
     /**
      * 复制JS代码
      */
-    public void copyJS() {
-    }
+    public void copyJS(){}
 
     /**
      * 系列风格改动
      */
-    public void styleChange() {
+    public void styleChange(){
 
     }
 
@@ -1064,14 +1053,14 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      * 创建分享模板的按钮, 目前只有jworkbook实现了
      *
      * @return 分享模板按钮
+     *
      */
-    public UIButton[] createShareButton() {
+    public UIButton[] createShareButton(){
         return new UIButton[0];
     }
 
     /**
      * 略
-     *
      * @param provider 预览模式
      */
     public void previewMenuActionPerformed(PreviewProvider provider) {
@@ -1080,7 +1069,6 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     /**
      * 支持的预览模式
-     *
      * @return 预览模式
      */
     public PreviewProvider[] supportPreview() {
@@ -1089,7 +1077,6 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     /**
      * 预览模式转换
-     *
      * @param typeCode 类型
      * @return 预览模式
      */
@@ -1113,7 +1100,6 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     /**
      * 加载插件中的按钮
-     *
      * @return 按钮组
      */
     public UIButton[] createExtraButtons() {
@@ -1128,7 +1114,6 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
 
     /**
      * 由于老版本的模板没有模板ID，当勾选使用参数模板时候，就加一个模板ID attr
-     *
      * @param isUseParamTemplate 是否使用参数模板
      */
     public void needAddTemplateIdAttr(boolean isUseParamTemplate) {
diff --git a/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java b/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java
deleted file mode 100644
index 16af4c3654..0000000000
--- a/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.fr.design.mainframe;
-
-import com.fr.stable.CodeUtils;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-/**
- * Created by hzzz on 2017/12/4.
- */
-public class SiteCenterToken {
-
-    public static String generateToken() {
-        String date = new SimpleDateFormat("yyyy-MM-dd").format(Calendar.getInstance().getTime());
-        return CodeUtils.md5Encode(date, "", "MD5");
-    }
-}
diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java
index 05737e7c35..84ebdcec85 100644
--- a/designer_base/src/com/fr/env/RemoteEnv.java
+++ b/designer_base/src/com/fr/env/RemoteEnv.java
@@ -1009,8 +1009,8 @@ public class RemoteEnv extends AbstractEnv {
         }
         try {
             HashMap<String, String> para = new HashMap<String, String>();
-            para.put("op", "fs_remote_vcs");
-            para.put("cmd", "hzzz");
+            para.put("op", "fr_remote_design");
+            para.put("cmd", "delete_file");
             para.put("file_path", filePath);
 
             HttpClient client = createHttpMethod(para);
@@ -2075,8 +2075,8 @@ public class RemoteEnv extends AbstractEnv {
         info.parseJSON(jo);
         return info;
     }
-    
-    
+
+
 
     @Override
     public String pluginServiceAction(String serviceID, String req) throws Exception {
@@ -2216,29 +2216,29 @@ public class RemoteEnv extends AbstractEnv {
     public void doWhenServerShutDown() {
 
     }
-    
+
     @Override
     public boolean isLocalEnv() {
-        
+
         return false;
     }
-    
+
     @Override
     public boolean hasPluginServiceStarted(String key) {
 
         return true;
     }
-    
+
     @Override
     public JSONArray getPluginStatus() {
-        
+
         try {
             HashMap<String, String> para = new HashMap<String, String>();
             para.put("op", "plugin");
             para.put("cmd", "get_status");
             para.put("current_uid", this.createUserID());
             para.put("currentUsername", this.getUser());
-            
+
             HttpClient client = createHttpMethod(para);
             InputStream input = execute4InputStream(client);
             return new JSONArray(stream2String(input));

From aef3d06f1f5ee70fadfd6d57667ec1d303f820d9 Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Wed, 27 Dec 2017 17:23:41 +0800
Subject: [PATCH 09/11] conflict

---
 .../fr/design/mainframe/SiteCenterToken.java    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 designer_base/src/com/fr/design/mainframe/SiteCenterToken.java

diff --git a/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java b/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java
new file mode 100644
index 0000000000..16af4c3654
--- /dev/null
+++ b/designer_base/src/com/fr/design/mainframe/SiteCenterToken.java
@@ -0,0 +1,17 @@
+package com.fr.design.mainframe;
+
+import com.fr.stable.CodeUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+/**
+ * Created by hzzz on 2017/12/4.
+ */
+public class SiteCenterToken {
+
+    public static String generateToken() {
+        String date = new SimpleDateFormat("yyyy-MM-dd").format(Calendar.getInstance().getTime());
+        return CodeUtils.md5Encode(date, "", "MD5");
+    }
+}

From 96c76437545b5ae54e386805bc9df90d6a349c1b Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Thu, 28 Dec 2017 11:15:32 +0800
Subject: [PATCH 10/11] refactor

---
 .../mainframe/toolbar/ToolBarMenuDock.java    | 42 +++++++++++++------
 .../fr/design/mainframe/toolbar/VcsScene.java | 39 +++++++++++++++++
 2 files changed, 69 insertions(+), 12 deletions(-)
 create mode 100644 designer_base/src/com/fr/design/mainframe/toolbar/VcsScene.java

diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
index 4aee3a024e..dbfe4f441d 100644
--- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@@ -59,6 +59,7 @@ import com.fr.plugin.observer.PluginEvent;
 import com.fr.plugin.observer.PluginEventListener;
 import com.fr.plugin.observer.PluginEventType;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -316,23 +317,26 @@ public abstract class ToolBarMenuDock {
     }
 
     public MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) {
-        boolean notVcs = !DesignerMode.isVcsMode();
-        MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_File"), 'F');
 
+        if (DesignerMode.isVcsMode()) {
+            MenuDef menuDef = VcsScene.createFileMenuDef(plus);
+            insertMenu(menuDef, MenuHandler.FILE);
+            return menuDef;
+        }
+        MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_File"), 'F');
         ShortCut[] scs = new ShortCut[0];
-        if (!BaseUtils.isAuthorityEditing() && notVcs) {
+        if (!BaseUtils.isAuthorityEditing()) {
             scs = createNewFileShortCuts();
         }
         if (!ArrayUtils.isEmpty(scs)) {
             menuDef.addShortCut(scs);
         }
 
-        if (notVcs) {
-            menuDef.addShortCut(openTemplateAction());
-            menuDef.addShortCut(new OpenRecentReportMenuDef());
-            addCloseCurrentTemplateAction(menuDef);
-        }
+        menuDef.addShortCut(openTemplateAction());
 
+        menuDef.addShortCut(new OpenRecentReportMenuDef());
+
+        addCloseCurrentTemplateAction(menuDef);
 
         scs = plus.shortcut4FileMenu();
         if (!ArrayUtils.isEmpty(scs)) {
@@ -343,9 +347,8 @@ public abstract class ToolBarMenuDock {
 
         addPreferenceAction(menuDef);
 
-        if (notVcs) {
-            addSwitchExistEnvAction(menuDef);
-        }
+        addSwitchExistEnvAction(menuDef);
+
         menuDef.addShortCut(new ExitDesignerAction());
 
         insertMenu(menuDef, MenuHandler.FILE);
@@ -577,7 +580,22 @@ public abstract class ToolBarMenuDock {
     }
 
     public NewTemplatePane getNewTemplatePane() {
-        return ToolBarNewTemplatePane.getInstance();
+        return new NewTemplatePane() {
+            @Override
+            public Icon getNew() {
+                return BaseUtils.readIcon("/com/fr/design/images/buttonicon/addicon.png");
+            }
+
+            @Override
+            public Icon getMouseOverNew() {
+                return BaseUtils.readIcon("/com/fr/design/images/buttonicon/add_press.png");
+            }
+
+            @Override
+            public Icon getMousePressNew() {
+                return BaseUtils.readIcon("/com/fr/design/images/buttonicon/add_press.png");
+            }
+        };
     }
 
     protected void insertMenu(MenuDef menuDef, String anchor) {
diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/VcsScene.java b/designer_base/src/com/fr/design/mainframe/toolbar/VcsScene.java
new file mode 100644
index 0000000000..6da207b9ea
--- /dev/null
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/VcsScene.java
@@ -0,0 +1,39 @@
+package com.fr.design.mainframe.toolbar;
+
+import com.fr.base.BaseUtils;
+import com.fr.design.actions.file.ExitDesignerAction;
+import com.fr.design.actions.file.PreferenceAction;
+import com.fr.design.menu.MenuDef;
+import com.fr.design.menu.SeparatorDef;
+import com.fr.design.menu.ShortCut;
+import com.fr.general.Inter;
+import com.fr.stable.ArrayUtils;
+
+/**
+ * Created by hzzz on 2017/12/28.
+ */
+public class VcsScene {
+
+    public static MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) {
+        MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_File"), 'F');
+
+        ShortCut[] scs = new ShortCut[0];
+        if (!ArrayUtils.isEmpty(scs)) {
+            menuDef.addShortCut(scs);
+        }
+
+        scs = plus.shortcut4FileMenu();
+        if (!ArrayUtils.isEmpty(scs)) {
+            menuDef.addShortCut(SeparatorDef.DEFAULT);
+            menuDef.addShortCut(scs);
+            menuDef.addShortCut(SeparatorDef.DEFAULT);
+        }
+
+        if (!BaseUtils.isAuthorityEditing()) {
+            menuDef.addShortCut(new PreferenceAction());
+        }
+
+        menuDef.addShortCut(new ExitDesignerAction());
+        return menuDef;
+    }
+}

From 6de3e5810fbd2e0b627970f1fcd2d2f7e4ae1e63 Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Thu, 28 Dec 2017 11:17:10 +0800
Subject: [PATCH 11/11] refactor

---
 designer_base/src/com/fr/design/mainframe/JTemplate.java   | 7 ++++---
 .../src/com/fr/design/mainframe/toolbar/VcsScene.java      | 7 +++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/designer_base/src/com/fr/design/mainframe/JTemplate.java b/designer_base/src/com/fr/design/mainframe/JTemplate.java
index 9afe6d802e..1da72d5f79 100644
--- a/designer_base/src/com/fr/design/mainframe/JTemplate.java
+++ b/designer_base/src/com/fr/design/mainframe/JTemplate.java
@@ -30,6 +30,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
 import com.fr.design.mainframe.templateinfo.TemplateProcessInfo;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
+import com.fr.design.mainframe.toolbar.VcsScene;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.NameSeparator;
 import com.fr.design.menu.ShortCut;
@@ -683,10 +684,10 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
      * @return 返回菜单
      */
     public ShortCut[] shortcut4FileMenu() {
-        if (BaseUtils.isAuthorityEditing()) {
+        if (DesignerMode.isVcsMode()) {
+            return VcsScene.shortcut4FileMenu(this);
+        } else if (BaseUtils.isAuthorityEditing()) {
             return new ShortCut[]{new SaveTemplateAction(this), new UndoAction(this), new RedoAction(this)};
-        } else if (DesignerMode.isVcsMode()) {
-            return new ShortCut[]{new UndoAction(this), new RedoAction(this)};
         } else {
             return new ShortCut[]{new SaveTemplateAction(this), new SaveAsTemplateAction(this), new UndoAction(this), new RedoAction(this)};
         }
diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/VcsScene.java b/designer_base/src/com/fr/design/mainframe/toolbar/VcsScene.java
index 6da207b9ea..1e7d9e88b3 100644
--- a/designer_base/src/com/fr/design/mainframe/toolbar/VcsScene.java
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/VcsScene.java
@@ -1,8 +1,11 @@
 package com.fr.design.mainframe.toolbar;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.actions.edit.RedoAction;
+import com.fr.design.actions.edit.UndoAction;
 import com.fr.design.actions.file.ExitDesignerAction;
 import com.fr.design.actions.file.PreferenceAction;
+import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
 import com.fr.design.menu.ShortCut;
@@ -36,4 +39,8 @@ public class VcsScene {
         menuDef.addShortCut(new ExitDesignerAction());
         return menuDef;
     }
+
+    public  static ShortCut[] shortcut4FileMenu(JTemplate jTemplate) {
+        return new ShortCut[]{new UndoAction(jTemplate), new RedoAction(jTemplate)};
+    }
 }