Browse Source

Pull request #8878: REPORT-71213 设计器关闭失败 && REPORT-70446 mac下悬浮弹窗隐藏重新展示时偶现白点

Merge in DESIGN/design from ~HADES/design:release/11.0 to release/11.0

* commit '65413b2db67980e26b50a8d147eac711c0eb183d':
  REPORT-70446 mac下悬浮弹窗隐藏重新展示时偶现白点
  REPORT-71213 设计器关闭失败
release/11.0
Hades 3 years ago
parent
commit
56ba8fe6f9
  1. 7
      designer-base/src/main/java/com/fr/exit/ConfigToPropMigrator.java
  2. 1
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/question/QuestionWindow.java

7
designer-base/src/main/java/com/fr/exit/ConfigToPropMigrator.java

@ -40,7 +40,14 @@ public class ConfigToPropMigrator {
}
public void execute() {
try {
_execute();
} catch (Throwable throwable) {
FineLoggerFactory.getLogger().warn(throwable.getMessage(), throwable);
}
}
private void _execute() {
if (WorkContext.getCurrent().isLocal()) {
String url = "jdbc:hsqldb:file://" + WorkContext.getCurrent().getPath() + "/" + ProjectConstants.EMBED_DB_DIRECTORY + "/finedb/db;hsqldb.tx=mvcc";

1
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/question/QuestionWindow.java

@ -55,6 +55,7 @@ public class QuestionWindow extends JWindow {
@Override
public void windowDeactivated(WindowEvent e) {
QuestionWindow.getInstance().dispose();
QuestionWindow.getInstance().setVisible(false);
}
});

Loading…
Cancel
Save