From e6490e67f0d3cdf7f8b3115f5eda543a856921a2 Mon Sep 17 00:00:00 2001
From: Ovilia <zwl.sjtu@gmail.com>
Date: Wed, 8 Dec 2021 17:33:49 +0800
Subject: [PATCH 1/3] fix(event): provide label index in axis events

---
 src/component/axis/AxisBuilder.ts |  4 ++++
 test/axisLabel.html               | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/component/axis/AxisBuilder.ts b/src/component/axis/AxisBuilder.ts
index d06c0b5710..17bb9359c2 100644
--- a/src/component/axis/AxisBuilder.ts
+++ b/src/component/axis/AxisBuilder.ts
@@ -46,6 +46,8 @@ type AxisEventData = {
     targetType: 'axisName' | 'axisLabel'
     name?: string
     value?: string | number
+    dataIndex?: number
+    formattedLabel?: string
 } & {
     [key in AxisIndexKey]?: number
 };
@@ -816,6 +818,8 @@ function buildAxisLabel(
             const eventData = AxisBuilder.makeAxisEventDataBase(axisModel);
             eventData.targetType = 'axisLabel';
             eventData.value = rawLabel;
+            eventData.dataIndex = index;
+            eventData.formattedLabel = formattedLabel;
 
             getECData(textEl).eventData = eventData;
         }
diff --git a/test/axisLabel.html b/test/axisLabel.html
index c8cb8bc9f0..a6c9e7ab3a 100644
--- a/test/axisLabel.html
+++ b/test/axisLabel.html
@@ -315,10 +315,6 @@
 
         <script>
 
-            var chart;
-            var myChart;
-            var option;
-
             require([
                 'echarts'/*, 'map/js/china' */
             ], function (echarts) {
@@ -326,6 +322,7 @@
                 var option = {
                     backgroundColor: '#eee',
                     "xAxis": {
+                        triggerEvent: true,
                         "type": "category",
                         "data": [
                             "2018-10-08",
@@ -365,11 +362,14 @@
                     ]
                 }
 
-                testHelper.create(echarts, 'main4', {
+                var chart = testHelper.create(echarts, 'main4', {
                     title: 'Label of yAxis should be RED, but 0 label does not display',
                     option: option,
                     recordCanvas: true
                 });
+                chart.on('click', function (params) {
+                    console.log(params);
+                });
             });
 
         </script>

From 37b42860520a3bcf831084f5fd773b50776a5707 Mon Sep 17 00:00:00 2001
From: Ovilia <zwl.sjtu@gmail.com>
Date: Mon, 28 Feb 2022 11:29:54 +0800
Subject: [PATCH 2/3] feat: provide tickIndex and dataIndex

---
 src/component/axis/AxisBuilder.ts | 8 +++++---
 test/axisLabel.html               | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/component/axis/AxisBuilder.ts b/src/component/axis/AxisBuilder.ts
index 605f483a66..5413910ed6 100644
--- a/src/component/axis/AxisBuilder.ts
+++ b/src/component/axis/AxisBuilder.ts
@@ -47,7 +47,7 @@ type AxisEventData = {
     name?: string
     value?: string | number
     dataIndex?: number
-    formattedLabel?: string
+    tickIndex?: number
 } & {
     [key in AxisIndexKey]?: number
 };
@@ -816,8 +816,10 @@ function buildAxisLabel(
             const eventData = AxisBuilder.makeAxisEventDataBase(axisModel);
             eventData.targetType = 'axisLabel';
             eventData.value = rawLabel;
-            eventData.dataIndex = index;
-            eventData.formattedLabel = formattedLabel;
+            eventData.tickIndex = index;
+            if (axis.type === 'category') {
+                eventData.dataIndex = index;
+            }
 
             getECData(textEl).eventData = eventData;
         }
diff --git a/test/axisLabel.html b/test/axisLabel.html
index a6c9e7ab3a..a3c5b97971 100644
--- a/test/axisLabel.html
+++ b/test/axisLabel.html
@@ -27,7 +27,7 @@
         <script src="lib/jquery.min.js"></script>
         <script src="lib/facePrint.js"></script>
         <script src="lib/testHelper.js"></script>
-        <script src="ut/lib/canteen.js"></script>
+        <script src="lib/canteen.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <link rel="stylesheet" href="lib/reset.css">
     </head>
@@ -330,6 +330,7 @@
                         ]
                     },
                     "yAxis": {
+                        triggerEvent: true,
                         "type": "value",
                         "axisLabel": {
                             "color": "red",

From 66c5c220e4f72472ce871c449188e80183f064f2 Mon Sep 17 00:00:00 2001
From: Ovilia <zwl.sjtu@gmail.com>
Date: Mon, 28 Feb 2022 11:43:01 +0800
Subject: [PATCH 3/3] fix: dataIndex

---
 src/component/axis/AxisBuilder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/component/axis/AxisBuilder.ts b/src/component/axis/AxisBuilder.ts
index 5413910ed6..5ed1ed3f6b 100644
--- a/src/component/axis/AxisBuilder.ts
+++ b/src/component/axis/AxisBuilder.ts
@@ -818,7 +818,7 @@ function buildAxisLabel(
             eventData.value = rawLabel;
             eventData.tickIndex = index;
             if (axis.type === 'category') {
-                eventData.dataIndex = index;
+                eventData.dataIndex = tickValue;
             }
 
             getECData(textEl).eventData = eventData;