Pull request #3547: CHART-18127 & CHART-18055 修改富文本参数分隔符、修改新增字段汇总方式默认值

Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0

* commit '2a56160bbc4f47261ca9092c02062f6cf01b351b':
  CHART-18055 修改新增字段汇总方式默认值
  CHART-18127 修改富文本参数分隔符

designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldButton.java

@@ -2,11 +2,11 @@ package com.fr.van.chart.designer.component.richText;
 
 import com.fr.base.BaseUtils;
 import com.fr.data.util.function.DataFunction;
-import com.fr.data.util.function.NoneFunction;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
+import com.fr.plugin.chart.base.FirstFunction;
 import com.fr.plugin.chart.base.format.AttrTooltipDurationFormat;
 import com.fr.plugin.chart.base.format.AttrTooltipFormat;
 import com.fr.plugin.chart.base.format.IntervalTimeFormat;
@@ -40,7 +40,7 @@ public class VanChartFieldButton extends JPanel {
     private UIToggleButton fieldButton;
     private UIButton addButton;
 
-    private DataFunction dataFunction = new NoneFunction();
+    private DataFunction dataFunction = new FirstFunction();
 
     public VanChartFieldButton(String fieldName, AttrTooltipFormat format, VanChartFieldListener listener) {
         this(fieldName, format, false, false, listener);

designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartRichEditorPane.java

@@ -30,6 +30,8 @@ import java.util.Map;
 
 public class VanChartRichEditorPane {
 
+    private static final String PARAMS_SPLITTER = "|";
+
     private static final String NAME_SPACE = "Pool";
     private static final String VARIABLE = "data";
 
@@ -163,7 +165,7 @@ public class VanChartRichEditorPane {
         if (paramsMap != null) {
             for (Map.Entry<String, String> entry : paramsMap.entrySet()) {
                 paramsStr.append(entry.getKey()).append(":").append(entry.getValue());
-                paramsStr.append("-");
+                paramsStr.append(PARAMS_SPLITTER);
             }
         }
 

designer-chart/src/main/resources/com/fr/design/editor/rich_editor.html

@@ -28,7 +28,7 @@
 
         var getDimensionIds = function (params) {
             var result = [];
-            var paramGroup = params.split("-");
+            var paramGroup = params.split("|");
 
             for (var i = 0, len = paramGroup.length; i < len; i++) {
                 var [key, value] = paramGroup[i].split(":");
@@ -44,7 +44,7 @@
 
         var getInitContent = function (params, initParams, align) {
             var editorService = BI.Services.getService("bi.service.design.chart.common.editor");
-            var paramGroup = params.split("-");
+            var paramGroup = params.split("|");
 
             content = "";