Browse Source

Merge pull request #10151 in DESIGN/design from final/10.0 to release/10.0

* commit '6eb8004cd48503c33f7409bb2316758def0e783c':
  REPORT-80483 10.0linux设计器图表空数据弹窗点不开
security/10.0
superman 2 years ago
parent
commit
d3bea69766
  1. 9
      designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java

9
designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java

@ -148,10 +148,15 @@ public enum SupportOSImpl implements SupportOS {
}, },
OLD_STYLE_CHOOSER { OLD_STYLE_CHOOSER {
@Override @Override
public boolean support() { public boolean support() {
return (OperatingSystem.isLinux() && Arch.getArch() == Arch.ARM) || MACOS_12_VERSION_ADAPTER.support(); boolean javafxExist = true;
try {
Class.forName("javafx.stage.FileChooser");
} catch (ClassNotFoundException e) {
javafxExist = false;
}
return !javafxExist || (OperatingSystem.isLinux() && Arch.getArch() == Arch.ARM) || MACOS_12_VERSION_ADAPTER.support();
} }
}, },

Loading…
Cancel
Save