From 52d74fd0ecd1df91609ce3e73e1b9eab65fc8e44 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Sat, 27 Apr 2019 17:54:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=85=8D=E7=BD=AE=E9=A1=B9=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/vcs/VcsConfigManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java index bbb6e9d9b..f61bba67a 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java @@ -11,10 +11,10 @@ import com.fr.stable.xml.XMLableReader; public class VcsConfigManager implements XMLReadable, XMLWriter { public static final String XML_TAG = "VcsConfigManager"; private static volatile VcsConfigManager instance = new VcsConfigManager(); - private boolean vcsEnable; - private boolean saveCommit; - private boolean useInterval; - private int saveInterval; + private boolean vcsEnable = true; + private boolean saveCommit = true; + private boolean useInterval = true; + private int saveInterval = 60; public static VcsConfigManager getInstance() { return instance; From 630c6f369cd65f957914fcecf65bb56fd480ec51 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Sat, 27 Apr 2019 18:18:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-16556=20@xiaoxia=20=E5=A4=A7?= =?UTF-8?q?=E6=A8=A1=E7=89=88=E8=BF=9B=E5=85=A5=E6=A8=A1=E7=89=88=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=AF=94=E8=BE=83=E6=85=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/DesignerFrameFileDealerPane.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index 265e7dfe6..f2f53fead 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -299,11 +299,6 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt boolean isCurrentEditing = isCurrentEditing(path); - // 如果模板正在编辑，保存后再打开版本管理 - if (isCurrentEditing) { - saveCurrentEditingTemplate(); - } - // 如果模板已经打开了，关掉，避免出现2个同名tab（1个是模板，1个是版本） closeOpenedTemplate(path, isCurrentEditing); FileVersionsPanel fileVersionTablePanel = FileVersionsPanel.getInstance();