Merge pull request #1541 in BA/design from ~FANGLEI/design:release/9.0 to release/9.0

* commit 'dbdc5cbc065f9270a15f49cc7c152addaa9e84d4':
  MOBILE-7257 把控件顺序的代码还原回去，已经确认过没有以前的bug问题了。

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)) {
+        // 选择的控件有两种类型，一种是WLayout，代表容器，一种是Widget，代表控件
-            WAbsoluteBodyLayout absoluteBodyLayout = (WAbsoluteBodyLayout) ((WAbsoluteLayout.BoundsWidget) body.getWidget(0)).getWidget();
+        if (selectedModel.acceptType(WSortLayout.class)) {
-            mobileWidgetList = absoluteBodyLayout.getOrderedMobileWidgetList();
+            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();
+            return new String[0][0];
-        }
-        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;
-
     }
 
     public boolean isCollapsed() {