From 36f366df2f650e5b126c7c53da657f0f4a759435 Mon Sep 17 00:00:00 2001
From: fr_shine <zheng@finereport.com>
Date: Mon, 5 Mar 2018 16:44:34 +0800
Subject: [PATCH] =?UTF-8?q?CHART-2062=20=E9=92=BB=E5=8F=96=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=20=E4=B8=8A=E9=92=BB=E5=8F=82=E6=95=B0=20=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E7=B3=BB=E5=88=97=E5=90=8D=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/component/VanChartHyperLinkPane.java      |  7 ++++++-
 .../designer/other/VanChartCatalogHyperLinkPane.java | 12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java b/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
index 70808d1c41..45edfe84fe 100644
--- a/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/custom/component/VanChartHyperLinkPane.java
@@ -1,5 +1,6 @@
 package com.fr.plugin.chart.custom.component;
 
+import com.fr.base.BaseFormula;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.web.ChartHyperPoplink;
 import com.fr.chart.web.ChartHyperRelateCellLink;
@@ -77,7 +78,7 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
         Constructor<? extends BasicBeanPane> constructor = null;
         try {
             constructor = creator.getUpdatePane().getConstructor(HashMap.class, boolean.class);
-            return constructor.newInstance(plot.getHyperLinkEditorMap(), false);
+            return constructor.newInstance(getHyperLinkEditorMap(), false);
 
         } catch (InstantiationException e) {
             FRLogger.getLogger().error(e.getMessage(), e);
@@ -91,6 +92,10 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
         return null;
     }
 
+    protected Map<String, BaseFormula> getHyperLinkEditorMap() {
+        return plot.getHyperLinkEditorMap();
+    }
+
 
     /**
      * 弹出列表的标题.
diff --git a/designer_chart/src/com/fr/plugin/chart/drillmap/designer/other/VanChartCatalogHyperLinkPane.java b/designer_chart/src/com/fr/plugin/chart/drillmap/designer/other/VanChartCatalogHyperLinkPane.java
index 8bf8bdfe6a..d6e5463db2 100644
--- a/designer_chart/src/com/fr/plugin/chart/drillmap/designer/other/VanChartCatalogHyperLinkPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/drillmap/designer/other/VanChartCatalogHyperLinkPane.java
@@ -1,15 +1,27 @@
 package com.fr.plugin.chart.drillmap.designer.other;
 
+import com.fr.base.BaseFormula;
 import com.fr.chart.chartattr.Plot;
+import com.fr.general.Inter;
 import com.fr.js.NameJavaScriptGroup;
 import com.fr.plugin.chart.custom.component.VanChartHyperLinkPane;
 import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * Created by hufan on 2016/12/13.
  */
 public class VanChartCatalogHyperLinkPane extends VanChartHyperLinkPane{
 
+    @Override
+    protected Map<String, BaseFormula> getHyperLinkEditorMap() {
+        HashMap<String, BaseFormula> map = new HashMap<String, BaseFormula>();
+        map.put(Inter.getLocText("FR-Chart-Area_Name"), BaseFormula.createFormulaBuilder().build("AREA_NAME"));
+        return map;
+    }
+
     protected void updateHotHyperLink(Plot plot, NameJavaScriptGroup nameGroup) {
         if (plot instanceof VanChartDrillMapPlot) {
             ((VanChartDrillMapPlot) plot).setDrillUpHyperLink(nameGroup);