From 86391d401a60c03e9b0dd14fa2e47f1463f03967 Mon Sep 17 00:00:00 2001 From: kerry Date: Thu, 29 Sep 2022 15:17:28 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-79537=20=E5=86=B3=E7=AD=96=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E3=80=8B=E7=BB=9D=E5=AF=B9=E5=B8=83=E5=B1=80=E8=87=AA?= =?UTF-8?q?=E9=80=82=E5=BA=94=E3=80=8B=E7=89=B9=E5=AE=9A=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E4=B8=8Bbody=E5=AE=BD=E5=BA=A6=E7=AA=81=E7=84=B6=E5=8F=980?= =?UTF-8?q?=E4=B8=94=E6=97=A0=E6=B3=95=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beans/adapters/layout/FRCardMainBorderLayoutAdapter.java | 5 ++++- .../designer/beans/adapters/layout/FRFitLayoutAdapter.java | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java index 13910f7d41..057baa9a31 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java +++ b/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; diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java index c893268ba1..8800bb6490 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java +++ b/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();