From 56ead7d91a09592d06f37380e5bd121c946701c3 Mon Sep 17 00:00:00 2001
From: fanglei <294531121>
Date: Thu, 22 Dec 2016 17:35:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3tab=E5=9D=97=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=87=AA=E9=80=82=E5=BA=94=E5=B8=83=E5=B1=80=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99->=E7=A7=BB=E5=8A=A8=E7=AB=AF->=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=89=8B=E6=9C=BA=E9=87=8D=E5=B8=83=E5=B1=80=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/creator/cardlayout/XWTabFitLayout.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
index 230e7671d..c95ee5869 100644
--- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
@@ -14,7 +14,9 @@ import com.fr.design.designer.creator.CRPropertyDescriptor;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWFitLayout;
+import com.fr.design.designer.properties.mobile.BodyMobilePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
+import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormHierarchyTreePane;
 import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
@@ -367,4 +369,13 @@ public class XWTabFitLayout extends XWFitLayout {
 	public XLayoutContainer getTopLayout() {
 		return this.getBackupParent().getTopLayout();
 	}
+
+	/**
+	 * 重写这个方法，解决tab块底下仍然显示手机重布局的bug
+	 * @return
+	 */
+	@Override
+	public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
+		return null;
+	}
 }
\ No newline at end of file

From ac2e680148388de81bb5d8b80320e6a65b1e47e8 Mon Sep 17 00:00:00 2001
From: fanglei <294531121>
Date: Thu, 22 Dec 2016 17:39:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=A9=BA=E6=95=B0?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/designer/creator/cardlayout/XWTabFitLayout.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
index c95ee5869..71df9b059 100644
--- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
@@ -376,6 +376,6 @@ public class XWTabFitLayout extends XWFitLayout {
 	 */
 	@Override
 	public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
-		return null;
+		return new WidgetPropertyUIProvider[0];
 	}
 }
\ No newline at end of file