REPORT-55228 工具栏问题 && REPORT-55228 设计器启动引导页面与切换账号页面 也要提示"更新相关组件"

designer-base/src/main/java/com/fr/design/login/DesignerLoginHelper.java

@@ -6,6 +6,7 @@ import com.fr.design.extra.WebViewDlgHelper;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.os.impl.SupportOSImpl;
+import com.fr.design.plugin.DesignerPluginContext;
 import com.fr.design.update.ui.dialog.UpdateMainDialog;
 import com.fr.general.GeneralContext;
 import java.awt.Dialog;
@@ -25,7 +26,7 @@ import javax.swing.WindowConstants;
 public class DesignerLoginHelper {
 
     private static final String MAIN_RESOURCE_PATH = "/com/fr/design/login/login.html";
-    private static final String JXBROWSER = "com.teamdev.jxbrowser.chromium.Browser";
+    private static final String JXBROWSER = "com.teamdev.jxbrowser.browser.Browser";
 
     private static UIDialog dialog = null;
 
@@ -91,6 +92,7 @@ public class DesignerLoginHelper {
             dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
             dialog.setVisible(false);
             dialog = null;
+            DesignerPluginContext.setPluginDialog(null);
         }
     }
 

designer-base/src/main/java/com/fr/design/login/DesignerLoginShowDialog.java

@@ -1,6 +1,7 @@
 package com.fr.design.login;
 
 import com.fr.design.dialog.UIDialog;
+import com.fr.design.plugin.DesignerPluginContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -36,6 +37,7 @@ public class DesignerLoginShowDialog extends UIDialog {
         setSize(DEFAULT);
         GUICoreUtils.centerWindow(this);
         setResizable(false);
+        DesignerPluginContext.setPluginDialog(this);
     }
 
     @Override

designer-base/src/main/java/com/fr/design/login/guide/DesignerGuideHelper.java

@@ -22,7 +22,7 @@ import javax.swing.WindowConstants;
 public class DesignerGuideHelper {
 
     private static final String MAIN_RESOURCE_PATH = "/com/fr/design/login/guide.html";
-    private static final String JXBROWSER = "com.teamdev.jxbrowser.chromium.Browser";
+    private static final String JXBROWSER = "com.teamdev.jxbrowser.browser.Browser";
     private static final long ONE_WEEK = 7 * 24 * 3600 * 1000L;
     private static final long ONE_MONTH = 30 * 24 * 3600 * 1000L;
     private static final long SIX_MONTH = 6 * ONE_MONTH;

designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java

@@ -23,6 +23,7 @@ import com.fr.design.mainframe.EditingMouseListener;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.NoSupportAuthorityEdit;
 import com.fr.design.mainframe.WidgetPropertyPane;
+import com.fr.design.plugin.DesignerPluginContext;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WTitleLayout;
@@ -783,12 +784,19 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 			public void run() {
 				popup.setLocation(designer.getLocationOnScreen().x + designer.getPaintX()  + extraX, designer.getLocationOnScreen().y + designer.getPaintY() + extraY);
 				popup.updatePane(designer);
-				popup.setVisible(selected && accept && popup.hasVisibleButtons() && popup.isCanVisible());
+				popup.setVisible(selected && accept && popup.hasVisibleButtons() && popup.isCanVisible() && !isShowPluginDialog());
 				popup.setRelativeBounds(bounds);
 			}
 		});
 	}
 
+	private boolean isShowPluginDialog() {
+		if (DesignerPluginContext.getPluginDialog() == null) {
+			return false;
+		}
+		return DesignerPluginContext.getPluginDialog().isVisible();
+	}
+
 	/**
 	 * 创建右击弹出菜单
 	 *

designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java

@@ -647,7 +647,7 @@ public class EditingMouseListener extends MouseInputAdapter {
                     @Override
                     public void run() {
                         for (XCreator xCreator : xCreators) {
-                            xCreator.setSelected(true);
+                            xCreator.setSelected(!e.isShiftDown());
                         }
                     }
                 });