Merge pull request #445 in BA/design from ~XIAOXIA/design:dev to dev

* commit '865d923177dbaed541f5c21a3815798920e4a20d':
  rt
  rt
  rt

designer_form/src/com/fr/design/form/parameter/FormParaDesigner.java

@@ -114,8 +114,6 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
 		if (!BaseUtils.isAuthorityEditing()) {
 			EastRegionContainerPane.getInstance().replaceUpPane(
 					WidgetPropertyPane.getInstance(this));
-			EastRegionContainerPane.getInstance().addParameterPane(ParameterPropertyPane.getInstance(this));
-			refreshParameter();
 		} else {
 			showAuthorityEditPane();
 		}
@@ -232,7 +230,14 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP
 		}
 		ParameterPropertyPane.getInstance().getParameterToolbarPane().populateBean(
 				p.getParameterArray() == null ? new Parameter[0] : p.getParameterArray());
-		ParameterPropertyPane.getInstance().repaintContainer();
+
+		EastRegionContainerPane.getInstance().addParameterPane(ParameterPropertyPane.getInstance(this));
+		if (p.getParameterArray().length == 0) {
+			EastRegionContainerPane.getInstance().setParameterHeight(30);
+		} else {
+			//参数面板独立后只能这边触发调整高度，根据参数个数调整换行，计算高度
+			EastRegionContainerPane.getInstance().setParameterHeight((p.getParameterArray().length + 5) / 6 * 30 + 80);
+		}
 	}
 
 	/**