Merge pull request #849 in DESIGN/design from ~XIAOXIA/design:feature/10.0 to feature/10.0

* commit 'cdd0cea75b33bd54232fb367ac1d962032e10c4a':
  bug fix
  REPORT-16550  REPORT-16547

designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java

@@ -119,7 +119,7 @@ public class VcsHelper {
             @Override
             public void run() {
 
-                String fileName = VcsHelper.getEditingFilename();
+                String fileName = getEditingFilename();
                 VcsOperator operator = WorkContext.getCurrent().get(VcsOperator.class);
                 VcsEntity entity = operator.getFileVersionByIndex(fileName, 0);
                 int latestFileVersion = 0;

designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionCellEditor.java

@@ -35,15 +35,16 @@ public class FileVersionCellEditor extends AbstractCellEditor implements TableCe
     @Override
     public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
         String fileOfVersion;
+        VcsOperator vcsOperator = WorkContext.getCurrent().get(VcsOperator.class);
         Component editor = row == 0 ? firstRowPanel : renderAndEditor;
         if (isSelected) {
             return editor;
         } else if (row == 0) {
             String path = DesignerFrameFileDealerPane.getInstance().getSelectedOperation().getFilePath();
-            fileOfVersion = WorkContext.getCurrent().get(VcsOperator.class).getFileOfCurrent(path.replaceFirst("/", ""));
+            fileOfVersion = vcsOperator.getFileOfCurrent(path.replaceFirst("/", ""));
         } else {
             renderAndEditor.update((VcsEntity) value);
-            fileOfVersion = WorkContext.getCurrent().get(VcsOperator.class).getFileOfFileVersion(((VcsEntity) value).getFilename(), ((VcsEntity) value).getVersion());
+            fileOfVersion = vcsOperator.getFileOfFileVersion(((VcsEntity) value).getFilename(), ((VcsEntity) value).getVersion());
 
         }
 

designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionDialog.java

@@ -36,7 +36,7 @@ public class FileVersionDialog extends UIDialog {
     private UITextField textField;
 
 
-    public FileVersionDialog(Frame frame) {
+    public FileVersionDialog(Frame frame, final String fileName) {
         super(frame);
         setUndecorated(true);
         setModal(true);
@@ -63,7 +63,7 @@ public class FileVersionDialog extends UIDialog {
             public void actionPerformed(ActionEvent e) {
                 FileVersionDialog.this.setVisible(false);
                 Date date = dateEditor.getValue();
-                List<VcsEntity> vcsEntities = WorkContext.getCurrent().get(VcsOperator.class).getFilterVersions(date, new Date(date.getTime() + DELAY), textField.getText());
+                List<VcsEntity> vcsEntities = WorkContext.getCurrent().get(VcsOperator.class).getFilterVersions(fileName, date, new Date(date.getTime() + DELAY), textField.getText());
                 FileVersionTable.getInstance().updateModel(1, vcsEntities);
 
             }
@@ -91,4 +91,5 @@ public class FileVersionDialog extends UIDialog {
     public void checkValid() throws Exception {
 
     }
+
 }

designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/FileVersionsPanel.java

@@ -2,6 +2,7 @@ package com.fr.design.mainframe.vcs.ui;
 
 import com.fr.base.GraphHelper;
 import com.fr.design.base.mode.DesignModeContext;
+import com.fr.design.base.mode.DesignerMode;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.MutilTempalteTabPane;
@@ -100,7 +101,7 @@ public class FileVersionsPanel extends BasicPane {
     }
 
     private void showFilterPane() {
-        versionDialog = new FileVersionDialog(DesignerContext.getDesignerFrame());
+        versionDialog = new FileVersionDialog(DesignerContext.getDesignerFrame(), templatePath);
         versionDialog.setVisible(true);
     }
 
@@ -153,7 +154,7 @@ public class FileVersionsPanel extends BasicPane {
         WestRegionContainerPane.getInstance().replaceUpPane(
                 isExit ? DesignerFrameFileDealerPane.getInstance() : this);
 
-        DesignModeContext.switchTo(isExit ? com.fr.design.base.mode.DesignerMode.NORMAL : com.fr.design.base.mode.DesignerMode.VCS);
+        DesignModeContext.switchTo(isExit ? DesignerMode.NORMAL : DesignerMode.VCS);
         // MutilTempalteTabPane & NewTemplatePane 是否可点
         ToolBarNewTemplatePane.getInstance().setButtonGray(!isExit);
 

designer-realize/src/main/java/com/fr/start/Designer.java

@@ -11,6 +11,7 @@ import com.fr.design.actions.file.newReport.NewWorkBookAction;
 import com.fr.design.actions.server.ServerConfigManagerAction;
 import com.fr.design.actions.server.StyleListAction;
 import com.fr.design.actions.server.WidgetManagerAction;
+import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.file.HistoryTemplateListPane;
@@ -363,12 +364,12 @@ public class Designer extends BaseDesigner {
 
     @Override
     protected void refreshLargeToolbarState() {
-        JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+        JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
         if (jt == null) {
             return;
         }
-        saveButton.setEnabled(!jt.isSaved() && !DesignerMode.isVcsMode());
-        MutilTempalteTabPane.getInstance().refreshOpenedTemplate(HistoryTemplateListPane.getInstance().getHistoryList());
+        saveButton.setEnabled(!jt.isSaved() && !DesignModeContext.isVcsMode());
+        MutilTempalteTabPane.getInstance().refreshOpenedTemplate(HistoryTemplateListCache.getInstance().getHistoryList());
         MutilTempalteTabPane.getInstance().repaint();
         if (DesignerEnvManager.getEnvManager().isSupportUndo()) {
             undo.setEnabled(jt.canUndo());