Merge pull request #6012 in DESIGN/design from feature/10.0 to feature/big-screen

* commit '6217c56855b3db140d287463e028d645345b203a':
  和抽之前完全一样
  CHART-21076 清楚磁盘缓存
  CHART-20411 适配大屏模板关闭
  CHART-20411 适配大屏模板另存为
  REPORT-60004 远程设计-保存弹窗 目录显示问题

designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

@@ -4,6 +4,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.base.mode.DesignModeContext;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.imenu.UIMenuItem;
@@ -753,7 +754,7 @@ public class MutilTempalteTabPane extends JComponent {
     /**
      * 关闭掉一个模板之后激活新的待显示模板
      */
-    private void activePrevTemplateAfterClose() {
+    public void activePrevTemplateAfterClose() {
         if (openedTemplate.isEmpty()) {
             //新建并激活模板
             DesignerContext.getDesignerFrame().addAndActivateJTemplate();

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -877,7 +877,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
     protected boolean export() throws Exception {
-        return this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(editingFILE));
+        return this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(getEditingFILE()));
 
     }
 
@@ -1460,7 +1460,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         if (editingFILE == null || editingFILE instanceof MemFILE) {
             return false;
         }
-        this.getTarget().export(TemplateResourceManager.getResource().saveTemplate(editingFILE));
+        export();
         this.editingFILE = editingFILE;
         return true;
     }

designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@@ -408,7 +408,9 @@ public abstract class ToolBarMenuDock {
 
         menuDef.addShortCut(new OpenRecentReportMenuDef());
 
-        addCloseCurrentTemplateAction(menuDef);
+        if (!DesignModeContext.isDuchampMode()) {
+            addCloseCurrentTemplateAction(menuDef);
+        }
 
         scs = plus.shortcut4FileMenu();
         if (!ArrayUtils.isEmpty(scs)) {

designer-base/src/main/java/com/fr/design/ui/ModernUIPane.java

@@ -26,6 +26,7 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.File;
 import java.util.Map;
 
 /**
@@ -170,6 +171,10 @@ public class ModernUIPane<T> extends BasicPane {
     public void clearCache() {
         if (browser != null) {
             browser.getCacheStorage().clearCache();
+            File file = new File(browser.getContext().getCacheDir());
+            if (file.exists()) {
+                file.delete();
+            }
         }
     }
 

designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@@ -29,6 +29,9 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.event.Event;
+import com.fr.event.EventDispatcher;
+import com.fr.event.Listener;
 import com.fr.file.filetree.FileNode;
 import com.fr.file.filter.ChooseFileFilter;
 import com.fr.file.filter.FILEFilter;
@@ -45,6 +48,8 @@ import com.fr.stable.os.windows.WindowsDetector;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.workspace.WorkContext;
 
+import com.fr.workspace.Workspace;
+import com.fr.workspace.WorkspaceEvent;
 import javax.swing.AbstractAction;
 import javax.swing.AbstractListModel;
 import javax.swing.ActionMap;
@@ -66,7 +71,6 @@ import javax.swing.ListModel;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.event.ListSelectionEvent;
@@ -1325,6 +1329,12 @@ public class FILEChooserPane extends BasicPane {
                     LocationButtonPane.this.repaint(10);
                 }
             });
+            EventDispatcher.listen(WorkspaceEvent.AfterSwitch, new Listener<Workspace>() {
+                @Override
+                public void on(Event event, Workspace param) {
+                    setPopDir(null);
+                }
+            });
         }
 
         public void highLightButton(FILE dir) {