Merge pull request #3742 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '6d86eb162d869e90d18f41e19660068b8ff84fbd':
  REPORT-47438 判断跟随自主界面的条件再优化补充下
  REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置
  REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置
  REPORT-47438 设计器弹窗在多屏情况下部分弹窗显示在另一块屏幕

designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java

@@ -169,7 +169,6 @@ public class PreviewTablePane extends BasicPane {
         this.add(new JScrollPane(preveiwTable), BorderLayout.CENTER);
         if (this.dialog == null) {
             this.dialog = this.showWindow(new JFrame());
-            GUICoreUtils.centerWindow(DesignerContext.getDesignerFrame(), this.dialog);
         }
         progressBar = new AutoProgressBar(this, Toolkit.i18nText("Fine-Design_Basic_Loading_Data"), "", 0, 100) {
             public void doMonitorCanceled() {

designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java

@@ -16,6 +16,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.locale.impl.BbsRegisterMark;
 import com.fr.design.locale.impl.BbsResetMark;
 import com.fr.design.locale.impl.BbsSpaceMark;
+import com.fr.design.plugin.DesignerPluginContext;
 import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
 import com.fr.general.CloudCenter;
 import com.fr.general.locale.LocaleCenter;
@@ -401,6 +402,7 @@ public class PluginWebBridge {
         if (uiDialog != null) {
             uiDialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
             uiDialog.setVisible(false);
+            DesignerPluginContext.setPluginDialog(null);
         }
     }
 

designer-base/src/main/java/com/fr/design/extra/ShopDialog.java

@@ -3,6 +3,7 @@ package com.fr.design.extra;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.jdk.JdkVersion;
+import com.fr.design.plugin.DesignerPluginContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.stable.StableUtils;
 
@@ -25,6 +26,7 @@ public class ShopDialog extends UIDialog {
         setSize(createDefaultDimension());
         GUICoreUtils.centerWindow(this);
         setResizable(false);
+        DesignerPluginContext.setPluginDialog(this);
     }
 
     private Dimension createDefaultDimension() {

designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java

@@ -5,6 +5,7 @@ import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.extra.PluginOperateUtils;
 import com.fr.design.i18n.Toolkit;
 
+import com.fr.design.plugin.DesignerPluginContext;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.manage.control.PluginTaskCallback;
 import com.fr.plugin.manage.control.PluginTaskResult;
@@ -31,9 +32,9 @@ public class ModifyStatusCallback implements PluginTaskCallback{
                     pluginInfo + Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Been_Disabled_Duplicate") :
                     pluginInfo + Toolkit.i18nText("Fine-Design_Plugin_Has_Been_Actived_Duplicate");
             FineLoggerFactory.getLogger().info(modifyMessage);
-            FineJOptionPane.showMessageDialog(null, modifyMessage);
+            FineJOptionPane.showMessageDialog(DesignerPluginContext.getPluginDialog(), modifyMessage);
         } else {
-            FineJOptionPane.showMessageDialog(null, pluginInfo, Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
+            FineJOptionPane.showMessageDialog(DesignerPluginContext.getPluginDialog(), pluginInfo, Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }
 

designer-base/src/main/java/com/fr/design/plugin/DesignerPluginContext.java

@@ -0,0 +1,21 @@
+package com.fr.design.plugin;
+
+import com.fr.design.dialog.UIDialog;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/3/8
+ */
+public class DesignerPluginContext {
+
+    private static UIDialog DIALOG;
+
+    public static UIDialog getPluginDialog() {
+        return DIALOG;
+    }
+
+    public static void setPluginDialog(UIDialog pluginDialog) {
+        DesignerPluginContext.DIALOG = pluginDialog;
+    }
+}

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

@@ -6,6 +6,7 @@ import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.plugin.DesignerPluginContext;
 import com.fr.design.update.ui.dialog.UpdateMainDialog;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
@@ -114,6 +115,7 @@ public class UpmFinder {
             dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
             dialog.setVisible(false);
             dialog = null;
+            DesignerPluginContext.setPluginDialog(null);
         }
     }
 }

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

@@ -2,6 +2,7 @@ package com.fr.design.upm;
 
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.UIDialog;
+import com.fr.design.plugin.DesignerPluginContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 
 import javax.swing.*;
@@ -25,6 +26,7 @@ public class UpmShowDialog extends UIDialog {
         setSize(DEFAULT_SHOP);
         GUICoreUtils.centerWindow(this);
         setResizable(false);
+        DesignerPluginContext.setPluginDialog(this);
     }
 
     @Override

designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java

@@ -38,6 +38,7 @@ import com.fr.stable.Constants;
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.StringUtils;
 
+import java.awt.Container;
 import javax.swing.AbstractButton;
 import javax.swing.Action;
 import javax.swing.BorderFactory;
@@ -318,7 +319,14 @@ public final class GUICoreUtils {
 	public static void centerWindow(Window win) {
 		// Toolkit.getDefaultToolkit().getScreenSize()在有多个显示器也只能获取到主屏的大小
 		// getGraphicsConfiguration().getBounds()能获取多个屏时 设计器主体界面所在屏的大小和对应的坐标
-		Rectangle rectangle = win.getGraphicsConfiguration().getBounds();
+		Rectangle rectangle;
+		Container parent = win.getParent();
+		boolean displayByDesignerFrame = (DesignerContext.getDesignerFrame() != null && parent == null) || (parent != null && !parent.isVisible() && DesignerContext.getDesignerFrame() != null);
+		if (displayByDesignerFrame) {
+			rectangle = DesignerContext.getDesignerFrame().getGraphicsConfiguration().getBounds();
+		} else {
+			rectangle = win.getGraphicsConfiguration().getBounds();
+		}
 		centerWindow(win, rectangle);
 	}