Commit 8648b2a2 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=26651 - Потеря отрисовки диаграммы Bar/Pie...

http://bugzserver/show_bug.cgi?id=26651 - Потеря отрисовки диаграммы Bar/Pie Chart при скрытии значений фильтрованного диапазона через Select All 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58626 954022d7-b5bf-4e40-9824-e11837661b57
parent 816da0ad
...@@ -3782,7 +3782,7 @@ drawPieChart.prototype = ...@@ -3782,7 +3782,7 @@ drawPieChart.prototype =
_drawPie: function () _drawPie: function ()
{ {
var numCache = this.chartProp.series[0].val.numRef ? this.chartProp.series[0].val.numRef.numCache.pts : this.chartProp.series[0].val.numLit.pts; var numCache = this._getFirstRealNumCache();
var brush, pen, val; var brush, pen, val;
var path; var path;
for (var i = 0,len = numCache.length; i < len; i++) { for (var i = 0,len = numCache.length; i < len; i++) {
...@@ -3800,7 +3800,7 @@ drawPieChart.prototype = ...@@ -3800,7 +3800,7 @@ drawPieChart.prototype =
var trueWidth = this.chartProp.trueWidth; var trueWidth = this.chartProp.trueWidth;
var trueHeight = this.chartProp.trueHeight; var trueHeight = this.chartProp.trueHeight;
var numCache = this.chartProp.series[0].val.numRef ? this.chartProp.series[0].val.numRef.numCache.pts : this.chartProp.series[0].val.numLit.pts; var numCache = this._getFirstRealNumCache();
var sumData = this.cChartDrawer._getSumArray(numCache, true); var sumData = this.cChartDrawer._getSumArray(numCache, true);
var radius = Math.min(trueHeight, trueWidth)/2; var radius = Math.min(trueHeight, trueWidth)/2;
...@@ -3821,6 +3821,20 @@ drawPieChart.prototype = ...@@ -3821,6 +3821,20 @@ drawPieChart.prototype =
}; };
}, },
_getFirstRealNumCache: function()
{
var series = this.chartProp.series;
var numCache;
for(var i = 0; i < series.length; i++)
{
numCache = this.chartProp.series[i].val.numRef ? this.chartProp.series[i].val.numRef.numCache.pts : this.chartProp.series[i].val.numLit.pts;
if(numCache && numCache.length)
return numCache;
}
return series[0].val.numRef ? series[0].val.numRef.numCache.pts : series[0].val.numLit.pts;
},
_calculateSegment: function (angle, radius, xCenter, yCenter) _calculateSegment: function (angle, radius, xCenter, yCenter)
{ {
if(isNaN(angle)) if(isNaN(angle))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment