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

* commit '8bf826dd52d09e5e1e5cba19742692ad1ce1910a':
  Revert "REPORT-70593 图片控件设计器插件，原插件禁用。方案参考https://kms.fineres.com/pages/viewpage.action?pageId=457117391"
  REPORT-80583 多结果数据集预览要弹参数面板
  REPORT-80491 linux设计器调用系统文件夹，设计器闪退
  REPORT-80583 多数据集预览参数设置

designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@@ -625,6 +625,8 @@ public abstract class DesignTableDataManager {
             // 把storeProcedure写成xml文件到out
             DataCoreXmlUtils.writeXMLStoreProcedure(writer, storeProcedure, null);
             if (storeProcedure.getDataModelList().size() > 0 && !storeProcedure.isFirstExpand()) {
+                // 存储过程有些特殊处理
+                // 这个就简单直接获取暂存列表吧
                 return storeProcedure.getDataModelList().toArray(new ProcedureDataModel[0]);
             }
             ParameterProvider[] inParameters = DataOperator.getInstance().getStoreProcedureParameters(storeProcedure);
@@ -633,11 +635,13 @@ public abstract class DesignTableDataManager {
                 showParaWindow(parameterMap, inParameters);
             }
             storeProcedure.setFirstExpand(false);
+        } else {
+            ParameterProvider[] parameters = DataOperator.getInstance().getTableDataParameters(tableData);
+            if (parameters.length > 0) {
+                showParaWindow(parameterMap, parameters);
+            }
         }
 
-        // 存储过程有些特殊处理
-        // 这个就简单直接获取暂存列表吧
-        // TODO 参数处理？
         if (needLoadingBar) {
             MultiResultTableDataWrapper.loadingBar.start();
         }

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

@@ -152,7 +152,13 @@ public enum SupportOSImpl implements SupportOS {
 
         @Override
         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();
         }
     },
 

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

@@ -160,7 +160,6 @@ public class DesignerActivator extends Activator implements Prepare {
 
     private LogHandler<DesignerLogAppender> logHandler = null;
     private static final String PLUGIN_EXPORT_IMAGE_SETTING = "com.fr.plugin.exportimagesettings.v11";
-    private static final String PICTURE_WIDGET_PLUGIN_ID = "com.fr.plugin.widget.picture.v11";
     private final Once pushUpdateTask = new Once(new Runnable() {
         @Override
         public void run() {
@@ -552,7 +551,6 @@ public class DesignerActivator extends Activator implements Prepare {
 
     private void prepareDefaultEmbedPluginInfo() {
         addMutable(PluginEmbedInfo.KEY, DefaultPluginEmbedInfo.create(PLUGIN_EXPORT_IMAGE_SETTING));
-        addMutable(PluginEmbedInfo.KEY, DefaultPluginEmbedInfo.create(PICTURE_WIDGET_PLUGIN_ID));
     }
 
     private void startBBSLoginAuthServer() {