Browse Source

Pull request #3662: REPORT-48415 【FR-X】模板设置为移动端模板,移动端模板切换新版,关闭再打开模板,又变为老版

Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x

* commit '8de03b58c4d94ca76e26cd7b23b5ba66d2624f58':
  代码修改
  REPORT-48415 【FR-X】模板设置为移动端模板,移动端模板切换新版,关闭再打开模板,又变为老版
persist/11.0
kerry 4 years ago
parent
commit
d5fb18a960
  1. 10
      designer-form/src/main/java/com/fr/design/fit/NewJForm.java

10
designer-form/src/main/java/com/fr/design/fit/NewJForm.java

@ -274,10 +274,16 @@ public class NewJForm extends JForm {
public UIButton[] createExtraButtons() { public UIButton[] createExtraButtons() {
UIButton[] extraButtons = super.createExtraButtons(); UIButton[] extraButtons = super.createExtraButtons();
switchAction = new SwitchAction(); return addAdaptiveSwitchButton(extraButtons);
return ArrayUtils.addAll(extraButtons, new UIButton[]{switchAction.getToolBarButton()});
} }
private UIButton[] addAdaptiveSwitchButton(UIButton[] extraButtons) {
switchAction = new SwitchAction();
if (!mobileForm()) {
return ArrayUtils.addAll(extraButtons, new UIButton[]{switchAction.getToolBarButton()});
}
return extraButtons;
}
public boolean isNewJFrom() { public boolean isNewJFrom() {
return jFormType == null || jFormType.isNewType(); return jFormType == null || jFormType.isNewType();

Loading…
Cancel
Save