From 21d0422f021e4b5e7c3bf6044ab173b22dedd00e Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Wed, 2 Sep 2020 10:15:55 +0800
Subject: [PATCH 1/4] =?UTF-8?q?CHART-15510=20=E6=A0=87=E7=AD=BE=E5=92=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=B8=AD=E6=8F=92=E5=85=A5BI=E7=9A=84?=
 =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/VanChartRichEditorPane.java     |  78 +++++++
 .../component/VanChartTooltipContentPane.java | 194 ++++++++++++++++--
 .../VanChartFormatPaneWithCheckBox.java       |  13 +-
 3 files changed, 264 insertions(+), 21 deletions(-)
 create mode 100644 designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java
new file mode 100644
index 000000000..c4588ce1c
--- /dev/null
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java
@@ -0,0 +1,78 @@
+package com.fr.van.chart.designer.component;
+
+import com.fr.design.ui.ModernUIPane;
+import com.fr.plugin.chart.base.AttrTooltipRichEditor;
+import com.fr.stable.StringUtils;
+
+import java.util.Map;
+
+public class VanChartRichEditorPane {
+
+    private static ModernUIPane<RichEditorModel> richEditorPane;
+
+    public static ModernUIPane<RichEditorModel> getInstance() {
+        if (richEditorPane == null) {
+            richEditorPane = new ModernUIPane.Builder<RichEditorModel>()
+                    .withEMB("/com/fr/design/editor/rich_editor.html")
+                    .namespace("Pool").build();
+        }
+
+        return richEditorPane;
+    }
+
+    public static RichEditorModel getRichEditorModel(AttrTooltipRichEditor richEditor) {
+        Map<String, String> paramsMap = richEditor.getParams();
+        StringBuilder paramsStr = new StringBuilder(StringUtils.EMPTY);
+
+        if (paramsMap != null) {
+            for (Map.Entry<String, String> entry : paramsMap.entrySet()) {
+                paramsStr.append(entry.getKey()).append(":").append(entry.getValue());
+                paramsStr.append("-");
+            }
+        }
+
+        int len = paramsStr.length();
+
+        if (len > 0) {
+            paramsStr.deleteCharAt(len - 1);
+        }
+
+        return new RichEditorModel(richEditor.getContent(), richEditor.isAuto(), paramsStr.toString());
+    }
+
+    public static class RichEditorModel {
+        private String content;
+        private boolean auto;
+        private String params;
+
+        public RichEditorModel(String content, boolean auto, String params) {
+            this.content = content;
+            this.auto = auto;
+            this.params = params;
+        }
+
+        public String getContent() {
+            return content;
+        }
+
+        public void setContent(String content) {
+            this.content = content;
+        }
+
+        public boolean isAuto() {
+            return auto;
+        }
+
+        public void setAuto(boolean auto) {
+            this.auto = auto;
+        }
+
+        public String getParams() {
+            return params;
+        }
+
+        public void setParams(String params) {
+            this.params = params;
+        }
+    }
+}
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 5920dd969..b52e4fda4 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
@@ -1,12 +1,23 @@
 package com.fr.van.chart.designer.component;
 
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.gui.autocomplete.AutoCompletion;
+import com.fr.design.gui.autocomplete.DefaultCompletionProvider;
 import com.fr.design.gui.ibutton.UIButtonGroup;
+import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.gui.syntax.ui.rtextarea.RTextArea;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-
+import com.fr.design.ui.ModernUIPane;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.base.AttrTooltipContent;
+import com.fr.plugin.chart.base.AttrTooltipRichEditor;
+import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
 import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox;
@@ -14,15 +25,23 @@ import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithChec
 import com.fr.van.chart.designer.component.format.PercentFormatPaneWithCheckBox;
 import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox;
 import com.fr.van.chart.designer.component.format.ValueFormatPaneWithCheckBox;
+import com.fr.van.chart.designer.component.format.VanChartFormatPaneWithCheckBox;
 import com.fr.van.chart.designer.style.VanChartStylePane;
 
+import javax.swing.JComponent;
+import javax.swing.JFrame;
 import javax.swing.JPanel;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
