Browse Source

REPORT-67348 组件包下载提示文本中的数量不符合设计意图

【问题原因】
下载组件包时后台已做过兼容性检测和去重处理,因此下载的组件包中本身就是兼容的组件。
所以不存在不兼容的组件。

【改动思路】
同上

REPORT-67348 组件包下载提示文本中的数量不符合设计意图

【问题原因】
下载组件包时后台已做过兼容性检测和去重处理,因此下载的组件包中本身就是兼容的组件。
所以不存在不兼容的组件。

【改动思路】
同上
feature/x
Starryi 3 years ago
parent
commit
585b289dab
  1. 39
      designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/mini/bridge/NativeProductBridge.java

39
designer-form/src/main/java/com/fr/design/mainframe/share/ui/online/mini/bridge/NativeProductBridge.java

@ -254,9 +254,9 @@ public class NativeProductBridge {
MiniComponentShopDialog.getInstance().getContentPane(), MiniComponentShopDialog.getInstance().getContentPane(),
Toolkit.i18nText("Fine-Design_Share_Online_Mini_Shop_Download_Incompatible_Component_Tip"), Toolkit.i18nText("Fine-Design_Share_Online_Mini_Shop_Download_Incompatible_Component_Tip"),
"", "",
FineJOptionPane.YES_NO_OPTION FineJOptionPane.OK_CANCEL_OPTION
); );
allowedDownload = result == JOptionPane.YES_OPTION; allowedDownload = result == JOptionPane.OK_OPTION;
} }
if (allowedDownload) { if (allowedDownload) {
fireStartEvent(null); fireStartEvent(null);
@ -353,33 +353,14 @@ public class NativeProductBridge {
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
@Override @Override
public void run() { public void run() {
boolean allowedDownload; OnlineShareWidget[] childrenWidgets = OnlineShopUtils.getPackageWidgets(widget, true);
OnlineShareWidget[] childrenWidgets = OnlineShopUtils.getPackageWidgets(widget, false); int result = FineJOptionPane.showConfirmDialog(
boolean isCompatibleWithCurrentEnv = true; MiniComponentShopDialog.getInstance().getContentPane(),
for (OnlineShareWidget children: childrenWidgets) { Toolkit.i18nText("Fine-Design_Share_Online_Mini_Shop_Download_Components_Package_Tip", childrenWidgets.length),
if (!children.isCompatibleWithCurrentEnv()) { "",
isCompatibleWithCurrentEnv = false; FineJOptionPane.OK_CANCEL_OPTION
break; );
} if (result == JOptionPane.OK_OPTION) {
}
int result;
if (!isCompatibleWithCurrentEnv) {
result = FineJOptionPane.showConfirmDialog(
MiniComponentShopDialog.getInstance().getContentPane(),
Toolkit.i18nText("Fine-Design_Share_Online_Mini_Shop_Download_Incompatible_Components_Package_Tip", childrenCount),
"",
FineJOptionPane.YES_NO_OPTION
);
} else {
result = FineJOptionPane.showConfirmDialog(
MiniComponentShopDialog.getInstance().getContentPane(),
Toolkit.i18nText("Fine-Design_Share_Online_Mini_Shop_Download_Components_Package_Tip", childrenCount),
"",
FineJOptionPane.YES_NO_OPTION
);
}
allowedDownload = result == JOptionPane.YES_OPTION;
if (allowedDownload) {
fireStartEvent(null); fireStartEvent(null);
action.install(); action.install();
} else { } else {

Loading…
Cancel
Save