提交 96acd9ed 编写于 作者: K kener

饼、雷达中心坐标百分比支持

上级 260a069a
......@@ -97,7 +97,7 @@ option = {
name:'访问来源',
type:'pie',
radius : [0, 110],
center: [,225],
center: ['50%', 225],
data:[
{value:335, name:'直接访问'},
{value:310, name:'邮件营销'},
......
......@@ -113,7 +113,7 @@ option = {
{ text: 'Firefox', max: 400},
{ text: 'Chrome', max: 400}
],
center : [,240],
center : ['50%', 240],
radius : 150
}
],
......
......@@ -1439,7 +1439,7 @@ var optionMap = {
{ text: 'Firefox', max: 400},
{ text: 'Chrome', max: 400}
],
center : [,240],
center : ['50%', 240],
radius : 150
}
],
......
......@@ -589,22 +589,7 @@ define(function(require) {
'recursive' : true
}
);
// 圆心坐标,无则为自适应居中
if (!opt.center
|| (opt.center && !(opt.center instanceof Array))) {
opt.center = [
Math.round(zr.getWidth() / 2),
Math.round(zr.getHeight() / 2)
];
}
else {
if (typeof opt.center[0] == 'undefined') {
opt.center[0] = Math.round(zr.getWidth() / 2);
}
if (typeof opt.center[1] == 'undefined') {
opt.center[1] = Math.round(zr.getHeight() / 2);
}
}
opt.center = self.parseCenter(opt.center);
// 传数组实现环形图,[内半径,外半径],传单个则默认为外半径为
if (typeof opt.radius == 'undefined') {
......
......@@ -98,7 +98,6 @@ define(function(require) {
}
}
/**
* 获取多级控制嵌套属性的基础方法
* 返回ctrList中优先级最高(最靠前)的非undefined属性,ctrList中均无定义则返回undefined
......@@ -258,6 +257,16 @@ define(function(require) {
return value;
}
}
/**
* 获取中心坐标
*/
function parseCenter(center) {
return [
parsePercent(center[0], self.zr.getWidth()),
parsePercent(center[1], self.zr.getHeight()),
];
}
function _trim(str) {
return str.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
......@@ -324,6 +333,7 @@ define(function(require) {
self.getFont = getFont;
self.addLabel = addLabel;
self.parsePercent = parsePercent;
self.parseCenter = parseCenter;
self.clear = clear;
self.dispose = dispose;
self.backupAdaptiveParams = backupAdaptiveParams;
......
......@@ -765,23 +765,8 @@ define(
}
);
// 圆心坐标,无则为自适应居中
if (!opt.center
|| (opt.center && !(opt.center instanceof Array))) {
opt.center = [
Math.round(zr.getWidth() / 2),
Math.round(zr.getHeight() / 2)
];
}
else {
if (typeof opt.center[0] == 'undefined') {
opt.center[0] = Math.round(zr.getWidth() / 2);
}
if (typeof opt.center[1] == 'undefined') {
opt.center[1] = Math.round(zr.getHeight() / 2);
}
}
opt.center = self.parseCenter(opt.center);
if (!opt.radius) {
opt.radius = Math.floor(
Math.min(_width, _height) / 2 - 50
......
......@@ -329,7 +329,7 @@ define(function() {
},
polar : {
// center: null, // 默认全局居中
center : ['50%', '50%'], // 默认全局居中
// radius: [0, min(width,height) - 50],
startAngle : 90,
splitNumber : 5,
......@@ -529,7 +529,7 @@ define(function() {
// 饼图默认参数
pie: {
// center: null, // 默认全局居中
center : ['50%', '50%'], // 默认全局居中
// radius: [0, min(width,height) - 50],
startAngle: 90,
minAngle: 5,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册