Skip to content

I
incubator-echarts

x649585723 / incubator-echarts
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
I
incubator-echarts

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 387ca790 编写于 作者: L lang
浏览文件
操作

map marline 动画的时候禁用缩放

上级 7696e2c4
隐藏空白更改
内联 并排
Showing with 37 addition and 29 deletion
src/chart/map.js
浏览文件 @ 387ca790
......@@ -1061,7 +1061,15 @@ define(function (require) {
if (this.shapeList.length <= 0) {
return;
}
for (var i = 0, l = this.shapeList.length; i < l; i++) {
var shape = this.shapeList[i];
// If any shape is still animating
if (shape.__animating) {
return;
}
}
var event = params.event;
var mx = zrEvent.getX(event);
var my = zrEvent.getY(event);
......@@ -1169,10 +1177,10 @@ define(function (require) {
shape.scale[1] *= delta;
}
else if (shapeType == 'mark-line') {
scaleMarkline(shapeType, delta);
scaleMarkline(shapeStyle, delta);
}
else if (shapeType == 'polyline') {
scalePolyline(shapeType, delta);
scalePolyline(shapeStyle, delta);
}
else if (shapeType == 'shape-bundle') {
for (var j = 0; j < shapeStyle.shapeList.length; j++) {
......
src/component/base.js
浏览文件 @ 387ca790
......@@ -37,7 +37,7 @@ define(function (require) {
: (ecData.get(self.shapeList[i], 'series') || {}).name;
if (name == targetName
&& !self.shapeList[i].invisible
&& !self.shapeList[i]._animating
&& !self.shapeList[i].__animating
) {
self.zr.addHoverShape(self.shapeList[i]);
}
......
src/util/ecAnimation.js
浏览文件 @ 387ca790
......@@ -60,7 +60,7 @@ define(function (require) {
}
zr.addShape(newShape);
newShape._animating = true;
newShape.__animating = true;
zr.animate(newShape.id, 'style')
.when(
duration,
......@@ -73,7 +73,7 @@ define(function (require) {
}
})
.done(function() {
newShape._animating = false;
newShape.__animating = false;
})
.start(easing);
}
......@@ -144,7 +144,7 @@ define(function (require) {
.start(easing);
}
newShape._animating = true;
newShape.__animating = true;
zr.animate(newShape.id, 'style')
.when(
duration,
......@@ -156,7 +156,7 @@ define(function (require) {
}
)
.done(function() {
newShape._animating = false;
newShape.__animating = false;
})
.start(easing);
}
......@@ -179,14 +179,14 @@ define(function (require) {
var newY = newShape.style.y;
newShape.style.y = oldShape.style.y;
zr.addShape(newShape);
newShape._animating = true;
newShape.__animating = true;
zr.animate(newShape.id, 'style')
.when(
duration,
{ y: newY }
)
.done(function() {
newShape._animating = false;
newShape.__animating = false;
})
.start(easing);
}
......@@ -206,7 +206,7 @@ define(function (require) {
var r0 = newShape.style.r0;
var r = newShape.style.r;
newShape._animating = true;
newShape.__animating = true;
if (newShape._animationAdd != 'r') {
newShape.style.r0 = 0;
......@@ -223,7 +223,7 @@ define(function (require) {
}
)
.done(function() {
newShape._animating = false;
newShape.__animating = false;
})
.start(easing);
zr.animate(newShape.id, '')
......@@ -245,7 +245,7 @@ define(function (require) {
}
)
.done(function() {
newShape._animating = false;
newShape.__animating = false;
})
.start(easing);
}
......@@ -284,7 +284,7 @@ define(function (require) {
);
zr.addShape(newShape);
newShape._animating = true;
newShape.__animating = true;
zr.animate(newShape.id, 'style')
.when(
duration,
......@@ -294,7 +294,7 @@ define(function (require) {
}
)
.done(function() {
newShape._animating = false;
newShape.__animating = false;
})
.start(easing);
}
......@@ -329,7 +329,7 @@ define(function (require) {
);
zr.addShape(newShape);
newShape._animating = true;
newShape.__animating = true;
zr.animate(newShape.id, 'style')
.when(
duration,
......@@ -339,7 +339,7 @@ define(function (require) {
}
)
.done(function() {
newShape._animating = false;
newShape.__animating = false;
})
.start(easing);
}
......@@ -360,7 +360,7 @@ define(function (require) {
newShape.scale = [0.1, 0.1, x, y];
zr.addShape(newShape);
newShape._animating = true;
newShape.__animating = true;
zr.animate(newShape.id, '')
.when(
duration,
......@@ -369,7 +369,7 @@ define(function (require) {
}
)
.done(function() {
newShape._animating = false;
newShape.__animating = false;
})
.start(easing);
}
......@@ -408,7 +408,7 @@ define(function (require) {
}
zr.addShape(newShape);
newShape._animating = true;
newShape.__animating = true;
zr.animate(newShape.id, 'style')
.when(
duration,
......@@ -420,7 +420,7 @@ define(function (require) {
}
)
.done(function() {
newShape._animating = false;
newShape.__animating = false;
})
.start(easing);
}
......@@ -446,7 +446,7 @@ define(function (require) {
var angle = newShape.style.angle;
newShape.style.angle = oldShape.style.angle;
zr.addShape(newShape);
newShape._animating = true;
newShape.__animating = true;
zr.animate(newShape.id, 'style')
.when(
duration,
......@@ -455,7 +455,7 @@ define(function (require) {
}
)
.done(function() {
newShape._animating = false;
newShape.__animating = false;
})
.start(easing);
}
......@@ -481,7 +481,7 @@ define(function (require) {
var y = newShape._y || 0;
newShape.scale = [0.01, 0.01, x, y];
zr.addShape(newShape);
newShape._animating = true;
newShape.__animating = true;
zr.animate(newShape.id, '')
.delay(delay)
.when(
......@@ -489,7 +489,7 @@ define(function (require) {
{scale : [1, 1, x, y]}
)
.done(function() {
newShape._animating = false;
newShape.__animating = false;
})
.start(easing || 'QuinticOut');
}
......@@ -530,7 +530,7 @@ define(function (require) {
);
zr.addShape(newShape);
newShape._animating = true;
newShape.__animating = true;
zr.animate(newShape.id, 'style')
.when(
duration,
......@@ -542,7 +542,7 @@ define(function (require) {
}
)
.done(function() {
newShape._animating = false;
newShape.__animating = false;
})
.start(easing);
}
......@@ -558,12 +558,12 @@ define(function (require) {
*/
function markline(zr, oldShape, newShape, duration, easing) {
easing = easing || 'QuinticOut';
newShape._animating = true;
newShape.__animating = true;
zr.addShape(newShape);
var newShapeStyle = newShape.style;
var animationDone = function () {
newShape._animating = false;
newShape.__animating = false;
}
if (oldShape) {
var oldShapeStyle = oldShape.style;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或