From 1f86bc3c2dc60e49c998cfdd369845abdcdc5ec2 Mon Sep 17 00:00:00 2001
From: Qin Xiaofu <boxingdream@sina.com>
Date: Tue, 10 Oct 2017 11:07:40 +0800
Subject: [PATCH] =?UTF-8?q?CHART-1295=20=E8=A7=A3=E5=86=B3=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E7=9B=98=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=87=AA=E5=AE=9A=E4=B9=89=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E4=B8=8D=E5=BA=94=E8=AF=A5=E5=87=BA=E7=8E=B0this.seriesName?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/VanChartTooltipContentPane.java     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java
index 9b38bc7c7..dfe6ed91d 100644
--- a/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java
+++ b/designer_chart/src/com/fr/plugin/chart/designer/component/VanChartTooltipContentPane.java
@@ -219,6 +219,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
         updateFormatPane(attrTooltipContent);
 
+        updateFormatsWithPaneWidth(attrTooltipContent);
+
         htmlLabelPane.update(attrTooltipContent.getHtmlLabel());
 
         return attrTooltipContent;
@@ -241,4 +243,17 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
             changedPercentFormatPane.update(attrTooltipContent.getChangedPercentFormat());
         }
     }
+
+    /**
+     * CHART-1295
+     * 通过格式的面板宽度来判断在自定义js代码中是否显示this.seriesName字符串。
+     * 图表对于其他的格式有要求也可以在这里继续添加。
+     * @param attrTooltipContent
+     */
+    private void updateFormatsWithPaneWidth (AttrTooltipContent attrTooltipContent) {
+        int paneWidth = seriesNameFormatPane.getWidth();
+        if (paneWidth == 0) {
+            attrTooltipContent.getSeriesFormat().setEnable(false);
+        }
+    }
 }
\ No newline at end of file