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

* commit '145543dc5af923712979d5d4fc9483804db9629b':
  将控件顺序代码还原

designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java

@@ -21,7 +21,7 @@ public class ElementCasePropertyUI extends AbstractWidgetPropertyUIProvider {
 
     @Override
     public AbstractPropertyTable createWidgetAttrTable() {
-        return new ElementCasePropertyTable(xCreator);
+        return null;
     }
 
     @Override

designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java

@@ -123,9 +123,11 @@ public class WidgetPropertyPane  extends FormDockView implements BaseWidgetPrope
                 extraPane.initPropertyGroups(designer);
             }
         }
-//        for (AbstractPropertyTable propertyTable : widgetPropertyTables) {
-//            propertyTable.initPropertyGroups(designer);
-//        }
+        if (widgetPropertyTables != null) {
+            for (AbstractPropertyTable propertyTable : widgetPropertyTables) {
+                propertyTable.initPropertyGroups(designer);
+            }
+        }
     }
 
     /**
@@ -224,12 +226,14 @@ public class WidgetPropertyPane  extends FormDockView implements BaseWidgetPrope
                     mobileExtraPropertyPanes.add(extraPane);
                     wsp.add(extraPane);
                 }
-//                AbstractPropertyTable propertyTable = widgetAttrProvider.createWidgetAttrTable();
-//                widgetPropertyTables.add(propertyTable);
-//                designer.addDesignerEditListener(new WidgetPropertyDesignerAdapter(formWidgetCardPane));
-//
-//                UIScrollPane uiScrollPane = new UIScrollPane(getExtraBodyTable(propertyTable));
-//                wsp.add(uiScrollPane);
+                AbstractPropertyTable propertyTable = widgetAttrProvider.createWidgetAttrTable();
+                if (propertyTable != null) {
+                    widgetPropertyTables.add(propertyTable);
+                    designer.addDesignerEditListener(new WidgetPropertyDesignerAdapter(formWidgetCardPane));
+
+                    UIScrollPane uiScrollPane = new UIScrollPane(getExtraBodyTable(propertyTable));
+                    wsp.add(uiScrollPane);
+                }
             }
         }
     }