Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/design into release/10.0

designer-base/src/main/java/com/fr/env/RemoteEnvPane.java

@@ -395,8 +395,20 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
      * 设置 app 和 servlet 默认值
      */
     private void setDefaultAppAndServlet() {
-        webAppNameInput.setText(FRContext.getCommonOperator().getAppName());
-        servletNameInput.setText(ServerConfig.getInstance().getServletName());
+        String appName;
+        String servletName;
+        try {
+            appName = FRContext.getCommonOperator().getAppName();
+        } catch (Exception ignored) {
+            appName = RemoteWorkspaceURL.DEFAULT_WEB_APP_NAME;
+        }
+        try {
+            servletName = ServerConfig.getInstance().getServletName();
+        } catch (Exception ignored) {
+            servletName = RemoteWorkspaceURL.DEFAULT_SERVLET_NAME;
+        }
+        webAppNameInput.setText(appName);
+        servletNameInput.setText(servletName);
     }
 
 

designer-base/src/main/java/com/fr/env/RemoteWorkspaceURL.java

@@ -10,18 +10,18 @@ import java.util.Objects;
  */
 public class RemoteWorkspaceURL implements FCloneable {
 
-    /**
-     * 默认 hostname
-     */
-    private static final String DEFAULT_HOST_NAME = "${IP}";
     /**
      * 默认 web app name
      */
-    private static final String DEFAULT_WEB_APP_NAME = "webroot";
+    static final String DEFAULT_WEB_APP_NAME = "webroot";
     /**
      * 默认 servlet name
      */
-    private static final String DEFAULT_SERVLET_NAME = "decision";
+    static final String DEFAULT_SERVLET_NAME = "decision";
+    /**
+     * 默认 hostname
+     */
+    private static final String DEFAULT_HOST_NAME = "${IP}";
     /**
      * 默认端口
      */

designer-form/src/main/java/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();
+						layout.resetStyle();
 						XWAbsoluteBodyLayout xwAbsoluteBodyLayout = new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0, 0));
 						xfl.getLayoutAdapter().addBean(xwAbsoluteBodyLayout, 0, 0);
 						for (Component component : components) {