From d7786c52c49bccb1b8c78989ef5e4d29348543fa Mon Sep 17 00:00:00 2001
From: yuanjiangxia <511217468@qq.com>
Date: Wed, 23 Mar 2022 17:53:33 +0800
Subject: [PATCH] fix(dataZoom): fix the dataZoom was unexpectedly displayed at
 the top when data contains null values.

---
 src/data/DataStore.ts      |   8 ++-
 test/dataZoom-feature.html | 112 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 116 insertions(+), 4 deletions(-)

diff --git a/src/data/DataStore.ts b/src/data/DataStore.ts
index ddd3c09a44..4ceb7ba894 100644
--- a/src/data/DataStore.ts
+++ b/src/data/DataStore.ts
@@ -290,8 +290,10 @@ class DataStore {
         // Parse from previous data offset. len may be changed after appendData
         for (let i = offset; i < len; i++) {
             const val = (chunk as any)[i] = ordinalMeta.parseAndCollect(chunk[i]);
-            dimRawExtent[0] = Math.min(val, dimRawExtent[0]);
-            dimRawExtent[1] = Math.max(val, dimRawExtent[1]);
+            if (!isNaN(val)) {
+                dimRawExtent[0] = Math.min(val, dimRawExtent[0]);
+                dimRawExtent[1] = Math.max(val, dimRawExtent[1]);
+            }
         }
 
         dim.ordinalMeta = ordinalMeta;
@@ -1308,4 +1310,4 @@ class DataStore {
     })();
 }
 
-export default DataStore;
\ No newline at end of file
+export default DataStore;
diff --git a/test/dataZoom-feature.html b/test/dataZoom-feature.html
index 8f2b5b0e97..6715089fd0 100644
--- a/test/dataZoom-feature.html
+++ b/test/dataZoom-feature.html
@@ -43,7 +43,7 @@
         <div id="specified_axis_second_setOption_normal_dz"></div>
         <div id="remove_dz"></div>
         <div id="duplicated_dataZoom_ref"></div>
-
+        <div id="main0"></div>
 
 
 
@@ -746,6 +746,116 @@
         });
         </script>
 
+        <script>
+            require(['echarts'], function (echarts) {
+                var option = {
+                    dataZoom: [{
+                        id: 'dataZoomX',
+                        type: 'slider',
+                        xAxisIndex: 0,
+                        filterMode: 'filter'
+                    }],
+                    legend: {
+                        data: ['语文'],
+                        top: '0'
+                    },
+                    tooltip: {
+                        trigger: 'axis',
+                        formatter: '{b0}<br />',
+                        axisPointer: {
+                            animation: true,
+                            type: 'line',
+                            lineStyle: {
+                                type: 'dashed'
+                            }
+                        }
+                    },
+                    grid: {
+                        left: 20,
+                        top: 38,
+                        right: 20,
+                        bottom: 65
+                    },
+                    xAxis: {
+                        type: 'category',
+                        data: [
+                        '第1周',
+                        '第2周',
+                        '第3周',
+                        '第4周',
+                        '第5周',
+                        '第6周',
+                        '第7周',
+                        '第8周',
+                        '第9周',
+                        '第10周',
+                        '第11周',
+                        '第12周',
+                        '第13周',
+                        '第14周',
+                        '第15周',
+                        '第16周',
+                        '第17周',
+                        '第18周',
+                        '第19周',
+                        '第20周',
+                        '第21周',
+                        '第22周'
+                        ],
+                        boundaryGap: false
+                    },
+                    yAxis: {
+                        type: 'category',
+                        boundaryGap: false,
+                        name: '等级',
+                        data: ['0', 'D', 'C', 'B', 'A'],
+                        splitLine: {
+                            show: true
+                        }
+                    },
+                    series: [{
+                        labelLine: { show: true },
+                        symbolSize: 16,
+                        type: 'line',
+                        smooth: true,
+                        name: '语文',
+                        data: [
+                            '-',
+                            '-',
+                            '-',
+                            '-',
+                            '-',
+                            '-',
+                            '-',
+                            '-',
+                            '-',
+                            '-',
+                            '-',
+                            '-',
+                            '-',
+                            '-',
+                            'D',
+                            '-',
+                            '-',
+                            '-',
+                            '-',
+                            '-',
+                            '-',
+                            '-'
+                        ]
+                    }]
+                };
+
+                var chart = testHelper.create(echarts, 'main0', {
+                    title: [
+                        'The dataZoom should be displayed at bottom',
+                    ],
+                    option: option,
+                    height: 350
+                });
+            });
+            </script>
+