Browse Source

Merge pull request #7418 in DESIGN/design from release/11.0 to feature/x

* commit '168504f77e21185200857eedb3948b150def84ed':
  REPORT-65170【主题边框】悬浮元素的预览图,右下的边框线看不到
  REPORT-65192 公式合法性检测错误字符位置返回不正确 1.如果返回错误位置,则模糊处理
  REPORT-64009 设计器内对macOS12的处理
  KERNEL-9928 重构水印加载 1.改成常量
  KERNEL-9928 重构水印加载 1.适配一下面板
feature/x
superman 3 years ago
parent
commit
52336e71d2
  1. 13
      designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
  2. 12
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
  3. 20
      designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java
  4. 10
      designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
  5. 2
      designer-base/src/main/java/com/fr/design/formula/exception/function/FormulaCheckWrongFunction.java
  6. 25
      designer-base/src/main/java/com/fr/design/gui/ifilechooser/ExtensionFilter.java
  7. 109
      designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserArgs.java
  8. 44
      designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserFactory.java
  9. 13
      designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserProvider.java
  10. 23
      designer-base/src/main/java/com/fr/design/gui/ifilechooser/JavaFxNativeFileChooser.java
  11. 130
      designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingFileChooser.java
  12. 276
      designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingImageFileChooser.java
  13. 5
      designer-base/src/main/java/com/fr/design/os/impl/PMDialogAction.java
  14. 44
      designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java
  15. 9
      designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java
  16. 39
      designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java
  17. 18
      designer-base/src/main/java/com/fr/design/upm/UpmBridge.java
  18. 6
      designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
  19. 13
      designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java
  20. 28
      designer-form/src/main/java/com/fr/design/mainframe/share/action/InstallComponentAction.java

