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 e310c6668..33037b5ad 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 @@ -85,7 +85,6 @@ public class ReportEnginePane extends BasicBeanPane { 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")); @@ -93,17 +92,19 @@ public class ReportEnginePane extends BasicBeanPane { outPagingEngineSelectPane.setVisible(false); outPagingEngineSelectPane.setPreferredSize(new Dimension(600, 300)); outPagingEngineSelectPane.add(createPagingEngineSelectPane()); + clientPaging.addActionListener(new SelectActionListener(clientPaging, outPagingEngineSelectPane)); 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")); - pagingEngineSelectPane.add(outEngineXSettingPane); outEngineXSettingPane.setVisible(false); outEngineXSettingPane.setPreferredSize(new Dimension(570, 240)); outEngineXSettingPane.add(createEngineXSettingPane()); + pagingEngineSelectPane.add(createPagingEngineRadioPanel()); + pagingEngineSelectPane.add(outEngineXSettingPane); + return pagingEngineSelectPane; } @@ -115,9 +116,9 @@ public class ReportEnginePane extends BasicBeanPane { pageQueryBoxPanel.add(pageQueryBox); engineXSettingPane.add(pageQueryBoxPanel); pageQueryPane = createPageQueryPane(); - pageQueryBox.addActionListener(new SelectActionListener(pageQueryBox, pageQueryPane)); pageQueryPane.setVisible(false); engineXSettingPane.add(pageQueryPane); + pageQueryBox.addActionListener(new SelectActionListener(pageQueryBox, pageQueryPane)); JPanel tipPane = new JPanel(); UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_tip"), SwingConstants.LEFT); tipPane.add(tip); @@ -256,7 +257,6 @@ public class ReportEnginePane extends BasicBeanPane { countPerPageEditor.setValue(30); countPerPageEditor.setEnabled(false); pageQueryBox.setSelected(false); - pageQueryBox.setEnabled(false); radioButtons.get(0).setSelected(false); radioButtons.get(1).setSelected(false); }