From ddcd55949f738a2e7983fccfe1135590f11a30dd Mon Sep 17 00:00:00 2001 From: "Fly.Li" Date: Wed, 27 Oct 2021 16:18:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-61669=EF=BC=9A=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=BC=95=E6=93=8E=E7=95=8C=E9=9D=A2=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=80=89=E6=8B=A9=E6=96=B0=E8=AE=A1=E7=AE=97=E5=BC=95?= =?UTF-8?q?=E6=93=8E=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/report/ReportEnginePane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 7db404e52..c2a959094 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 @@ -107,7 +107,7 @@ public class ReportEnginePane extends BasicBeanPane { 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 { } 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); From 1f320aa852db127369922a7d8a513cc25f2730cd Mon Sep 17 00:00:00 2001 From: kerry Date: Wed, 27 Oct 2021 18:46:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-61682=E3=80=90=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E5=B8=83=E5=B1=80-=E5=8E=9F=E5=B8=83=E5=B1=80=E6=8E=A8?= =?UTF-8?q?=E8=8D=904.1=E3=80=91=E5=86=B3=E7=AD=96=E6=8A=A5=E8=A1=A8-?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E5=B8=83=E5=B1=80-=E5=B8=83?= =?UTF-8?q?=E5=B1=80id=E6=9C=89=E5=87=A0=E4=B8=AA=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/com/fr/design/form/layouts/templates/2-4/5.frm | 2 +- .../resources/com/fr/design/form/layouts/templates/2-4/6.frm | 2 +- .../resources/com/fr/design/form/layouts/templates/5-7/2.frm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm index 167db8fd2..c0c38602a 100644 --- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/5.frm @@ -129,7 +129,7 @@ - + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm index 504bfbd12..e38eb3eb3 100644 --- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/2-4/6.frm @@ -129,7 +129,7 @@ - + diff --git a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm index 17a624d7d..721ecc234 100644 --- a/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm +++ b/designer-form/src/main/resources/com/fr/design/form/layouts/templates/5-7/2.frm @@ -138,7 +138,7 @@ - +