Browse Source

Pull request #3310: REPORT-45689 顶部参数面板优化 兼容空类型 无须填充面板

Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '4550d21f02c908e05311ef399e443a8cd15b072d':
  REPORT-45689 兼容空类型 无须填充面板
feature/big-screen
Hades 4 years ago
parent
commit
c170d68152
  1. 4
      designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileParamSettingPane.java

4
designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileParamSettingPane.java

@ -12,6 +12,7 @@ import com.fr.form.ui.mobile.MobileParamStyle;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.report.ExtraReportClassManager; import com.fr.report.ExtraReportClassManager;
import com.fr.report.fun.MobileParamStyleProvider; import com.fr.report.fun.MobileParamStyleProvider;
import com.fr.report.mobile.EmptyMobileParamStyle;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.CardLayout; import java.awt.CardLayout;
import java.awt.Component; import java.awt.Component;
@ -103,7 +104,10 @@ public class MobileParamSettingPane extends BasicPane {
if (ComparatorUtils.equals(mobileParamStyle.disPlayName(), provider.displayName())) { if (ComparatorUtils.equals(mobileParamStyle.disPlayName(), provider.displayName())) {
String displayName = provider.displayName(); String displayName = provider.displayName();
paramStyleList.setSelectedIndex(i); paramStyleList.setSelectedIndex(i);
// 如果是兼容空类型 无须填充面板
if (!(mobileParamStyle instanceof EmptyMobileParamStyle)) {
map.get(displayName).populateBean(mobileParamStyle); map.get(displayName).populateBean(mobileParamStyle);
}
card.show(right, displayName); card.show(right, displayName);
return; return;
} }

Loading…
Cancel
Save