REPORT-5503 表单背景不能铺满

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().stashAndRemoveMargin()) {
+                            DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
+                        }
                     }
                 }
                 if (row == 1) {
@@ -142,6 +148,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
 
             xfl.getLayoutAdapter().removeBean(xwAbsoluteLayout, xwAbsoluteLayout.getWidth(), xwAbsoluteLayout.getHeight());
             xfl.remove(xwAbsoluteLayout);
+            xfl.toData().restoreMargin();
 
             for (Component comp : components) {
                 XCreator xCreator = (XCreator) comp;

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

@@ -12,6 +12,7 @@ import com.fr.design.mainframe.widget.editors.FitLayoutDirectionEditor;
 import com.fr.design.mainframe.widget.editors.LayoutTypeEditor;
 import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor;
 import com.fr.design.mainframe.widget.editors.PropertyCellEditor;
+import com.fr.form.ui.PaddingMargin;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WAbsoluteBodyLayout;
 import com.fr.form.ui.container.WAbsoluteLayout;
@@ -152,6 +153,7 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel {
 						wAbsoluteBodyLayout.setCompState(WAbsoluteLayout.STATE_FIXED);
 						Component[] components = xfl.getComponents();
 						xfl.removeAll();
+                        xfl.toData().stashAndRemoveMargin();
 						XWAbsoluteBodyLayout xwAbsoluteBodyLayout = new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0, 0));
 						xfl.getLayoutAdapter().addBean(xwAbsoluteBodyLayout, 0, 0);
 						for (Component component : components) {