From e43bedb410ee0ac7a9b39ebefe6dad2531bb23e3 Mon Sep 17 00:00:00 2001 From: "fly.li" Date: Tue, 28 Sep 2021 15:58:28 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-59567:=E6=8A=A5=E8=A1=A8=E5=BC=95?= =?UTF-8?q?=E6=93=8E=E5=B1=9E=E6=80=A7=E9=9D=A2=E6=9D=BF=E6=8C=89=E4=BA=A4?= =?UTF-8?q?=E4=BA=92=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/report/ReportEnginePane.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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); }