From f7f91b2f0f20c358a74e79062a63d87f6b66dd8b Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Tue, 29 Sep 2020 15:30:01 +0800
Subject: [PATCH] =?UTF-8?q?CHART-16060=20=E6=BC=8F=E6=96=97=E5=9B=BE?=
 =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E5=8F=82=E6=95=B0=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/designer/component/VanChartTooltipContentPane.java    | 2 +-
 .../funnel/designer/style/VanChartFunnelTooltipContentPane.java | 1 +
 .../designer/style/VanChartWordCloudTooltipContentPane.java     | 1 +
 .../src/main/resources/com/fr/design/editor/script/editor.js    | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
index 159db1a488..895da24a5a 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
@@ -608,8 +608,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
             setDirty(false);
         }
 
-        checkCardPane();
         checkStylePane();
+        checkCardPane();
     }
 
     private void populateTypeButton(AttrTooltipContent attrTooltipContent) {
diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelTooltipContentPane.java
index 4c4ff52201..37e7624af0 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelTooltipContentPane.java
@@ -62,6 +62,7 @@ public class VanChartFunnelTooltipContentPane extends VanChartTooltipContentPane
         AttrTooltipContent attrTooltipContent = new AttrTooltipContent();
         attrTooltipContent.getCategoryFormat().setEnable(false);
         attrTooltipContent.setSeriesFormat(new AttrTooltipNameFormat());
+        attrTooltipContent.setRichTextSeriesFormat(new AttrTooltipNameFormat());
         attrTooltipContent.getSeriesFormat().setEnable(true);
         attrTooltipContent.getValueFormat().setEnable(true);
         return attrTooltipContent;
diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java
index 850645c758..c0e9ac6c37 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java
@@ -81,6 +81,7 @@ public class VanChartWordCloudTooltipContentPane extends VanChartTooltipContentP
     protected AttrTooltipContent createAttrTooltip() {
         AttrTooltipContent attrTooltipContent = new AttrTooltipContent();
         attrTooltipContent.setSeriesFormat(new AttrTooltipNameFormat());
+        attrTooltipContent.setRichTextSeriesFormat(new AttrTooltipNameFormat());
         return attrTooltipContent;
     }
 }
diff --git a/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js b/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
index 1a2a07dc4b..f87d8b6c04 100644
--- a/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
+++ b/designer-chart/src/main/resources/com/fr/design/editor/script/editor.js
@@ -107,7 +107,7 @@
 
         _cleanHtml: function (value) {
             var editorService = BI.Services.getService("bi.service.design.chart.common.editor");
-            var dimensionIds = this.options.dimensionIds;
+            var dimensionIds = this.model.dimensionIds;
             var dataIdMap = {};
 
             for (var i = 0, len = dimensionIds.length; i < len; i++) {