Browse Source

Merge pull request #7630 in DESIGN/design from final/11.0 to release/11.0

* commit '52cf2958a82a284265bc5cf9aa2257b2c1b295df':
  REPORT-65722  设计器点击选择按钮控件图标时无反应,没有出现原生文件选择器弹窗 同步到11.0
bugfix/11.0
superman 3 years ago
parent
commit
fe1597771b
  1. 14
      designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java

14
designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java

@ -197,7 +197,9 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
private File currentDirectory; private File currentDirectory;
public Builder fileSelectionMode(FileSelectionMode fileSelectionMode) { public Builder fileSelectionMode(FileSelectionMode fileSelectionMode) {
this.fileSelectionMode = fileSelectionMode; if (fileSelectionMode != null) {
this.fileSelectionMode = fileSelectionMode;
}
return this; return this;
} }
@ -209,13 +211,17 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
} }
public Builder filters(FileChooser.ExtensionFilter[] filters) { public Builder filters(FileChooser.ExtensionFilter[] filters) {
this.filters = filters; if (filters != null) {
this.filters = filters;
}
return this; return this;
} }
public Builder filters(ExtensionFilter[] filters) { public Builder filters(ExtensionFilter[] filters) {
for (ExtensionFilter filter : filters) { if (filters != null) {
this.filters = ArrayUtils.add(this.filters, new FileChooser.ExtensionFilter(filter.getDes(), filter.getExtensions())); for (ExtensionFilter filter : filters) {
this.filters = ArrayUtils.add(this.filters, new FileChooser.ExtensionFilter(filter.getDes(), filter.getExtensions()));
}
} }
return this; return this;
} }

Loading…
Cancel
Save