diff --git a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
index af2d1d2a1..6192649ab 100644
--- a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
+++ b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java
@@ -56,12 +56,13 @@ public class SaveSomeTemplatePane extends BasicPane {
             this.dialog = this.showSmallWindow(parent, new DialogActionAdapter() {
                 @Override
                 public void doOk() {
+                    isAllSaved = true;
                     for (int i = 0; i < templateCheckBoxes.length; i++) {
                         if (templateCheckBoxes[i].isSelected()) {
-                            saveSelectedTemplate(unSavedTemplate.get(i));
+                            // 当存在模板保存失败时，视为整体的isAllSaved失败
+                            isAllSaved = saveSelectedTemplate(unSavedTemplate.get(i)) && isAllSaved;
                         }
                     }
-                    isAllSaved = true;
                 }
 
                 public void doCancel() {
@@ -188,12 +189,13 @@ public class SaveSomeTemplatePane extends BasicPane {
     }
 
 
-    private void saveSelectedTemplate(JTemplate<?, ?> specifiedTemplate) {
+    private boolean saveSelectedTemplate(JTemplate<?, ?> specifiedTemplate) {
         if (!specifiedTemplate.isSaved()) {
             specifiedTemplate.stopEditing();
-            specifiedTemplate.saveTemplate();
+            return specifiedTemplate.saveTemplate();
         }
         FineLoggerFactory.getLogger().info( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
+        return true;
     }