From f902d06d5fa7b9e6720e6e49b097689e4d5415bd Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Wed, 14 Jul 2021 13:43:44 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-54374=20=E6=8B=96=E6=8B=BD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9tab=E9=87=8C=E7=9A=84=E7=BB=9D=E5=AF=B9=E7=94=BB?=
 =?UTF-8?q?=E5=B8=83=E5=9D=97=E9=AB=98=E5=BA=A6=EF=BC=8C=E7=BB=9D=E5=AF=B9?=
 =?UTF-8?q?=E7=94=BB=E5=B8=83=E5=9D=97=E9=94=99=E4=B9=B1=20=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E8=AE=BE=E7=BD=AE=E9=9D=A2=E6=9D=BF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=EF=BC=8C=E7=BB=9D=E5=AF=B9=E7=94=BB=E5=B8=83?=
 =?UTF-8?q?=E5=9D=97=E5=86=85=E9=83=A8=E7=BB=84=E4=BB=B6=E4=BD=8D=E7=A7=BB?=
 =?UTF-8?q?=E6=88=90=E7=94=BB=E5=B8=83=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/designer/creator/XWFitLayout.java  | 45 +++++++++++++------
 .../fr/design/mainframe/FormSelection.java    |  4 +-
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java
index 896cbe37c5..cd0919d593 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java
@@ -758,6 +758,11 @@ public class XWFitLayout extends XLayoutContainer {
 		int[] veris = getVeris(true);
 		int containerWidth = 0;
 		int containerHeight = 0;
+
+		PaddingMargin margin = toData().getMargin();
+		int maxW = this.getWidth() - margin.getRight();
+		int maxH = this.getHeight() - margin.getBottom();
+
 		for (int index=0, n=this.getComponentCount(); index<n; index++) {
 			XCreator creator = (XCreator) this.getComponent(index);
 			BoundsWidget wgt = (BoundsWidget) layout.getBoundsWidget(creator.toData());
@@ -793,6 +798,14 @@ public class XWFitLayout extends XLayoutContainer {
 			BoundsWidget wgt = (BoundsWidget) layout.getBoundsWidget(creator.toData());
 			//如果子组件是绝对布局，则内部的widget也要更新
 			if (creator.acceptType(XWAbsoluteLayout.class)){
+
+				// backupBounds处理下内边距 否则计算缩放比例时总是存在一个内边距的误差
+				if (creator.getBackupBound() != null) {
+					Rectangle backUpBound = creator.getBackupBound();
+					processContainerMargin(margin, backUpBound, maxW, maxH);
+					creator.setBackupBound(backUpBound);
+				}
+
 				//更新的时候一定要带上backupBound
 				if (creator.getBackupBound() == null && wgt.getBeforeScaleBounds() != null) {
 					creator.setBackupBound(dealWgtBound(wgt.getBeforeScaleBounds()));
@@ -1064,24 +1077,28 @@ public class XWFitLayout extends XLayoutContainer {
 		for (int i=0; i<num; i++) {
 			Component comp = this.getComponent(i);
 			Rectangle rec = comp.getBounds();
-			if (rec.x == margin.getLeft()) {
-				rec.x = 0;
-				rec.width += margin.getLeft();
-			}
-			if (rec.y == margin.getTop()) {
-				rec.y = 0;
-				rec.height += margin.getTop();
-			}
-			if (rec.x +rec.width == maxW) {
-				rec.width += margin.getRight();
-			}
-			if (rec.y + rec.height == maxH) {
-				rec.height += margin.getBottom();
-			}
+			processContainerMargin(margin, rec, maxW, maxH);
 			comp.setBounds(rec);
 		}
 	}
 
+	private void processContainerMargin(PaddingMargin margin, Rectangle rec, int maxW, int maxH) {
+		if (rec.x == margin.getLeft()) {
+			rec.x = 0;
+			rec.width += margin.getLeft();
+		}
+		if (rec.y == margin.getTop()) {
+			rec.y = 0;
+			rec.height += margin.getTop();
+		}
+		if (rec.x +rec.width == maxW) {
+			rec.width += margin.getRight();
+		}
+		if (rec.y + rec.height == maxH) {
+			rec.height += margin.getBottom();
+		}
+	}
+
 	public Component getTopComp(int x, int y) {
 		int val = getAcualInterval();
 		return this.getComponentAt(x, y-default_Length-val);
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java b/designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java
index 5f48ce294d..7d3711a695 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java
@@ -277,7 +277,9 @@ public class FormSelection {
         for (XCreator creator : selection) {
             LayoutAdapter layoutAdapter = AdapterBus.searchLayoutAdapter(designer, creator);
             if (layoutAdapter != null) {
-                if (creator.acceptType(XWAbsoluteLayout.class) && recs.size() > i) {
+                // 这里处理绝对画布块 仅局限于选中多个组件且其中包含了绝对画布块的情况
+                boolean accept = creator.acceptType(XWAbsoluteLayout.class) && recs.size() > i && selection.size() > 1;
+                if (accept) {
                     Rectangle rectangle = recs.get(i);
                     check4ParaPane(rectangle);
                     creator.setBackupBound(rectangle);