From c17fa49111b192f9c9d60134ae9ea5ec2afbaf86 Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 29 Jun 2018 14:36:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-9277=20=E3=80=9010.0=E4=B8=80?= =?UTF-8?q?=E8=BD=AE=E5=9B=9E=E5=BD=92=E3=80=91=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webattr/EditReportServerParameterPane.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/designer-realize/src/com/fr/design/webattr/EditReportServerParameterPane.java b/designer-realize/src/com/fr/design/webattr/EditReportServerParameterPane.java index 457e60098..b0e99025a 100644 --- a/designer-realize/src/com/fr/design/webattr/EditReportServerParameterPane.java +++ b/designer-realize/src/com/fr/design/webattr/EditReportServerParameterPane.java @@ -74,13 +74,17 @@ public class EditReportServerParameterPane extends LoadingBasicPane { // File.separator + reportServerPreferenceConfig.fileName()); webAttr = ((ReportWebAttr) ConfigManager.getProviderInstance().getGlobalAttribute(ReportWebAttr.class)); - if (webAttr != null) { - pagePane.populateBean(webAttr.getWebPage()); - viewPane.populateBean(webAttr.getWebView()); - writePane.populateBean(webAttr.getWebWrite()); - cssPane.populate(webAttr); - jsPane.populate(webAttr); + if(webAttr.getWebPage() != null){ + pagePane.populateBean(webAttr.getWebPage()); } + if(webAttr.getWebView() != null){ + viewPane.populateBean(webAttr.getWebView()); + } + if(webAttr.getWebWrite() != null){ + writePane.populateBean(webAttr.getWebWrite()); + } + cssPane.populate(webAttr); + jsPane.populate(webAttr); printSettings = ReportUtils.getPrintSettingsFromServerConfig(); printSettingPane.populate(printSettings); From 70e3022e160d2f2039205185f8ef56d69b8ad1bd Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 29 Jun 2018 14:39:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A2=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webattr/EditReportServerParameterPane.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/designer-realize/src/com/fr/design/webattr/EditReportServerParameterPane.java b/designer-realize/src/com/fr/design/webattr/EditReportServerParameterPane.java index b0e99025a..d8c777655 100644 --- a/designer-realize/src/com/fr/design/webattr/EditReportServerParameterPane.java +++ b/designer-realize/src/com/fr/design/webattr/EditReportServerParameterPane.java @@ -15,6 +15,9 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.webattr.printsettings.PrintSettingPane; import com.fr.general.Inter; import com.fr.report.core.ReportUtils; +import com.fr.report.web.WebPage; +import com.fr.report.web.WebView; +import com.fr.report.web.WebWrite; import com.fr.web.attr.ReportWebAttr; import javax.swing.*; @@ -74,14 +77,17 @@ public class EditReportServerParameterPane extends LoadingBasicPane { // File.separator + reportServerPreferenceConfig.fileName()); webAttr = ((ReportWebAttr) ConfigManager.getProviderInstance().getGlobalAttribute(ReportWebAttr.class)); - if(webAttr.getWebPage() != null){ - pagePane.populateBean(webAttr.getWebPage()); + WebPage webPage = webAttr.getWebPage(); + WebView webView = webAttr.getWebView(); + WebWrite webWrite = webAttr.getWebWrite(); + if(webPage != null){ + pagePane.populateBean(webPage); } - if(webAttr.getWebView() != null){ - viewPane.populateBean(webAttr.getWebView()); + if(webView != null){ + viewPane.populateBean(webView); } - if(webAttr.getWebWrite() != null){ - writePane.populateBean(webAttr.getWebWrite()); + if(webWrite != null){ + writePane.populateBean(webWrite); } cssPane.populate(webAttr); jsPane.populate(webAttr);