13
designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@ -23,6 +23,7 @@ import com.fr.design.mainframe.ComponentReuseNotifyUtil;
import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo; import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
import com.fr.design.mainframe.vcs.VcsConfigManager; import com.fr.design.mainframe.vcs.VcsConfigManager;
import com.fr.design.notification.SnapChatConfig; import com.fr.design.notification.SnapChatConfig;
import com.fr.design.os.impl.SupportOSImpl;
import com.fr.design.port.DesignerPortContext; import com.fr.design.port.DesignerPortContext;
import com.fr.design.style.color.ColorSelectConfigManager; import com.fr.design.style.color.ColorSelectConfigManager;
import com.fr.design.update.push.DesignerPushUpdateConfigManager; import com.fr.design.update.push.DesignerPushUpdateConfigManager;
@ -211,6 +212,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
private int layoutTemplateStyle = LAYOUT_TEMPLATE_SIMPLE_STYLE; private int layoutTemplateStyle = LAYOUT_TEMPLATE_SIMPLE_STYLE;
private boolean useOptimizedUPM4Adapter;
/** /**
* DesignerEnvManager. * DesignerEnvManager.
*/ */
@ -665,6 +668,14 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
this.showTemplateMissingPlugin = showTemplateMissingPlugin; this.showTemplateMissingPlugin = showTemplateMissingPlugin;
} }
public boolean isUseOptimizedUPM4Adapter() {
return useOptimizedUPM4Adapter;
}
public void setUseOptimizedUPM4Adapter(boolean useOptimizedUPM4Adapter) {
this.useOptimizedUPM4Adapter = useOptimizedUPM4Adapter;
}
/** /**
* 知否自动备份 * 知否自动备份
* *
@ -1888,6 +1899,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
} }
this.setEmbedServerLazyStartup(reader.getAttrAsBoolean("embedServerLazyStartup", false)); this.setEmbedServerLazyStartup(reader.getAttrAsBoolean("embedServerLazyStartup", false));
this.setShowTemplateMissingPlugin(reader.getAttrAsBoolean("showTemplateMissingPlugin", true)); this.setShowTemplateMissingPlugin(reader.getAttrAsBoolean("showTemplateMissingPlugin", true));
this.setUseOptimizedUPM4Adapter(reader.getAttrAsBoolean("useOptimizedUPM4Adapter", SupportOSImpl.MACOS_12_VERSION_ADAPTER.support()));
this.setShowServerDatasetAuthTip(reader.getAttrAsBoolean("showServerDatasetAuthTip", true)); this.setShowServerDatasetAuthTip(reader.getAttrAsBoolean("showServerDatasetAuthTip", true));
this.setLayoutTemplateStyle(reader.getAttrAsInt("layoutTemplateStyle", LAYOUT_TEMPLATE_SIMPLE_STYLE)); this.setLayoutTemplateStyle(reader.getAttrAsInt("layoutTemplateStyle", LAYOUT_TEMPLATE_SIMPLE_STYLE));
} }
@ -2165,6 +2177,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
} }
writer.attr("layoutTemplateStyle", this.getLayoutTemplateStyle()); writer.attr("layoutTemplateStyle", this.getLayoutTemplateStyle());
writer.attr("showServerDatasetAuthTip", this.isShowServerDatasetAuthTip()); writer.attr("showServerDatasetAuthTip", this.isShowServerDatasetAuthTip());
writer.attr("useOptimizedUPM4Adapter", this.isUseOptimizedUPM4Adapter());
writer.end(); writer.end();
} }

12
designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@ -16,9 +16,10 @@ import com.fr.design.gui.ibutton.UINoThemeColorButton;
import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.icombobox.UIDictionaryComboBox; import com.fr.design.gui.icombobox.UIDictionaryComboBox;
import com.fr.design.gui.ifilechooser.FileChooserArgs;
import com.fr.design.gui.ifilechooser.FileChooserFactory;
import com.fr.design.gui.ifilechooser.FileChooserProvider; import com.fr.design.gui.ifilechooser.FileChooserProvider;
import com.fr.design.gui.ifilechooser.FileSelectionMode; import com.fr.design.gui.ifilechooser.FileSelectionMode;
import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
import com.fr.design.gui.ilable.ActionLabel; import com.fr.design.gui.ilable.ActionLabel;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.iprogressbar.UIProgressBarUI; import com.fr.design.gui.iprogressbar.UIProgressBarUI;
@ -513,9 +514,8 @@ public class PreferencePane extends BasicPane {
@Override @Override
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
FileChooserProvider fileChooserProvider = FileChooserProvider fileChooserProvider =
new JavaFxNativeFileChooser.Builder(). FileChooserFactory.createFileChooser(FileChooserArgs.newBuilder().
fileSelectionMode(FileSelectionMode.DIR). setFileSelectionMode(FileSelectionMode.DIR).build());
build();
int saveValue = fileChooserProvider.showDialog(chooseDirBtn); int saveValue = fileChooserProvider.showDialog(chooseDirBtn);
if (saveValue == JFileChooser.APPROVE_OPTION) { if (saveValue == JFileChooser.APPROVE_OPTION) {
File selectedFile = fileChooserProvider.getSelectedFile(); File selectedFile = fileChooserProvider.getSelectedFile();
@ -728,7 +728,8 @@ public class PreferencePane extends BasicPane {
this.portEditor.setValue(new Integer(designerEnvManager.getEmbedServerPort())); this.portEditor.setValue(new Integer(designerEnvManager.getEmbedServerPort()));
if (useOptimizedUPMCheckbox != null) { if (useOptimizedUPMCheckbox != null) {
useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM()); useOptimizedUPMCheckbox.setSelected(ServerPreferenceConfig.getInstance().isUseOptimizedUPM()
|| DesignerEnvManager.getEnvManager().isUseOptimizedUPM4Adapter());
} }
if (useNewVersionLoginCheckbox != null) { if (useNewVersionLoginCheckbox != null) {
@ -808,6 +809,7 @@ public class PreferencePane extends BasicPane {
designerEnvManager.setJoinProductImprove(this.joinProductImproveCheckBox.isSelected()); designerEnvManager.setJoinProductImprove(this.joinProductImproveCheckBox.isSelected());
designerEnvManager.setEmbedServerLazyStartup(this.embedServerLazyStartupCheckBox.isSelected()); designerEnvManager.setEmbedServerLazyStartup(this.embedServerLazyStartupCheckBox.isSelected());
designerEnvManager.setImageCompress(this.imageCompressPanelCheckBox.isSelected()); designerEnvManager.setImageCompress(this.imageCompressPanelCheckBox.isSelected());
designerEnvManager.setUseOptimizedUPM4Adapter(this.useOptimizedUPMCheckbox.isSelected());
VcsConfigManager vcsConfigManager = designerEnvManager.getVcsConfigManager(); VcsConfigManager vcsConfigManager = designerEnvManager.getVcsConfigManager();
vcsConfigManager.setSaveInterval(this.saveIntervalEditor.getValue()); vcsConfigManager.setSaveInterval(this.saveIntervalEditor.getValue());
vcsConfigManager.setVcsEnable(this.vcsEnableCheckBox.isSelected()); vcsConfigManager.setVcsEnable(this.vcsEnableCheckBox.isSelected());

20
designer-base/src/main/java/com/fr/design/cell/CellStylePreviewPane.java

@ -7,6 +7,7 @@ import com.fr.base.ScreenResolution;
import com.fr.base.Style; import com.fr.base.Style;
import com.fr.general.FRFont; import com.fr.general.FRFont;
import com.fr.general.IOUtils; import com.fr.general.IOUtils;
import com.fr.stable.Constants;
import com.fr.stable.unit.PT; import com.fr.stable.unit.PT;
import javax.swing.JPanel; import javax.swing.JPanel;
@ -153,16 +154,16 @@ public class CellStylePreviewPane extends JPanel {
float adjustRight = 0; float adjustRight = 0;
float adjustBottom = 0; float adjustBottom = 0;
if (column == 0) { if (column == 0) {
adjustLeft = GraphHelper.getLineStyleSize(style.getBorderLeft()) / 2.0F; adjustLeft = GraphHelper.getLineStyleSize(style.getBorderLeft()) / 2.0F + computeOffset4DoubleStyleBorder(style);
} }
if (row == 0) { if (row == 0) {
adjustTop = GraphHelper.getLineStyleSize(style.getBorderTop()) / 2.0F; adjustTop = GraphHelper.getLineStyleSize(style.getBorderTop()) / 2.0F + computeOffset4DoubleStyleBorder(style);
} }
if (column == columnSpan - 1) { if (column == columnSpan - 1) {
adjustRight = -GraphHelper.getLineStyleSize(style.getBorderRight()) / 2.0F; adjustRight = -GraphHelper.getLineStyleSize(style.getBorderRight()) / 2.0F - computeOffset4DoubleStyleBorder(style);
} }
if (row == rowSpan - 1) { if (row == rowSpan - 1) {
adjustBottom = -GraphHelper.getLineStyleSize(style.getBorderBottom()) / 2.0F; adjustBottom = -GraphHelper.getLineStyleSize(style.getBorderBottom()) / 2.0F - computeOffset4DoubleStyleBorder(style);
} }
g2d.translate(adjustLeft, adjustTop); g2d.translate(adjustLeft, adjustTop);
@ -170,6 +171,17 @@ public class CellStylePreviewPane extends JPanel {
g2d.translate(-adjustLeft, -adjustTop); g2d.translate(-adjustLeft, -adjustTop);
} }
private float computeOffset4DoubleStyleBorder(Style style) {
float offset = 0F;
if (style.getBorderLeft() == Constants.LINE_DOUBLE) {
offset += GraphHelper.getLineStyleSize(Constants.LINE_THIN) / 2.0F;
} else if (style.getBorderLeft() == Constants.LINE_DOUBLE_DOT) {
offset += GraphHelper.getLineStyleSize(Constants.LINE_DOT) / 2.0F;
}
return offset;
}
@Override @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
Dimension size = super.getPreferredSize(); Dimension size = super.getPreferredSize();

10
designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@ -867,8 +867,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
if (checkResult.isValid()) { if (checkResult.isValid()) {
showMessageDialog(checkResult.getTips(), checkResult.isValid()); showMessageDialog(checkResult.getTips(), checkResult.isValid());
} else { } else {
String position = Toolkit.i18nText("Fine-Design_Basic_Formula_The") + (checkResult.getFormulaCoordinates().getColumns()) int columns = checkResult.getFormulaCoordinates().getColumns();
+ Toolkit.i18nText("Fine-Design_Basic_Formula_Error_Position") + " "; String position = StringUtils.EMPTY;
if (columns >= 0) {
position = Toolkit.i18nText("Fine-Design_Basic_Formula_The") + columns
+ Toolkit.i18nText("Fine-Design_Basic_Formula_Error_Position") + " ";
}
int confirmDialog = FineJOptionPane.showConfirmDialog( int confirmDialog = FineJOptionPane.showConfirmDialog(
FormulaPane.this, FormulaPane.this,
position + messageTips, position + messageTips,
@ -879,7 +883,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
new String[]{Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result"), Toolkit.i18nText("Fine-Design_Basic_Formula_Continue")}, new String[]{Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result"), Toolkit.i18nText("Fine-Design_Basic_Formula_Continue")},
Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result")); Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Result"));
if (confirmDialog == 0) { if (confirmDialog == 0) {
formulaTextArea.setCaretPosition(checkResult.getFormulaCoordinates().getColumns()); formulaTextArea.setCaretPosition(Math.max(columns, 0));
formulaTextArea.requestFocus(); formulaTextArea.requestFocus();
return false; return false;
} }

2
designer-base/src/main/java/com/fr/design/formula/exception/function/FormulaCheckWrongFunction.java

@ -74,7 +74,7 @@ public class FormulaCheckWrongFunction implements Function<Exception, FormulaChe
invalidFormula = invalidFormula.substring(0, invalidFormula.indexOf(",")); invalidFormula = invalidFormula.substring(0, invalidFormula.indexOf(","));
} }
int index = formulaText.indexOf(invalidFormula); int index = formulaText.indexOf(invalidFormula);
return Math.max(index, 0); return index;
} }
} }

25
designer-base/src/main/java/com/fr/design/gui/ifilechooser/ExtensionFilter.java

@ -0,0 +1,25 @@
package com.fr.design.gui.ifilechooser;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/12/29
*/
public class ExtensionFilter {
private final String des;
private final String[] extensions;
public ExtensionFilter(String des, String... extensions) {
this.des = des;
this.extensions = extensions;
}
public String getDes() {
return des;
}
public String[] getExtensions() {
return extensions;
}
}

