Merge pull request #3684 in DESIGN/design from feature/10.0 to research/10.0

* commit '0274a0850df5e2e4ac581bf29438ad1d292455f4':
  REPORT-47886 参数面板先添加两个参数，再新建两个参数 全部添加，参数和查询按钮会重叠
  REPORT-47886 参数面板先添加两个参数，再新建两个参数 全部添加，参数和查询按钮会重叠

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

@@ -694,8 +694,8 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
             formSubmitButton.setWidgetName("Search");
             formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query"));
             XCreator xCreator = XCreatorUtils.createXCreator(formSubmitButton);
-            if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * 3 + H_GAP, FIRST_V_LOCATION
-                    + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) {
+            if (this.autoAddComponent(xCreator, H_COMPONENT_GAP * 3 + H_GAP, FIRST_V_LOCATION
+                    + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE))) {
                 currentIndex = ((int) Math.ceil((currentIndex + 1) / (double) NUM_IN_A_LINE)) * NUM_IN_A_LINE;
             }
         }