Pull request #10205: REPORT-79537 决策报表》绝对布局自适应》特定操作下body宽度突然变0且无法更改

Merge in DESIGN/design from ~KERRY/design_10.0:bugfix/10.0 to bugfix/10.0

* commit '86391d401a60c03e9b0dd14fa2e47f1463f03967':
  REPORT-79537 决策报表》绝对布局自适应》特定操作下body宽度突然变0且无法更改

designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java

@@ -73,7 +73,10 @@ public class FRCardMainBorderLayoutAdapter extends FRBorderLayoutAdapter {
 
             FormDesigner formDesigner = WidgetPropertyPane.getInstance().getEditingFormDesigner();
             AddingModel model = formDesigner.getAddingModel();
-            model.setAddedIllegal(true);
+            if (model != null) {
+                model.setAddedIllegal(true);
+            }
+
             return true;
         } else {
             return false;

designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java

@@ -11,6 +11,7 @@ import com.fr.design.designer.beans.painters.FRFitLayoutPainter;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XCreatorUtils;
 import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
 import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.creator.cardlayout.XWCardLayout;
@@ -339,6 +340,10 @@ public class FRFitLayoutAdapter extends FRBodyLayoutAdapter {
      */
     @Override
     public void fix(XCreator creator) {
+        //XWAbsoluteBodyLayout作为body不允许在Fit布局中调整尺寸
+        if(creator.acceptType(XWAbsoluteBodyLayout.class)){
+            return;
+        }
         //拖拽组件原大小、位置
         Rectangle backupBound = creator.getBackupBound();
         backupBound.x -= container.getX();