From 5580aef0bb888a4387ae30da7c2bce9c2a79b71b Mon Sep 17 00:00:00 2001
From: "yaoh.wu" <yaoh.wu@fanruan.com>
Date: Fri, 3 Aug 2018 14:53:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-10263=20=E5=90=AF=E5=8A=A8=E6=97=B6?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E8=BF=9C=E7=A8=8B=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=90=8E=E5=BC=B9=E7=AA=97=E9=80=89=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/env/RemoteEnvPane.java  | 16 ++++++++++++++--
 .../main/java/com/fr/env/RemoteWorkspaceURL.java | 12 ++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
index 15a46f8b51..ff4ec66608 100644
--- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
+++ b/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);
     }
 
 
diff --git a/designer-base/src/main/java/com/fr/env/RemoteWorkspaceURL.java b/designer-base/src/main/java/com/fr/env/RemoteWorkspaceURL.java
index 069541f355..f7f5e6aeeb 100644
--- a/designer-base/src/main/java/com/fr/env/RemoteWorkspaceURL.java
+++ b/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}";
     /**
      * 默认端口
      */

From e1303fbc934a449c0a118a32f1d505056da2b32e Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Fri, 3 Aug 2018 14:56:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-10328=20=E3=80=9010.0=E5=86=92?=
 =?UTF-8?q?=E7=83=9F=E3=80=91@xiaoxia=EF=BC=9A=E8=A1=A8=E5=8D=95=E4=BB=8E?=
 =?UTF-8?q?=E6=A8=AA=E5=90=91=E8=87=AA=E9=80=82=E5=BA=94=E5=88=87=E5=88=B0?=
 =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E5=B8=83=E5=B1=80=EF=BC=8C=E7=BC=A9=E6=94=BE?=
 =?UTF-8?q?=E4=BC=9A=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/properties/FRFitLayoutPropertiesGroupModel.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java
index 6bc1d2a6b5..1e6d55e7be 100644
--- a/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java
+++ b/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) {