Эх сурвалжийг харах

[search] Fix exceptions with stacked/grouped chart

Enrico Berti 10 жил өмнө
parent
commit
a954073

+ 3 - 1
desktop/core/src/desktop/static/desktop/ext/js/d3.v3.js

@@ -5589,7 +5589,9 @@ d3 = function() {
       for (j = 0; j < m; ++j) {
         out.call(stack, series[0][j], o = offsets[j], points[0][j][1]);
         for (i = 1; i < n; ++i) {
-          out.call(stack, series[i][j], o += points[i - 1][j][1], points[i][j][1]);
+          if (typeof series[i][j] != 'undefined'){
+            out.call(stack, series[i][j], o += points[i - 1][j][1], points[i][j][1]);
+          }
         }
       }
       return data;

+ 9 - 8
desktop/core/src/desktop/static/desktop/js/nv.d3.growingMultiBar.js

@@ -99,14 +99,15 @@ nv.models.growingMultiBar = function() {
           var posBase = 0, negBase = 0;
           data.map(function(d) {
             var f = d.values[i]
-            f.size = Math.abs(f.y);
-            if (f.y<0)  {
-              f.y1 = negBase;
-              negBase = negBase - f.size;
-            } else
-            {
-              f.y1 = f.size + posBase;
-              posBase = posBase + f.size;
+            if (typeof f != 'undefined') {
+              f.size = Math.abs(f.y);
+              if (f.y < 0) {
+                f.y1 = negBase;
+                negBase = negBase - f.size;
+              } else {
+                f.y1 = f.size + posBase;
+                posBase = posBase + f.size;
+              }
             }
           });
         });