Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

REPORT-61249 视觉图变动

bugfix/11.0
kerry 3 years ago
parent
b2fef89cb4
commit
a0566c3860
2 changed files with 45 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm
  2. 57
      designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm

24
designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm
Unescape View File

@ -59,50 +59,50 @@
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box1"/> <WidgetName name="box5"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="0" y="75" width="716" height="274"/> <BoundsAttr x="0" y="303" width="244" height="237"/>
</Widget> </Widget>
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box2"/> <WidgetName name="box4"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="716" y="75" width="244" height="465"/> <BoundsAttr x="244" y="303" width="236" height="237"/>
</Widget> </Widget>
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box0"/> <WidgetName name="box3"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="0" y="0" width="960" height="75"/> <BoundsAttr x="480" y="303" width="236" height="237"/>
</Widget> </Widget>
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box5"/> <WidgetName name="box2"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="0" y="349" width="244" height="191"/> <BoundsAttr x="716" y="75" width="244" height="465"/>
</Widget> </Widget>
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box4"/> <WidgetName name="box1"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="244" y="349" width="236" height="191"/> <BoundsAttr x="0" y="75" width="716" height="228"/>
</Widget> </Widget>
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box3"/> <WidgetName name="box0"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="480" y="349" width="236" height="191"/> <BoundsAttr x="0" y="0" width="960" height="75"/>
</Widget> </Widget>
<ShowBookmarks showBookmarks="true"/> <ShowBookmarks showBookmarks="true"/>
<Sorted sorted="false"/> <Sorted sorted="false"/>

57
designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm
Unescape View File

@ -59,96 +59,105 @@
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box4"/> <WidgetName name="box10"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="246" y="142" width="468" height="398"/> <BoundsAttr x="714" y="379" width="246" height="161"/>
</Widget> </Widget>
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box0"/> <WidgetName name="box9"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="0" y="0" width="960" height="75"/> <BoundsAttr x="714" y="227" width="246" height="152"/>
</Widget> </Widget>
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box9"/> <WidgetName name="box8"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="714" y="379" width="246" height="161"/> <BoundsAttr x="714" y="75" width="246" height="152"/>
</Widget> </Widget>
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box3"/> <WidgetName name="box7"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="0" y="379" width="246" height="161"/> <BoundsAttr x="480" y="75" width="234" height="67"/>
</Widget> </Widget>
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box8"/> <WidgetName name="box6"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="714" y="227" width="246" height="152"/> <BoundsAttr x="246" y="75" width="234" height="67"/>
</Widget> </Widget>
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box7"/> <WidgetName name="box5"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="714" y="75" width="246" height="152"/> <BoundsAttr x="246" y="142" width="468" height="237"/>
</Widget> </Widget>
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box2"/> <WidgetName name="box4"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="0" y="227" width="246" height="152"/> <BoundsAttr x="246" y="379" width="468" height="161"/>
</Widget> </Widget>
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box1"/> <WidgetName name="box3"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="0" y="75" width="246" height="152"/> <BoundsAttr x="0" y="379" width="246" height="161"/>
</Widget> </Widget>
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box6"/> <WidgetName name="box2"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </InnerWidget>
<BoundsAttr x="480" y="75" width="234" height="67"/> <BoundsAttr x="0" y="227" width="246" height="152"/>
</Widget> </Widget>
<Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget"> <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
<InnerWidget class="com.fr.form.ui.container.OccupiedLayout"> <InnerWidget class="com.fr.form.ui.container.OccupiedLayout">
<OccupiedLayout> <OccupiedLayout>
<WidgetName name="box5"/> <WidgetName name="box1"/>
</OccupiedLayout> </OccupiedLayout>
</InnerWidget> </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> </Widget>
<ShowBookmarks showBookmarks="true"/> <ShowBookmarks showBookmarks="true"/>
<Sorted sorted="false"/> <Sorted sorted="false"/>
<MobileWidgetList> <MobileWidgetList>
<Widget widgetName="box0"/> <Widget widgetName="box0"/>
<Widget widgetName="box1"/> <Widget widgetName="box1"/>
<Widget widgetName="box5"/>
<Widget widgetName="box6"/> <Widget widgetName="box6"/>
<Widget widgetName="box7"/> <Widget widgetName="box7"/>
<Widget widgetName="box4"/>
<Widget widgetName="box2"/>
<Widget widgetName="box8"/> <Widget widgetName="box8"/>
<Widget widgetName="box3"/> <Widget widgetName="box5"/>
<Widget widgetName="box2"/>
<Widget widgetName="box9"/> <Widget widgetName="box9"/>
<Widget widgetName="box3"/>
<Widget widgetName="box4"/>
<Widget widgetName="box10"/>
</MobileWidgetList> </MobileWidgetList>
<FrozenWidgets/> <FrozenWidgets/>
<MobileBookMarkStyle class="com.fr.form.ui.mobile.impl.DefaultMobileBookMarkStyle"/> <MobileBookMarkStyle class="com.fr.form.ui.mobile.impl.DefaultMobileBookMarkStyle"/>

Write Preview
Loading…
Cancel
Save