From fc9adf928ebdd7a615cf21c29fca4c5545809646 Mon Sep 17 00:00:00 2001
From: zhouping <zhouping@finereport.com>
Date: Mon, 27 Mar 2017 09:33:08 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-2171=20=E8=A1=A8=E5=8D=95=E9=87=8C?=
 =?UTF-8?q?=E5=B5=8C=E5=A5=97tab=E5=90=8E,=20=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E4=BA=86,=20=E6=89=80=E6=9C=89=E8=87=AA?=
 =?UTF-8?q?=E9=80=82=E5=BA=94=E9=83=BD=E8=BF=99=E6=A0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/designer/creator/XWAbsoluteLayout.java   | 10 ++++++++++
 .../com/fr/design/designer/creator/XWFitLayout.java    |  1 +
 2 files changed, 11 insertions(+)

diff --git a/designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java b/designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java
index 4ed1b6549..1c731dffa 100644
--- a/designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java
@@ -8,6 +8,7 @@ import java.awt.event.ContainerEvent;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 import java.beans.IntrospectionException;
+import java.util.ArrayList;
 import java.util.HashMap;
 
 import com.fr.design.designer.beans.AdapterBus;
@@ -16,6 +17,7 @@ import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRAbsoluteLayoutAdapter;
 import com.fr.design.designer.beans.location.Direction;
 import com.fr.design.designer.beans.models.SelectionModel;
+import com.fr.design.designer.creator.cardlayout.XWTabFitLayout;
 import com.fr.design.form.layout.FRAbsoluteLayout;
 import com.fr.design.icon.IconPathConstants;
 import com.fr.design.mainframe.*;
@@ -154,6 +156,14 @@ public class XWAbsoluteLayout extends XLayoutContainer {
 		if (xCreator.acceptType(XWAbsoluteLayout.class)){
 			((XWAbsoluteLayout) xCreator).updateBoundsWidget();
 		}
+		// 如果子组件时tab布局，则tab布局内部的组件的wiget也要更新，否则保存后重新打开大小不对
+		ArrayList<?> childrenList = xCreator.getTargetChildrenList();
+		if(!childrenList.isEmpty()){
+			for(int i=0; i<childrenList.size(); i++){
+				XWTabFitLayout tabLayout = (XWTabFitLayout) childrenList.get(i);
+				tabLayout.updateBoundsWidget();
+			}
+		}
 		BoundsWidget boundsWidget = layout.getBoundsWidget(xCreator.toData());
 		Rectangle rectangle = dealWidgetBound(xCreator.getBounds());
 	}
diff --git a/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java b/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java
index 340ec9cd1..ae0b974fb 100644
--- a/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java
@@ -759,6 +759,7 @@ public class XWFitLayout extends XLayoutContainer {
 			//如果子组件是绝对布局，则内部的widget也要更新
 			if (creator.acceptType(XWAbsoluteLayout.class)){
 				((XWAbsoluteLayout) creator).updateBoundsWidget();
+				creator.setBackupBound(creator.getBounds());
 			}
     	}
     	layout.setContainerHeight(containerHeight);