From 620cb6f49e3fdc01a6921c2566bbc43140850246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E7=A3=8A?= <294531121@qq.com>
Date: Mon, 13 Nov 2017 14:07:11 +0800
Subject: [PATCH] =?UTF-8?q?MOBILE-6599=20=E8=AE=BE=E7=BD=AE=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E5=8F=AF=E7=94=A8=E4=BC=9A=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=A1=BA=E5=BA=8F=E9=94=99=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/MobileWidgetTable.java   | 27 +++++++++----------
 1 file changed, 12 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 c9a8587972..63b22e421c 100644
--- a/designer_form/src/com/fr/design/mainframe/MobileWidgetTable.java
+++ b/designer_form/src/com/fr/design/mainframe/MobileWidgetTable.java
@@ -250,26 +250,23 @@ public class MobileWidgetTable extends JTable {
             return new String[0][0];
         }
 
-        //选择的控件
-        XCreator selectedCreator = designer.getSelectionModel().getSelection().getSelectedCreator();
-        Widget selectedModel = selectedCreator != null ? selectedCreator.toData() : null;
+        WFitLayout body = (WFitLayout) designer.getRootComponent().toData();
 
-        if (selectedModel == null) {
+        if (body == null || !body.acceptType(WSortLayout.class)) {
             return new String[0][0];
         }
 
-        // 选择的控件有两种类型，一种是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 {
-            return new String[0][0];
+        List<String> 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);
         }
+        if (!body.isSorted()) {
+            body.setSorted(true);
+        }
+        return widgetName;
+
     }
 
     public boolean isCollapsed() {