Merge pull request #261 in BA/design from ~ZHOUPING/design:dev to dev

* commit '09bf14f648065df9f7d6a05a47428227fad20e49':
  release的修改同步到dev

designer_form/src/com/fr/design/designer/beans/adapters/layout/FRParameterLayoutAdapter.java

@@ -1,14 +1,20 @@
 package com.fr.design.designer.beans.adapters.layout;
 
 import com.fr.design.beans.GroupModel;
+import com.fr.design.designer.beans.ConstraintsGroupModel;
 import com.fr.design.designer.beans.HoverPainter;
 import com.fr.design.designer.beans.painters.FRParameterLayoutPainter;
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XCreatorUtils;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.form.parameter.RootDesignGroupModel;
+import com.fr.design.utils.ComponentUtils;
+import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.container.WParameterLayout;
 
+import java.awt.*;
+
 /**
  * 表单参数界面的监听器
  */
@@ -40,4 +46,65 @@ public class FRParameterLayoutAdapter extends FRAbsoluteLayoutAdapter {
 		wabs.refreshTagList();
     }
 
+    /**
+     * 是否能在指定位置添加组件
+     *
+     * @param creator 组件
+     * @param x       坐标x
+     * @param y       坐标y
+     * @return 能则返回true
+     */
+    @Override
+    public boolean accept(XCreator creator, int x, int y) {
+        return x >= 0 && y >= 0 && creator.getHeight() <= container.getHeight()
+                && creator.getWidth() <= container.getWidth();
+    }
+
+    @Override
+    protected void addComp(XCreator creator, int x, int y) {
+        if (XCreatorUtils.getParentXLayoutContainer(creator) != null) {
+            Rectangle r = ComponentUtils.getRelativeBounds(container);
+            Rectangle creatorRectangle = ComponentUtils.getRelativeBounds(creator);
+            x = creatorRectangle.x - r.x;
+            y = creatorRectangle.y - r.y;
+        } else {
+            int w = creator.getWidth() / 2;
+            int h = creator.getHeight() / 2;
+            x = x - w;
+            y = y - h;
+        }
+
+        fix(creator, x, y);
+        container.add(creator);
+        LayoutUtils.layoutRootContainer(container);
+    }
+
+    /**
+     * 调整组件大小到合适尺寸位置
+     *
+     * @param creator 组件
+     * @param x       坐标x
+     * @param y       坐标y
+     */
+    @Override
+    public void fix(XCreator creator, int x, int y) {
+        if (x < 0) {
+            x = 0;
+        } else if (x + creator.getWidth() > container.getWidth()) {
+            x = container.getWidth() - creator.getWidth();
+        }
+
+        if (y < 0) {
+            y = 0;
+        } else if (y + creator.getHeight() > container.getHeight()) {
+            y = container.getHeight() - creator.getHeight();
+        }
+
+        creator.setLocation(x, y);
+    }
+
+    @Override
+    public ConstraintsGroupModel getLayoutConstraints(XCreator creator) {
+        return super.getLayoutConstraints(creator);
+    }
 }

designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java

@@ -174,4 +174,13 @@ public class XWParameterLayout extends XWAbsoluteLayout {
     public XLayoutContainer getTopLayout() {
         return this;
     }
+
+    /**
+     * 新增删除拉伸后更新每个组件的BoundsWidget
+     *
+     * @param xCreator
+     */
+    @Override
+    public void updateBoundsWidget(XCreator xCreator) {
+    }
 }