Merge pull request #3593 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '9d0e4abba8fb7b6d32fe2206f468715043e515b8':
  CHART-18103 调整富文本字体选择组件宽度
  CHART-18257 支持组合图的富文本新增字段参数
  CHART-18255 富文本默认字段最后一个不需要添加换行

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() {

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;
         }
 
@@ -83,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"},