From 32420649ac447efe4c9eba681e0ea1b52e7fa9db Mon Sep 17 00:00:00 2001 From: plough Date: Thu, 28 Jun 2018 16:05:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?REPORT-8846=20=E3=80=9010.0=E4=B8=80?= =?UTF-8?q?=E8=BD=AE=E5=9B=9E=E5=BD=92=E3=80=91=E7=BA=B8=E5=BC=A0=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E4=B8=8D=E5=8F=AF=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E5=87=BAPDF=E8=BF=98=E6=98=AF=E4=BC=9A=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E7=BA=B8=E5=BC=A0=E8=83=8C=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/report/ReportBackgroundPane.java | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/designer-realize/src/com/fr/design/report/ReportBackgroundPane.java b/designer-realize/src/com/fr/design/report/ReportBackgroundPane.java index a3e913fe41..f3c8a6ee81 100644 --- a/designer-realize/src/com/fr/design/report/ReportBackgroundPane.java +++ b/designer-realize/src/com/fr/design/report/ReportBackgroundPane.java @@ -1,16 +1,18 @@ package com.fr.design.report; -import java.awt.BorderLayout; - -import com.fr.page.ReportSettingsProvider; +import com.fr.design.dialog.BasicPane; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; import com.fr.design.style.background.BackgroundPane; +import com.fr.general.Inter; +import com.fr.page.ReportSettingsProvider; + +import javax.swing.JPanel; +import java.awt.BorderLayout; public class ReportBackgroundPane extends BasicPane { private UICheckBox isPrintBackgroundCheckBox; + private UICheckBox isExportBackgroundCheckBox; private BackgroundPane backgroundPane; public ReportBackgroundPane() { @@ -19,14 +21,17 @@ public class ReportBackgroundPane extends BasicPane { backgroundPane = new BackgroundPane(); this.add(backgroundPane, BorderLayout.CENTER); - isPrintBackgroundCheckBox = new UICheckBox( - Inter.getLocText("ReportGUI-Print_Background")); - this.add(isPrintBackgroundCheckBox, BorderLayout.SOUTH); + isPrintBackgroundCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Print_Background")); + isExportBackgroundCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Export_Background")); + JPanel sourth = new JPanel(); + sourth.add(isExportBackgroundCheckBox); + sourth.add(isPrintBackgroundCheckBox); + this.add(sourth, BorderLayout.SOUTH); } @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"paper", "Background"}); + return Inter.getLocText("M_Report-Report_Background"); } /** @@ -35,6 +40,7 @@ public class ReportBackgroundPane extends BasicPane { public void populate(ReportSettingsProvider reportSettings) { this.backgroundPane.populate(reportSettings.getBackground()); this.isPrintBackgroundCheckBox.setSelected(reportSettings.isPrintBackground()); + this.isExportBackgroundCheckBox.setSelected(reportSettings.isExportBackground()); } /** @@ -43,5 +49,6 @@ public class ReportBackgroundPane extends BasicPane { public void update(ReportSettingsProvider reportSettings) { reportSettings.setBackground(this.backgroundPane.update()); reportSettings.setPrintBackground(this.isPrintBackgroundCheckBox.isSelected()); + reportSettings.setExportBackground(this.isExportBackgroundCheckBox.isSelected()); } } \ No newline at end of file From fe1b13b7404ac5b688a31d89130b2eb0875b86ea Mon Sep 17 00:00:00 2001 From: plough Date: Thu, 28 Jun 2018 16:18:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/com/fr/design/menu/KeySetUtils.java | 2 +- .../src/com/fr/design/report/ReportBackgroundPane.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-base/src/com/fr/design/menu/KeySetUtils.java b/designer-base/src/com/fr/design/menu/KeySetUtils.java index 949d5334c4..e95b51e958 100644 --- a/designer-base/src/com/fr/design/menu/KeySetUtils.java +++ b/designer-base/src/com/fr/design/menu/KeySetUtils.java @@ -592,7 +592,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Report-Report_Background"); + return Inter.getLocText("Fine-Designer_Report_Background"); } @Override diff --git a/designer-realize/src/com/fr/design/report/ReportBackgroundPane.java b/designer-realize/src/com/fr/design/report/ReportBackgroundPane.java index f3c8a6ee81..7c8c3de822 100644 --- a/designer-realize/src/com/fr/design/report/ReportBackgroundPane.java +++ b/designer-realize/src/com/fr/design/report/ReportBackgroundPane.java @@ -21,8 +21,8 @@ public class ReportBackgroundPane extends BasicPane { backgroundPane = new BackgroundPane(); this.add(backgroundPane, BorderLayout.CENTER); - isPrintBackgroundCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Print_Background")); - isExportBackgroundCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Export_Background")); + isPrintBackgroundCheckBox = new UICheckBox(Inter.getLocText("Fine-Designer_Print_Background")); + isExportBackgroundCheckBox = new UICheckBox(Inter.getLocText("Fine-Designer_Export_Background")); JPanel sourth = new JPanel(); sourth.add(isExportBackgroundCheckBox); sourth.add(isPrintBackgroundCheckBox); @@ -31,7 +31,7 @@ public class ReportBackgroundPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("M_Report-Report_Background"); + return Inter.getLocText("Fine-Designer_Report_Background"); } /** From 6f288bf97d2e74839c404740f4bb1b7725706d31 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Thu, 28 Jun 2018 17:01:10 +0800 Subject: [PATCH 3/5] REPORT-9094 REPORT-9018 --- designer-form/src/com/fr/design/mainframe/JForm.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/designer-form/src/com/fr/design/mainframe/JForm.java b/designer-form/src/com/fr/design/mainframe/JForm.java index 5b06619515..4f98378061 100644 --- a/designer-form/src/com/fr/design/mainframe/JForm.java +++ b/designer-form/src/com/fr/design/mainframe/JForm.java @@ -815,14 +815,6 @@ public class JForm extends JTemplate implements BaseJForm { } } - /** - * 模板更新 - */ - public void fireTargetModified() { - super.fireTargetModified(); - WidgetPropertyPane.getInstance().refreshDockingView(); - } - /** * 在Form和ElementCase, 以及ElementCase和ElementCase之间切换 * From 4909e035c81a89e81bfe3a77c40d395242abfac9 Mon Sep 17 00:00:00 2001 From: neil <459208047@qq.com> Date: Thu, 28 Jun 2018 17:44:14 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-9189=E3=80=9010.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92=E3=80=91=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90?= =?UTF-8?q?=E4=B8=8B=E6=A8=A1=E6=9D=BF=E4=B8=80=E7=9B=B4=E5=9C=A8=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD,=20=E4=B8=8D=E9=9C=80=E8=A6=81=E8=AF=BB=E5=8F=96super?= =?UTF-8?q?=E9=87=8C=E7=9A=84tabledata.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer-realize/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java b/designer-realize/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java index 51bba7487c..74b36372b5 100644 --- a/designer-realize/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java +++ b/designer-realize/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java @@ -120,7 +120,6 @@ public class ErrorInfoLogAppender extends AppenderSkeleton { @Override public void readXML(XMLableReader reader) { - super.readXML(reader); readDesign(reader); } From ccfa66c79163fa646afac74517ce2f4b66fee57d Mon Sep 17 00:00:00 2001 From: richie Date: Thu, 28 Jun 2018 18:23:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?CORE-101=20AOP=E5=9F=BA=E7=A1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-realize/src/com/fr/start/Designer.java | 3 +++ designer-realize/src/com/fr/start/module/DesignerStartup.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/designer-realize/src/com/fr/start/Designer.java b/designer-realize/src/com/fr/start/Designer.java index fad29deb3f..178739fe39 100644 --- a/designer-realize/src/com/fr/start/Designer.java +++ b/designer-realize/src/com/fr/start/Designer.java @@ -44,6 +44,7 @@ import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.module.Module; import com.fr.module.ModuleContext; +import com.fr.record.analyzer.FineAnalyzer; import com.fr.stable.BuildContext; import com.fr.stable.OperatingSystem; import com.fr.stable.ProductConstants; @@ -97,6 +98,8 @@ public class Designer extends BaseDesigner { */ public static void main(String[] args) { + FineAnalyzer.init(); + BuildContext.setBuildFilePath("/com/fr/stable/build.properties"); diff --git a/designer-realize/src/com/fr/start/module/DesignerStartup.java b/designer-realize/src/com/fr/start/module/DesignerStartup.java index 1936451f26..bd43d4c831 100644 --- a/designer-realize/src/com/fr/start/module/DesignerStartup.java +++ b/designer-realize/src/com/fr/start/module/DesignerStartup.java @@ -4,6 +4,8 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.event.Event; import com.fr.event.Listener; import com.fr.module.Activator; +import com.fr.record.analyzer.EnableMetrics; +import com.fr.record.analyzer.Metrics; import com.fr.start.Designer; import com.fr.start.EnvSwitcher; import com.fr.start.SplashContext; @@ -17,9 +19,11 @@ import java.util.concurrent.Executors; /** * Created by juhaoyu on 2018/1/8. */ +@EnableMetrics public class DesignerStartup extends Activator { @Override + @Metrics public void start() { startSub(PreStartActivator.class); //启动基础部分