From 3e79b082ee7e07e9889ee29c062b7f2ad72df1e0 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Fri, 19 Feb 2021 20:21:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?CHART-18255=20=E5=AF=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AD=97=E6=AE=B5=E6=9C=80=E5=90=8E=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E4=B8=8D=E9=9C=80=E8=A6=81=E6=B7=BB=E5=8A=A0=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/com/fr/design/editor/rich_editor.html   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html b/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html
index c1d533e8d5..197b2ed425 100644
--- a/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html
+++ b/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html
@@ -47,8 +47,7 @@
         var getInitContent = function (params, initParams, align) {
             var editorService = BI.Services.getService("bi.service.design.chart.common.editor");
             var paramGroup = params.split("|");
-
-            content = "";
+            var content = "";
 
             for (var i = 0, len = paramGroup.length; i < len; i++) {
                 var [key, value] = paramGroup[i].split(":");
@@ -58,6 +57,10 @@
                 }
             }
 
+            if (BI.endWith(content, '<br></p>')) {
+                content = content.slice(0, -8) + '</p>';
+            }
+
             return content;
         }
 

From 8477071a6e6ca01e8abfea32c38bb9d7ad2c2780 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Fri, 19 Feb 2021 21:44:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?CHART-18257=20=E6=94=AF=E6=8C=81=E7=BB=84?=
 =?UTF-8?q?=E5=90=88=E5=9B=BE=E7=9A=84=E5=AF=8C=E6=96=87=E6=9C=AC=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/VanChartTooltipContentPane.java        | 12 ++++++++----
 1 file changed, 8 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 947c63684e..3c4cbf70c7 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
@@ -384,7 +384,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
     private void fireRichEditor() {
         AttrTooltipRichText richText = this.richTextTooltipContent.getRichTextAttr();
-
+        refreshTableFieldParams(richText.getParams());
         ModernUIPane<VanChartRichEditorModel> richEditorPane = VanChartRichEditorPane.createRichEditorPane(richText);
         VanChartRichTextPane richTextPane = this.createRichTextPane(richEditorPane);
 
@@ -456,15 +456,19 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
             params.put(fieldNames[i], fieldFormats[i].getJs());
         }
 
+        refreshTableFieldParams(params);
+
+        richText.setParams(params);
+    }
+
+    private void refreshTableFieldParams(Map<String, String> params) {
         List<String> tableFieldNames = VanChartRichEditorPane.getFieldNames();
 
-        if (tableFieldNames != null) {
+        if (tableFieldNames != null && params != null) {
             for (String fieldName : tableFieldNames) {
                 params.put(fieldName, "${" + fieldName + "_" + fieldName.hashCode() + "}");
             }
         }
-
-        richText.setParams(params);
     }
 
     private JPanel createHtmlPane() {

From 8d8566843cf8ad6c2b11584112ca519d9cfec0c7 Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Sat, 20 Feb 2021 11:10:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?CHART-18103=20=E8=B0=83=E6=95=B4=E5=AF=8C?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=AD=97=E4=BD=93=E9=80=89=E6=8B=A9=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/com/fr/design/editor/rich_editor.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html b/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html
index 197b2ed425..08e2437ada 100644
--- a/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html
+++ b/designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html
@@ -86,7 +86,10 @@
             toolbar: {
                 buttons: [
                     {type: "bi.rich_editor_font_chooser"},
-                    {type: "bi.rich_editor_size_chooser"},
+                    {
+                        type: "bi.rich_editor_size_chooser",
+                        width: 70
+                    },
                     {type: "bi.rich_editor_bold_button"},
                     {type: "bi.rich_editor_italic_button"},
                     {type: "bi.rich_editor_underline_button"},