Merge remote-tracking branch 'origin/final/11.0' into final/11.0

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

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

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

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

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

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

designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java

@@ -107,7 +107,7 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
         engineSettingPane.add(outEngineXSettingPane, JLayeredPane.DEFAULT_LAYER);
         engineSettingPane.add(outLineEngineSettingPane, JLayeredPane.DEFAULT_LAYER);
         engineSettingPane.moveToFront(outEngineXSettingPane);
-        engineSettingPane.setVisible(false);
+        engineSettingPane.setVisible(true);
         JPanel pagingEngineSelectPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
         pagingEngineSelectPane.add(createPagingEngineRadioPanel());
         pagingEngineSelectPane.add(engineSettingPane);
@@ -197,7 +197,7 @@ public class ReportEnginePane extends BasicBeanPane<LayerReportAttr> {
     }
 
     private JPanel createPagingEngineRadioPanel(){
-        UIRadioButton newEngine = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_New_Engine"), false);
+        UIRadioButton newEngine = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_New_Engine"), true);
         UIRadioButton lineEngine = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Line_Engine"), false);
         ButtonGroup buttonGroup = new ButtonGroup();
         buttonGroup.add(newEngine);