REPORT-134818 fix:fbp回归问题：修复参数面板控件属性面板勾选框触发热区过大问题

designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java

@@ -3,6 +3,9 @@ package com.fr.design.mainframe.widget.ui;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.form.ui.Widget;
 
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.row;
+
 
 /**
  * Created by kerry on 2017/9/30.
@@ -17,12 +20,12 @@ public class BasicSetVisiblePropertyPane extends FormBasicPropertyPane {
     protected void initComponent() {
         UICheckBox otherOtherConfig = createOtherConfig();
         if(otherOtherConfig != null){
-            corePane.add(otherOtherConfig);
+            corePane.add(row(cell(otherOtherConfig)).getComponent());
         }
         visibleCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Visible"), true);
         visibleCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"));
 
-        corePane.add(visibleCheckBox);
+        corePane.add(row(cell(visibleCheckBox)).getComponent());
     }
 
     public UICheckBox createOtherConfig(){

designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java

@@ -275,9 +275,9 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
                         cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background"))).weight(LEFT_WEIGHT),
                         cell(backgroundPane).weight(RIGHT_WEIGHT)
                 ),
-                cell(displayReport),
-                cell(useParamsTemplate),
-                cell(fireAfterEditor)
+                row(cell(displayReport)),
+                row(cell(useParamsTemplate)),
+                row(cell(fireAfterEditor))
         ).getComponent();
     }
 

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

@@ -42,7 +42,7 @@ public class ButtonGroupDictPane extends JPanel {
 				cell(columnLabel).weight(LEFT_WEIGHT), cell(columnSpinner).weight(RIGHT_WEIGHT)
 		).getComponent();
 		this.add(column(VERTICAL_GAP,
-				cell(adaptiveCheckbox),
+				row(cell(adaptiveCheckbox)),
 				cell(columnSettingRow)
 
 		).getComponent());

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

@@ -13,6 +13,7 @@ import javax.swing.JPanel;
 
 import static com.fine.swing.ui.layout.Layouts.cell;
 import static com.fine.swing.ui.layout.Layouts.column;
+import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fr.design.constants.LayoutConstants.VERTICAL_GAP;
 
 public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane<CheckBoxGroup> {
@@ -41,7 +42,7 @@ public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane<CheckBoxGroup
 		checkbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Choose_Type_All"));
 		returnTypePane = new ReturnTypePane();
 		return column(VERTICAL_GAP,
-				cell(checkbox),
+				row(cell(checkbox)),
 				cell(returnTypePane)
 		).getComponent();
 	}

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

@@ -13,6 +13,7 @@ import javax.swing.JPanel;
 import java.awt.Component;
 
 import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.swing.ui.layout.Layouts.column;
 import static com.fr.design.constants.LayoutConstants.VERTICAL_GAP;
 
@@ -42,7 +43,8 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane<ComboCheckBox>
 		returnTypePane = new ReturnTypePane();
 
 		return column(VERTICAL_GAP,
-				cell(supportTagCheckBox),cell(returnTypePane)
+				row(cell(supportTagCheckBox)),
+				cell(returnTypePane)
 		).getComponent();
 	}
 

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

@@ -7,6 +7,9 @@ import com.fr.form.ui.CustomWriteAbleRepeatEditor;
 
 import javax.swing.JPanel;
 
+import static com.fine.swing.ui.layout.Layouts.row;
+import static com.fine.swing.ui.layout.Layouts.cell;
+
 /**
  * Author : Shockway
  * Date: 13-9-18
@@ -24,7 +27,7 @@ public abstract class CustomWritableRepeatEditorPane<T extends CustomWriteAbleRe
 	public  JPanel setValidatePane(){
 		this.customDataCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Custom_Data"), false);
 		JPanel otherContentPane = super.setValidatePane();
-		otherContentPane.add(customDataCheckBox);
+		otherContentPane.add(row(cell(customDataCheckBox)).getComponent());
 		return otherContentPane;
 	}
 

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

@@ -52,7 +52,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 						cell(dicPane[0]).weight(LEFT_WEIGHT),
 						cell(dicPane[1]).weight(RIGHT_WEIGHT)
 				),
-				cell(repeatCheckBox)
+				row(cell(repeatCheckBox))
 		).getComponent();
 		if (waterMarkComponent[0] != null && waterMarkComponent[1] != null) {
 			panel.add(row(
@@ -115,7 +115,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 	public  JPanel setValidatePane(){
         directWriteCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Edit"), false);
 		JPanel otherContentPane = column(LayoutConstants.VERTICAL_GAP).getComponent();
-		otherContentPane.add(directWriteCheckBox);
+		otherContentPane.add(row(cell(directWriteCheckBox)).getComponent());
 		return otherContentPane;
 	}
 

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

@@ -154,7 +154,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         });
 
         validatePane.add(column(VERTICAL_GAP,
-                cell(allowBlankCheckBox),
+                row(cell(allowBlankCheckBox)),
                 cell(errorTipPane)
         ).getComponent());
 

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

@@ -82,8 +82,8 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
 
         return column(VERTICAL_GAP,
                 cell(formWidgetValuePane),
-                cell(isStyleAlignmentWrapText),
-                cell(isPageSetupVertically),
+                row(cell(isStyleAlignmentWrapText)),
+                row(cell(isPageSetupVertically)),
                 row(
                         cell(FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Display_Position_Similar"))).weight(LEFT_WEIGHT),
                         cell(hAlignmentPane).weight(RIGHT_WEIGHT)

designer-realize/src/main/java/com/fr/design/widget/ui/WritableRepeatEditorPane.java

@@ -5,6 +5,8 @@ import com.fr.form.ui.WriteAbleRepeatEditor;
 
 import javax.swing.JPanel;
 
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.row;
 import static com.fine.swing.ui.layout.Layouts.column;
 
 public abstract class WritableRepeatEditorPane<E extends WriteAbleRepeatEditor> extends DirectWriteEditorDefinePane<E> {
@@ -19,7 +21,7 @@ public abstract class WritableRepeatEditorPane<E extends WriteAbleRepeatEditor>
 		JPanel contentPane = column(LayoutConstants.VERTICAL_GAP).getComponent();
 		JPanel otherContentPane = this.setThirdContentPane();
 		if (otherContentPane != null) {
-			contentPane.add(otherContentPane);
+			contentPane.add(row(cell(otherContentPane)).getComponent());
 		}
 		return contentPane;
 	}