diff --git a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
index 87b7f2f25..047420294 100644
--- a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
+++ b/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();
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
index d4931763c..ec0387cef 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
+++ b/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;
     }
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
index 866c2fabe..cfc4483c9 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/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)) {
diff --git a/designer-base/src/main/java/com/fr/design/ui/ModernUIPane.java b/designer-base/src/main/java/com/fr/design/ui/ModernUIPane.java
index 90d6accf6..09fa2bbc0 100644
--- a/designer-base/src/main/java/com/fr/design/ui/ModernUIPane.java
+++ b/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();
+            }
         }
     }