109
designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserArgs.java

@ -0,0 +1,109 @@
package com.fr.design.gui.ifilechooser;
/**
* 文件选择器可设置的参数集合
*
* @author hades
* @version 10.0
* Created by hades on 2021/12/21
*/
public class FileChooserArgs {
private final FileSelectionMode fileSelectionMode;
private final String filterDes;
private final String[] extensions;
private final String selectedPath;
private final ExtensionFilter[] filters;
private final String tipText;
private final boolean multiSelectionEnabled;
public static Builder newBuilder() {
return new Builder();
}
private FileChooserArgs(Builder builder) {
this.fileSelectionMode = builder.fileSelectionMode;
this.filterDes = builder.filterDes;
this.extensions = builder.extensions;
this.selectedPath = builder.selectedPath;
this.filters = builder.filters;
this.tipText = builder.tipText;
this.multiSelectionEnabled = builder.multiSelectionEnabled;
}
public FileSelectionMode getFileSelectionMode() {
return fileSelectionMode;
}
public String getFilterDes() {
return filterDes;
}
public String[] getExtensions() {
return extensions;
}
public String getSelectedPath() {
return selectedPath;
}
public ExtensionFilter[] getFilters() {
return filters;
}
public String getTipText() {
return tipText;
}
public boolean isMultiSelectionEnabled() {
return multiSelectionEnabled;
}
public static class Builder {
private FileSelectionMode fileSelectionMode;
private String filterDes;
private String[] extensions;
private String selectedPath;
private ExtensionFilter[] filters = new ExtensionFilter[0];
private String tipText;
private boolean multiSelectionEnabled;
public Builder setFileSelectionMode(FileSelectionMode fileSelectionMode) {
this.fileSelectionMode = fileSelectionMode;
return this;
}
public Builder setFilter(String filterDes, String... extensions) {
this.filterDes = filterDes;
this.extensions = extensions;
return this;
}
public Builder setSelectedPath(String selectedPath) {
this.selectedPath = selectedPath;
return this;
}
public Builder setFilters(ExtensionFilter[] filters) {
this.filters = filters;
return this;
}
public Builder setTipText(String tipText) {
this.tipText = tipText;
return this;
}
public Builder setMultiSelectionEnabled(boolean multiSelectionEnabled) {
this.multiSelectionEnabled = multiSelectionEnabled;
return this;
}
public FileChooserArgs build() {
return new FileChooserArgs(this);
}
}
}

44
designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserFactory.java

@ -0,0 +1,44 @@
package com.fr.design.gui.ifilechooser;
import com.fr.design.i18n.Toolkit;
import com.fr.design.os.impl.SupportOSImpl;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/12/21
*/
public class FileChooserFactory {
public static FileChooserProvider createFileChooser(FileChooserArgs fileChooserArgs) {
if (SupportOSImpl.OLD_STYLE_CHOOSER.support()) {
return new SwingFileChooser.Builder().
setFileSelectionMode(fileChooserArgs.getFileSelectionMode()).
setFileFilter(fileChooserArgs.getFilterDes(), fileChooserArgs.getExtensions()).
setSelectedFile(fileChooserArgs.getSelectedPath()).
setMultiSelectionEnabled(fileChooserArgs.isMultiSelectionEnabled()).
setTipText(fileChooserArgs.getTipText()).
setFileFilter(fileChooserArgs.getFilters()).build();
} else {
return new JavaFxNativeFileChooser.Builder().
fileSelectionMode(fileChooserArgs.getFileSelectionMode()).
filter(fileChooserArgs.getFilterDes(), fileChooserArgs.getExtensions()).
currentDirectory(fileChooserArgs.getSelectedPath()).
title(fileChooserArgs.getTipText()).
filters(fileChooserArgs.getFilters()).build();
}
}
public static FileChooserProvider createImageFileChooser() {
if (SupportOSImpl.OLD_STYLE_CHOOSER.support()) {
return new SwingImageFileChooser();
} else {
return new JavaFxNativeFileChooser.Builder().
fileSelectionMode(FileSelectionMode.FILE).
title(Toolkit.i18nText("Fine-Design_Basic_Open")).
filter(Toolkit.i18nText("Fine-Design_Basic_Image_Image_Files"), "*.jpg", "*.gif", "*.png", "*.bmp").
build();
}
}
}

13
designer-base/src/main/java/com/fr/design/gui/ifilechooser/FileChooserProvider.java

@ -9,4 +9,17 @@ public interface FileChooserProvider {
File getSelectedFile(); File getSelectedFile();
int showDialog(Component parent); int showDialog(Component parent);
default int showOpenDialog(Component parent, String approveButtonText) {
return -1;
}
default void setMultiSelectionEnabled(boolean multiple) {
}
default void setCurrentDirectory(File file) {
}
} }

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

