fix: fix stacked bar not drawn because of NaN value brought in #11951

apache · Feb 27, 2020 · 9adb6a9 · 9adb6a9
1 parent ca4c391
commit 9adb6a9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/chart/bar/BarView.js b/src/chart/bar/BarView.js
@@ -145,6 +145,7 @@ export default echarts.extendChartView({
                     bgEls[dataIndex] = bgEl;
                 }
 
+                // If dataZoom in filteMode: 'empty', the baseValue can be set as NaN in "axisProxy".
                 if (!data.hasValue(dataIndex)) {
                     return;
                 }

diff --git a/src/layout/barGrid.js b/src/layout/barGrid.js
@@ -452,7 +452,10 @@ export function layout(seriesType, ecModel) {
                 if (Math.abs(width) < barMinHeight) {
                     width = (width < 0 ? -1 : 1) * barMinHeight;
                 }
-                stacked && (lastStackCoords[stackId][baseValue][sign] += width);
+                // Ignore stack from NaN value
+                if (!isNaN(width)) {
+                    stacked && (lastStackCoords[stackId][baseValue][sign] += width);
+                }
             }
             else {
                 var coord = cartesian.dataToPoint([baseValue, value]);
@@ -465,7 +468,10 @@ export function layout(seriesType, ecModel) {
                     // Include zero to has a positive bar
                     height = (height <= 0 ? -1 : 1) * barMinHeight;
                 }
-                stacked && (lastStackCoords[stackId][baseValue][sign] += height);
+                // Ignore stack from NaN value
+                if (!isNaN(height)) {
+                    stacked && (lastStackCoords[stackId][baseValue][sign] += height);
+                }
             }
 
             data.setItemLayout(idx, {

diff --git a/test/bar.html b/test/bar.html
@@ -82,7 +82,7 @@
 
                 for (var i = 0; i < 10; i++) {
                     xAxisData.push('类目' + i);
-                    data1.push((Math.random() * 5).toFixed(2));
+                    data1.push(i === 0 ? '-' : (Math.random() * 5).toFixed(2));
                     data2.push(-Math.random().toFixed(2));
                     data3.push((Math.random() + 0.5).toFixed(2));
                     data4.push((Math.random() + 0.3).toFixed(2));
-Original file line number
+Diff line change
@@ Expand Up / @@ -145,6 +145,7 @@ export default echarts.extendChartView({ @@
                         bgEls[dataIndex] = bgEl;
                     }
+                    // If dataZoom in filteMode: 'empty', the baseValue can be set as NaN in "axisProxy".
                     if (!data.hasValue(dataIndex)) {
                         return;
                     }
@@ Expand Down @@