* finish task #3712 and fix bug #1419.

This commit is contained in:
Catouse
2018-03-19 17:13:01 +08:00
parent 9123dbb30c
commit 37dfcc7a26
+5 -5
View File
@@ -138,15 +138,16 @@ if($config->debug)
{value: options.value, label: options.name, color: options.color},
{value: 100 - options.value, label: '', color: options.backColor}
];
$canvas[options.doughnut ? 'doughnutChart' : 'pieChart'](data, $.extend(
var chartOptions = $.extend(
{
segmentShowStroke: false,
animation: options.animation,
showTooltips: options.showTip,
tooltipTemplate: options.tipTemplate,
percentageInnerCutout: options.doughnutSize,
}, options.chartOptions));
}, options.chartOptions);
$canvas[options.doughnut ? 'doughnutChart' : 'pieChart'](data, chartOptions);
});
};
@@ -154,8 +155,7 @@ if($config->debug)
{
$('.table-chart').tableChart();
var $pies = $('.progress-pie');
if($pies.length > 100) setTimeout(function(){$pies.progressPie();}, 1000);
else $pies.progressPie();
setTimeout(function(){$pies.progressPie();}, $pies.length > 100 ? 1000 : 200);
});
}());
</script>