From b38901e8b13ed29e0842f37299bf9a95eaa7b528 Mon Sep 17 00:00:00 2001
From: Hades <Hades@fanruan.com>
Date: Wed, 5 Dec 2018 19:20:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/designer/creator/XWScaleLayout.java  | 13 +++++++++++++
 .../fr/design/mainframe/WidgetPropertyPane.java | 17 +----------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWScaleLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWScaleLayout.java
index 2ffe6c6eb7..1db5e40451 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XWScaleLayout.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWScaleLayout.java
@@ -10,6 +10,7 @@ import java.awt.event.ContainerEvent;
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRScaleLayoutAdapter;
 import com.fr.design.form.layout.FRScaleLayout;
+import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WScaleLayout;
 import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget;
@@ -166,4 +167,16 @@ public class XWScaleLayout extends DedicateLayoutContainer {
 		XCreator child = getXCreator(INDEX);
 		child.firePropertyChange();
 	}
+
+	/**
+	 * 获取被包装的XCreator扩展的属性tab
+	 * @return
+	 */
+	@Override
+	public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
+		if (this.getXCreatorCount() > 0) {
+			return this.getXCreator(0).getWidgetPropertyUIProviders();
+		}
+		return super.getWidgetPropertyUIProviders();
+	}
 }
\ No newline at end of file
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java
index 5a25ad1ecf..af17389be0 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java
@@ -16,7 +16,6 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.widget.ui.FormWidgetCardPane;
 import com.fr.design.widget.ui.designer.mobile.MobileWidgetDefinePane;
 
-import com.fr.general.ComparatorUtils;
 import com.fr.stable.ArrayUtils;
 
 import javax.swing.*;
@@ -174,26 +173,12 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper
         FormSelection selection = designer.getSelectionModel().getSelection();
         WidgetPropertyUIProvider[] embeddedPropertyUIProviders = null;
         if (selection != null && selection.getSelectedCreator() != null) {
-            embeddedPropertyUIProviders = getEmbeddedPropertyUIProviders(selection.getSelectedCreator());
+            embeddedPropertyUIProviders = selection.getSelectedCreator().getWidgetPropertyUIProviders();
         }
         Set<WidgetPropertyUIProvider> set = ExtraDesignClassManager.getInstance().getArray(WidgetPropertyUIProvider.XML_TAG);
         return ArrayUtils.addAll(embeddedPropertyUIProviders, set.toArray(new WidgetPropertyUIProvider[set.size()]));
     }
 
-    /**
-     * 获取当前控件扩展的属性tab
-     * @param xCreator
-     * @return
-     */
-    private  WidgetPropertyUIProvider[] getEmbeddedPropertyUIProviders(XCreator xCreator) {
-        if (xCreator instanceof XWScaleLayout
-                && ComparatorUtils.equals(((XWScaleLayout) xCreator).getXCreatorCount(), 1)
-                && ((XWScaleLayout) xCreator).getXCreator(0) instanceof XTextEditor) {
-            return ((XWScaleLayout) xCreator).getXCreator(0).getWidgetPropertyUIProviders();
-        }
-        return xCreator.getWidgetPropertyUIProviders();
-    }
-
     /**
      * 判断是将拓展的tab放入属性表还是将原来的tab放入属性表
      *