From 860bd0fc981c6fc947f4093dd5e7cece54405c8a Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Sun, 24 Jan 2021 22:22:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/VanChartTooltipContentPane.java | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 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 7b22b02c8..947c63684 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
@@ -47,7 +47,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -450,7 +450,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         String[] fieldNames = getRichTextFieldNames();
         AttrTooltipFormat[] fieldFormats = getRichTextFieldFormats();
 
-        Map<String, String> params = new HashMap<>();
+        Map<String, String> params = new LinkedHashMap<>();
 
         for (int i = 0, len = fieldNames.length; i < len; i++) {
             params.put(fieldNames[i], fieldFormats[i].getJs());
@@ -691,21 +691,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         checkRichEditorState(attrTooltipContent);
     }
 
-    protected void populateRichTextFormat(VanChartFormatPaneWithCheckBox[] formatPaneGroup, AttrTooltipFormat[] formatGroup) {
-        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);
-
-                // 填充面板时，更新富文本编辑器参数
-                AttrTooltipRichText richText = this.richTextTooltipContent.getRichTextAttr();
-                formatPane.updateFormatParams(richText.getParams(), format.getJs());
-            }
-        }
-    }
-
     protected void populateRichText(AttrTooltipRichText tooltipRichText) {
         if (tooltipRichText != null) {
             updateLocalRichText(tooltipRichText.getContent(), tooltipRichText.isAuto());
@@ -728,7 +713,6 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
         updateLabelType(attrTooltipContent);
         updateFormatPane(attrTooltipContent);
         if (supportRichEditor()) {
-            // updateRichEditor(attrTooltipContent);
             updateTooltipFormat(attrTooltipContent, this.richTextTooltipContent);
             updateTooltipRichText(attrTooltipContent);
         }