Merge pull request #1548 in BA/design from ~HZZZ/design:vcs2 to feature/9.0

* commit '6de3e5810fbd2e0b627970f1fcd2d2f7e4ae1e63':
  refactor
  refactor
  conflict
  1227
  remove ds_store
  1227
  1227
  .
  .:
  .
  加token校验

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(
+        boolean showWorkBookExportMenu = DesignerMode.isVcsMode()
-                super.shortcut4FileMenu(),
+                || BaseUtils.isAuthorityEditing()
-                BaseUtils.isAuthorityEditing() || (FRContext.getCurrentEnv() instanceof RemoteEnv) ? new ShortCut[0] : new ShortCut[]{this.createWorkBookExportMenu()}
+                || (FRContext.getCurrentEnv() instanceof RemoteEnv);
+        return (ShortCut[]) ArrayUtils.addAll(super.shortcut4FileMenu(),
+                showWorkBookExportMenu ? new ShortCut[0] : new ShortCut[]{this.createWorkBookExportMenu()}
         );
     }
 

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,6 +31,10 @@ 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();
@@ -68,7 +75,7 @@ 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>();
 
@@ -81,7 +88,6 @@ public final class WebPreviewUtils {
                 }
             }
             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);

designer_base/src/com/fr/design/file/MutilTempalteTabPane.java

@@ -3,6 +3,7 @@ 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;
@@ -632,6 +633,11 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
      * @param e 鼠标事件
      */
     public void mousePressed(MouseEvent e) {
+        //如果在版本管理情况下，不允许切换tab
+        if (DesignerMode.isVcsMode()) {
+            JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Vcs_tab_click"), Inter.getLocText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE);
+            return;
+        }
 
         int evtX = e.getX();
         int evtY = e.getY();
@@ -951,6 +957,4 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
             }
         }
     }
-
-
 }

designer_base/src/com/fr/design/fun/TemplateTreeShortCutProvider.java

@@ -0,0 +1,14 @@
+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;
+}

designer_base/src/com/fr/design/fun/impl/AbstractTemplateTreeShortCutProvider.java

@@ -0,0 +1,31 @@
+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 1;
+    }
+
+    @Override
+    public String mark4Provider() {
+        return getClass().getName();
+    }
+
+    @Override
+    public void process() {
+    }
+
+    @Override
+    public void undo() {
+    }
+}

designer_base/src/com/fr/design/locale/designer.properties

@@ -2149,6 +2149,7 @@ 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
 FR-Designer_Preference_CachingTemplate=Template memory optimization
 FR-Designer_Preference_MaxCachingTemplate=The designer maximum cache template number:
 FR-Designer_Preference_CachingTemplateTip=Set to 0 to close the function; restart the designer and take effect

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -2148,6 +2148,7 @@ 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
 FR-Designer_Preference_CachingTemplate=Template memory optimization
 FR-Designer_Preference_MaxCachingTemplate=The designer maximum cache template number:
 FR-Designer_Preference_CachingTemplateTip=Set to 0 to close the function; restart the designer and take effect

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -2149,6 +2149,7 @@ 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=
 FR-Designer_Move_Up=
 FR-Designer_Move_Down=
 FR-Designer_Move_To_Top=

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -2149,6 +2149,7 @@ FR-Designer_Export_Background=
 FR-Designer_Print_Background=
 FR-Designer_Env_Des_Https=
 FR-Designer_Format_JavaScript=Format Code
+FR-Designer-Vcs_tab_click=
 FR-Designer_Move_Up=
 FR-Designer_Move_Down=
 FR-Designer_Move_To_Top=

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -2149,6 +2149,7 @@ 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
+FR-Designer-Vcs_tab_click=\u8BF7\u5148\u9000\u51FA\u7248\u672C\u7BA1\u7406\u72B6\u6001\u518D\u5207\u6362\u6A21\u677F
 FR-Designer_Preference_CachingTemplate=\u6A21\u677F\u5185\u5B58\u4F18\u5316
 FR-Designer_Preference_MaxCachingTemplate=\u8BBE\u8BA1\u5668\u6700\u5927\u7F13\u5B58\u6A21\u677F\u4E2A\u6570\uFF1A
 FR-Designer_Preference_CachingTemplateTip=\u8BBE\u7F6E\u4E3A0\u8868\u793A\u5173\u95ED\u8BE5\u529F\u80FD\uFF1B\u91CD\u542F\u8BBE\u8BA1\u5668\u540E\u751F\u6548

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -2148,6 +2148,7 @@ 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=
 FR-Designer_Preference_CachingTemplate=\u7BC4\u672C\u8A18\u61B6\u9AD4\u512A\u5316
 FR-Designer_Preference_MaxCachingTemplate=\u8A2D\u8A08\u5668\u6700\u5927\u7DE9\u5B58\u7BC4\u672C\u500B\u6578\uFF1A
 FR-Designer_Preference_CachingTemplateTip=\u8A2D\u5B9A\u70BA0\u8868\u793A\u95DC\u9589\u8A72\u529F\u80FD\uFF1B\u91CD\u5553\u8A2D\u8A08\u5668\u5F8C\u751F\u6548

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;
 

designer_base/src/com/fr/design/mainframe/JTemplate.java

@@ -3,6 +3,7 @@ package com.fr.design.mainframe;
 import com.fr.base.*;
 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;
@@ -29,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;
@@ -682,7 +684,9 @@ 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 {
             return new ShortCut[]{new SaveTemplateAction(this), new SaveAsTemplateAction(this), new UndoAction(this), new RedoAction(this)};

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;
@@ -316,8 +317,13 @@ public abstract class ToolBarMenuDock {
     }
 
     public MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) {
-        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()) {
             scs = createNewFileShortCuts();

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");
+    }
+}

designer_base/src/com/fr/design/mainframe/toolbar/VcsScene.java

@@ -0,0 +1,46 @@
+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;
+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;
+    }
+
+    public  static ShortCut[] shortcut4FileMenu(JTemplate jTemplate) {
+        return new ShortCut[]{new UndoAction(jTemplate), new RedoAction(jTemplate)};
+    }
+}