Browse Source

MOBILE-24962 && MOBILE-24940 合到final

final/10.0
hades 5 years ago
parent
commit
6ef9b8cdaf
  1. 6
      designer-form/src/main/java/com/fr/design/actions/FormMobileAttrAction.java
  2. 6
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/BodyMobileDefinePane.java

6
designer-form/src/main/java/com/fr/design/actions/FormMobileAttrAction.java

@ -77,8 +77,10 @@ public class FormMobileAttrAction extends JTemplateAction<JForm> {
formTpl.setFormMobileAttr(formMobileAttr); // 会调整 body 的自适应布局,放到最后 formTpl.setFormMobileAttr(formMobileAttr); // 会调整 body 的自适应布局,放到最后
((FormArea)jf.getFormDesign().getParent()).onMobileAttrModified(); ((FormArea)jf.getFormDesign().getParent()).onMobileAttrModified();
jf.getFormDesign().getSelectionModel().setSelectedCreator(jf.getFormDesign().getRootComponent()); jf.getFormDesign().getSelectionModel().setSelectedCreator(jf.getFormDesign().getRootComponent());
//改变布局为自适应布局,只在移动端属性设置保存后改变一次 //当自适应属性自动匹配处于勾选状态 进行切换
doChangeBodyLayout(); if (formMobileAttr.isMobileOnly() && formMobileAttr.isAdaptivePropertyAutoMatch()) {
doChangeBodyLayout();
}
WidgetPropertyPane.getInstance().refreshDockingView(); WidgetPropertyPane.getInstance().refreshDockingView();
jf.fireTargetModified(); jf.fireTargetModified();

6
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/BodyMobileDefinePane.java

@ -115,8 +115,9 @@ public class BodyMobileDefinePane extends MobileWidgetDefinePane {
boolean flag = !shouldHidePadding(designer); boolean flag = !shouldHidePadding(designer);
advancePane.setVisible(flag); advancePane.setVisible(flag);
layoutPane.setVisible(flag); layoutPane.setVisible(flag);
frozenPane.setVisible(appRelayoutCheck.isSelected()); boolean appRelayout = FormDesignerUtils.isAppRelayout(designer);
bookMarkSettingPane.setVisible(appRelayoutCheck.isSelected()); frozenPane.setVisible(appRelayout);
bookMarkSettingPane.setVisible(appRelayout);
return holder; return holder;
} }
@ -172,6 +173,7 @@ public class BodyMobileDefinePane extends MobileWidgetDefinePane {
advancePane.setVisible(appPaddingVisible); advancePane.setVisible(appPaddingVisible);
layoutPane.setVisible(appPaddingVisible); layoutPane.setVisible(appPaddingVisible);
frozenPane.setVisible(appRelayout); frozenPane.setVisible(appRelayout);
bookMarkSettingPane.setVisible(appRelayout);
mobileWidgetListPane.updateToDesigner(); mobileWidgetListPane.updateToDesigner();
designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED); designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED);

Loading…
Cancel
Save