提交 dfc339ed 编写于 作者: K kener

pie、polar、title自适应bug fix

上级 8eba8d0c
......@@ -589,7 +589,6 @@ define(function(require) {
'recursive' : true
}
);
// 圆心坐标,无则为自适应居中
if (!opt.center
|| (opt.center && !(opt.center instanceof Array))) {
......@@ -606,7 +605,7 @@ define(function(require) {
opt.center[1] = Math.round(zr.getHeight() / 2);
}
}
// 传数组实现环形图,[内半径,外半径],传单个则默认为外半径为
if (typeof opt.radius == 'undefined') {
opt.radius = [
......@@ -655,11 +654,18 @@ define(function(require) {
if (newOption) {
option = newOption;
series = option.series;
self.backupAdaptiveParams(series, ['center', 'radius']);
}
self.clear();
_buildShape();
}
function resize() {
// 复位录原始定义
self.restoreAdaptiveParams(series, ['center', 'radius']);
refresh();
}
/**
* 动态数据增加动画
* 心跳效果
......@@ -1124,6 +1130,7 @@ define(function(require) {
// 接口方法
self.init = init;
self.refresh = refresh;
self.resize = resize;
self.addDataAnimation = addDataAnimation;
self.animation = animation;
self.onclick = onclick;
......
......@@ -164,7 +164,7 @@ define(function(require) {
var y = pos[1];
var ret = [];
if (typeof(x) == 'string') {
if (trim(x).substr(-1) == '%') {
if (_trim(x).substr(-1) == '%') {
ret[0] = parseFloat(x) / 100 * this.zr.getWidth();
} else {
ret[0] = parseFloat(x);
......@@ -174,7 +174,7 @@ define(function(require) {
}
if (typeof(y) == 'string') {
if (trim(y).substr(-1) == '%') {
if (_trim(y).substr(-1) == '%') {
ret[1] = parseFloat(y) / 100 * this.zr.getHeight();
} else {
ret[1] = parseFloat(y);
......@@ -186,10 +186,36 @@ define(function(require) {
return ret;
}
function trim(str) {
function _trim(str) {
return str.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
}
// 记录自适应原始定义,resize用
function backupAdaptiveParams(series, attrs, isAll) {
for (var i = 0, l = series.length; i < l; i++) {
if (isAll || series[i].type == self.type) {
for (var j = 0, k = attrs.length; j < k; j++) {
series[i]['__' + attrs[i]] = zrUtil.clone(
series[i][attrs[i]]
);
}
}
}
}
// 还原自适应原始定义,resize用
function restoreAdaptiveParams(series, attrs, isAll) {
for (var i = 0, l = series.length; i < l; i++) {
if (isAll || series[i].type == self.type) {
for (var j = 0, k = attrs.length; j < k; j++) {
series[i][attrs[i]] = zrUtil.clone(
series[i]['__' + attrs[i]]
);
}
}
}
}
function resize() {
self.refresh && self.refresh();
}
......@@ -226,6 +252,8 @@ define(function(require) {
self.calAbsolute = calAbsolute;
self.clear = clear;
self.dispose = dispose;
self.backupAdaptiveParams = backupAdaptiveParams;
self.restoreAdaptiveParams = restoreAdaptiveParams;
self.resize = resize;
}
......
......@@ -30,17 +30,10 @@ define(
var _queryTarget;
function init(newOption, newComponent) {
option = newOption;
component = newComponent;
self.clear();
polar = option.polar;
series = option.series;
_buildShape();
refresh(newOption);
}
/**
* 绘制图形
*/
......@@ -920,15 +913,28 @@ define(
return polar[index].indicator;
}
/**
/**
* 刷新
*/
function refresh() {
function refresh(newOption) {
if (newOption) {
option = newOption;
polar = option.polar;
series = option.series;
self.backupAdaptiveParams(polar,['center', 'radius'],true);
}
self.clear();
_buildShape();
}
function resize() {
// 复位录原始定义
self.restoreAdaptiveParams(polar, ['center', 'radius'], true);
refresh();
}
self.refresh = refresh;
self.resize = resize;
self.reformOption = reformOption;
self.getVector = getVector;
......
......@@ -247,9 +247,15 @@ define(function (require) {
_buildShape();
}
}
function resize() {
self.clear();
_buildShape();
}
self.init = init;
self.refresh = refresh;
self.resize = resize;
init(option);
}
......
......@@ -328,7 +328,9 @@ define(function() {
},
polar : {
startAngle : 90,
// center: null, // 默认全局居中
// radius: [0, min(width,height) - 50],
startAngle : 90,
splitNumber : 5,
name : {
show: true,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册