Browse Source

Merge pull request #855 in DESIGN/design from ~XIAOXIA/design:feature/10.0 to feature/10.0

* commit '630c6f369cd65f957914fcecf65bb56fd480ec51':
  REPORT-16556 @xiaoxia 大模版进入模版版本比较慢
  无JIRA任务 增加配置项默认值
research/10.0
xiaoxia 6 years ago
parent
commit
9b277e3062
  1. 5
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
  2. 8
      designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java

5
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); boolean isCurrentEditing = isCurrentEditing(path);
// 如果模板正在编辑,保存后再打开版本管理
if (isCurrentEditing) {
saveCurrentEditingTemplate();
}
// 如果模板已经打开了,关掉,避免出现2个同名tab(1个是模板,1个是版本) // 如果模板已经打开了,关掉,避免出现2个同名tab(1个是模板,1个是版本)
closeOpenedTemplate(path, isCurrentEditing); closeOpenedTemplate(path, isCurrentEditing);
FileVersionsPanel fileVersionTablePanel = FileVersionsPanel.getInstance(); FileVersionsPanel fileVersionTablePanel = FileVersionsPanel.getInstance();

8
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 class VcsConfigManager implements XMLReadable, XMLWriter {
public static final String XML_TAG = "VcsConfigManager"; public static final String XML_TAG = "VcsConfigManager";
private static volatile VcsConfigManager instance = new VcsConfigManager(); private static volatile VcsConfigManager instance = new VcsConfigManager();
private boolean vcsEnable; private boolean vcsEnable = true;
private boolean saveCommit; private boolean saveCommit = true;
private boolean useInterval; private boolean useInterval = true;
private int saveInterval; private int saveInterval = 60;
public static VcsConfigManager getInstance() { public static VcsConfigManager getInstance() {
return instance; return instance;

Loading…
Cancel
Save