REPORT-19466 【匹配移动端】组件级控制选中等

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

@@ -107,8 +107,8 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
                 new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Zoom_In_Logic"), SwingConstants.LEFT), new UILabel(ChartMobileFitAttrState.PROPORTION.description())},
                 new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Zoom_Out_Logic"), SwingConstants.LEFT), zoomOutComboBox},
                 new Component[] {tipLabel, null},
-                new Component[] {allowFullCheckBox},
-                new Component[] {functionalWhenUnactivatedCheckBox}
+                new Component[] {allowFullCheckBox, null},
+                new Component[] {functionalWhenUnactivatedCheckBox, null}
         };
 
         double f = TableLayout.FILL;

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

@@ -29,10 +29,10 @@ import java.awt.Component;
 
 /**
  * 报表块-移动端属性面板
- *
+ * <p>
  * Created by fanglei on 2017/8/8.
  */
-public class ElementCaseDefinePane extends MobileWidgetDefinePane{
+public class ElementCaseDefinePane extends MobileWidgetDefinePane {
     private static final double MAX_HEIGHT_LIMIT = 0.8;
     private static final Item[] ITEMS = {
             new Item(MobileFitAttrState.HORIZONTAL.description(), MobileFitAttrState.HORIZONTAL),
@@ -52,7 +52,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{
     private UICheckBox allowFullCheckBox;
     private UICheckBox functionalWhenUnactivatedCheckBox;
 
-    public ElementCaseDefinePane (XCreator xCreator) {
+    public ElementCaseDefinePane(XCreator xCreator) {
         this.xCreator = xCreator;
     }
 
@@ -94,16 +94,16 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{
                 new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Horizontal"), SwingConstants.LEFT), hComboBox},
                 new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Vertical"), SwingConstants.LEFT), vComboBox},
                 new Component[] {heightRestrictCheckBox, null},
-                new Component[] {allowFullCheckBox},
-                new Component[] {functionalWhenUnactivatedCheckBox},
+                new Component[] {allowFullCheckBox, null},
+                new Component[] {functionalWhenUnactivatedCheckBox, null},
                 new Component[] {maxHeightLabel, maxHeightSpinner}
         };
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
-        double[] rowSize = {p, p, p, p, p};
-        double[] columnSize = {p,f};
-        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
-        final JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 30, LayoutConstants.VGAP_LARGE);
+        double[] rowSize = {p, p, p, p, p, p};
+        double[] columnSize = {p, f};
+        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
+        final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, 30, LayoutConstants.VGAP_LARGE);
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         final JPanel panelWrapper = FRGUIPaneFactory.createBorderLayout_S_Pane();
         panelWrapper.add(panel, BorderLayout.NORTH);
@@ -135,9 +135,9 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{
     public void populate(FormDesigner designer) {
         this.designer = designer;
         this.addAttributeChangeListener(changeListener);
-        ElementCaseEditor elementCaseEditor = (ElementCaseEditor)xCreator.toData();
-        this.hComboBox.setSelectedItem(new Item (elementCaseEditor.getHorziontalAttr().description(), elementCaseEditor.getHorziontalAttr()));
-        this.vComboBox.setSelectedItem(new Item (elementCaseEditor.getVerticalAttr().description(), elementCaseEditor.getVerticalAttr()));
+        ElementCaseEditor elementCaseEditor = (ElementCaseEditor) xCreator.toData();
+        this.hComboBox.setSelectedItem(new Item(elementCaseEditor.getHorziontalAttr().description(), elementCaseEditor.getHorziontalAttr()));
+        this.vComboBox.setSelectedItem(new Item(elementCaseEditor.getVerticalAttr().description(), elementCaseEditor.getVerticalAttr()));
         this.heightRestrictCheckBox.setSelected(elementCaseEditor.isHeightRestrict());
         this.maxHeightLabel.setVisible(elementCaseEditor.isHeightRestrict());
         this.maxHeightSpinner.setVisible(elementCaseEditor.isHeightRestrict());
@@ -152,24 +152,24 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{
         String globalName = this.getGlobalName();
         switch (globalName) {
             case "hComboBox":
-                ((ElementCaseEditor)xCreator.toData()).setHorziontalAttr(((MobileFitAttrState)((Item)hComboBox.getSelectedItem()).getValue()));
+                ((ElementCaseEditor) xCreator.toData()).setHorziontalAttr(((MobileFitAttrState) ((Item) hComboBox.getSelectedItem()).getValue()));
                 break;
             case "vComboBox":
-                ((ElementCaseEditor)xCreator.toData()).setVerticalAttr(((MobileFitAttrState)((Item)vComboBox.getSelectedItem()).getValue()));
+                ((ElementCaseEditor) xCreator.toData()).setVerticalAttr(((MobileFitAttrState) ((Item) vComboBox.getSelectedItem()).getValue()));
                 break;
             case "heightRestrictCheckBox":
                 boolean isHeightRestrict = heightRestrictCheckBox.isSelected();
-                ((ElementCaseEditor)xCreator.toData()).setHeightRestrict(isHeightRestrict);
+                ((ElementCaseEditor) xCreator.toData()).setHeightRestrict(isHeightRestrict);
                 maxHeightSpinner.setVisible(isHeightRestrict);
                 maxHeightLabel.setVisible(isHeightRestrict);
                 break;
             case "maxHeightSpinner":
-                ((ElementCaseEditor)xCreator.toData()).setHeightPercent(maxHeightSpinner.getValue());
+                ((ElementCaseEditor) xCreator.toData()).setHeightPercent(maxHeightSpinner.getValue());
                 break;
             case "allowFullCheckBox":
-                ((ElementCaseEditor)xCreator.toData()).setAllowFullScreen(allowFullCheckBox.isSelected());
+                ((ElementCaseEditor) xCreator.toData()).setAllowFullScreen(allowFullCheckBox.isSelected());
             case "functionalWhenUnactivatedCheckBox":
-                ((ElementCaseEditor)xCreator.toData()).setAllowFullScreen(functionalWhenUnactivatedCheckBox.isSelected());
+                ((ElementCaseEditor) xCreator.toData()).setFunctionalWhenUnactivated(functionalWhenUnactivatedCheckBox.isSelected());
         }
     }