From dbdc5cbc065f9270a15f49cc7c152addaa9e84d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Fri, 22 Dec 2017 16:29:38 +0800
Subject: [PATCH] =?UTF-8?q?MOBILE-7257=20=E6=8A=8A=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E7=9A=84=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=9E=E5=8E=BB=EF=BC=8C=E5=B7=B2=E7=BB=8F=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E8=BF=87=E6=B2=A1=E6=9C=89=E4=BB=A5=E5=89=8D=E7=9A=84bug?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/MobileWidgetTable.java   | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/MobileWidgetTable.java b/designer_form/src/com/fr/design/mainframe/MobileWidgetTable.java
index 3188630689..0f0f3bd45e 100644
--- a/designer_form/src/com/fr/design/mainframe/MobileWidgetTable.java
+++ b/designer_form/src/com/fr/design/mainframe/MobileWidgetTable.java
@@ -247,31 +247,30 @@ public class MobileWidgetTable extends JTable {
      * @return String[][] 二维数组，[0][0]widgetName
      */
     private String[][] getData() {
-        List<String> mobileWidgetList = new ArrayList<String>();
         if (designer.isFormParaDesigner()) {
             return new String[0][0];
         }
 
-        WSortLayout body = (WSortLayout) designer.getRootComponent().toData();
+        //选择的控件
+        XCreator selectedCreator = designer.getSelectionModel().getSelection().getSelectedCreator();
+        Widget selectedModel = selectedCreator != null ? selectedCreator.toData() : null;
 
-        if (body == null) {
+        if (selectedModel == null) {
             return new String[0][0];
         }
 
-        if (body.getWidgetCount() > 0 && body.getWidget(0).acceptType(WAbsoluteBodyLayout.class)) {
-            WAbsoluteBodyLayout absoluteBodyLayout = (WAbsoluteBodyLayout) ((WAbsoluteLayout.BoundsWidget) body.getWidget(0)).getWidget();
-            mobileWidgetList = absoluteBodyLayout.getOrderedMobileWidgetList();
+        // 选择的控件有两种类型，一种是WLayout，代表容器，一种是Widget，代表控件
+        if (selectedModel.acceptType(WSortLayout.class)) {
+            List<String> mobileWidgetList = ((WSortLayout) selectedModel).getOrderedMobileWidgetList();
+            String[][] widgetName = new String[mobileWidgetList.size() + 1][1];
+            widgetName[0][0] = Inter.getLocText("FR-Designer_WidgetOrder");
+            for (int i = 0; i < mobileWidgetList.size(); i++) {
+                widgetName[i + 1][0] = mobileWidgetList.get(i);
+            }
+            return widgetName;
         } else {
-            mobileWidgetList = body.getOrderedMobileWidgetList();
-        }
-        String[][] widgetName = new String[mobileWidgetList.size() + 1][1];
-        widgetName[0][0] = Inter.getLocText("FR-Designer_WidgetOrder");
-        for (int i = 0; i < mobileWidgetList.size(); i++) {
-            widgetName[i + 1][0] = mobileWidgetList.get(i);
+            return new String[0][0];
         }
-
-        return widgetName;
-
     }
 
     public boolean isCollapsed() {