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,7 +29,7 @@ import java.awt.Component;
 
 /**
  * 报表块-移动端属性面板
- *
+ * <p>
  * Created by fanglei on 2017/8/8.
  */
 public class ElementCaseDefinePane extends MobileWidgetDefinePane {
@@ -94,15 +94,15 @@ 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[] rowSize = {p, p, p, p, p, p};
         double[] columnSize = {p, f};
-        int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
+        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();
@@ -169,7 +169,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{
             case "allowFullCheckBox":
                 ((ElementCaseEditor) xCreator.toData()).setAllowFullScreen(allowFullCheckBox.isSelected());
             case "functionalWhenUnactivatedCheckBox":
-                ((ElementCaseEditor)xCreator.toData()).setAllowFullScreen(functionalWhenUnactivatedCheckBox.isSelected());
+                ((ElementCaseEditor) xCreator.toData()).setFunctionalWhenUnactivated(functionalWhenUnactivatedCheckBox.isSelected());
         }
     }