From 8ee1ce5044c521ac3dcb9dc9974f0ffa1e337e15 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Wed, 25 Jul 2018 14:05:21 +0800 Subject: [PATCH] REPORT-9377 & REPORT-9953 --- .../widget/ui/designer/mobile/ChartEditorDefinePane.java | 4 +++- .../widget/ui/designer/mobile/ElementCaseDefinePane.java | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java index d43475841..e65269b88 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java @@ -97,7 +97,6 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane { tipLabel.setForeground(Color.gray); updateTipLabel(); allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Allow_Full_Screen")); - allowFullCheckBox.setSelected(true); Component[][] components = new Component[][]{ new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Zoom_In_Logic"), SwingConstants.LEFT), new UILabel(ChartMobileFitAttrState.PROPORTION.description())}, @@ -159,6 +158,8 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane { ChartMobileFitAttrStateProvider zoomOutAttr = chartEditor.getMobileAttr().getZoomOutAttr(); this.zoomOutComboBox.setSelectedItem(new Item(zoomOutAttr.description(), zoomOutAttr)); updateTipLabel(); + boolean allowFullScreen = chartEditor.getMobileAttr().isAllowFullScreen(); + this.allowFullCheckBox.setSelected(allowFullScreen); // 数据 populate 完成后，再设置监听 this.bindListeners2Widgets(); @@ -184,6 +185,7 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane { ChartMobileAttrProvider mobileAttr = ((BaseChartEditor)xCreator.toData()).getMobileAttr(); mobileAttr.setZoomInAttr(ChartMobileFitAttrState.PROPORTION); mobileAttr.setZoomOutAttr((ChartMobileFitAttrState)((Item)zoomOutComboBox.getSelectedItem()).getValue()); + mobileAttr.setAllowFullScreen(allowFullCheckBox.isSelected()); DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来 } } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java index 8f26119e6..58ddd80e5 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java @@ -138,6 +138,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{ this.maxHeightLabel.setVisible(elementCaseEditor.isHeightRestrict()); this.maxHeightSpinner.setVisible(elementCaseEditor.isHeightRestrict()); this.maxHeightSpinner.setValue(elementCaseEditor.getHeightPercent()); + this.allowFullCheckBox.setSelected(elementCaseEditor.isAllowFullScreen()); } @Override @@ -160,6 +161,9 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{ case "maxHeightSpinner": ((ElementCaseEditor)xCreator.toData()).setHeightPercent(maxHeightSpinner.getValue()); break; + case "allowFullCheckBox": + ((ElementCaseEditor)xCreator.toData()).setAllowFullScreen(allowFullCheckBox.isSelected()); + break; } } @@ -168,6 +172,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{ this.vComboBox.setGlobalName("vComboBox"); this.heightRestrictCheckBox.setGlobalName("heightRestrictCheckBox"); this.maxHeightSpinner.setGlobalName("maxHeightSpinner"); + this.allowFullCheckBox.setGlobalName("allowFullCheckBox"); } }