Pull request #9105: REPORT-72783 设计器关闭时，单模板和多模板保存弹窗逻辑统一

Merge in DESIGN/design from ~YVAN/design:feature/x to feature/x

* commit '893095bd90311a34ef0b49238d7ab020caeffcd0':
  REPORT-72783 设计器关闭时，单模板和多模板保存弹窗逻辑统一 改下变量名
  REPORT-72783 设计器关闭时，单模板和多模板保存弹窗逻辑统一 【问题原因】产品沟通，需要统一一下，免得维护多套 【改动思路】统一成多模版保存的弹窗 【review建议】无

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

@@ -198,23 +198,6 @@ public class SaveSomeTemplatePane extends BasicPane {
         return true;
     }
 
-
-    public int saveLastOneTemplate() {
-        JTemplate<?, ?> specifiedTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
-        if (!specifiedTemplate.isALLSaved()) {
-            specifiedTemplate.stopEditing();
-            int returnVal = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?",
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
-            if (returnVal == JOptionPane.YES_OPTION) {
-                specifiedTemplate.saveTemplate();
-                FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
-            }
-            return returnVal;
-        }
-        return JOptionPane.YES_OPTION;
-    }
-
-
     protected String title4PopupWindow() {
         return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save");
     }

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

@@ -172,18 +172,11 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
             }
             //关闭前当前模板 停止编辑
             HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().stopEditing();
-            SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(true);
-            // 只有一个文件未保存时
-            if (HistoryTemplateListCache.getInstance().getHistoryCount() == 1) {
-                int choose = saveSomeTempaltePane.saveLastOneTemplate();
-                if (choose != JOptionPane.CANCEL_OPTION) {
+            SaveSomeTemplatePane saveSomeTemplatePane = new SaveSomeTemplatePane(true);
+            // 全部保存成功才退出
+            if (saveSomeTemplatePane.showSavePane()) {
                 DesignerFrame.this.exit();
             }
-            } else {
-                if (saveSomeTempaltePane.showSavePane()) {
-                    DesignerFrame.this.exit();
-                }
-            }
         }
 
         @Override