Browse Source

Merge pull request #6425 in DESIGN/design from release/11.0 to feature/x

* commit 'a1bafe52e90856da8b9823d084c6001d16182482':
  REPORT-58836 自定义导出二期-revert
  REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
feature/x
superman 3 years ago
parent
commit
781da35c58
  1. 947
      designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java
  2. 2
      designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm
  3. 2
      designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm
  4. 2
      designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm

947
designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java

File diff suppressed because it is too large Load Diff

2
designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm

@ -129,7 +129,7 @@
</WatermarkAttr> </WatermarkAttr>
</WatermarkAttr> </WatermarkAttr>
<TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark"> <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
<TemplateLayoutIdAttrMark LayoutId="fcbeb8e9-e709-45cc-8826-36b519776098"/> <TemplateLayoutIdAttrMark LayoutId="37411f22-0083-4508-aec2-ee0cdd4c47b1"/>
</TemplateLayoutIdAttrMark> </TemplateLayoutIdAttrMark>
<TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark"> <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
<TemplateIdAttMark TemplateId="1b495536-b042-45db-a6be-768b472fe7b5"/> <TemplateIdAttMark TemplateId="1b495536-b042-45db-a6be-768b472fe7b5"/>

2
designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm

@ -129,7 +129,7 @@
</WatermarkAttr> </WatermarkAttr>
</WatermarkAttr> </WatermarkAttr>
<TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark"> <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
<TemplateLayoutIdAttrMark LayoutId="fcbeb8e9-e709-45cc-8826-36b519776098"/> <TemplateLayoutIdAttrMark LayoutId="70dae42a-09f9-404e-a5fc-b94acee03d0c"/>
</TemplateLayoutIdAttrMark> </TemplateLayoutIdAttrMark>
<TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark"> <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
<TemplateIdAttMark TemplateId="13b65e55-e7da-43b2-b0e4-3521d500829a"/> <TemplateIdAttMark TemplateId="13b65e55-e7da-43b2-b0e4-3521d500829a"/>

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

@ -138,7 +138,7 @@
</WatermarkAttr> </WatermarkAttr>
</WatermarkAttr> </WatermarkAttr>
<TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark"> <TemplateLayoutIdAttrMark class="com.fr.base.iofile.attr.TemplateLayoutIdAttrMark">
<TemplateLayoutIdAttrMark LayoutId="fcbeb8e9-e709-45cc-8826-36b519776098"/> <TemplateLayoutIdAttrMark LayoutId="436c01cc-a271-4cf0-9610-956a405771fd"/>
</TemplateLayoutIdAttrMark> </TemplateLayoutIdAttrMark>
<TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark"> <TemplateIdAttMark class="com.fr.base.iofile.attr.TemplateIdAttrMark">
<TemplateIdAttMark TemplateId="75a803de-4022-4a58-953a-3db28c1a7aeb"/> <TemplateIdAttMark TemplateId="75a803de-4022-4a58-953a-3db28c1a7aeb"/>

Loading…
Cancel
Save