@ -4,6 +4,8 @@ package com.fr.design.gui.ifilechooser;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.stable.ArrayUtils;
import com.fr.stable.StringUtils;
import com.sun.javafx.application.PlatformImpl; import com.sun.javafx.application.PlatformImpl;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.scene.Scene; import javafx.scene.Scene;
@ -173,10 +175,20 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
this.fileSelectionMode = fileSelectionMode; this.fileSelectionMode = fileSelectionMode;
} }
@Override
public void setCurrentDirectory(File currentDirectory) { public void setCurrentDirectory(File currentDirectory) {
this.currentDirectory = currentDirectory; this.currentDirectory = currentDirectory;
} }
@Override
public void setMultiSelectionEnabled(boolean multiple) {
this.setSelectionMode(multiple ? FileSelectionMode.MULTIPLE_FILE : FileSelectionMode.FILE);
}
@Override
public int showOpenDialog(Component parent, String approveButtonText) {
return this.showDialog(parent);
}
public static class Builder { public static class Builder {
private FileSelectionMode fileSelectionMode = FileSelectionMode.FILE; private FileSelectionMode fileSelectionMode = FileSelectionMode.FILE;
@ -190,7 +202,9 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
} }
public Builder title(String title) { public Builder title(String title) {
this.title = title; if (StringUtils.isNotEmpty(title)) {
this.title = title;
}
return this; return this;
} }
@ -199,6 +213,13 @@ public class JavaFxNativeFileChooser implements FileChooserProvider {
return this; return this;
} }
public Builder filters(ExtensionFilter[] filters) {
for (ExtensionFilter filter : filters) {
this.filters = ArrayUtils.add(this.filters, new FileChooser.ExtensionFilter(filter.getDes(), filter.getExtensions()));
}
return this;
}
public Builder filter(String des, String... extensions) { public Builder filter(String des, String... extensions) {
if (extensions != null) { if (extensions != null) {
this.filters = new FileChooser.ExtensionFilter[]{new FileChooser.ExtensionFilter(des, extensions)}; this.filters = new FileChooser.ExtensionFilter[]{new FileChooser.ExtensionFilter(des, extensions)};

130
designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingFileChooser.java

@ -0,0 +1,130 @@
package com.fr.design.gui.ifilechooser;
import com.fr.common.annotations.Negative;
import com.fr.design.upm.UpmUtils;
import com.fr.stable.ArrayUtils;
import com.fr.stable.StringUtils;
import java.awt.Component;
import java.io.File;
import javax.swing.JFileChooser;
import javax.swing.filechooser.FileFilter;
import javax.swing.filechooser.FileNameExtensionFilter;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/12/21
*/
@Negative(until = "2022-6-1")
class SwingFileChooser implements FileChooserProvider {
private final JFileChooser fileChooser;
private final Builder builder;
private SwingFileChooser(Builder builder) {
fileChooser = new JFileChooser();
fileChooser.setFileSelectionMode(builder.fileSelectionMode);
fileChooser.setFileFilter(builder.fileFilter);
fileChooser.setSelectedFile(builder.selectedFile);
fileChooser.setMultiSelectionEnabled(builder.multiSelectionEnabled);
this.builder = builder;
}
@Override
public File[] getSelectedFiles() {
return fileChooser.getSelectedFiles();
}
@Override
public File getSelectedFile() {
return fileChooser.getSelectedFile();
}
@Override
public int showDialog(Component parent) {
if (StringUtils.isEmpty(builder.tipText)) {
return fileChooser.showOpenDialog(parent);
} else {
return fileChooser.showDialog(parent, builder.tipText);
}
}
@Override
public int showOpenDialog(Component parent, String approveButtonText) {
return fileChooser.showDialog(parent, approveButtonText);
}
@Override
public void setCurrentDirectory(File file) {
fileChooser.setCurrentDirectory(file);
}
@Override
public void setMultiSelectionEnabled(boolean multiple) {
fileChooser.setMultiSelectionEnabled(multiple);
}
/**
* 和一般builder不同的是 setXXX还做参数转换逻辑
*/
public static class Builder {
private int fileSelectionMode = JFileChooser.FILES_ONLY;
private FileFilter fileFilter;
private File selectedFile;
private boolean multiSelectionEnabled;
private String tipText;
public Builder setFileSelectionMode(FileSelectionMode fileSelectionMode) {
if (FileSelectionMode.DIR.equals(fileSelectionMode)) {
this.fileSelectionMode = JFileChooser.DIRECTORIES_ONLY;
} else if (FileSelectionMode.FILE.equals(fileSelectionMode)) {
this.fileSelectionMode = JFileChooser.FILES_ONLY;
} else if (FileSelectionMode.MULTIPLE_FILE.equals(fileSelectionMode)) {
this.fileSelectionMode = JFileChooser.FILES_AND_DIRECTORIES;
}
return this;
}
public Builder setFileFilter(String des, String... extension) {
if (StringUtils.isNotEmpty(des) && ArrayUtils.isNotEmpty(extension)) {
this.fileFilter = new FileNameExtensionFilter(des, UpmUtils.findMatchedExtension(extension));
}
return this;
}
public Builder setFileFilter(ExtensionFilter[] extensionFilters) {
StringBuilder desBuilder = new StringBuilder();
String[] extensions = new String[0];
for (ExtensionFilter extensionFilter : extensionFilters) {
desBuilder.append(extensionFilter.getDes()).append(" ");
extensions = ArrayUtils.addAll(extensions, UpmUtils.findMatchedExtension(extensionFilter.getExtensions()));
}
if (ArrayUtils.isNotEmpty(extensionFilters)) {
this.fileFilter = new FileNameExtensionFilter(desBuilder.toString().trim(), extensions);
}
return this;
}
public Builder setSelectedFile(String selectedPath) {
if (StringUtils.isNotEmpty(selectedPath)) {
this.selectedFile = new File(selectedPath);
}
return this;
}
public Builder setMultiSelectionEnabled(boolean multiSelectionEnabled) {
this.multiSelectionEnabled = multiSelectionEnabled;
return this;
}
public Builder setTipText(String tipText) {
this.tipText = tipText;
return this;
}
public SwingFileChooser build() {
return new SwingFileChooser(this);
}
}
}

276
designer-base/src/main/java/com/fr/design/gui/ifilechooser/SwingImageFileChooser.java

@ -0,0 +1,276 @@
package com.fr.design.gui.ifilechooser;
import com.fr.base.BaseUtils;
import com.fr.common.annotations.Negative;
import com.fr.design.DesignerEnvManager;
import com.fr.design.style.ChooseFileView;
import com.fr.design.style.background.image.ExpandFileChooser;
import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
import java.util.Enumeration;
import java.util.Hashtable;
import javax.swing.filechooser.FileFilter;
/**
* @author hades
* @version 10.0
* Created by hades on 2021/12/30
*/
@Negative(until = "2022-6-1")
class SwingImageFileChooser extends ExpandFileChooser implements FileChooserProvider {
public SwingImageFileChooser() {
super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Compress"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open"));
ExampleFileFilter bothFilter = new ExampleFileFilter(
new String[]{"jpg", "gif", "png", "bmp"},
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Image_Files"));
bothFilter.setExtensionListInDescription(true);
this.addChoosableFileFilter(bothFilter);
this.setAcceptAllFileFilterUsed(false);
// Create Custom FileView
ChooseFileView fileView = new ChooseFileView();
fileView.putIcon("jpg", BaseUtils.readIcon("/com/fr/base/images/dialog/file/jpgFile.gif"));
fileView.putIcon("gif", BaseUtils.readIcon("/com/fr/base/images/dialog/file/gifFile.gif"));
fileView.putIcon("png", BaseUtils.readIcon("/com/fr/base/images/dialog/file/pngFile.png"));
fileView.putIcon("bmp", BaseUtils.readIcon("/com/fr/base/images/dialog/file/bmpFile.gif"));
this.setFileView(fileView);
}
@Override
public int showDialog(Component parent, String approveButtonText) {
return super.showDialog(parent, approveButtonText);
}
@Override
public ActionListener checkAction() {
return new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
DesignerEnvManager.getEnvManager().setImageCompress(isCheckSelected());
DesignerEnvManager.getEnvManager().saveXMLFile();
}
};
}
@Override
public int showDialog(Component parent) {
return showOpenDialog(parent);
}
/**
* A convenience implementation of FileFilter that filters out
* all files except for those type extensions that it knows about.
* <p/>D:\finereport\develop\code\test\TestCase\WEB-INF\reportlets\TestCase\01903.cpt
* <p>
* Extensions are of the type ".foo", which is typically found on
* Windows and Unix boxes, but not on Macinthosh. Case is ignored.
* <p/>
* Example - create a new filter that filerts out all files
* but gif and jpg image files:
* <p/>
* JFileChooser chooser = new JFileChooser();
* ExampleFileFilter filter = new ExampleFileFilter(
* new String{"gif", "jpg"}, "JPEG & GIF Images")
* chooser.addChoosableFileFilter(filter);
* chooser.showOpenDialog(this);
*
* @author Jeff Dinkins
* @version 1.12 12/03/01
*/
class ExampleFileFilter extends FileFilter {
private Hashtable filters = null;
private String description = null;
private String fullDescription = null;
private boolean useExtensionsInDescription = true;
/**
* Creates a file filter. If no filters are added, then all
* files are accepted.
*
* @see #addExtension
*/
public ExampleFileFilter() {
this.filters = new Hashtable();
}
/**
* Creates a file filter that accepts files with the given extension.
* Example: new ExampleFileFilter("jpg");
*
* @see #addExtension
*/
public ExampleFileFilter(String extension) {
this(extension, null);
}
/**
* Creates a file filter that accepts the given file type.
* Example: new ExampleFileFilter("jpg", "JPEG Image Images");
* <p/>
* Note that the "." before the extension is not needed. If
* provided, it will be ignored.
*
* @see #addExtension
*/
public ExampleFileFilter(String extension, String description) {
this();
if (extension != null) addExtension(extension);
if (description != null) setDescription(description);
}
/**
* Creates a file filter from the given string array.
* Example: new ExampleFileFilter(String {"gif", "jpg"});
* <p/>
* Note that the "." before the extension is not needed adn
* will be ignored.
*
* @see #addExtension
*/
public ExampleFileFilter(String[] filters) {
this(filters, null);
}
/**
* Creates a file filter from the given string array and description.
* Example: new ExampleFileFilter(String {"gif", "jpg"}, "Gif and JPG Images");
* <p/>
* Note that the "." before the extension is not needed and will be ignored.
*
* @see #addExtension
*/
public ExampleFileFilter(String[] filters, String description) {
this();
for (int i = 0; i < filters.length; i++) {
// add filters one by one
addExtension(filters[i]);
}
if (description != null) setDescription(description);
}
/**
* Return true if this file should be shown in the directory pane,
* false if it shouldn't.
* <p/>
* Files that begin with "." are ignored.
*
* @see #getExtension
*/
@Override
public boolean accept(File f) {
if (f != null) {
if (f.isDirectory()) {
return true;
}
String extension = getExtension(f);
if (extension != null && filters.get(getExtension(f)) != null) {
return true;
}
}
return false;
}
/**
* Return the extension portion of the file's name .
*
* @see #getExtension
* @see FileFilter#accept
*/
public String getExtension(File f) {
if (f != null) {
String filename = f.getName();
int i = filename.lastIndexOf('.');
if (i > 0 && i < filename.length() - 1) {
return filename.substring(i + 1).toLowerCase();
}
}
return null;
}
/**
* Adds a filetype "dot" extension to filter against.
* <p/>
* For example: the following code will create a filter that filters
* out all files except those that end in ".jpg" and ".tif":
* <p/>
* ExampleFileFilter filter = new ExampleFileFilter();
* filter.addExtension("jpg");
* filter.addExtension("tif");
* <p/>
* Note that the "." before the extension is not needed and will be ignored.
*/
public void addExtension(String extension) {
if (filters == null) {
filters = new Hashtable(5);
}
filters.put(extension.toLowerCase(), this);
fullDescription = null;
}
/**
* Returns the human readable description of this filter. For
* example: "JPEG and GIF Image Files (*.jpg, *.gif)"
*
* @see FileFilter#getDescription
*/
@Override
public String getDescription() {
if (fullDescription == null) {
if (description == null || isExtensionListInDescription()) {
fullDescription = description == null ? "(" : description + " (";
// build the description from the extension list
Enumeration extensions = filters.keys();
if (extensions != null) {
fullDescription += "." + extensions.nextElement();
while (extensions.hasMoreElements()) {
fullDescription += ", ." + extensions.nextElement();
}
}
fullDescription += ")";
} else {
fullDescription = description;
}
}
return fullDescription;
}
/**
* Sets the human readable description of this filter. For
* example: filter.setDescription("Gif and JPG Images");
*/
public void setDescription(String description) {
this.description = description;
fullDescription = null;
}
/**
* Determines whether the extension list (.jpg, .gif, etc) should
* show up in the human readable description.
* <p/>
* Only relevent if a description was provided in the constructor
* or using setDescription();
*/
public void setExtensionListInDescription(boolean b) {
useExtensionsInDescription = b;
fullDescription = null;
}
/**
* Returns whether the extension list (.jpg, .gif, etc) should
* show up in the human readable description.
* <p/>
* Only relevent if a description was provided in the constructor
* or using setDescription();
*/
public boolean isExtensionListInDescription() {
return useExtensionsInDescription;
}
}
}

5
designer-base/src/main/java/com/fr/design/os/impl/PMDialogAction.java

@ -1,6 +1,7 @@
package com.fr.design.os.impl; package com.fr.design.os.impl;
import com.fr.config.ServerPreferenceConfig; import com.fr.config.ServerPreferenceConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.extra.WebViewDlgHelper; import com.fr.design.extra.WebViewDlgHelper;
import com.fr.design.jdk.JdkVersion; import com.fr.design.jdk.JdkVersion;
import com.fr.design.upm.UpmFinder; import com.fr.design.upm.UpmFinder;
@ -23,7 +24,9 @@ public class PMDialogAction implements OSBasedAction {
DesignUtils.visitEnvServerByParameters( PLUGIN_MANAGER_ROUTE,null,null); DesignUtils.visitEnvServerByParameters( PLUGIN_MANAGER_ROUTE,null,null);
return; return;
} }
if (ServerPreferenceConfig.getInstance().isUseOptimizedUPM() || SupportOSImpl.MACOS_NEW_PLUGIN_MANAGEMENT.support()) { if (ServerPreferenceConfig.getInstance().isUseOptimizedUPM()
|| SupportOSImpl.MACOS_NEW_PLUGIN_MANAGEMENT.support()
|| DesignerEnvManager.getEnvManager().isUseOptimizedUPM4Adapter()) {
UpmFinder.showUPMDialog(); UpmFinder.showUPMDialog();
} else { } else {
WebViewDlgHelper.createPluginDialog(); WebViewDlgHelper.createPluginDialog();

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

@ -8,13 +8,18 @@ import com.fr.general.GeneralContext;
import com.fr.json.JSON; import com.fr.json.JSON;
import com.fr.json.JSONFactory; import com.fr.json.JSONFactory;
import com.fr.json.JSONObject; import com.fr.json.JSONObject;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.stable.os.Arch; import com.fr.stable.os.Arch;
import com.fr.stable.os.OperatingSystem; import com.fr.stable.os.OperatingSystem;
import com.fr.stable.os.support.SupportOS; import com.fr.stable.os.support.SupportOS;
import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContext;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Scanner;
/** /**
* @author pengda * @author pengda
@ -143,6 +148,45 @@ public enum SupportOSImpl implements SupportOS {
} }
}, },
OLD_STYLE_CHOOSER {
@Override
public boolean support() {
return (OperatingSystem.isLinux() && Arch.getArch() == Arch.ARM) || MACOS_12_VERSION_ADAPTER.support();
}
},
MACOS_12_VERSION_ADAPTER {
@Override
public boolean support() {
return (OperatingSystem.isMacos() && getMacOsVersionNumber() >= macosMontereyVersionNum);
}
private final int macosMontereyVersionNum = 12;
/**
* System.getProperty("os.version") 在最新macos版本存在bug
* https://bugs.openjdk.java.net/browse/JDK-8253702
*
* @return
*/
private int getMacOsVersionNumber() {
String result;
List<String> command = new ArrayList<>();
command.add("/usr/bin/sw_vers");
command.add("-productVersion");
try (InputStream inputStream = new ProcessBuilder(command).start().getInputStream();
Scanner s = new Scanner(inputStream).useDelimiter("\\A")) {
result = s.hasNext() ? s.next() : StringUtils.EMPTY;
String[] versionSlice = result.split("\\.");
return Integer.parseInt(versionSlice[0]);
} catch (Exception e) {
FineLoggerFactory.getLogger().warn(e.getMessage(), e);
return 0;
}
}
},
DESIGNER_LOGIN { DESIGNER_LOGIN {
@Override @Override
public boolean support() { public boolean support() {

9
designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java

@ -1,5 +1,6 @@
package com.fr.design.report; package com.fr.design.report;
import com.fr.base.iofile.attr.WaterMarkProvideConstant;
import com.fr.base.iofile.attr.WatermarkAttr; import com.fr.base.iofile.attr.WatermarkAttr;
import com.fr.design.dialog.AbstractTemplateServerSettingPane; import com.fr.design.dialog.AbstractTemplateServerSettingPane;
import com.fr.report.core.ReportUtils; import com.fr.report.core.ReportUtils;
@ -42,13 +43,13 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
} }
public void populate(WatermarkAttr watermark) { public void populate(WatermarkAttr watermark) {
if (!watermark.isValid()) { if (watermark.getWaterMarkProvider().equals(WaterMarkProvideConstant.TEMPLATE)) {
chooseComboBox.setSelectedIndex(SINGLE_SET);
watermarkPane.populate(watermark);
} else {
chooseComboBox.setSelectedIndex(SERVER_SET); chooseComboBox.setSelectedIndex(SERVER_SET);
populateServerSettings(); populateServerSettings();
return;
} }
chooseComboBox.setSelectedIndex(SINGLE_SET);
watermarkPane.populate(watermark);
} }

39
designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java

@ -4,62 +4,47 @@
package com.fr.design.style.background.image; package com.fr.design.style.background.image;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.gui.ifilechooser.FileSelectionMode; import com.fr.design.gui.ifilechooser.FileChooserFactory;
import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser; import com.fr.design.gui.ifilechooser.FileChooserProvider;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.share.collect.ComponentCollector;
import com.fr.design.mainframe.toast.DesignerToastMsgUtil; import com.fr.design.mainframe.toast.DesignerToastMsgUtil;
import javafx.stage.FileChooser;
import javax.swing.*;
import java.awt.*; import java.awt.Component;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.io.File; import java.io.File;
import javax.swing.SwingUtilities;
/** /**
* This class used to choose image files. * This class used to choose image files.
*/ */
public class ImageFileChooser { public class ImageFileChooser {
private final FileChooserProvider fileChooserProvider;
JavaFxNativeFileChooser javaFxNativeFileChooser;
public ImageFileChooser() { public ImageFileChooser() {
javaFxNativeFileChooser = fileChooserProvider = FileChooserFactory.createImageFileChooser();
new JavaFxNativeFileChooser.Builder().
fileSelectionMode(FileSelectionMode.FILE).
title(Toolkit.i18nText("Fine-Design_Basic_Open")).
filter(Toolkit.i18nText("Fine-Design_Basic_Image_Image_Files"), "*.jpg", "*.gif", "*.png", "*.bmp").
build();
} }
public int showOpenDialog(Component parent, String approveButtonText) { public int showOpenDialog(Component parent, String approveButtonText) {
return showOpenDialog(parent); return fileChooserProvider.showOpenDialog(parent, approveButtonText);
} }
public int showOpenDialog(Component parent) { public int showOpenDialog(Component parent) {
showImageCompressMoveTip(); showImageCompressMoveTip();
return javaFxNativeFileChooser.showDialog(parent); return fileChooserProvider.showDialog(parent);
} }
public void setCurrentDirectory(File file) { public void setCurrentDirectory(File file) {
javaFxNativeFileChooser.setCurrentDirectory(file); fileChooserProvider.setCurrentDirectory(file);
} }
public void setMultiSelectionEnabled(boolean multiple) { public void setMultiSelectionEnabled(boolean multiple) {
if (multiple) { fileChooserProvider.setMultiSelectionEnabled(multiple);
javaFxNativeFileChooser.setSelectionMode(FileSelectionMode.MULTIPLE_FILE);
} else {
javaFxNativeFileChooser.setSelectionMode(FileSelectionMode.FILE);
}
} }
public File getSelectedFile() { public File getSelectedFile() {
return javaFxNativeFileChooser.getSelectedFile(); return fileChooserProvider.getSelectedFile();
} }
public boolean isCheckSelected() { public boolean isCheckSelected() {

18
designer-base/src/main/java/com/fr/design/upm/UpmBridge.java

@ -14,9 +14,10 @@ import com.fr.design.extra.exe.GetPluginPrefixExecutor;
import com.fr.design.extra.exe.PluginLoginExecutor; import com.fr.design.extra.exe.PluginLoginExecutor;
import com.fr.design.extra.exe.ReadUpdateOnlineExecutor; import com.fr.design.extra.exe.ReadUpdateOnlineExecutor;
import com.fr.design.extra.exe.SearchOnlineExecutor; import com.fr.design.extra.exe.SearchOnlineExecutor;
import com.fr.design.gui.ifilechooser.FileChooserArgs;
import com.fr.design.gui.ifilechooser.FileChooserFactory;
import com.fr.design.gui.ifilechooser.FileChooserProvider; import com.fr.design.gui.ifilechooser.FileChooserProvider;
import com.fr.design.gui.ifilechooser.FileSelectionMode; import com.fr.design.gui.ifilechooser.FileSelectionMode;
import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.locale.impl.BbsRegisterMark; import com.fr.design.locale.impl.BbsRegisterMark;
import com.fr.design.locale.impl.BbsResetMark; import com.fr.design.locale.impl.BbsResetMark;
@ -39,11 +40,12 @@ import com.teamdev.jxbrowser.chromium.Browser;
import com.teamdev.jxbrowser.chromium.JSArray; import com.teamdev.jxbrowser.chromium.JSArray;
import com.teamdev.jxbrowser.chromium.JSFunction; import com.teamdev.jxbrowser.chromium.JSFunction;
import com.teamdev.jxbrowser.chromium.JSObject; import com.teamdev.jxbrowser.chromium.JSObject;
import javafx.stage.FileChooser;
import javax.swing.*; import java.awt.Desktop;
import javax.swing.JFileChooser;
import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
import javax.swing.filechooser.FileNameExtensionFilter; import javax.swing.filechooser.FileNameExtensionFilter;
import java.awt.*;
import java.io.File; import java.io.File;
import java.net.URI; import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
@ -312,10 +314,10 @@ public class UpmBridge {
RunnableFuture<String> future = new FutureTask<>(new Callable<String>() { RunnableFuture<String> future = new FutureTask<>(new Callable<String>() {
@Override @Override
public String call() { public String call() {
FileChooserProvider fileChooserProvider = new JavaFxNativeFileChooser.Builder(). FileChooserProvider fileChooserProvider = FileChooserFactory.createFileChooser(
fileSelectionMode(FileSelectionMode.FILE). FileChooserArgs.newBuilder().
filter(des, filter). setFileSelectionMode(FileSelectionMode.FILE).
build(); setFilter(des, filter).build());
int result = fileChooserProvider.showDialog(UpmFinder.getDialog()); int result = fileChooserProvider.showDialog(UpmFinder.getDialog());
if (result == JFileChooser.APPROVE_OPTION) { if (result == JFileChooser.APPROVE_OPTION) {
return fileChooserProvider.getSelectedFile().getAbsolutePath(); return fileChooserProvider.getSelectedFile().getAbsolutePath();

6
designer-base/src/main/java/com/fr/env/RemoteEnvPane.java vendored

@ -9,9 +9,10 @@ import com.fr.design.fun.DesignerEnvProcessor;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ifilechooser.FileChooserArgs;
import com.fr.design.gui.ifilechooser.FileChooserFactory;
import com.fr.design.gui.ifilechooser.FileChooserProvider; import com.fr.design.gui.ifilechooser.FileChooserProvider;
import com.fr.design.gui.ifilechooser.FileSelectionMode; import com.fr.design.gui.ifilechooser.FileSelectionMode;
import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ipasswordfield.UIPassWordField; import com.fr.design.gui.ipasswordfield.UIPassWordField;
import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength; import com.fr.design.gui.ipasswordfield.UIPasswordFieldWithFixedLength;
@ -564,7 +565,8 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
fileChooserButton.addActionListener(new ActionListener() { fileChooserButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
FileChooserProvider fileChooserProvider = new JavaFxNativeFileChooser.Builder().fileSelectionMode(FileSelectionMode.FILE).build(); FileChooserProvider fileChooserProvider = FileChooserFactory.createFileChooser(FileChooserArgs.newBuilder().
setFileSelectionMode(FileSelectionMode.FILE).build());
int saveValue = fileChooserProvider.showDialog(SwingUtilities.getWindowAncestor(RemoteEnvPane.this)); int saveValue = fileChooserProvider.showDialog(SwingUtilities.getWindowAncestor(RemoteEnvPane.this));
if (saveValue == JFileChooser.APPROVE_OPTION) { if (saveValue == JFileChooser.APPROVE_OPTION) {
File selectedFile = fileChooserProvider.getSelectedFile(); File selectedFile = fileChooserProvider.getSelectedFile();

13
designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java

@ -9,8 +9,9 @@ import com.fr.design.data.DesignTableDataManager;
import com.fr.design.data.tabledata.wrapper.TableDataWrapper; import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.icombobox.FilterComboBox; import com.fr.design.gui.icombobox.FilterComboBox;
import com.fr.design.gui.ifilechooser.FileChooserArgs;
import com.fr.design.gui.ifilechooser.FileChooserFactory;
import com.fr.design.gui.ifilechooser.FileChooserProvider; import com.fr.design.gui.ifilechooser.FileChooserProvider;
import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.gui.ilable.BoldFontTextLabel;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
@ -19,8 +20,6 @@ import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralUtils; import com.fr.general.GeneralUtils;
import com.fr.general.data.DataModel; import com.fr.general.data.DataModel;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.stable.StringUtils;
import org.apache.batik.swing.svg.SVGFileFilter;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
import javax.swing.JPanel; import javax.swing.JPanel;
@ -110,10 +109,12 @@ public class MapCustomPane extends BasicBeanPane<String> implements AbstrctMapAt
private ActionListener selectPictureActionListener = new ActionListener() { private ActionListener selectPictureActionListener = new ActionListener() {
@Override
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
FileChooserProvider fileChooserProvider = new JavaFxNativeFileChooser.Builder(). FileChooserProvider fileChooserProvider = FileChooserFactory.createFileChooser(
filter(".svg, .svgz", "*.svg", "*.svgz"). FileChooserArgs.newBuilder().
currentDirectory(lastSelectPath).build(); setFilter(".svg, .svgz", "*.svg", "*.svgz").
setSelectedPath(lastSelectPath).build());
int returnVal = fileChooserProvider.showDialog(DesignerContext.getDesignerFrame()); int returnVal = fileChooserProvider.showDialog(DesignerContext.getDesignerFrame());
if (returnVal != JFileChooser.CANCEL_OPTION) { if (returnVal != JFileChooser.CANCEL_OPTION) {
File selectedFile = fileChooserProvider.getSelectedFile(); File selectedFile = fileChooserProvider.getSelectedFile();

28
designer-form/src/main/java/com/fr/design/mainframe/share/action/InstallComponentAction.java

@ -4,10 +4,11 @@ import com.fr.design.actions.UpdateAction;
import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicDialog;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.dialog.FineJOptionPane; import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.ifilechooser.ExtensionFilter;
import com.fr.design.gui.ifilechooser.FileChooserArgs;
import com.fr.design.gui.ifilechooser.FileChooserFactory;
import com.fr.design.gui.ifilechooser.FileChooserProvider; import com.fr.design.gui.ifilechooser.FileChooserProvider;
import com.fr.design.gui.ifilechooser.FileSelectionMode; import com.fr.design.gui.ifilechooser.FileSelectionMode;
import com.fr.design.gui.ifilechooser.JavaFxNativeFileChooser;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.share.ui.base.FailureMessagePane; import com.fr.design.mainframe.share.ui.base.FailureMessagePane;
@ -15,17 +16,13 @@ import com.fr.design.mainframe.share.ui.local.LocalWidgetRepoPane;
import com.fr.design.mainframe.share.util.InstallUtils; import com.fr.design.mainframe.share.util.InstallUtils;
import com.fr.design.mainframe.share.util.ShareComponentUtils; import com.fr.design.mainframe.share.util.ShareComponentUtils;
import com.fr.design.mainframe.share.util.ShareUIUtils; import com.fr.design.mainframe.share.util.ShareUIUtils;
import com.fr.design.os.impl.SupportOSImpl;
import com.fr.form.share.record.ShareWidgetInfoManager; import com.fr.form.share.record.ShareWidgetInfoManager;
import com.fr.form.share.utils.ReuxUtils; import com.fr.form.share.utils.ReuxUtils;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.sun.javafx.tk.FileChooserType;
import javafx.stage.FileChooser;
import javax.swing.Action; import javax.swing.Action;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
import javax.swing.SwingWorker; import javax.swing.SwingWorker;
import javax.swing.filechooser.FileNameExtensionFilter;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@ -46,15 +43,16 @@ public class InstallComponentAction extends UpdateAction {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
FileChooserProvider fileChooserProvider = FileChooserProvider fileChooserProvider = FileChooserFactory.createFileChooser(
new JavaFxNativeFileChooser.Builder(). FileChooserArgs.newBuilder().
fileSelectionMode(FileSelectionMode.MULTIPLE_FILE). setFileSelectionMode(FileSelectionMode.MULTIPLE_FILE).
title(Toolkit.i18nText("Fine-Design_Basic_Select")). setMultiSelectionEnabled(true).
filters(new FileChooser.ExtensionFilter[]{ setTipText(Toolkit.i18nText("Fine-Design_Basic_Select")).
new FileChooser.ExtensionFilter("reu", "*.reu"), setFilters(new ExtensionFilter[] {
new FileChooser.ExtensionFilter("reus", "*.reus"), new ExtensionFilter("reu", "*.reu"),
new FileChooser.ExtensionFilter("zip", "*.zip")}). new ExtensionFilter("reus", "*.reus"),
build(); new ExtensionFilter("zip", "*.zip"),
}).build());
int returnValue = fileChooserProvider.showDialog(null); int returnValue = fileChooserProvider.showDialog(null);
installComponent(returnValue, fileChooserProvider.getSelectedFiles()); installComponent(returnValue, fileChooserProvider.getSelectedFiles());
} }

Loading…
Cancel
Save