Browse Source

Pull request #6283: REPORT-61237 && REPORT-61249 视觉图变动【固定布局-原布局推荐4.1】决策报表-自适应布局-新建空白模板,切换到固定布局,此时无法往设计画布里拖入组件

Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0

* commit 'a0566c38606f7973e58ccded7d0d3e73e533954b':
  REPORT-61249 视觉图变动
  REPORT-61237【固定布局-原布局推荐4.1】决策报表-自适应布局-新建空白模板,切换到固定布局,此时无法往设计画布里拖入组件
bugfix/11.0
kerry 3 years ago
parent
commit
448133f990
  1. 3
      designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFixLayoutAdapter.java
  2. 24
      designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm
  3. 57
      designer-form/src/main/resources/com/fr/design/form/layouts/templates/multi/4.frm

3
designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRFixLayoutAdapter.java

@ -110,7 +110,8 @@ public class FRFixLayoutAdapter extends AbstractLayoutAdapter {
@Override @Override
public boolean accept(XCreator creator, int x, int y) { public boolean accept(XCreator creator, int x, int y) {
return true; Component component = container.getComponentAt(x, y);
return component != container;
} }

24
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"> <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

@ -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"/>

Loading…
Cancel
Save