Merge pull request #435 in BA/design from ~ZHOUPING/design:master to master

* commit 'f09f1d4645d32a3cb3c9b72699bf1798e5455a2a':
  REPORT-625 表单参数面板高度自己变 参数面板高度不要算上分辨率的比例缩放

designer_form/src/com/fr/design/mainframe/FormArea.java

@@ -341,8 +341,6 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
 			if (layout.getParent() != null) {
 				int paraHeight = designer.getParaHeight();
 				if (needCalculateParaHeight && paraHeight > 0) {
-					// 调整参数界面的大小
-					paraHeight += (int) (paraHeight*percent) ;
 					designer.setParaHeight(paraHeight);
 					XWBorderLayout parent =  (XWBorderLayout) layout.getParent();
 					parent.toData().setNorthSize(paraHeight);