Browse Source

Merge pull request #12520 in DESIGN/design from release/11.0 to bugfix/11.0

* commit '7f7f44c77e9209b4ac7fcbd0acbe9f18d0f188a8':
  REPORT-101478 【版本管理二期】部分配置项默认没有勾选
  REPORT-101483 【版本管理二期】数据迁移提示的弹窗以设备中央为准
bugfix/11.0
superman 1 year ago
parent
commit
9af100e014
  1. 2
      designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java
  2. 2
      designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java

2
designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java

@ -81,7 +81,7 @@ public class VcsConfigManager implements XMLReadable, XMLWriter {
this.setUseInterval(reader.getAttrAsBoolean("useInterval", true)); this.setUseInterval(reader.getAttrAsBoolean("useInterval", true));
this.setVcsEnable(reader.getAttrAsBoolean("vcsEnable", true)); this.setVcsEnable(reader.getAttrAsBoolean("vcsEnable", true));
this.setAutoSaveInterval(reader.getAttrAsInt("autoSaveInterval", 15)); this.setAutoSaveInterval(reader.getAttrAsInt("autoSaveInterval", 15));
this.setUseAutoSave(reader.getAttrAsBoolean("useAutoSave", false)); this.setUseAutoSave(reader.getAttrAsBoolean("useAutoSave", true));
} }
} }

2
designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java

@ -307,7 +307,7 @@ public class VcsMovePanel extends BasicPane {
panel.add(titleLabel); panel.add(titleLabel);
panel.add(firstLabel); panel.add(firstLabel);
panel.add(secondLabel); panel.add(secondLabel);
int value = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), panel, Toolkit.i18nText("Fine-Design_Vcs_Move_Title"), JOptionPane.YES_NO_OPTION); int value = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(DesignerContext.getDesignerFrame()), panel, Toolkit.i18nText("Fine-Design_Vcs_Move_Title"), JOptionPane.YES_NO_OPTION);
processMove(value); processMove(value);
} }

Loading…
Cancel
Save