Browse Source

Merge pull request #5454 in DESIGN/design from feature/10.0 to feature/big-screen

* commit '1deec6d3a147be5251694091ddad4cba23eb44dd':
  REPORT-51276 组件批量下载前需要登录
  REPORT-55717 解决组件快捷配置编辑按钮会打开多个弹窗问题
  REPORT-57610 单元格没画出来
feature/big-screen
superman 3 years ago
parent
commit
8dd65bfce5
  1. 3
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
  2. 8
      designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/widgetpackage/OnlineWidgetPackagesShowPane.java
  3. 7
      designer-realize/src/main/java/com/fr/design/share/ui/config/table/ExpandEffectTable.java

3
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@ -879,8 +879,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
basePane.add(east, BorderLayout.EAST); basePane.add(east, BorderLayout.EAST);
} }
layeredPane.repaint(); jTemplate.setComposite();
layeredPane.revalidate();
} }
/** /**

8
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; package com.fr.design.mainframe.share.ui.online.widgetpackage;
import com.fr.design.DesignerEnvManager;
import com.fr.design.dialog.FineJOptionPane; import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory; 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.DesignerContext;
import com.fr.design.mainframe.share.ui.base.MouseClickListener; import com.fr.design.mainframe.share.ui.base.MouseClickListener;
import com.fr.design.mainframe.share.ui.online.AbstractOnlineWidgetShowPane; 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() { downloadLabel = createLabel(Toolkit.i18nText("Fine-Design_Share_Download_All_Component"), new MouseClickListener() {
@Override @Override
public void mouseClicked(MouseEvent e) { 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") String message = Toolkit.i18nText("Fine-Design_Share_Download_All_Component_Message")
+ "\n" + "\n"
+ Toolkit.i18nText("Fine-Design_Share_Total") + Toolkit.i18nText("Fine-Design_Share_Total")

7
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(); effectControlUpdatePane.populate();
effectPopupEditDialog = EffectPopupEditDialog.newInstance(ShareDialogUtils.getInstance().getConfigDialog(), effectControlUpdatePane); effectPopupEditDialog = EffectPopupEditDialog.newInstance(ShareDialogUtils.getInstance().getConfigDialog(), effectControlUpdatePane);
effectPopupEditDialog.setTitle(selectEffectItem.getName()); 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() { effectPopupEditDialog.addDialogActionListener(new DialogActionAdapter() {
@Override @Override
public void doOk() { public void doOk() {
effectControlUpdatePane.update(); 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) { public void mouseExited(MouseEvent e) {

Loading…
Cancel
Save