From a1bb9bc52de1b777de11ad96ae28716b23960222 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Mon, 27 Sep 2021 17:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8B=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/form/layouts/templates/multi/5.frm | 37 +++++++-----
 .../design/form/layouts/templates/multi/6.frm | 56 ++++++++++++-------
 2 files changed, 60 insertions(+), 33 deletions(-)

diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/5.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/5.frm
index 5dde2178e..21c56152f 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/5.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/5.frm
@@ -59,7 +59,7 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box5"/>
+<WidgetName name="box7"/>
 </OccupiedLayout>
 </InnerWidget>
 <BoundsAttr x="0" y="183" width="480" height="197"/>
@@ -67,7 +67,7 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box4"/>
+<WidgetName name="box6"/>
 </OccupiedLayout>
 </InnerWidget>
 <BoundsAttr x="480" y="183" width="480" height="197"/>
@@ -83,7 +83,7 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box9"/>
+<WidgetName name="box10"/>
 </OccupiedLayout>
 </InnerWidget>
 <BoundsAttr x="637" y="380" width="323" height="160"/>
@@ -91,7 +91,7 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box7"/>
+<WidgetName name="box8"/>
 </OccupiedLayout>
 </InnerWidget>
 <BoundsAttr x="0" y="380" width="323" height="160"/>
@@ -99,7 +99,7 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box8"/>
+<WidgetName name="box9"/>
 </OccupiedLayout>
 </InnerWidget>
 <BoundsAttr x="323" y="380" width="314" height="160"/>
@@ -107,10 +107,18 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box6"/>
+<WidgetName name="box5"/>
+</OccupiedLayout>
+</InnerWidget>
+<BoundsAttr x="764" y="75" width="196" height="108"/>
+</Widget>
+<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
+<InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
+<OccupiedLayout>
+<WidgetName name="box1"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="0" y="75" width="244" height="108"/>
+<BoundsAttr x="0" y="75" width="196" height="108"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
@@ -118,37 +126,38 @@
 <WidgetName name="box3"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="716" y="75" width="244" height="108"/>
+<BoundsAttr x="384" y="75" width="192" height="108"/>
 </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="480" y="75" width="236" height="108"/>
+<BoundsAttr x="576" y="75" width="188" height="108"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box1"/>
+<WidgetName name="box2"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="244" y="75" width="236" height="108"/>
+<BoundsAttr x="196" y="75" width="188" height="108"/>
 </Widget>
 <ShowBookmarks showBookmarks="true"/>
 <Sorted sorted="false"/>
 <MobileWidgetList>
 <Widget widgetName="box0"/>
-<Widget widgetName="box6"/>
 <Widget widgetName="box1"/>
 <Widget widgetName="box2"/>
 <Widget widgetName="box3"/>
-<Widget widgetName="box5"/>
 <Widget widgetName="box4"/>
+<Widget widgetName="box5"/>
 <Widget widgetName="box7"/>
+<Widget widgetName="box6"/>
 <Widget widgetName="box8"/>
 <Widget widgetName="box9"/>
+<Widget widgetName="box10"/>
 </MobileWidgetList>
 <FrozenWidgets/>
 <MobileBookMarkStyle class="com.fr.form.ui.mobile.impl.DefaultMobileBookMarkStyle"/>
diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/6.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/6.frm
index 3644ecff8..a76dbdb6b 100644
--- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/6.frm
+++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/6.frm
@@ -75,7 +75,7 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box10"/>
+<WidgetName name="box8"/>
 </OccupiedLayout>
 </InnerWidget>
 <BoundsAttr x="0" y="337" width="295" height="203"/>
@@ -83,7 +83,7 @@
 <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="665" y="337" width="295" height="203"/>
@@ -91,23 +91,23 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box9"/>
+<WidgetName name="box5"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="0" y="142" width="295" height="195"/>
+<BoundsAttr x="665" y="142" width="295" height="195"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box5"/>
+<WidgetName name="box3"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="665" y="142" width="295" height="195"/>
+<BoundsAttr x="0" y="142" width="295" height="195"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box6"/>
+<WidgetName name="box4"/>
 </OccupiedLayout>
 </InnerWidget>
 <BoundsAttr x="295" y="142" width="370" height="101"/>
@@ -115,49 +115,67 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box4"/>
+<WidgetName name="box12"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="716" y="75" width="244" height="67"/>
+<BoundsAttr x="796" y="75" width="164" height="67"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box1"/>
+<WidgetName name="box2"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="0" y="75" width="244" height="67"/>
+<BoundsAttr x="0" y="75" width="164" height="67"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box3"/>
+<WidgetName name="box10"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="480" y="75" width="236" height="67"/>
+<BoundsAttr x="480" y="75" width="160" height="67"/>
 </Widget>
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
 <OccupiedLayout>
-<WidgetName name="box2"/>
+<WidgetName name="box9"/>
 </OccupiedLayout>
 </InnerWidget>
-<BoundsAttr x="244" y="75" width="236" height="67"/>
+<BoundsAttr x="320" y="75" width="160" height="67"/>
+</Widget>
+<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
+<InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
+<OccupiedLayout>
+<WidgetName name="box11"/>
+</OccupiedLayout>
+</InnerWidget>
+<BoundsAttr x="640" y="75" width="156" height="67"/>
+</Widget>
+<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
+<InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
+<OccupiedLayout>
+<WidgetName name="box1"/>
+</OccupiedLayout>
+</InnerWidget>
+<BoundsAttr x="164" y="75" width="156" height="67"/>
 </Widget>
 <ShowBookmarks showBookmarks="true"/>
 <Sorted sorted="false"/>
 <MobileWidgetList>
 <Widget widgetName="box0"/>
-<Widget widgetName="box1"/>
 <Widget widgetName="box2"/>
+<Widget widgetName="box1"/>
+<Widget widgetName="box9"/>
+<Widget widgetName="box10"/>
+<Widget widgetName="box11"/>
+<Widget widgetName="box12"/>
 <Widget widgetName="box3"/>
 <Widget widgetName="box4"/>
-<Widget widgetName="box9"/>
-<Widget widgetName="box6"/>
 <Widget widgetName="box5"/>
 <Widget widgetName="box7"/>
-<Widget widgetName="box10"/>
 <Widget widgetName="box8"/>
+<Widget widgetName="box6"/>
 </MobileWidgetList>
 <FrozenWidgets/>
 <MobileBookMarkStyle class="com.fr.form.ui.mobile.impl.DefaultMobileBookMarkStyle"/>