From f28682f0865bdec3aca99919455d069d09db73e2 Mon Sep 17 00:00:00 2001
From: zhouping <zhouping@finereport.com>
Date: Mon, 12 Dec 2016 15:50:59 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-884=20=E7=BB=9D=E5=AF=B9=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=EF=BC=8C=E5=8F=82=E6=95=B0=E9=9D=A2=E6=9D=BF=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=AF=E4=BB=A5=E6=8B=96=E5=88=B0=E4=B8=8B=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8E=E7=BB=84=E4=BB=B6=E9=87=8D=E5=8F=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beans/adapters/layout/FRAbsoluteLayoutAdapter.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java
index 6e68cc2d71..3d53eab015 100644
--- a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java
+++ b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java
@@ -60,6 +60,13 @@ public class FRAbsoluteLayoutAdapter extends FRBodyLayoutAdapter {
 		if (comp == null){
 			return false;
 		}
+		//参数面板内的组件不允许拖往绝对布局中
+		if (creator.getParent() != null && ((XCreator)creator.getParent()).acceptType(XWParameterLayout.class)){
+			Rectangle rec = creator.getBounds();
+			rec.y = creator.getParent().getHeight() - rec.height;
+			creator.setBounds(rec);
+			return false;
+		}
 		//判断下组件能不能拖入绝对布局
 		if (!creator.canEnterIntoAbsolutePane()){
 			return false;