From b2fef89cb4ce7a871ad2b5cb778d48a8ca07a0ce Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Wed, 20 Oct 2021 14:09:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?REPORT-61237=E3=80=90=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80-=E5=8E=9F=E5=B8=83=E5=B1=80=E6=8E=A8?=
 =?UTF-8?q?=E8=8D=904.1=E3=80=91=E5=86=B3=E7=AD=96=E6=8A=A5=E8=A1=A8-?=
 =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E5=B8=83=E5=B1=80-=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E7=A9=BA=E7=99=BD=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=88=B0=E5=9B=BA=E5=AE=9A=E5=B8=83=E5=B1=80=EF=BC=8C?=
 =?UTF-8?q?=E6=AD=A4=E6=97=B6=E6=97=A0=E6=B3=95=E5=BE=80=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E7=94=BB=E5=B8=83=E9=87=8C=E6=8B=96=E5=85=A5=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/beans/adapters/layout/FRFixLayoutAdapter.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFixLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFixLayoutAdapter.java
index d649c5e30b..7fe0f5d7a6 100644
--- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFixLayoutAdapter.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFixLayoutAdapter.java
@@ -110,7 +110,8 @@ public class FRFixLayoutAdapter extends AbstractLayoutAdapter {
 
     @Override
     public boolean accept(XCreator creator, int x, int y) {
-        return true;
+        Component component = container.getComponentAt(x, y);
+        return component != container;
     }
 
 

From a0566c38606f7973e58ccded7d0d3e73e533954b Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Wed, 20 Oct 2021 14:49:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-61249=20=E8=A7=86=E8=A7=89=E5=9B=BE?=
 =?UTF-8?q?=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/form/layouts/templates/5-7/2.frm   | 24 ++++----
 .../design/form/layouts/templates/multi/4.frm | 57 +++++++++++--------
 2 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm
index e7f9d76d02..17a624d7d7 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm
@@ -59,50 +59,50 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box1"/>
+<WidgetName name="box5"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="0" y="75" width="716" height="274"/>
+<BoundsAttr x="0" y="303" width="244" height="237"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box2"/>
+<WidgetName name="box4"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="716" y="75" width="244" height="465"/>
+<BoundsAttr x="244" y="303" width="236" height="237"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box0"/>
+<WidgetName name="box3"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="0" y="0" width="960" height="75"/>
+<BoundsAttr x="480" y="303" width="236" height="237"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box5"/>
+<WidgetName name="box2"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="0" y="349" width="244" height="191"/>
+<BoundsAttr x="716" y="75" width="244" height="465"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box4"/>
+<WidgetName name="box1"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="244" y="349" width="236" height="191"/>
+<BoundsAttr x="0" y="75" width="716" height="228"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box3"/>
+<WidgetName name="box0"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="480" y="349" width="236" height="191"/>
+<BoundsAttr x="0" y="0" width="960" height="75"/>
 </Widget>
 <ShowBookmarks showBookmarks="true"/>
 <Sorted sorted="false"/>
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm
index 21eac8ae6d..c18a36d26a 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm
@@ -59,96 +59,105 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box4"/>
+<WidgetName name="box10"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="246" y="142" width="468" height="398"/>
+<BoundsAttr x="714" y="379" width="246" height="161"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box0"/>
+<WidgetName name="box9"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="0" y="0" width="960" height="75"/>
+<BoundsAttr x="714" y="227" width="246" height="152"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box9"/>
+<WidgetName name="box8"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="714" y="379" width="246" height="161"/>
+<BoundsAttr x="714" y="75" width="246" height="152"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box3"/>
+<WidgetName name="box7"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="0" y="379" width="246" height="161"/>
+<BoundsAttr x="480" y="75" width="234" height="67"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box8"/>
+<WidgetName name="box6"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="714" y="227" width="246" height="152"/>
+<BoundsAttr x="246" y="75" width="234" height="67"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box7"/>
+<WidgetName name="box5"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="714" y="75" width="246" height="152"/>
+<BoundsAttr x="246" y="142" width="468" height="237"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box2"/>
+<WidgetName name="box4"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="0" y="227" width="246" height="152"/>
+<BoundsAttr x="246" y="379" width="468" height="161"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box1"/>
+<WidgetName name="box3"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="0" y="75" width="246" height="152"/>
+<BoundsAttr x="0" y="379" width="246" height="161"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box6"/>
+<WidgetName name="box2"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="480" y="75" width="234" height="67"/>
+<BoundsAttr x="0" y="227" width="246" height="152"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box5"/>
+<WidgetName name="box1"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="246" y="75" width="234" height="67"/>
+<BoundsAttr x="0" y="75" width="246" height="152"/>
+</Widget>
+<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
+<InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
+<OccupiedLayout>
+<WidgetName name="box0"/>
+</OccupiedLayout>
+</InnerWidget>
+<BoundsAttr x="0" y="0" width="960" height="75"/>
 </Widget>
 <ShowBookmarks showBookmarks="true"/>
 <Sorted sorted="false"/>
 <MobileWidgetList>
 <Widget widgetName="box0"/>
 <Widget widgetName="box1"/>
-<Widget widgetName="box5"/>
 <Widget widgetName="box6"/>
 <Widget widgetName="box7"/>
-<Widget widgetName="box4"/>
-<Widget widgetName="box2"/>
 <Widget widgetName="box8"/>
-<Widget widgetName="box3"/>
+<Widget widgetName="box5"/>
+<Widget widgetName="box2"/>
 <Widget widgetName="box9"/>
+<Widget widgetName="box3"/>
+<Widget widgetName="box4"/>
+<Widget widgetName="box10"/>
 </MobileWidgetList>
 <FrozenWidgets/>
 <MobileBookMarkStyle class="com.fr.form.ui.mobile.impl.DefaultMobileBookMarkStyle"/>