From 13eab084508dcf7e72eed279bd28acda6c40359d Mon Sep 17 00:00:00 2001 From: zheng Date: Mon, 2 Jul 2018 11:14:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?CHART-2466=20=E9=92=BB=E5=8F=96=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=20=E5=8F=82=E6=95=B0=E5=8F=AA=E6=9C=89=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../other/VanChartCatalogHyperLinkPane.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/designer-chart/src/com/fr/van/chart/drillmap/designer/other/VanChartCatalogHyperLinkPane.java b/designer-chart/src/com/fr/van/chart/drillmap/designer/other/VanChartCatalogHyperLinkPane.java index 7ee033f8df..b93118409b 100644 --- a/designer-chart/src/com/fr/van/chart/drillmap/designer/other/VanChartCatalogHyperLinkPane.java +++ b/designer-chart/src/com/fr/van/chart/drillmap/designer/other/VanChartCatalogHyperLinkPane.java @@ -1,15 +1,29 @@ package com.fr.van.chart.drillmap.designer.other; +import com.fr.base.BaseFormula; import com.fr.chart.chartattr.Plot; +import com.fr.extended.chart.HyperLinkPara; +import com.fr.extended.chart.HyperLinkParaHelper; import com.fr.js.NameJavaScriptGroup; import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot; import com.fr.van.chart.custom.component.VanChartHyperLinkPane; +import java.util.HashMap; +import java.util.Map; + /** * Created by hufan on 2016/12/13. */ public class VanChartCatalogHyperLinkPane extends VanChartHyperLinkPane { + protected Map getHyperLinkEditorMap() { + HashMap map = new HashMap(); + for (HyperLinkPara para : HyperLinkParaHelper.DRILL_TOOLS) { + map.put(para.getName(), BaseFormula.createFormulaBuilder().build(para.getFormulaContent())); + } + return map; + } + protected void updateHotHyperLink(Plot plot, NameJavaScriptGroup nameGroup) { if (plot instanceof VanChartDrillMapPlot) { ((VanChartDrillMapPlot) plot).setDrillUpHyperLink(nameGroup); From 407c09336caec0386a79852d80cb90c4f455d7c3 Mon Sep 17 00:00:00 2001 From: zheng Date: Mon, 2 Jul 2018 21:23:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drillmap/designer/other/VanChartCatalogHyperLinkPane.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designer-chart/src/com/fr/van/chart/drillmap/designer/other/VanChartCatalogHyperLinkPane.java b/designer-chart/src/com/fr/van/chart/drillmap/designer/other/VanChartCatalogHyperLinkPane.java index b93118409b..84bd44667c 100644 --- a/designer-chart/src/com/fr/van/chart/drillmap/designer/other/VanChartCatalogHyperLinkPane.java +++ b/designer-chart/src/com/fr/van/chart/drillmap/designer/other/VanChartCatalogHyperLinkPane.java @@ -1,6 +1,7 @@ package com.fr.van.chart.drillmap.designer.other; import com.fr.base.BaseFormula; +import com.fr.base.FormulaBuilder; import com.fr.chart.chartattr.Plot; import com.fr.extended.chart.HyperLinkPara; import com.fr.extended.chart.HyperLinkParaHelper; @@ -17,9 +18,10 @@ import java.util.Map; public class VanChartCatalogHyperLinkPane extends VanChartHyperLinkPane { protected Map getHyperLinkEditorMap() { + FormulaBuilder builder = BaseFormula.createFormulaBuilder(); HashMap map = new HashMap(); for (HyperLinkPara para : HyperLinkParaHelper.DRILL_TOOLS) { - map.put(para.getName(), BaseFormula.createFormulaBuilder().build(para.getFormulaContent())); + map.put(para.getName(), builder.build(para.getFormulaContent())); } return map; }