Merge pull request #860 in DESIGN/design from ~XIAOXIA/design:release/10.0 to release/10.0

* commit 'e6f7bc739fc0e624d055177c4bc6978bdfe16dc6':
  REPORT-16527 @xiaoxia 通过直接预览触发的模版保存，该模版不会保存新版本

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

@@ -277,19 +277,19 @@ public class Designer extends BaseDesigner {
         ) {
             @Override
             protected void upButtonClickEvent() {
-                JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+                JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
                 if (jt == null) {
                     return;
                 }
-                WebPreviewUtils.preview(jt);
-                if (DesignerEnvManager.getEnvManager().getVcsConfigManager().isVcsEnable()) {
+                if (DesignerEnvManager.getEnvManager().getVcsConfigManager().isVcsEnable() && saveButton.isEnabled()) {
                     VcsHelper.dealWithVcs(jt);
                 }
+                WebPreviewUtils.preview(jt);
             }
 
             @Override
             protected void downButtonClickEvent() {
-                final JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+                final JTemplate<?, ?> jt = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
                 if (jt == null) {
                     return;
                 }