From b3ecd97d1de370b2ad48fe1b999859506355b89d Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 18 Oct 2017 11:01:54 +0800 Subject: [PATCH 01/13] =?UTF-8?q?REPORT-5095=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E7=BC=93=E5=AD=98=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/start/Designer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/start/Designer.java b/designer/src/com/fr/start/Designer.java index d84492381..35ace6e6a 100644 --- a/designer/src/com/fr/start/Designer.java +++ b/designer/src/com/fr/start/Designer.java @@ -1,6 +1,7 @@ package com.fr.start; import com.fr.base.BaseUtils; +import com.fr.base.Env; import com.fr.base.FRContext; import com.fr.design.DesignerEnvManager; import com.fr.design.actions.core.ActionFactory; @@ -447,7 +448,8 @@ public class Designer extends BaseDesigner { InformationCollector collector = InformationCollector.getInstance(); collector.collectStopTime(); collector.saveXMLFile(); - ServletContext.fireServletStopListener(); + Env currentEnv = FRContext.getCurrentEnv(); + currentEnv.doWhenServerShutDown(); } -} \ No newline at end of file +} From 29335470e6d9100126bf6cb2e54972a152ffc6f7 Mon Sep 17 00:00:00 2001 From: vito Date: Wed, 18 Oct 2017 11:37:55 +0800 Subject: [PATCH 02/13] =?UTF-8?q?REPORT-5093=20=E4=BC=98=E5=8C=96=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E7=94=BB=E9=9D=A2=E9=94=AF=E9=BD=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/start/SplashWindow.java | 42 ++++++++----------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/designer_base/src/com/fr/start/SplashWindow.java b/designer_base/src/com/fr/start/SplashWindow.java index f2df42981..aa83c34f7 100644 --- a/designer_base/src/com/fr/start/SplashWindow.java +++ b/designer_base/src/com/fr/start/SplashWindow.java @@ -1,46 +1,40 @@ package com.fr.start; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Image; - -import javax.swing.ImageIcon; -import javax.swing.JFrame; -import javax.swing.JPanel; - import com.fr.base.BaseUtils; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.stable.OperatingSystem; import com.sun.awt.AWTUtilities; +import javax.swing.ImageIcon; +import javax.swing.JFrame; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Image; + + public class SplashWindow extends JFrame { private SplashPane splash = null; @SuppressWarnings("LeakingThisInConstructor") - public SplashWindow(SplashPane splashPane) { + public SplashWindow(SplashPane splashPane) { // alex:必须设置这个属性为true,才可以用透明背景 System.setProperty("sun.java2d.noddraw", "true"); this.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png")); - JPanel defaultPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.setContentPane(defaultPane); - - defaultPane.setBackground(new Color(0, 0, 0, 0)); //slash pane this.splash = splashPane; - splash.setBackground(null); - Image image = splash.getSplashImage(); - ImageIcon imageIcon = new ImageIcon(image); + if (splash != null) { - defaultPane.add(splash, BorderLayout.CENTER); + splash.setBackground(null); + Image image = splash.getSplashImage(); + ImageIcon imageIcon = new ImageIcon(image); + this.setContentPane(splash); this.setSize(new Dimension(imageIcon.getIconWidth(), imageIcon.getIconHeight())); } else { - defaultPane.add(new UILabel("Error, please contract: support@finereport.com"), BorderLayout.CENTER); + this.setContentPane(new UILabel("Error, please contract: support@finereport.com")); this.setSize(new Dimension(480, 320)); } @@ -50,9 +44,9 @@ public class SplashWindow extends JFrame { //使窗体背景透明 if (OperatingSystem.isWindows()) { - this.setBackground(new Color(0,0,0,0)); + this.setBackground(new Color(0, 0, 0, 0)); } - + GUICoreUtils.centerWindow(this); this.setVisible(true); } @@ -62,8 +56,8 @@ public class SplashWindow extends JFrame { */ public void dispose() { super.dispose(); - if(this.splash != null){ - this.splash.releaseTimer(); + if (this.splash != null) { + this.splash.releaseTimer(); } } From 1ec59c1efa0966a8a40666f7077bca9dff841a60 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 18 Oct 2017 14:30:01 +0800 Subject: [PATCH 03/13] =?UTF-8?q?REPORT-5084=20[9.0=E4=BA=8C=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=89=93=E5=BC=80=E7=9A=84=E6=A8=A1=E6=9D=BF=E4=B8=AD?= =?UTF-8?q?=E6=9C=89=E8=AE=BE=E7=BD=AE=E4=BA=86=E7=82=B9=E5=87=BB=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=8C=89=E9=92=AE=EF=BC=8C=E6=89=93=E5=BC=80?= =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/controlpane/UIListControlPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java index a148fd3b8..fd519b0aa 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java @@ -98,7 +98,7 @@ public abstract class UIListControlPane extends UIControlPane { // richie:避免多次update和populate大大降低效率 if (!evt.getValueIsAdjusting()) { // shoc 切换的时候加检验 - if (hasInvalid(false)) { + if (hasInvalid(false) || DesignerContext.getDesignerFrame().getSelectedJTemplate() == null) { return; } ((JControlUpdatePane) UIListControlPane.this.controlUpdatePane).update(); From b955bbbc89054de0751e74206e913b94f2b43373 Mon Sep 17 00:00:00 2001 From: daniel Date: Wed, 18 Oct 2017 16:04:59 +0800 Subject: [PATCH 04/13] REPORT-4930 --- designer_base/src/com/fr/start/BaseDesigner.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index 5be4889c7..d299a8cdd 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -3,6 +3,8 @@ */ package com.fr.start; +import com.fr.base.ConfigManagerCreatorProxy; +import com.fr.base.ConfigManagerFactory; import com.fr.base.FRContext; import com.fr.design.DesignerEnvManager; import com.fr.design.ExtraDesignClassManager; @@ -62,6 +64,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock { public BaseDesigner(String[] args) { RestartHelper.deleteRecordFilesWhenStart(); + ConfigManagerFactory.registerConfigManagerProxy(new ConfigManagerCreatorProxy()); //启动core BuildContext.setBuildFilePath(buildPropertiesPath()); Register.load(); From 1e33946812c30a8c7cc73404cc073a195f6c7c95 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Wed, 18 Oct 2017 16:21:39 +0800 Subject: [PATCH 05/13] =?UTF-8?q?REPORT-5084=20[9.0=E4=BA=8C=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=89=93=E5=BC=80=E7=9A=84=E6=A8=A1=E6=9D=BF=E4=B8=AD?= =?UTF-8?q?=E6=9C=89=E8=AE=BE=E7=BD=AE=E4=BA=86=E7=82=B9=E5=87=BB=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=8C=89=E9=92=AE=EF=BC=8C=E6=89=93=E5=BC=80?= =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/ElementCasePaneDelegate.java | 4 +++- .../src/com/fr/design/gui/controlpane/UIListControlPane.java | 2 +- designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java index bbc87fa78..0f1c38bd2 100644 --- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java +++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java @@ -75,7 +75,9 @@ public class ElementCasePaneDelegate extends ElementCasePane { EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(RolesAlreadyEditedPane.getInstance()); return; } - CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this); + if (DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) { + CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this); + } CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this); QuickEditorRegion.getInstance().populate(getCurrentEditor()); JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java index fd519b0aa..a148fd3b8 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java @@ -98,7 +98,7 @@ public abstract class UIListControlPane extends UIControlPane { // richie:避免多次update和populate大大降低效率 if (!evt.getValueIsAdjusting()) { // shoc 切换的时候加检验 - if (hasInvalid(false) || DesignerContext.getDesignerFrame().getSelectedJTemplate() == null) { + if (hasInvalid(false)) { return; } ((JControlUpdatePane) UIListControlPane.this.controlUpdatePane).update(); diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 279873f0b..1881bd02c 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -925,7 +925,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta } else { this.addAndActivateJTemplate(jt); } - + //REPORT-5084：激活后刷新一下右側面板 + jt.refreshEastPropertiesPane(); } /** From ab6453dcb4de9f1eef4fcabc5152a1db499dce25 Mon Sep 17 00:00:00 2001 From: plough Date: Wed, 18 Oct 2017 17:23:05 +0800 Subject: [PATCH 06/13] =?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=EF=BC=8C=E4=B8=8B=E6=8B=89=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=95=BF=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/controlpane/UIControlPane.java | 8 +++++--- designer_base/src/com/fr/design/module/DesignModule.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java index d3bfb9662..ec65e6b2d 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UIControlPane.java @@ -37,7 +37,8 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH protected CardLayout cardLayout; protected JPanel cardPane; protected BasePlot plot; - private static final int TOP_TOOLBAR_HEIGHT = 24; + private static final int TOP_TOOLBAR_HEIGHT = 20; + private static final int TOP_TOOLBAR_WIDTH = 156; // 可能因为用了tablelayout，要比其他地方多一个像素，看起来才正常 public UIControlPane() { this.initComponentPane(); @@ -191,6 +192,7 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH g2.fillRect(0, 0, c.getWidth(), c.getHeight()); } }); + topToolBar.setBorder(null); topToolBar.setLayout(new BorderLayout()); ShortCut addItem = addItemShortCut().getShortCut(); addItem.intoJToolBar(topToolBar); @@ -206,10 +208,10 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH protected JPanel getLeftTopPane (UIToolbar topToolBar) { double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - double[] columnSize = { p, f}; + double[] columnSize = { p, f, TOP_TOOLBAR_WIDTH}; double[] rowSize = {TOP_TOOLBAR_HEIGHT}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(getAddItemText()), topToolBar}, + new Component[]{new UILabel(getAddItemText()), new JPanel(), topToolBar}, }; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); } diff --git a/designer_base/src/com/fr/design/module/DesignModule.java b/designer_base/src/com/fr/design/module/DesignModule.java index 2830566c2..a82fd032e 100644 --- a/designer_base/src/com/fr/design/module/DesignModule.java +++ b/designer_base/src/com/fr/design/module/DesignModule.java @@ -95,7 +95,7 @@ public abstract class DesignModule extends TopModule { new NameObjectCreator(Inter.getLocText("FR-Designer_Email"), EmailJavaScript.class, EmailPane.class), new NameObjectCreator(Inter.getLocText("Hyperlink-Web_link"), WebHyperlink.class, WebHyperlinkPane.ChartNoRename.class), new NameObjectCreator(Inter.getLocText("JavaScript-Dynamic_Parameters"), ParameterJavaScript.class, ParameterJavaScriptPane.ChartNoRename.class), - new NameObjectCreator("FR-Designer_JavaScript", JavaScriptImpl.class, JavaScriptImplPane.ChartNoRename.class) + new NameObjectCreator(Inter.getLocText("FR-Designer_JavaScript"), JavaScriptImpl.class, JavaScriptImplPane.ChartNoRename.class) }; } From 8f6f1a1ba622e03bf6ab0e4db3225a3f65afb509 Mon Sep 17 00:00:00 2001 From: vito Date: Thu, 19 Oct 2017 16:56:04 +0800 Subject: [PATCH 07/13] =?UTF-8?q?REPORT-3976=20=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=89=88=E6=9C=AC=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/extra/PluginUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/extra/PluginUtils.java b/designer_base/src/com/fr/design/extra/PluginUtils.java index 7ef3eaaad..f4403c7fc 100644 --- a/designer_base/src/com/fr/design/extra/PluginUtils.java +++ b/designer_base/src/com/fr/design/extra/PluginUtils.java @@ -195,7 +195,7 @@ public class PluginUtils { JSONArray resultJSONArray = JSONArray.create(); for(int i = 0; i < oriJSONArray.length(); i++){ JSONObject jo = oriJSONArray.getJSONObject(i); - String envVersion = jo.optString("env-version"); + String envVersion = jo.optString("envversion"); if(isCompatibleCurrentEnv(envVersion)){ resultJSONArray.put(jo); } From e420eeac47e4012a725d357bb82fe3e5b8f69a94 Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 19 Oct 2017 22:02:37 +0800 Subject: [PATCH 08/13] PFC-1053 --- build.9.0.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.9.0.gradle b/build.9.0.gradle index 43b7bcf26..b31565813 100644 --- a/build.9.0.gradle +++ b/build.9.0.gradle @@ -15,7 +15,7 @@ task appletJar<<{ fileset(dir:"${basicDir}/report/build/classes/main") fileset(dir:"${basicDir}/platform/build/classes/main") } - unjar(src:"${libDir}/3rd.jar",dest:"./tmp") + unjar(src:"${libDir}/fr-third-9.0.jar",dest:"./tmp") unjar(src:"${libDir}/servlet-api.jar",dest:"./tmp") jar(jarfile:"build/libs/fr-applet-9.0.jar"){ fileset(dir:"build/classes"){ From 57501f58abb1aff18635672e033dea1f89542361 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Fri, 20 Oct 2017 13:36:52 +0800 Subject: [PATCH 09/13] =?UTF-8?q?CHART-1602=20=E4=BF=AE=E6=94=B9phantomjs?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5=EF=BC=8C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=8F=90=E7=A4=BA=E5=9B=BE=E7=89=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/ChartTypeInterfaceManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index 0512a3d82..fa9d1dba2 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -1,5 +1,6 @@ package com.fr.design; +import com.fr.base.FRContext; import com.fr.chart.base.ChartConstants; import com.fr.chart.base.ChartInternationalNameContentBean; import com.fr.chart.chartattr.Chart; @@ -157,9 +158,11 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr @Override public void run() { - - VanChartPhantomService.startPhantomService(); - + try { + VanChartPhantomService.startPhantomService(); + } catch (Exception e){ + FRContext.getLogger().info("phantomjs server startup failure：" + e.getMessage()); + } initAllChartsDemoImage(allCharts); } }).start(); From 5b3e2ed5475ff7bee89f310a41829041928d23d9 Mon Sep 17 00:00:00 2001 From: ju Date: Fri, 20 Oct 2017 15:13:51 +0800 Subject: [PATCH 10/13] fix --- .../design/mainframe/errorinfo/ErrorInfoUploader.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java b/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java index 43847170a..40e870047 100644 --- a/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java +++ b/designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java @@ -11,6 +11,8 @@ import com.fr.json.JSONException; import com.fr.json.JSONObject; import com.fr.license.function.VT4FR; import com.fr.log.LogHandler; +import com.fr.regist.FRCoreContext; +import com.fr.regist.LicenseListener; import com.fr.stable.CodeUtils; import com.fr.stable.EnvChangedListener; import com.fr.stable.ProductConstants; @@ -52,6 +54,14 @@ public class ErrorInfoUploader { // 这个控制没啥意义, 主要在于宣传功能. licSupport = VT4FR.AlphaFine.support(); + FRCoreContext.listenerLicense(new LicenseListener() { + + @Override + public void onChange() { + + licSupport = VT4FR.AlphaFine.support(); + } + }); } private ErrorInfoUploader() { From f79919b81f469a38220ed4e06d9aa0af2676a320 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Fri, 20 Oct 2017 15:51:30 +0800 Subject: [PATCH 11/13] =?UTF-8?q?REPORT-4888=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9=20=E8=81=9A=E5=90=88?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=8D=95=E5=85=83=E6=8A=A5=E8=A1=A8=E7=BC=A9?= =?UTF-8?q?=E6=94=BE=E9=97=AE=E9=A2=98=EF=BC=9B=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E5=85=B8-=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=AF=B9=E9=BD=90=EF=BC=9B=E6=95=B0=E6=8D=AE=E5=AD=97?= =?UTF-8?q?=E5=85=B8-=E5=85=AC=E5=BC=8F=20=E5=AD=97=E4=BD=93=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E7=81=B0=E5=8C=96=EF=BC=9B=E6=82=AC=E6=B5=AE=E5=85=83?= =?UTF-8?q?=E7=B4=A0item=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/mainframe/ReportFloatPane.java | 4 +++- designer/src/com/fr/poly/PolyDesignUI.java | 8 ++++---- designer/src/com/fr/poly/PolyDesigner.java | 2 +- .../src/com/fr/design/present/dict/FormulaDictPane.java | 2 +- .../src/com/fr/design/present/dict/TableDataDictPane.java | 3 ++- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/ReportFloatPane.java b/designer/src/com/fr/design/mainframe/ReportFloatPane.java index e75960042..c7cb6871f 100644 --- a/designer/src/com/fr/design/mainframe/ReportFloatPane.java +++ b/designer/src/com/fr/design/mainframe/ReportFloatPane.java @@ -80,7 +80,9 @@ public class ReportFloatPane extends JPanel { insertFloatMenu.setIconPath("com/fr/design/images/control/addPopup.png"); JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); ElementCasePaneDelegate elementCasePaneDelegate = (ElementCasePaneDelegate) editingTemplate.getCurrentElementCasePane(); - refreshInsertFloatMenu(elementCasePaneDelegate); + if (elementCasePaneDelegate != null) { + refreshInsertFloatMenu(elementCasePaneDelegate); + } } private UIButton createButtonUI() { diff --git a/designer/src/com/fr/poly/PolyDesignUI.java b/designer/src/com/fr/poly/PolyDesignUI.java index b915e1ad8..855f68a1e 100644 --- a/designer/src/com/fr/poly/PolyDesignUI.java +++ b/designer/src/com/fr/poly/PolyDesignUI.java @@ -209,10 +209,10 @@ public class PolyDesignUI extends ComponentUI { private void paintAddingData(Graphics g, AddingData addingData) { BlockCreator comp = addingData.getCreator(); - int x = (int) (addingData.getCurrentX()*time); - int y = (int) (addingData.getCurrentY()*time); - int width = (int) (comp.getWidth()*time); - int height = (int) (comp.getHeight()*time); + int x = (int) (addingData.getCurrentX() / time); + int y = (int) (addingData.getCurrentY() / time); + int width = comp.getWidth(); + int height = comp.getHeight(); paintCreator(g, comp, x, y, width, height); } diff --git a/designer/src/com/fr/poly/PolyDesigner.java b/designer/src/com/fr/poly/PolyDesigner.java index c8cc3362f..7c2f800c7 100644 --- a/designer/src/com/fr/poly/PolyDesigner.java +++ b/designer/src/com/fr/poly/PolyDesigner.java @@ -280,7 +280,7 @@ public class PolyDesigner extends ReportComponent { int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}}; UILabel tag = new UILabel(Inter.getLocText("FR-Designer-Formula_Dictionary_Display_Examples_Html")); - tag.setForeground(new Color(51, 51, 52)); + tag.setForeground(new Color(143, 143, 146)); tag.setPreferredSize(new Dimension(225, 80)); JPanel t = new JPanel(new BorderLayout()); t.add(tag, BorderLayout.CENTER); diff --git a/designer_base/src/com/fr/design/present/dict/TableDataDictPane.java b/designer_base/src/com/fr/design/present/dict/TableDataDictPane.java index 566591a1e..fd7c14da1 100644 --- a/designer_base/src/com/fr/design/present/dict/TableDataDictPane.java +++ b/designer_base/src/com/fr/design/present/dict/TableDataDictPane.java @@ -51,6 +51,7 @@ import java.util.List; public class TableDataDictPane extends FurtherBasicBeanPane implements Previewable, UIObserver { private static final int BEGIN = 1; private static final int END = 10; + private static final int VGAP = 24; private static final long serialVersionUID = -5469742115988153206L; private static final int SELECTED_NO_TABLEDATA = -2; public TableDataComboBox tableDataNameComboBox; @@ -111,7 +112,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane new Component[]{new UILabel(Inter.getLocText("FR-Designer_Display_Value") + " ", UILabel.LEFT), valueDictPane}, }; - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM); + JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, VGAP, LayoutConstants.VGAP_MEDIUM); this.setLayout(new BorderLayout()); this.add(panel, BorderLayout.CENTER); } From 48be05117fbe3159999ae91d9523f0bef448d345 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Fri, 20 Oct 2017 15:55:42 +0800 Subject: [PATCH 12/13] =?UTF-8?q?REPORT-4888=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/poly/PolyDesigner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer/src/com/fr/poly/PolyDesigner.java b/designer/src/com/fr/poly/PolyDesigner.java index 7c2f800c7..c8cc3362f 100644 --- a/designer/src/com/fr/poly/PolyDesigner.java +++ b/designer/src/com/fr/poly/PolyDesigner.java @@ -280,7 +280,7 @@ public class PolyDesigner extends ReportComponent Date: Fri, 20 Oct 2017 17:16:48 +0800 Subject: [PATCH 13/13] =?UTF-8?q?CHART-1614=20=E5=9C=A8chartModule?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=97=B6=EF=BC=8C=E5=B0=B1=E7=AB=8B=E5=88=BB?= =?UTF-8?q?=E5=90=AF=E5=8A=A8phantomjs=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/ChartTypeInterfaceManager.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index fa9d1dba2..d11733e0c 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -1,6 +1,5 @@ package com.fr.design; -import com.fr.base.FRContext; import com.fr.chart.base.ChartConstants; import com.fr.chart.base.ChartInternationalNameContentBean; import com.fr.chart.chartattr.Chart; @@ -70,7 +69,6 @@ import com.fr.plugin.chart.map.MapIndependentVanChartInterface; import com.fr.plugin.chart.map.VanChartMapPlot; import com.fr.plugin.chart.multilayer.MultiPieIndependentVanChartInterface; import com.fr.plugin.chart.multilayer.VanChartMultiPiePlot; -import com.fr.plugin.chart.phantom.VanChartPhantomService; import com.fr.plugin.chart.pie.PieIndependentVanChartInterface; import com.fr.plugin.chart.radar.RadarIndependentVanChartInterface; import com.fr.plugin.chart.radar.VanChartRadarPlot; @@ -152,21 +150,16 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr allCharts[i] = rowChart; } - + //异步加载图片 new Thread(new Runnable() { - + @Override public void run() { - try { - VanChartPhantomService.startPhantomService(); - } catch (Exception e){ - FRContext.getLogger().info("phantomjs server startup failure：" + e.getMessage()); - } initAllChartsDemoImage(allCharts); } }).start(); - + return child; }