diff --git a/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java b/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java index f90f59c8c..9a2f38b99 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java @@ -18,7 +18,6 @@ import com.fr.report.core.ReportUtils; import com.fr.report.stable.LayerReportAttr; import com.fr.report.worksheet.WorkSheet; import com.fr.stable.ProductConstants; - import javax.swing.AbstractButton; import javax.swing.BorderFactory; import javax.swing.ButtonGroup; @@ -73,28 +72,43 @@ public class ReportEnginePane extends BasicBeanPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel outReportEnginePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_Attribute")); outReportEnginePane.setPreferredSize(new Dimension(600, 370)); - JPanel reportEnginePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); this.add(outReportEnginePane, BorderLayout.NORTH); - outReportEnginePane.add(reportEnginePane); + outReportEnginePane.add(createReportEnginePane()); + JPanel outAdvicePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advice")); + this.add(outAdvicePane, BorderLayout.SOUTH); + outAdvicePane.setPreferredSize(new Dimension(600, 150)); + outAdvicePane.add(createAdvicePane()); + } + + private JPanel createReportEnginePane(){ + JPanel reportEnginePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); JPanel clientPagingpanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); clientPaging = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Enable_Client_Page")); clientPaging.setSelected(false); + clientPaging.addActionListener(new SelectActionListener(clientPaging, outPagingEngineSelectPane)); clientPagingpanel.add(clientPaging); reportEnginePane.add(clientPagingpanel); outPagingEngineSelectPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Paging_Engine_Select")); - outPagingEngineSelectPane.setPreferredSize(new Dimension(600, 300)); reportEnginePane.add(outPagingEngineSelectPane); - JPanel pagingEngineSelectPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); - outPagingEngineSelectPane.add(pagingEngineSelectPane); outPagingEngineSelectPane.setVisible(false); - clientPaging.addActionListener(new SelectActionListener(clientPaging, outPagingEngineSelectPane)); + outPagingEngineSelectPane.setPreferredSize(new Dimension(600, 300)); + outPagingEngineSelectPane.add(createPagingEngineSelectPane()); + return reportEnginePane; + } + + private JPanel createPagingEngineSelectPane(){ + JPanel pagingEngineSelectPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); pagingEngineSelectPane.add(createPagingEngineRadioPanel()); outEngineXSettingPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_New_Engine")); - outEngineXSettingPane.setVisible(false); pagingEngineSelectPane.add(outEngineXSettingPane); - JPanel engineXSettingPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); - outEngineXSettingPane.add(engineXSettingPane); + outEngineXSettingPane.setVisible(false); outEngineXSettingPane.setPreferredSize(new Dimension(570, 240)); + outEngineXSettingPane.add(createEngineXSettingPane()); + return pagingEngineSelectPane; + } + + private JPanel createEngineXSettingPane(){ + JPanel engineXSettingPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); JPanel pageQueryBoxPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); pageQueryBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fixed_Line_Paging")); pageQueryBox.setSelected(false); @@ -108,10 +122,7 @@ public class ReportEnginePane extends BasicBeanPane { UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_tip"), SwingConstants.LEFT); tipPane.add(tip); engineXSettingPane.add(tipPane); - JPanel outAdvicePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advice")); - this.add(outAdvicePane, BorderLayout.SOUTH); - outAdvicePane.setPreferredSize(new Dimension(600, 150)); - outAdvicePane.add(createAdvicePane()); + return engineXSettingPane; } private JPanel createPageQueryPane() {