Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
780f7872
I
incubator-echarts
项目概览
x649585723
/
incubator-echarts
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
incubator-echarts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
780f7872
编写于
12月 07, 2015
作者:
L
lang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Effect configuration
上级
67edaf12
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
33 addition
and
10 deletion
+33
-10
src/chart/effectScatter/EffectScatterSeries.js
src/chart/effectScatter/EffectScatterSeries.js
+10
-0
src/chart/helper/EffectSymbol.js
src/chart/helper/EffectSymbol.js
+15
-9
test/effectScatter.html
test/effectScatter.html
+8
-1
未找到文件。
src/chart/effectScatter/EffectScatterSeries.js
浏览文件 @
780f7872
...
@@ -26,6 +26,16 @@ define(function (require) {
...
@@ -26,6 +26,16 @@ define(function (require) {
// When to show the effect, option: 'render'|'emphasis'
// When to show the effect, option: 'render'|'emphasis'
showEffectOn
:
'
render
'
,
showEffectOn
:
'
render
'
,
// Period of effect
effectPeriod
:
4000
,
// Ripple effect config
rippleEffect
:
{
// Scale of ripple
scale
:
2.5
,
// Brush type can be fill or stroke
brushType
:
'
fill
'
},
// Cartesian coordinate system
// Cartesian coordinate system
xAxisIndex
:
0
,
xAxisIndex
:
0
,
...
...
src/chart/helper/EffectSymbol.js
浏览文件 @
780f7872
...
@@ -44,13 +44,13 @@ define(function (require) {
...
@@ -44,13 +44,13 @@ define(function (require) {
this
.
childAt
(
1
).
removeAll
();
this
.
childAt
(
1
).
removeAll
();
};
};
effectSymbolProto
.
startEffectAnimation
=
function
()
{
effectSymbolProto
.
startEffectAnimation
=
function
(
period
,
brushType
,
rippleScale
)
{
var
symbolType
=
this
.
_symbolType
;
var
symbolType
=
this
.
_symbolType
;
var
color
=
this
.
_color
;
var
color
=
this
.
_color
;
var
rippleGroup
=
this
.
childAt
(
1
);
var
rippleGroup
=
this
.
childAt
(
1
);
var
randomOffset
=
-
Math
.
random
()
*
5000
;
var
randomOffset
=
-
Math
.
random
()
*
period
;
for
(
var
i
=
0
;
i
<
EFFECT_RIPPLE_NUMBER
;
i
++
)
{
for
(
var
i
=
0
;
i
<
EFFECT_RIPPLE_NUMBER
;
i
++
)
{
var
ripplePath
=
symbolUtil
.
createSymbol
(
var
ripplePath
=
symbolUtil
.
createSymbol
(
...
@@ -58,23 +58,24 @@ define(function (require) {
...
@@ -58,23 +58,24 @@ define(function (require) {
);
);
ripplePath
.
attr
({
ripplePath
.
attr
({
style
:
{
style
:
{
stroke
:
null
,
stroke
:
brushType
===
'
stroke
'
?
color
:
null
,
fill
:
color
fill
:
brushType
===
'
fill
'
?
color
:
null
,
strokeNoScale
:
true
},
},
z2
:
99
,
z2
:
99
,
scale
:
[
1
,
1
]
scale
:
[
1
,
1
]
});
});
var
delay
=
-
i
/
EFFECT_RIPPLE_NUMBER
*
5000
+
randomOffset
;
var
delay
=
-
i
/
EFFECT_RIPPLE_NUMBER
*
period
+
randomOffset
;
// TODO Configurable period
// TODO Configurable period
ripplePath
.
animate
(
''
,
true
)
ripplePath
.
animate
(
''
,
true
)
.
when
(
5000
,
{
.
when
(
period
,
{
scale
:
[
3
,
3
]
scale
:
[
rippleScale
,
rippleScale
]
})
})
.
delay
(
delay
)
.
delay
(
delay
)
.
start
();
.
start
();
ripplePath
.
animateStyle
(
true
)
ripplePath
.
animateStyle
(
true
)
.
when
(
5000
,
{
.
when
(
period
,
{
opacity
:
0
opacity
:
0
})
})
.
delay
(
delay
)
.
delay
(
delay
)
...
@@ -109,6 +110,7 @@ define(function (require) {
...
@@ -109,6 +110,7 @@ define(function (require) {
this
.
childAt
(
0
).
updateData
(
data
,
idx
);
this
.
childAt
(
0
).
updateData
(
data
,
idx
);
var
rippleGroup
=
this
.
childAt
(
1
);
var
rippleGroup
=
this
.
childAt
(
1
);
var
itemModel
=
data
.
getItemModel
(
idx
);
var
symbolType
=
data
.
getItemVisual
(
idx
,
'
symbol
'
);
var
symbolType
=
data
.
getItemVisual
(
idx
,
'
symbol
'
);
var
symbolSize
=
normalizeSymbolSize
(
data
.
getItemVisual
(
idx
,
'
symbolSize
'
));
var
symbolSize
=
normalizeSymbolSize
(
data
.
getItemVisual
(
idx
,
'
symbolSize
'
));
var
color
=
data
.
getItemVisual
(
idx
,
'
color
'
);
var
color
=
data
.
getItemVisual
(
idx
,
'
color
'
);
...
@@ -125,9 +127,13 @@ define(function (require) {
...
@@ -125,9 +127,13 @@ define(function (require) {
this
.
_color
=
color
;
this
.
_color
=
color
;
var
showEffectOn
=
seriesModel
.
get
(
'
showEffectOn
'
);
var
showEffectOn
=
seriesModel
.
get
(
'
showEffectOn
'
);
var
rippleScale
=
itemModel
.
get
(
'
rippleEffect.scale
'
);
var
brushType
=
itemModel
.
get
(
'
rippleEffect.brushType
'
);
var
effectPeriod
=
itemModel
.
get
(
'
effectPeriod
'
);
this
.
stopEffectAnimation
();
this
.
stopEffectAnimation
();
if
(
showEffectOn
===
'
render
'
)
{
if
(
showEffectOn
===
'
render
'
)
{
this
.
startEffectAnimation
();
this
.
startEffectAnimation
(
effectPeriod
,
brushType
,
rippleScale
);
}
}
var
symbol
=
this
.
childAt
(
0
);
var
symbol
=
this
.
childAt
(
0
);
function
onEmphasis
()
{
function
onEmphasis
()
{
...
...
test/effectScatter.html
浏览文件 @
780f7872
...
@@ -491,10 +491,12 @@
...
@@ -491,10 +491,12 @@
},
},
label
:
{
label
:
{
normal
:
{
normal
:
{
formatter
:
'
{b}
'
,
position
:
'
right
'
,
show
:
false
show
:
false
},
},
emphasis
:
{
emphasis
:
{
show
:
fals
e
show
:
tru
e
}
}
},
},
itemStyle
:
{
itemStyle
:
{
...
@@ -514,6 +516,11 @@
...
@@ -514,6 +516,11 @@
return
val
[
2
]
/
10
;
return
val
[
2
]
/
10
;
},
},
showEffectOn
:
'
render
'
,
showEffectOn
:
'
render
'
,
rippleEffect
:
{
brushType
:
'
stroke
'
},
hoverAnimation
:
true
,
label
:
{
label
:
{
normal
:
{
normal
:
{
formatter
:
'
{b}
'
,
formatter
:
'
{b}
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录