Pull request #5571: REPORT-55717 REPORT-51276 bug fixed

Merge in DESIGN/design from ~TOMMY/design:final/10.0 to final/10.0

* commit '4113abd295cc8b391c9f0f5050fb4956b06ece67':
  REPORT-51276 组件批量下载前需要登录
  REPORT-55717 解决组件快捷配置编辑按钮会打开多个弹窗问题

designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/widgetpackage/OnlineWidgetPackagesShowPane.java

@@ -1,10 +1,13 @@
 package com.fr.design.mainframe.share.ui.online.widgetpackage;
 
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.login.DesignerLoginHelper;
+import com.fr.design.login.DesignerLoginSource;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.share.ui.base.MouseClickListener;
 import com.fr.design.mainframe.share.ui.online.AbstractOnlineWidgetShowPane;
@@ -64,6 +67,11 @@ public class OnlineWidgetPackagesShowPane extends AbstractOnlineWidgetShowPane {
         downloadLabel = createLabel(Toolkit.i18nText("Fine-Design_Share_Download_All_Component"), new MouseClickListener() {
             @Override
             public void mouseClicked(MouseEvent e) {
+                String userName = DesignerEnvManager.getEnvManager().getDesignerLoginUsername();
+                if (StringUtils.isEmpty(userName)) {
+                    DesignerLoginHelper.showLoginDialog(DesignerLoginSource.NORMAL);
+                    return;
+                }
                 String message = Toolkit.i18nText("Fine-Design_Share_Download_All_Component_Message")
                         + "\n"
                         + Toolkit.i18nText("Fine-Design_Share_Total")

designer-realize/src/main/java/com/fr/design/share/ui/config/table/ExpandEffectTable.java

@@ -114,15 +114,16 @@ public class ExpandEffectTable extends JPanel {
                     effectControlUpdatePane.populate();
                     effectPopupEditDialog = EffectPopupEditDialog.newInstance(ShareDialogUtils.getInstance().getConfigDialog(), effectControlUpdatePane);
                     effectPopupEditDialog.setTitle(selectEffectItem.getName());
-                    Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
-                    effectPopupEditDialog.setLocation((d.width - effectPopupEditDialog.getSize().width) / 2, (d.height - effectPopupEditDialog.getSize().height) / 2);
-                    effectPopupEditDialog.setVisible(true);
                     effectPopupEditDialog.addDialogActionListener(new DialogActionAdapter() {
                         @Override
                         public void doOk() {
                             effectControlUpdatePane.update();
                         }
                     });
+                    Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
+                    effectPopupEditDialog.setLocation((d.width - effectPopupEditDialog.getSize().width) / 2, (d.height - effectPopupEditDialog.getSize().height) / 2);
+                    effectPopupEditDialog.setModal(true);
+                    effectPopupEditDialog.setVisible(true);
                 }
             }
             public void mouseExited(MouseEvent e) {