From ce672cb26db4c1dfe5d29ee347c9d8d16f251066 Mon Sep 17 00:00:00 2001
From: TommysLee <li_zongjin@qq.com>
Date: Wed, 1 Feb 2023 19:45:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=A1=91?=
 =?UTF-8?q?=E5=9F=BA=E5=9B=BELabel=20Value=E6=80=BB=E6=98=AFundefined?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/chart/sankey/SankeyView.ts |  3 ++-
 src/label/labelStyle.ts        | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/chart/sankey/SankeyView.ts b/src/chart/sankey/SankeyView.ts
index 5432908d48..b71e667dc4 100644
--- a/src/chart/sankey/SankeyView.ts
+++ b/src/chart/sankey/SankeyView.ts
@@ -273,7 +273,8 @@ class SankeyView extends ChartView {
                 {
                     labelFetcher: seriesModel,
                     labelDataIndex: node.dataIndex,
-                    defaultText: node.id
+                    labelValue: layout.value,
+                    defaultText: node.id                    
                 }
             );
 
diff --git a/src/label/labelStyle.ts b/src/label/labelStyle.ts
index 007f080c4c..859c68583a 100644
--- a/src/label/labelStyle.ts
+++ b/src/label/labelStyle.ts
@@ -94,6 +94,7 @@ interface SetLabelStyleOpt<TLabelDataIndex> extends TextCommonParams {
     };
     labelDataIndex?: TLabelDataIndex;
     labelDimIndex?: number;
+    labelValue?: number;
 
     /**
      * Inject a setter of text for the text animation case.
@@ -135,9 +136,17 @@ function getLabelText<TLabelDataIndex>(
     const labelFetcher = opt.labelFetcher;
     const labelDataIndex = opt.labelDataIndex;
     const labelDimIndex = opt.labelDimIndex;
+    const labelValue = opt.labelValue;
     const normalModel = stateModels.normal;
     let baseText;
+    let extendParams = null;
     if (labelFetcher) {
+        if (labelValue != undefined && labelValue != null) {
+            extendParams = {
+                interpolatedValue: labelValue
+            };
+        }
+
         baseText = labelFetcher.getFormattedLabel(
             labelDataIndex, 'normal',
             null,
@@ -145,7 +154,7 @@ function getLabelText<TLabelDataIndex>(
             normalModel && normalModel.get('formatter'),
             interpolatedValue != null ? {
                 interpolatedValue: interpolatedValue
-            } : null
+            } : extendParams
         );
     }
     if (baseText == null) {

From a53a2690576f2fb4a0fb91325ef869bff6dbb924 Mon Sep 17 00:00:00 2001
From: TommysLee <li_zongjin@qq.com>
Date: Thu, 2 Feb 2023 19:24:27 +0800
Subject: [PATCH 2/3] Code optimization

---
 src/label/labelStyle.ts | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/label/labelStyle.ts b/src/label/labelStyle.ts
index 859c68583a..cd5f8c4a69 100644
--- a/src/label/labelStyle.ts
+++ b/src/label/labelStyle.ts
@@ -139,22 +139,13 @@ function getLabelText<TLabelDataIndex>(
     const labelValue = opt.labelValue;
     const normalModel = stateModels.normal;
     let baseText;
-    let extendParams = null;
     if (labelFetcher) {
-        if (labelValue != undefined && labelValue != null) {
-            extendParams = {
-                interpolatedValue: labelValue
-            };
-        }
-
         baseText = labelFetcher.getFormattedLabel(
             labelDataIndex, 'normal',
             null,
             labelDimIndex,
             normalModel && normalModel.get('formatter'),
-            interpolatedValue != null ? {
-                interpolatedValue: interpolatedValue
-            } : extendParams
+             {interpolatedValue: retrieve2(interpolatedValue, labelValue)}
         );
     }
     if (baseText == null) {

From e791b791b2bffb9363a9240426e42977f8e1c5bc Mon Sep 17 00:00:00 2001
From: TommysLee <li_zongjin@qq.com>
Date: Thu, 2 Feb 2023 19:26:25 +0800
Subject: [PATCH 3/3] Resolve: Trailing spaces not allowed

---
 src/chart/sankey/SankeyView.ts |  2 +-
 test/sankey-labelValue.html    | 98 ++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 test/sankey-labelValue.html

diff --git a/src/chart/sankey/SankeyView.ts b/src/chart/sankey/SankeyView.ts
index b71e667dc4..74082dd6e7 100644
--- a/src/chart/sankey/SankeyView.ts
+++ b/src/chart/sankey/SankeyView.ts
@@ -274,7 +274,7 @@ class SankeyView extends ChartView {
                     labelFetcher: seriesModel,
                     labelDataIndex: node.dataIndex,
                     labelValue: layout.value,
-                    defaultText: node.id                    
+                    defaultText: node.id
                 }
             );
 
diff --git a/test/sankey-labelValue.html b/test/sankey-labelValue.html
new file mode 100644
index 0000000000..1608bd5fb0
--- /dev/null
+++ b/test/sankey-labelValue.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+
+<html>
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <script src="lib/simpleRequire.js"></script>
+        <script src="lib/config.js"></script>
+    </head>
+    <body>
+        <style>
+            html, body, #main {
+                margin: 0;
+                width: 100%;
+                height: 100vh;
+            }
+        </style>
+
+        <div id="main"></div>
+
+        <script>
+            require(['echarts'], function (echarts) {
+                var chart = echarts.init(document.querySelector("#main"), 'dark');
+                window.onresize = chart.resize;
+
+                const sankeyData = [
+                    {source: 'EasyGrid Energy', target: 'Chip Industry', value: 860},
+                    {source: 'EasyGrid Energy', target: 'Industrial Internet', value: 1600},
+                    {source: 'EG Green Energy', target: 'Chip Industry', value: 2600},
+                    {source: 'EG Green Energy', target: 'IOT', value: 500},
+
+                    {source: 'Industrial Internet', target: 'IOT', value: 800},
+                    {source: 'Industrial Internet', target: 'Intelligent Manufacturing', value: 600},
+
+                    {source: 'Chip Industry', target: 'Chip Manufacturing', value: 1600},
+                    {source: 'Chip Industry', target: 'Chip Package', value: 1200},
+                    {source: 'Chip Industry', target: 'Chip Design', value: 600},
+
+                    {source: 'Chip Manufacturing', target: '5mm', value: 600},
+                    {source: 'Chip Manufacturing', target: '10mm', value: 500},
+                    {source: 'Chip Manufacturing', target: '15mm', value: 500}
+                ];
+
+                var option = {
+                    title: {text: 'The values of Label and Tooltip are the same',padding: 20},
+                    series: [{
+                        type: 'sankey',
+                        layout: 'none',
+                        lineStyle: {color: 'gradient', curveness: 0.5},
+                        emphasis: {focus: 'adjacency'},
+                        data: getNames(),
+                        links: sankeyData
+                    }],
+                    tooltip: {trigger: 'item', triggerOn: 'mousemove'},
+                    label: {
+                        formatter: (params) => {
+                            return params.name + ' ' + params.value + 'kW·h';
+                        }
+                    }
+                };
+
+                chart.setOption(option);
+
+                function getNames() {
+                    return sankeyData.reduce((names, item) => {
+                        if (-1 == names.indexOf(item.source)) {
+                            names.push(item.source);
+                        }
+                        if (-1 == names.indexOf(item.target)) {
+                            names.push(item.target);
+                        }
+                        return names;
+                    }, []).map(item => {return {name:item}});
+                }
+            });
+        </script>
+    </body>
+</html>
+