Browse Source

Pull request #7857: REPORT-66378 【组件商城风格优化】设计器商城,国际化下套用组件入口是否需要屏蔽

Merge in DESIGN/design from ~STARRYI/design:REPORT-62688 to feature/x

* commit '49a7825ed2d0de30a15a3b14c89f807c935e57fe':
  REPORT-66378 【组件商城风格优化】设计器商城,国际化下套用组件入口是否需要屏蔽
feature/x
starryi 3 years ago
parent
commit
31fad7ff0f
  1. 4
      designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java
  2. 3
      designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
  3. 2
      designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java

4
designer-base/src/main/java/com/fr/design/mainframe/share/ComponentShareUtil.java

@ -34,6 +34,10 @@ public class ComponentShareUtil {
return localeMark.getValue();
}
public static boolean isShowMiniShopWindow() {
return isShowOnlineWidgetRepoPane();
}
/**
* 判断是否可触达
*

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

@ -18,6 +18,7 @@ import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.imenu.UIPopupMenu;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.share.ComponentShareUtil;
import com.fr.design.mainframe.share.ui.online.OnlineWidgetRepoPane;
import com.fr.design.mainframe.share.ui.online.mini.MiniComponentShopDialog;
import com.fr.design.mainframe.share.util.OnlineShopUtils;
@ -265,7 +266,7 @@ public class FormParaWidgetPane extends JPanel {
jPanel.addMouseListener(new MouseListener() {
@Override
public void mouseClicked(MouseEvent e) {
if (OnlineShopUtils.testConnection()) {
if (OnlineShopUtils.testConnection() && ComponentShareUtil.isShowMiniShopWindow()) {
MiniComponentShopDialog.getInstance().show();
} else {
OnlineWidgetRepoPane.getInstance().switch2InternetErrorPane();

2
designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/OnlineWidgetTabPane.java

@ -103,7 +103,7 @@ public class OnlineWidgetTabPane extends JPanel {
button.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
if (OnlineShopUtils.testConnection()) {
if (OnlineShopUtils.testConnection() && ComponentShareUtil.isShowMiniShopWindow()) {
MiniComponentShopDialog.getInstance().show();
FormWidgetDetailPane.getInstance().switch2Local();
FormWidgetDetailPane.getInstance().enterWidgetLib();

Loading…
Cancel
Save