From 3b3481f7685cf32f84681902559ae16cbd47c251 Mon Sep 17 00:00:00 2001
From: zhouping <zhouping@finereport.com>
Date: Mon, 20 Feb 2017 11:20:01 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-1814=20=E8=A1=A8=E5=8D=95tab=E5=9D=97?=
 =?UTF-8?q?=E7=9A=84=E6=94=B9=E8=89=AFbug=20=E5=B5=8C=E5=A5=97=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/creator/cardlayout/XWCardLayout.java      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java
index 7597a45796..8a7db60597 100644
--- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java
@@ -296,8 +296,14 @@ public class XWCardLayout extends XLayoutContainer {
 	 * @return 嵌套与否
 	 */
 	private boolean isNested() {
-		XLayoutContainer xLayoutContainer = this.getBackupParent().getBackupParent();
-		return xLayoutContainer == null || xLayoutContainer.acceptType(XWTabFitLayout.class);
+		XCreator xCreator = (XCreator)this.getBackupParent().getParent();
+		while (xCreator != null) {
+			if (xCreator.acceptType(XWCardMainBorderLayout.class)) {
+				return true;
+			}
+			xCreator = (XCreator) xCreator.getParent();
+		}
+		return false;
 	}
 
 	public CRPropertyDescriptor[] getisCarousel() throws IntrospectionException {