From ad8555b4e1d413f9af427cdb6aa43ba75b9bf2ef Mon Sep 17 00:00:00 2001
From: MoMeak <fr123456>
Date: Tue, 14 Nov 2017 16:37:26 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-5409=20=E3=80=90=E9=9A=BE=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F=E3=80=91=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6=E5=9C=A8?=
 =?UTF-8?q?=E6=8B=96=E5=8A=A8=E8=BF=87=E7=A8=8B=E4=B8=ADbody=E7=9A=84?=
 =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E5=B8=83=E5=B1=80=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beans/adapters/layout/FRFitLayoutAdapter.java         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java
index 3a030f7f2b..fd256cc828 100644
--- a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java
+++ b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java
@@ -40,6 +40,8 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
     private HoverPainter painter;
     //区分拖拽和编辑宽高
     private boolean isEdit;
+    //区分拖拽边框和 删除
+    private boolean isDel;
 
     public boolean isEdit() {
         return isEdit;
@@ -720,9 +722,11 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
      * 删除组件或者重新拖动时，其它组件重新计算位置大小
      */
     protected void delete(XCreator creator, int creatorWidth, int creatorHeight) {
+        isDel = true;
         int x = creator.getX();
         int y = creator.getY();
         recalculateChildrenSize(x, y, creatorWidth, creatorHeight);
+        isDel = false;
     }
 
     /**
@@ -1095,7 +1099,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
      * 删除或拉伸控件左边框时 调整左侧的组件位置大小；
      */
     protected boolean calculateLefttRelatComponent(int objWidth) {
-        if (isBeyondAdjustWidthScope(objWidth)) {
+        if (!isDel && isBeyondAdjustWidthScope(objWidth)) {
             return false;
         }
         int count = leftComps.size();
@@ -1153,7 +1157,7 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
      * 删除或拉伸上边框    调整上方的组件位置大小
      */
     protected boolean calculateUpRelatComponent(int objHeight) {
-        if (isBeyondAdjustHeightScope(objHeight)) {
+        if (!isDel && isBeyondAdjustHeightScope(objHeight)) {
             return false;
         }
         int count = upComps.size();