Merge pull request #7435 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit 'eb0671deb00d8130214df6f95238cd99e015b1df':
  REPORT-65290 设计器-水印，平台改变水印开关，模板水印变成了模板单独设置 1.修改水印的isvalid
  REPORT-65369 设计器内对macOS12的处理-按钮图标设置-在点击 选择图片时回到了父弹窗界面，没有实时显示出来，而需要再次单机设计器界面
  REPORT-65381 linux_arm设计器-点击菜单栏文件-选项，出现弹窗后再点击 确定按钮，弹窗不消失，无任何反应
  REPORT-64009 设计器内对macOS12的处理 fix import
  REPORT-64009 设计器内对macOS12的处理 fix门槛用例的bug

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

@@ -788,7 +788,7 @@ public class PreferencePane extends BasicPane {
         designerEnvManager.setJoinProductImprove(this.joinProductImproveCheckBox.isSelected());
         designerEnvManager.setEmbedServerLazyStartup(this.embedServerLazyStartupCheckBox.isSelected());
         designerEnvManager.setImageCompress(this.imageCompressPanelCheckBox.isSelected());
-        designerEnvManager.setUseOptimizedUPM4Adapter(this.useOptimizedUPMCheckbox.isSelected());
+        designerEnvManager.setUseOptimizedUPM4Adapter(this.useOptimizedUPMCheckbox != null && this.useOptimizedUPMCheckbox.isSelected());
         VcsConfigManager vcsConfigManager = designerEnvManager.getVcsConfigManager();
         vcsConfigManager.setSaveInterval(this.saveIntervalEditor.getValue());
         vcsConfigManager.setVcsEnable(this.vcsEnableCheckBox.isSelected());

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

@@ -1,5 +1,6 @@
 package com.fr.design.report;
 
+import com.fr.base.iofile.attr.WaterMarkProvideConstant;
 import com.fr.base.iofile.attr.WatermarkAttr;
 import com.fr.design.dialog.AbstractTemplateServerSettingPane;
 import com.fr.report.core.ReportUtils;
@@ -42,13 +43,13 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
     }
 
     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);
             populateServerSettings();
-            return;
         }
-        chooseComboBox.setSelectedIndex(SINGLE_SET);
-        watermarkPane.populate(watermark);
     }
 
 

designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@@ -4,14 +4,14 @@ import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
 import com.fr.base.Icon;
 import com.fr.base.IconManager;
-import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ibutton.UIButton;
 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.JavaFxNativeFileChooser;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.iscrollbar.UIScrollBar;
 import com.fr.design.gui.itextarea.DescriptionTextArea;
@@ -30,23 +30,35 @@ import com.fr.stable.ListMap;
 import com.fr.stable.StringUtils;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
-import javafx.stage.FileChooser;
 
-import javax.swing.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Window;
+import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
+import javax.swing.JComponent;
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JToggleButton;
+import javax.swing.ScrollPaneConstants;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.plaf.basic.BasicButtonUI;
-import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
 
 /**
  * carl：自定义Icon编辑
@@ -414,7 +426,7 @@ public class CustomIconPane extends BasicPane {
 
             browseButton.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
-                    onBrowseButtonClicked();
+                    onBrowseButtonClicked(SwingUtilities.getWindowAncestor(EditIconDialog.this));
                 }
             });
 
@@ -449,12 +461,11 @@ public class CustomIconPane extends BasicPane {
             this.add(centerPane, BorderLayout.CENTER);
         }
 
-        private void onBrowseButtonClicked() {
+        private void onBrowseButtonClicked(Window parent) {
             // carl:不知道是否只要png格式,反正导出时全部都转成png了
-            FileChooserProvider fileChooserProvider = new JavaFxNativeFileChooser.Builder().
+            FileChooserProvider fileChooserProvider = FileChooserFactory.createFileChooser(FileChooserArgs.newBuilder().
-                    filter("Icon Image File", "*.jpg", "*.jpeg", "*.png", "*.gif").
+                                                        setFilter("Icon Image File", "*.jpg", "*.jpeg", "*.png", "*.gif").build());
-                    build();
+            if (JFileChooser.APPROVE_OPTION == fileChooserProvider.showDialog(parent)) {
-            if (JFileChooser.APPROVE_OPTION == fileChooserProvider.showDialog(DesignerContext.getDesignerFrame())) {
                 String path = fileChooserProvider.getSelectedFile().getAbsolutePath();
                 // 图片存储有最大值48*48限制，没有超过最大值时，按原图大小存储，超过最大值后，压缩至最大值存储
                 Image image = BaseUtils.readImage(path);

designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@@ -8,6 +8,7 @@ import com.fr.base.passport.FinePassportManager;
 import com.fr.base.process.ProcessOperator;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.config.MarketConfig;
+import com.fr.config.ServerPreferenceConfig;
 import com.fr.decision.update.backup.RecoverManager;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
@@ -177,6 +178,9 @@ public class DesignerActivator extends Activator implements Prepare {
         //生成BasicChartQuickEditor对象，需要用到ChartDesignerActivator的注册信息（DesignModuleFactory.registerChartPropertyPaneClass(ChartPropertyPane.class);）
         //所以不能在registerCellEditor函数中进行注册
         ActionFactory.registerCellEditor(ChartCollection.class, new BasicChartQuickEditor());
+        if (DesignerEnvManager.getEnvManager().isUseOptimizedUPM4Adapter() && WorkContext.getCurrent().isLocal()) {
+            ServerPreferenceConfig.getInstance().setUseOptimizedUPM(DesignerEnvManager.getEnvManager().isUseOptimizedUPM4Adapter());
+        }
     }
 
     private void loadLogAppender() {