From a1b9c0bcf424e721bbaf74a3021513f511c93712 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Tue, 8 Sep 2020 10:29:57 +0800
Subject: [PATCH] CHART-15510 toJSON

---
 .../component/VanChartTooltipContentPane.java  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 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 084d121942..20aacca017 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
@@ -159,14 +159,14 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{null, createContentStylePane()}
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Content_Style")), createContentStylePane()}
         };
 
         return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
     }
 
     private JComponent createContentStylePane() {
-        UIButton contentTextArea = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Content_Style"));
+        UIButton contentTextArea = new UIButton(Toolkit.i18nText("Fine-Design_Report_RichTextEditor"));
 
         contentTextArea.addMouseListener(new MouseAdapter() {
             public void mouseClicked(MouseEvent e) {
@@ -395,6 +395,14 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
             return;
         }
 
+        VanChartFormatPaneWithCheckBox[] formatPaneGroup = getFormatPaneGroup();
+
+        for (VanChartFormatPaneWithCheckBox formatPane : formatPaneGroup) {
+            if (formatPane != null) {
+                formatPane.setSelected(false);
+            }
+        }
+
         for (String param : params) {
             VanChartFormatPaneWithCheckBox formatPane = getTargetFormatPane(param);
 
@@ -450,9 +458,11 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     private void updateTooltipRichText(AttrTooltipContent attrTooltipContent) {
         try {
             if (attrTooltipContent != null) {
-                attrTooltipContent.setRichText((AttrTooltipRichText) richText.clone());
+                AttrTooltipRichText tooltipRichText = attrTooltipContent.getRichText();
+                tooltipRichText.setContent(richText.getContent());
+                tooltipRichText.setAuto(richText.isAuto());
             }
-        } catch (Exception e){
+        } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }