From 45f5802c1c38fce71ab5675bf272481254fef038 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Mon, 13 Nov 2017 09:26:14 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-5503=20=E8=A1=A8=E5=8D=95=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E4=B8=8D=E8=83=BD=E9=93=BA=E6=BB=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FRAbsoluteBodyLayoutPropertiesGroupModel.java           | 6 ++++++
 .../properties/FRFitLayoutPropertiesGroupModel.java         | 1 +
 2 files changed, 7 insertions(+)

diff --git a/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java b/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java
index eb4b31154..20702ec8f 100644
--- a/designer_form/src/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java
+++ b/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) {
diff --git a/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java b/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java
index 9ffad4533..d6d7c06c5 100644
--- a/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java
+++ b/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) {