Merge pull request #1494 in BA/design from ~PLOUGH/design:release/8.0 to release/8.0

* commit '3431c64d2bd01d3ca349529405d854125f759c60':
  REPORT-5832 表单自适应切到绝对布局后, 需要清理掉一些绝对布局里没有的属性

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

@@ -100,7 +100,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
                         return switch2FitBodyLayout();
                     } else {
                         XWFitLayout xfl = (XWFitLayout) xwAbsoluteLayout.getBackupParent();
-                        if (xfl.toData().removeMargin()) {
+                        if (xfl.toData().resetStyle()) {
                             DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
                         }
                     }

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

@@ -153,7 +153,7 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel {
 						wAbsoluteBodyLayout.setCompState(WAbsoluteLayout.STATE_FIXED);
 						Component[] components = xfl.getComponents();
 						xfl.removeAll();
-                        xfl.toData().removeMargin();
+                        layout.resetStyle();
 						XWAbsoluteBodyLayout xwAbsoluteBodyLayout = new XWAbsoluteBodyLayout(wAbsoluteBodyLayout, new Dimension(0, 0));
 						xfl.getLayoutAdapter().addBean(xwAbsoluteBodyLayout, 0, 0);
 						for (Component component : components) {