Browse Source

MOBILE-29490 【H5】10.4.80升级到10.4.90后,模板中有些内容显示不全

feature/big-screen
hades 4 years ago
parent
commit
85fcea5fba
  1. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java
  2. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java

@ -202,8 +202,8 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
MobileCollapsedStyle style = ((ChartEditor) xCreator.toData()).getMobileCollapsedStyle(); MobileCollapsedStyle style = ((ChartEditor) xCreator.toData()).getMobileCollapsedStyle();
this.mobileCollapsedStyleEditor.setStyle(style); this.mobileCollapsedStyleEditor.setStyle(style);
this.mobileCollapsedStyleEditor.setSelected(style.isCollapsedWork());
fix(style); fix(style);
this.mobileCollapsedStyleEditor.setSelected(style.isCollapsedWork());
} }
/** /**
@ -212,7 +212,7 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
* @param style * @param style
*/ */
private void fix(MobileCollapsedStyle style) { private void fix(MobileCollapsedStyle style) {
style.setCollapsedWork(!FormDesignerUtils.isInAbsoluteLayout(xCreator)); style.setCollapsedWork(style.isCollapsedWork() && !FormDesignerUtils.isInAbsoluteLayout(xCreator));
} }

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java

@ -176,8 +176,8 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane {
this.allowFullCheckBox.setSelected(elementCaseEditor.isAllowFullScreen()); this.allowFullCheckBox.setSelected(elementCaseEditor.isAllowFullScreen());
this.functionalWhenUnactivatedCheckBox.setSelected(!elementCaseEditor.isFunctionalWhenUnactivated()); this.functionalWhenUnactivatedCheckBox.setSelected(!elementCaseEditor.isFunctionalWhenUnactivated());
this.mobileCollapsedStyleEditor.setStyle(elementCaseEditor.getMobileCollapsedStyle()); this.mobileCollapsedStyleEditor.setStyle(elementCaseEditor.getMobileCollapsedStyle());
this.mobileCollapsedStyleEditor.setSelected(elementCaseEditor.getMobileCollapsedStyle().isCollapsedWork());
fix(elementCaseEditor.getMobileCollapsedStyle()); fix(elementCaseEditor.getMobileCollapsedStyle());
this.mobileCollapsedStyleEditor.setSelected(elementCaseEditor.getMobileCollapsedStyle().isCollapsedWork());
} }
/** /**
@ -186,7 +186,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane {
* @param style * @param style
*/ */
private void fix(MobileCollapsedStyle style) { private void fix(MobileCollapsedStyle style) {
style.setCollapsedWork(!FormDesignerUtils.isInAbsoluteLayout(xCreator)); style.setCollapsedWork(style.isCollapsedWork() && !FormDesignerUtils.isInAbsoluteLayout(xCreator));
} }
@Override @Override

Loading…
Cancel
Save