+import javax.swing.text.Document;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 /**
  * 内容界面 。数据点提示
@@ -43,22 +62,29 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
     private JPanel centerPane;
     private JPanel commonPanel;
+    private JPanel editorPane;
+    private RTextArea contentTextArea;
     private VanChartHtmlLabelPane htmlLabelPane;
 
     private VanChartStylePane parent;
     private JPanel showOnPane;
 
+    private AttrTooltipRichEditor richEditor;
+
     public VanChartTooltipContentPane(VanChartStylePane parent, JPanel showOnPane){
         this.parent = parent;
         this.showOnPane = showOnPane;
+        this.richEditor = new AttrTooltipRichEditor();
 
         this.setLayout(new BorderLayout());
         this.add(createLabelContentPane(),BorderLayout.CENTER);
     }
 
     private JPanel createLabelContentPane() {
-        content = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"),
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")});
+        content = new UIButtonGroup<>(new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Common"),
+                Toolkit.i18nText("Fine-Design_Chart_Custom")
+        });
 
         initFormatPane(parent, showOnPane);
 
@@ -80,8 +106,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
                 }
             }
         };
-        centerPane.add(htmlLabelPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));
-        centerPane.add(commonPanel,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));
+        centerPane.add(htmlLabelPane, Toolkit.i18nText("Fine-Design_Chart_Custom"));
+        centerPane.add(commonPanel, Toolkit.i18nText("Fine-Design_Chart_Common"));
 
         double[] column = {f, e};
         double[] row = {p,p,p};
@@ -90,17 +116,28 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
                 new Component[]{new UILabel(getLabelContentTitle()),content},
                 new Component[]{null,centerPane},
         };
-        initContentListener();
+
         JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, column);
-        return getLabelContentPane(contentPane);
+
+        // editorPane = createRichEditorPanel();
+
+        JPanel panel = new JPanel();
+        panel.setLayout(new BorderLayout());
+
+        panel.add(contentPane, BorderLayout.CENTER);
+        // panel.add(editorPane, BorderLayout.SOUTH);
+
+        initContentListener();
+
+        return getLabelContentPane(panel);
     }
 
     protected String getLabelContentTitle () {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text");
+        return Toolkit.i18nText("Fine-Design_Report_Text");
     }
 
     protected JPanel getLabelContentPane(JPanel contentPane) {
-        return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content"), contentPane);
+        return createTableLayoutPaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Content"), contentPane);
     }
 
     protected VanChartHtmlLabelPane createHtmlLabelPane() {
@@ -117,6 +154,82 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         return TableLayoutHelper.createTableLayoutPane(getPaneComponents(), rowSize, columnSize);
     }
 
+    private JPanel createRichEditorPanel() {
+        double p = TableLayout.PREFERRED;
+        double f = TableLayout.FILL;
+        double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
+
+        double[] columnSize = {f, e};
+        double[] rowSize = {p, p};
+
+        Component[][] components = new Component[][]{
+                new Component[]{null, null},
+                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Content_Style")), createContentStylePane()}
+        };
+
+        return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
+    }
+
+    private JComponent createContentStylePane() {
+        contentTextArea = new RTextArea();
+        contentTextArea.setLineWrap(true);
+        contentTextArea.addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent e) {
+                fireRichEditor();
+            }
+
+            public void mousePressed(MouseEvent e) {
+                fireRichEditor();
+            }
+        });
+
+        DefaultCompletionProvider provider = new DefaultCompletionProvider();
+        AutoCompletion ac = new AutoCompletion(provider);
+        String shortCuts = DesignerEnvManager.getEnvManager().getAutoCompleteShortcuts();
+
+        ac.setTriggerKey(KeyStroke.getKeyStroke(shortCuts.replace("+", "pressed")));
+        ac.install(contentTextArea);
+
+        return new UIScrollPane(contentTextArea) {
+            public Dimension getPreferredSize() {
+                return new Dimension(super.getPreferredSize().width, 100);
+            }
+        };
+    }
+
+    private void fireRichEditor() {
+        final ModernUIPane<VanChartRichEditorPane.RichEditorModel> pane = VanChartRichEditorPane.getInstance();
+        BasicDialog dialog = pane.showWindow(new JFrame());
+
+        pane.populate(VanChartRichEditorPane.getRichEditorModel(richEditor));
+
+        dialog.addDialogActionListener(new DialogActionAdapter() {
+
+            public void doOk() {
+                VanChartRichEditorPane.RichEditorModel model = pane.update();
+
+                String content = model.getContent();
+
+                populateContentTextArea(content);
+
+                richEditor.setContent(content);
+                richEditor.setAuto(model.isAuto());
+
+                SwingUtilities.getWindowAncestor(pane).setVisible(false);
+            }
+
+            public void doCancel() {
+                SwingUtilities.getWindowAncestor(pane).setVisible(false);
+            }
+        });
+
+        dialog.setVisible(true);
+
+        if (parent != null) {
+            parent.attributeChanged();
+        }
+    }
+
     protected void initFormatPane(VanChartStylePane parent, JPanel showOnPane){
         categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane);
         seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane);
@@ -154,13 +267,17 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     private void checkCardPane() {
         CardLayout cardLayout = (CardLayout) centerPane.getLayout();
         if (content.getSelectedIndex() == 1) {
-            cardLayout.show(centerPane,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom"));
+            cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Custom"));
             if(isDirty()){
                 setCustomFormatterText();
                 setDirty(false);
             }
         } else {
-            cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Common"));
+            cardLayout.show(centerPane, Toolkit.i18nText("Fine-Design_Chart_Common"));
+        }
+
+        if (editorPane != null) {
+            editorPane.setVisible(content.getSelectedIndex() == 0);
         }
     }
 
@@ -211,16 +328,48 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     }
 
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
-        categoryNameFormatPane.populate(attrTooltipContent.getCategoryFormat());
-        seriesNameFormatPane.populate(attrTooltipContent.getSeriesFormat());
-        valueFormatPane.populate(attrTooltipContent.getValueFormat());
-        percentFormatPane.populate(attrTooltipContent.getPercentFormat());
+        VanChartFormatPaneWithCheckBox[] formatPaneGroup = new VanChartFormatPaneWithCheckBox[]{
+                categoryNameFormatPane, seriesNameFormatPane, valueFormatPane, percentFormatPane,
+                changedValueFormatPane, changedPercentFormatPane
+        };
 
-        if (changedValueFormatPane != null) {
-            changedValueFormatPane.populate(attrTooltipContent.getChangedValueFormat());
+        AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
+                attrTooltipContent.getCategoryFormat(),
+                attrTooltipContent.getSeriesFormat(),
+                attrTooltipContent.getValueFormat(),
+                attrTooltipContent.getPercentFormat(),
+                attrTooltipContent.getChangedValueFormat(),
+                attrTooltipContent.getChangedPercentFormat()
+        };
+
+        for (int i = 0, len = formatPaneGroup.length; i < len; i++) {
+            VanChartFormatPaneWithCheckBox formatPane = formatPaneGroup[i];
+            AttrTooltipFormat format = formatGroup[i];
+
+            if (formatPane != null && format != null) {
+                formatPane.populate(format);
+
+                // 填充面板时，更新富文本编辑器参数
+                formatPane.updateFormatParams(richEditor.getParams(), format.getFormatJSONKey());
+            }
         }
-        if (changedPercentFormatPane != null) {
-            changedPercentFormatPane.populate(attrTooltipContent.getChangedPercentFormat());
+
+        AttrTooltipRichEditor tooltipRichEditor = attrTooltipContent.getRichEditor();
+
+        if (tooltipRichEditor != null) {
+            populateContentTextArea(tooltipRichEditor.getContent());
+        }
+    }
+
+    private void populateContentTextArea(String content) {
+        try {
+            if (contentTextArea != null) {
+                Document document = contentTextArea.getDocument();
+                document.remove(0, document.getLength());
+                document.insertString(0, content, null);
+            }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 
@@ -230,6 +379,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         attrTooltipContent.setCommon(content.getSelectedIndex() == 0);
 
         updateFormatPane(attrTooltipContent);
+        updateRichEditor(attrTooltipContent);
 
         updateFormatsWithPaneWidth(attrTooltipContent);
 
@@ -256,6 +406,12 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         }
     }
 
+    private void updateRichEditor(AttrTooltipContent attrTooltipContent) {
+        if (attrTooltipContent != null) {
+            attrTooltipContent.setRichEditor(richEditor);
+        }
+    }
+
     /**
      * CHART-1295
      * 通过格式的面板宽度来判断在自定义js代码中是否显示this.seriesName字符串。
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
index 3c8591bd6..f125ec8c7 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
@@ -6,7 +6,7 @@ import com.fr.design.gui.frpane.UIBubbleFloatPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.style.FormatPane;
-
+import com.fr.design.i18n.Toolkit;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.stable.Constants;
 
@@ -17,6 +17,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.text.Format;
+import java.util.Map;
 
 /**
  * Created by Mitisky on 16/2/23.
@@ -41,7 +42,7 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
 
         this.setLayout(new BorderLayout());
         isSelectedBox = new UICheckBox(getCheckBoxText());
-        formatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
+        formatButton = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
         this.add(isSelectedBox, BorderLayout.CENTER);
         this.add(formatButton, BorderLayout.EAST);
 
@@ -135,4 +136,12 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
         tooltipFormat.setFormat(format);
         tooltipFormat.setEnable(isSelectedBox.isSelected());
     }
+
+    public void updateFormatParams(Map<String, String> paramMap, String value) {
+        String key = this.getCheckBoxText();
+
+        if (paramMap != null && !paramMap.containsKey(key)) {
+            paramMap.put(key, value);
+        }
+    }
 }

From bf14ab15b726ec35744850023e68fbb95d8abf5b Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Mon, 7 Sep 2020 17:28:15 +0800
Subject: [PATCH 2/4] =?UTF-8?q?CHART-15510=20=E5=AE=8C=E5=96=84=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E6=A0=B7=E5=BC=8F=E7=95=8C=E9=9D=A2=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/VanChartRichEditorPane.java     |  67 ++++++-
 .../component/VanChartTooltipContentPane.java | 163 +++++++++++-------
 .../VanChartFormatPaneWithCheckBox.java       |  46 ++---
 3 files changed, 180 insertions(+), 96 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java
index c4588ce1c..b4b9dd32f 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java
@@ -1,27 +1,61 @@
 package com.fr.van.chart.designer.component;
 
 import com.fr.design.ui.ModernUIPane;
-import com.fr.plugin.chart.base.AttrTooltipRichEditor;
+import com.fr.plugin.chart.base.AttrTooltipRichText;
 import com.fr.stable.StringUtils;
+import com.teamdev.jxbrowser.chromium.Browser;
+import com.teamdev.jxbrowser.chromium.JSValue;
+import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter;
+import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 public class VanChartRichEditorPane {
 
+    private static final String namespace = "Pool";
+    private static final String variable = "data";
+    private static final String richEditorPath = "/com/fr/design/editor/rich_editor.html";
+    private static final String expression = "dispatch()";
+
     private static ModernUIPane<RichEditorModel> richEditorPane;
+    private static Browser browser;
+
+    public static ModernUIPane<RichEditorModel> createRichEditorPane(AttrTooltipRichText richEditor) {
+        RichEditorModel model = getRichEditorModel(richEditor);
 
-    public static ModernUIPane<RichEditorModel> getInstance() {
         if (richEditorPane == null) {
-            richEditorPane = new ModernUIPane.Builder<RichEditorModel>()
-                    .withEMB("/com/fr/design/editor/rich_editor.html")
-                    .namespace("Pool").build();
+            richEditorPane = initPane(model);
+        } else if (browser != null) {
+            updatePane(browser, model);
         }
 
         return richEditorPane;
     }
 
-    public static RichEditorModel getRichEditorModel(AttrTooltipRichEditor richEditor) {
-        Map<String, String> paramsMap = richEditor.getParams();
+    public static ModernUIPane<RichEditorModel> initPane(RichEditorModel model) {
+        return new ModernUIPane.Builder<RichEditorModel>()
+                .prepare(new ScriptContextAdapter() {
+                    public void onScriptContextCreated(ScriptContextEvent event) {
+                        browser = event.getBrowser();
+
+                        JSValue ns = browser.executeJavaScriptAndReturnValue("window." + namespace);
+                        ns.asObject().setProperty(variable, model);
+                    }
+                })
+                .withEMB(richEditorPath)
+                .namespace(namespace).build();
+    }
+
+    public static void updatePane(Browser browser, RichEditorModel model) {
+        JSValue ns = browser.executeJavaScriptAndReturnValue("window." + namespace);
+        ns.asObject().setProperty(variable, model);
+        browser.executeJavaScript("window." + namespace + "." + expression);
+    }
+
+    public static RichEditorModel getRichEditorModel(AttrTooltipRichText richText) {
+        Map<String, String> paramsMap = richText.getParams();
         StringBuilder paramsStr = new StringBuilder(StringUtils.EMPTY);
 
         if (paramsMap != null) {
@@ -37,7 +71,24 @@ public class VanChartRichEditorPane {
             paramsStr.deleteCharAt(len - 1);
         }
 
-        return new RichEditorModel(richEditor.getContent(), richEditor.isAuto(), paramsStr.toString());
+        return new RichEditorModel(richText.getContent(), richText.isAuto(), paramsStr.toString());
+    }
+
+    public static List<String> richParamsParser(String content, Map<String, String> paramsMap) {
+        if (content == null || paramsMap == null) {
+            return null;
+        }
+
+        List<String> result = new ArrayList<>();
+
+        for (Map.Entry<String, String> entry : paramsMap.entrySet()) {
+            String param = entry.getValue();
+            if (content.contains(param)) {
+                result.add(param);
+            }
+        }
+
+        return result;
     }
 
     public static class RichEditorModel {
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 b52e4fda4..084d12194 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
@@ -1,22 +1,19 @@
 package com.fr.van.chart.designer.component;
 
-import com.fr.design.DesignerEnvManager;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.design.gui.autocomplete.AutoCompletion;
-import com.fr.design.gui.autocomplete.DefaultCompletionProvider;
+import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIButtonGroup;
-import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.syntax.ui.rtextarea.RTextArea;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.ui.ModernUIPane;
+import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.base.AttrTooltipContent;
-import com.fr.plugin.chart.base.AttrTooltipRichEditor;
+import com.fr.plugin.chart.base.AttrTooltipRichText;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.van.chart.designer.TableLayout4VanChartHelper;
 import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox;
@@ -31,9 +28,7 @@ import com.fr.van.chart.designer.style.VanChartStylePane;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
-import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
-import javax.swing.text.Document;
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Component;
@@ -42,6 +37,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.List;
 
 /**
  * 内容界面 。数据点提示
@@ -63,18 +59,17 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     private JPanel centerPane;
     private JPanel commonPanel;
     private JPanel editorPane;
-    private RTextArea contentTextArea;
     private VanChartHtmlLabelPane htmlLabelPane;
 
     private VanChartStylePane parent;
     private JPanel showOnPane;
 
-    private AttrTooltipRichEditor richEditor;
+    private AttrTooltipRichText richText;
 
     public VanChartTooltipContentPane(VanChartStylePane parent, JPanel showOnPane){
         this.parent = parent;
         this.showOnPane = showOnPane;
-        this.richEditor = new AttrTooltipRichEditor();
+        this.richText = new AttrTooltipRichText();
 
         this.setLayout(new BorderLayout());
         this.add(createLabelContentPane(),BorderLayout.CENTER);
@@ -164,44 +159,29 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Content_Style")), createContentStylePane()}
+                new Component[]{null, createContentStylePane()}
         };
 
         return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
     }
 
     private JComponent createContentStylePane() {
-        contentTextArea = new RTextArea();
-        contentTextArea.setLineWrap(true);
+        UIButton contentTextArea = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Content_Style"));
+
         contentTextArea.addMouseListener(new MouseAdapter() {
             public void mouseClicked(MouseEvent e) {
                 fireRichEditor();
             }
-
-            public void mousePressed(MouseEvent e) {
-                fireRichEditor();
-            }
         });
 
-        DefaultCompletionProvider provider = new DefaultCompletionProvider();
-        AutoCompletion ac = new AutoCompletion(provider);
-        String shortCuts = DesignerEnvManager.getEnvManager().getAutoCompleteShortcuts();
-
-        ac.setTriggerKey(KeyStroke.getKeyStroke(shortCuts.replace("+", "pressed")));
-        ac.install(contentTextArea);
-
-        return new UIScrollPane(contentTextArea) {
-            public Dimension getPreferredSize() {
-                return new Dimension(super.getPreferredSize().width, 100);
-            }
-        };
+        return contentTextArea;
     }
 
     private void fireRichEditor() {
-        final ModernUIPane<VanChartRichEditorPane.RichEditorModel> pane = VanChartRichEditorPane.getInstance();
+        final ModernUIPane<VanChartRichEditorPane.RichEditorModel> pane = VanChartRichEditorPane.createRichEditorPane(richText);
         BasicDialog dialog = pane.showWindow(new JFrame());
 
-        pane.populate(VanChartRichEditorPane.getRichEditorModel(richEditor));
+        pane.populate(VanChartRichEditorPane.getRichEditorModel(richText));
 
         dialog.addDialogActionListener(new DialogActionAdapter() {
 
@@ -209,11 +189,9 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
                 VanChartRichEditorPane.RichEditorModel model = pane.update();
 
                 String content = model.getContent();
-
-                populateContentTextArea(content);
-
-                richEditor.setContent(content);
-                richEditor.setAuto(model.isAuto());
+                List<String> params = VanChartRichEditorPane.richParamsParser(content, richText.getParams());
+                populateFormatParams(params);
+                updateLocalRichText(content, model.isAuto());
 
                 SwingUtilities.getWindowAncestor(pane).setVisible(false);
             }
@@ -304,6 +282,59 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         }
     }
 
+    protected VanChartFormatPaneWithCheckBox[] getFormatPaneGroup() {
+        return  new VanChartFormatPaneWithCheckBox[]{
+                categoryNameFormatPane, seriesNameFormatPane,
+                valueFormatPane, percentFormatPane,
+                changedValueFormatPane, changedPercentFormatPane
+        };
+    }
+
+    protected VanChartFormatPaneWithCheckBox getTargetFormatPane(Object param) {
+        VanChartFormatPaneWithCheckBox[] formatPaneGroup = getFormatPaneGroup();
+
+        Object[] params = richText.getParams().values().toArray();
+
+        for (int i = 0, len = Math.min(params.length, formatPaneGroup.length); i < len; i++) {
+            if (ComparatorUtils.equals(params[i], param) && formatPaneGroup[i] != null) {
+                return formatPaneGroup[i];
+            }
+        }
+
+        return null;
+    }
+
+    private String getParamsRichText() {
+        VanChartFormatPaneWithCheckBox[] formatPaneGroup = getFormatPaneGroup();
+
+        // todo 获取参数对应的富文本字符串，正确的流程是：
+        // 在BI的富文本组件中，先清空content，然后addParam，最后读取最新的content，
+        // 但是当前接口还没开出来，暂时先在本地写死，模拟类似的效果
+        String[] richTextGroup = new String[]{
+                "<img alt=\"categoryFormat\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:88.17578125px;height: 16px; max-width:88.17578125px;max-height: 16px; min-width:88.17578125px;min-height: 16px\" name=\"categoryFormat\"/>",
+                "<img alt=\"seriesFormat\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:73.73828125px;height: 16px; max-width:73.73828125px;max-height: 16px; min-width:73.73828125px;min-height: 16px\" name=\"seriesFormat\"/>",
+                "<img alt=\"valueFormat\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:71.4765625px;height: 16px; max-width:71.4765625px;max-height: 16px; min-width:71.4765625px;min-height: 16px\" name=\"valueFormat\"/>",
+                "<img alt=\"percentFormat\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:83.388671875px;height: 16px; max-width:83.388671875px;max-height: 16px; min-width:83.388671875px;min-height: 16px\" name=\"percentFormat\"/>",
+                "<img alt=\"changedValueFormat\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:117.888671875px;height: 16px; max-width:117.888671875px;max-height: 16px; min-width:117.888671875px;min-height: 16px\" name=\"changedValueFormat\"/>",
+                "<img alt=\"changedPercentFormat\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:128.224609375px;height: 16px; max-width:128.224609375px;max-height: 16px; min-width:128.224609375px;min-height: 16px\" name=\"changedPercentFormat\"/>"
+        };
+
+        StringBuilder result = new StringBuilder("<p>");
+
+        for (int i = 0, len = formatPaneGroup.length; i < len; i++) {
+            VanChartFormatPaneWithCheckBox formatPane = formatPaneGroup[i];
+            String paramRichText = richTextGroup[i];
+
+            if (formatPane != null && formatPane.isSelected()) {
+                result.append(paramRichText);
+            }
+        }
+
+        result.append("</p>");
+
+        return result.toString();
+    }
+
     @Override
     protected String title4PopupWindow() {
         return "";
@@ -328,10 +359,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     }
 
     protected void populateFormatPane(AttrTooltipContent attrTooltipContent) {
-        VanChartFormatPaneWithCheckBox[] formatPaneGroup = new VanChartFormatPaneWithCheckBox[]{
-                categoryNameFormatPane, seriesNameFormatPane, valueFormatPane, percentFormatPane,
-                changedValueFormatPane, changedPercentFormatPane
-        };
+        VanChartFormatPaneWithCheckBox[] formatPaneGroup = getFormatPaneGroup();
 
         AttrTooltipFormat[] formatGroup = new AttrTooltipFormat[]{
                 attrTooltipContent.getCategoryFormat(),
@@ -350,37 +378,45 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
                 formatPane.populate(format);
 
                 // 填充面板时，更新富文本编辑器参数
-                formatPane.updateFormatParams(richEditor.getParams(), format.getFormatJSONKey());
+                formatPane.updateFormatParams(richText.getParams(), format.getFormatJSONKey());
             }
         }
 
-        AttrTooltipRichEditor tooltipRichEditor = attrTooltipContent.getRichEditor();
+        AttrTooltipRichText tooltipRichText = attrTooltipContent.getRichText();
 
-        if (tooltipRichEditor != null) {
-            populateContentTextArea(tooltipRichEditor.getContent());
+        if (tooltipRichText != null) {
+            updateLocalRichText(tooltipRichText.getContent(), tooltipRichText.isAuto());
+            setDirty(false);
         }
     }
 
-    private void populateContentTextArea(String content) {
-        try {
-            if (contentTextArea != null) {
-                Document document = contentTextArea.getDocument();
-                document.remove(0, document.getLength());
-                document.insertString(0, content, null);
+    private void populateFormatParams(List<String> params) {
+        if (params == null) {
+            return;
+        }
+
+        for (String param : params) {
+            VanChartFormatPaneWithCheckBox formatPane = getTargetFormatPane(param);
+
+            if (formatPane != null) {
+                formatPane.setSelected(true);
             }
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 
     public AttrTooltipContent updateBean() {
         AttrTooltipContent attrTooltipContent = createAttrTooltip();
 
-        attrTooltipContent.setCommon(content.getSelectedIndex() == 0);
+        boolean isCommon = content.getSelectedIndex() == 0;
 
-        updateFormatPane(attrTooltipContent);
-        updateRichEditor(attrTooltipContent);
+        attrTooltipContent.setCommon(isCommon);
+        if (isDirty() && isCommon) {
+            updateLocalRichText(getParamsRichText(), false);
+            setDirty(false);
+        }
 
+        updateFormatPane(attrTooltipContent);
+        updateTooltipRichText(attrTooltipContent);
         updateFormatsWithPaneWidth(attrTooltipContent);
 
         htmlLabelPane.update(attrTooltipContent.getHtmlLabel());
@@ -406,9 +442,18 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         }
     }
 
-    private void updateRichEditor(AttrTooltipContent attrTooltipContent) {
-        if (attrTooltipContent != null) {
-            attrTooltipContent.setRichEditor(richEditor);
+    private void updateLocalRichText(String content, boolean isAuto) {
+        richText.setContent(content);
+        richText.setAuto(isAuto);
+    }
+
+    private void updateTooltipRichText(AttrTooltipContent attrTooltipContent) {
+        try {
+            if (attrTooltipContent != null) {
+                attrTooltipContent.setRichText((AttrTooltipRichText) richText.clone());
+            }
+        } catch (Exception e){
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 
diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
index f125ec8c7..503d23a7e 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java
@@ -15,7 +15,6 @@ import java.awt.BorderLayout;
 import java.awt.Point;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
 import java.text.Format;
 import java.util.Map;
 
@@ -38,41 +37,22 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
     public VanChartFormatPaneWithCheckBox(AbstractAttrNoScrollPane parent, JPanel showOnPane) {
         this.parent = parent;
         this.showOnPane = showOnPane;
-        this.isDirty = true;
+        this.isDirty = false;
 
         this.setLayout(new BorderLayout());
-        isSelectedBox = new UICheckBox(getCheckBoxText());
-        formatButton = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
-        this.add(isSelectedBox, BorderLayout.CENTER);
-        this.add(formatButton, BorderLayout.EAST);
 
-        initFormatListener();
-        isSelectedBox.addMouseListener(new MouseListener() {
-            @Override
-            public void mouseClicked(MouseEvent e) {
+        isSelectedBox = new UICheckBox(getCheckBoxText()) {
+            protected void attributeChange() {
                 isDirty = true;
+                super.attributeChange();
             }
+        };
 
-            @Override
-            public void mousePressed(MouseEvent e) {
-
-            }
-
-            @Override
-            public void mouseReleased(MouseEvent e) {
-
-            }
-
-            @Override
-            public void mouseEntered(MouseEvent e) {
-
-            }
-
-            @Override
-            public void mouseExited(MouseEvent e) {
+        formatButton = new UIButton(Toolkit.i18nText("Fine-Design_Chart_Use_Format"));
+        this.add(isSelectedBox, BorderLayout.CENTER);
+        this.add(formatButton, BorderLayout.EAST);
 
-            }
-        });
+        initFormatListener();
     }
 
     protected abstract String getCheckBoxText();
@@ -127,6 +107,14 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{
         this.isDirty = isDirty;
     }
 
+    public boolean isSelected() {
+        return this.isSelectedBox.isSelected();
+    }
+
+    public void setSelected(boolean isSelected) {
+        this.isSelectedBox.setSelected(isSelected);
+    }
+
     public void populate(AttrTooltipFormat tooltipFormat) {
         this.isSelectedBox.setSelected(tooltipFormat.isEnable());
         this.format = tooltipFormat.getFormat();

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 3/4] 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 084d12194..20aacca01 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);
         }
     }

From 49d74a8b156a16894441ff7f8a6828bf916c49fc Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Tue, 8 Sep 2020 12:22:57 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/VanChartRichEditorPane.java     |  3 ++-
 .../component/VanChartTooltipContentPane.java | 27 ++++++++-----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java
index b4b9dd32f..4dfd250a1 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java
+++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartRichEditorPane.java
@@ -8,6 +8,7 @@ import com.teamdev.jxbrowser.chromium.JSValue;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter;
 import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent;
 
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -83,7 +84,7 @@ public class VanChartRichEditorPane {
 
         for (Map.Entry<String, String> entry : paramsMap.entrySet()) {
             String param = entry.getValue();
-            if (content.contains(param)) {
+            if (content.contains(URLEncoder.encode(param))) {
                 result.add(param);
             }
         }
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 20aacca01..a5aafc79a 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
@@ -11,7 +11,6 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.ui.ModernUIPane;
 import com.fr.general.ComparatorUtils;
-import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.base.AttrTooltipContent;
 import com.fr.plugin.chart.base.AttrTooltipRichText;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
@@ -311,12 +310,12 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         // 在BI的富文本组件中，先清空content，然后addParam，最后读取最新的content，
         // 但是当前接口还没开出来，暂时先在本地写死，模拟类似的效果
         String[] richTextGroup = new String[]{
-                "<img alt=\"categoryFormat\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:88.17578125px;height: 16px; max-width:88.17578125px;max-height: 16px; min-width:88.17578125px;min-height: 16px\" name=\"categoryFormat\"/>",
-                "<img alt=\"seriesFormat\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:73.73828125px;height: 16px; max-width:73.73828125px;max-height: 16px; min-width:73.73828125px;min-height: 16px\" name=\"seriesFormat\"/>",
-                "<img alt=\"valueFormat\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:71.4765625px;height: 16px; max-width:71.4765625px;max-height: 16px; min-width:71.4765625px;min-height: 16px\" name=\"valueFormat\"/>",
-                "<img alt=\"percentFormat\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:83.388671875px;height: 16px; max-width:83.388671875px;max-height: 16px; min-width:83.388671875px;min-height: 16px\" name=\"percentFormat\"/>",
-                "<img alt=\"changedValueFormat\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:117.888671875px;height: 16px; max-width:117.888671875px;max-height: 16px; min-width:117.888671875px;min-height: 16px\" name=\"changedValueFormat\"/>",
-                "<img alt=\"changedPercentFormat\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:128.224609375px;height: 16px; max-width:128.224609375px;max-height: 16px; min-width:128.224609375px;min-height: 16px\" name=\"changedPercentFormat\"/>"
+                "<img  alt=\"%24%7BCATEGORY%7D\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:86.095703125px;height: 16px; max-width:86.095703125px;max-height: 16px; min-width:86.095703125px;min-height: 16px\" name=\"%24%7BCATEGORY%7D\" />",
+                "<img  alt=\"%24%7BSERIES%7D\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:63.8828125px;height: 16px; max-width:63.8828125px;max-height: 16px; min-width:63.8828125px;min-height: 16px\" name=\"%24%7BSERIES%7D\" />",
+                "<img  alt=\"%24%7BVALUE%7D\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:61.849609375px;height: 16px; max-width:61.849609375px;max-height: 16px; min-width:61.849609375px;min-height: 16px\" name=\"%24%7BVALUE%7D\" />",
+                "<img  alt=\"%24%7BPERCENT%7D\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:77.39453125px;height: 16px; max-width:77.39453125px;max-height: 16px; min-width:77.39453125px;min-height: 16px\" name=\"%24%7BPERCENT%7D\" />",
+                "<img  alt=\"%24%7BCHANGEDVALUE%7D\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:122.119140625px;height: 16px; max-width:122.119140625px;max-height: 16px; min-width:122.119140625px;min-height: 16px\" name=\"%24%7BCHANGEDVALUE%7D\" />",
+                "<img  alt=\"%24%7BCHANGEDPERCENT%7D\" class=\"rich-editor-param\" style=\"background-color: rgba(54, 133, 242, 0.1);vertical-align: middle; margin: 0 1px; width:137.6640625px;height: 16px; max-width:137.6640625px;max-height: 16px; min-width:137.6640625px;min-height: 16px\" name=\"%24%7BCHANGEDPERCENT%7D\" />"
         };
 
         StringBuilder result = new StringBuilder("<p>");
@@ -378,7 +377,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
                 formatPane.populate(format);
 
                 // 填充面板时，更新富文本编辑器参数
-                formatPane.updateFormatParams(richText.getParams(), format.getFormatJSONKey());
+                formatPane.updateFormatParams(richText.getParams(), format.getJs());
             }
         }
 
@@ -456,14 +455,10 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
     }
 
     private void updateTooltipRichText(AttrTooltipContent attrTooltipContent) {
-        try {
-            if (attrTooltipContent != null) {
-                AttrTooltipRichText tooltipRichText = attrTooltipContent.getRichText();
-                tooltipRichText.setContent(richText.getContent());
-                tooltipRichText.setAuto(richText.isAuto());
-            }
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        if (attrTooltipContent != null) {
+            AttrTooltipRichText tooltipRichText = attrTooltipContent.getRichText();
+            tooltipRichText.setContent(richText.getContent());
+            tooltipRichText.setAuto(richText.isAuto());
         }
     }