diff --git a/designer/designer.iml b/designer/designer.iml
deleted file mode 100644
index 9ff693f288..0000000000
--- a/designer/designer.iml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="designer_base" />
-    <orderEntry type="module" module-name="designer_form" />
-    <orderEntry type="module" module-name="designer_chart" />
-    <orderEntry type="module" module-name="designer_chart" />
-    <orderEntry type="module" module-name="designer_base" />
-    <orderEntry type="module" module-name="designer_form" />
-    <orderEntry type="module" module-name="base" />
-    <orderEntry type="module" module-name="base-basic" />
-    <orderEntry type="module" module-name="base-calculate" />
-    <orderEntry type="module" module-name="base-data" />
-    <orderEntry type="module" module-name="base-file" />
-    <orderEntry type="module" module-name="base-performance" />
-    <orderEntry type="module" module-name="base-plugin-engine" />
-    <orderEntry type="module" module-name="base-stable" />
-    <orderEntry type="module" module-name="chart-base" />
-    <orderEntry type="module" module-name="chart-chartattr" />
-    <orderEntry type="module" module-name="chart-chartdata" />
-    <orderEntry type="module" module-name="chart-chartglyph" />
-    <orderEntry type="module" module-name="chart-web" />
-    <orderEntry type="module" module-name="engine" />
-    <orderEntry type="module" module-name="engine-cross" />
-    <orderEntry type="module" module-name="engine-enhancement" />
-    <orderEntry type="module" module-name="engine-page" />
-    <orderEntry type="module" module-name="engine-remote" />
-    <orderEntry type="module" module-name="engine-view" />
-    <orderEntry type="module" module-name="engine-write" />
-    <orderEntry type="module" module-name="fmobile" />
-    <orderEntry type="module" module-name="form" />
-    <orderEntry type="module" module-name="fsbakrestore" />
-    <orderEntry type="module" module-name="fschedule" />
-    <orderEntry type="module" module-name="fservice" />
-    <orderEntry type="module" module-name="fsmonitor" />
-    <orderEntry type="library" name="lib" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java
index f80a3a5844..842257d1fc 100644
--- a/designer_base/src/com/fr/env/RemoteEnv.java
+++ b/designer_base/src/com/fr/env/RemoteEnv.java
@@ -29,11 +29,7 @@ import com.fr.file.CacheManager;
 import com.fr.file.DatasourceManager;
 import com.fr.file.DatasourceManagerProvider;
 import com.fr.file.filetree.FileNode;
-import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
-import com.fr.general.IOUtils;
-import com.fr.general.Inter;
-import com.fr.general.LogRecordTime;
+import com.fr.general.*;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONException;
@@ -1839,7 +1835,7 @@ public class RemoteEnv extends AbstractEnv {
         if (input == null) {
             return;
         }
-        LogRecordTime[] records = DavXMLUtils.readXMLLogRecords(input);
+        LogRecordTime[] records = LogUtils.readXMLLogRecords(input);
         for (LogRecordTime logRecordTime : records) {
             //TODO
         }
diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
index 1b88936c94..eaafb9dbf8 100644
--- a/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
+++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
@@ -3,6 +3,7 @@ package com.fr.design.widget.ui.designer.layout;
 import com.fr.design.data.DataCreatorUI;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
 import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.creator.XWScaleLayout;
@@ -117,6 +118,13 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
 
     @Override
     public void populateBean(WFitLayout ob) {
+        FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
+        XLayoutContainer rootLayout = selectedBodyLayout(formDesigner);
+        if (rootLayout != formDesigner.getRootComponent()
+                && formDesigner.getSelectionModel().getSelection().getSelectedCreator() == formDesigner.getRootComponent()) {
+            formDesigner.getSelectionModel().setSelectedCreators(
+                    FormSelectionUtils.rebuildSelection(xWFitLayout, new Widget[]{selectedBodyLayout(formDesigner).toData()}));
+        }
         paddingBound.populate(ob);
         layoutComboBox.setSelectedIndex(ob.getBodyLayoutType().getTypeValue());
         adaptComboBox.setSelectedIndex(ob.getCompState());
@@ -124,6 +132,14 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
         stylePane.setValue(ob.getBorderStyle());
     }
 
+    private XLayoutContainer selectedBodyLayout(FormDesigner formDesigner) {
+        XLayoutContainer rootLayout = formDesigner.getRootComponent();
+        if (rootLayout.getComponentCount() == 1 && rootLayout.getXCreator(0).acceptType(XWAbsoluteBodyLayout.class)){
+            rootLayout = (XWAbsoluteBodyLayout)rootLayout.getXCreator(0);
+        }
+        return rootLayout;
+    }
+
 
     @Override
     public WFitLayout updateBean() {