Merge branch 'release/9.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design into release/9.0

designer/src/com/fr/design/mainframe/bbs/bbs.properties

@@ -4,8 +4,8 @@ COLLECT_URL=http://www.finereporthelp.com:8081/bbs/ReportServer?op=bbs&cmd=colle
 DEFAULT_URL=http\://bbs.finereport.com/home.php?mod=space&do=notice
 GET_MESSAGE_URL=http://feedback.finedevelop.com:3000/bbs/message/count
 GET_SIGN_INFO_URL=http\://bbs.finereport.com
-LLINK= http\://bbs.fanruan.com/home.php?mod=space&uid=66470&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=67190&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=65659&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=60352&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=78157&do=profile
+LINK=http\://bbs.fanruan.com/home.php?mod=space&uid=66470&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=67190&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=65659&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=60352&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=78157&do=profile
 SHARE_URL=http\://bbs.finereport.com
-UUSER=cherishdqy\uFF08\u9093\u79CB\u4E91\uFF09|yets11\uFF08\u9676\u5B5D\u6587\uFF09|\u661F\u75D5\uFF08\u71D5\u5B8F\u4F1F\uFF09|\u9759\u542C\u7985\u9E23\uFF08\u674E\u51A0\u519B\uFF09|yiyemeiying\uFF08\u5218\u4F73\uFF09
+USER=cherishdqy\uFF08\u9093\u79CB\u4E91\uFF09|yets11\uFF08\u9676\u5B5D\u6587\uFF09|\u661F\u75D5\uFF08\u71D5\u5B8F\u4F1F\uFF09|\u9759\u542C\u7985\u9E23\uFF08\u674E\u51A0\u519B\uFF09|yiyemeiying\uFF08\u5218\u4F73\uFF09
 VERIFY_URL=http://www.finereporthelp.com:8081/bbs/ReportServer?op=bbs&cmd=verify
 UPDATE_INFO_URL=http://bbs.finereport.com/source/plugin/infor/infor.html

designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java

@@ -2,6 +2,7 @@ package com.fr.design.designer.properties;
 
 import com.fr.design.designer.creator.*;
 import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormSelectionUtils;
 import com.fr.design.mainframe.WidgetPropertyPane;
@@ -97,6 +98,11 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
                 if (row == 0) {
                     if (state == WBodyLayoutType.FIT.getTypeValue()) {
                         return switch2FitBodyLayout();
+                    } else {
+                        XWFitLayout xfl = (XWFitLayout) xwAbsoluteLayout.getBackupParent();
+                        if (xfl.toData().removeMargin()) {
+                            DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
+                        }
                     }
                 }
                 if (row == 1) {

designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java

@@ -152,6 +152,7 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel {
 						wAbsoluteBodyLayout.setCompState(WAbsoluteLayout.STATE_FIXED);
 						Component[] components = xfl.getComponents();
 						xfl.removeAll();
+						xfl.toData().removeMargin();
 						XWAbsoluteBodyLayout xwAbsoluteBodyLayout = new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0, 0));
 						xfl.getLayoutAdapter().addBean(xwAbsoluteBodyLayout, 0, 0);
 						for (Component component : components) {

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() {