From 2a56160bbc4f47261ca9092c02062f6cf01b351b Mon Sep 17 00:00:00 2001
From: "Qinghui.Liu" <Qinghui.Liu@fanruan.com>
Date: Wed, 3 Feb 2021 15:42:43 +0800
Subject: [PATCH] =?UTF-8?q?CHART-18055=20=E4=BF=AE=E6=94=B9=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5=E6=B1=87=E6=80=BB=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/component/richText/VanChartFieldButton.java      | 4 ++--
 .../src/main/resources/com/fr/design/editor/rich_editor.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldButton.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldButton.java
index 1e76d616c..a9caac791 100644
--- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/richText/VanChartFieldButton.java
+++ b/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);
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 967ff74a0..2b7677f5c 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
@@ -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 = "";