Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
e0aae601
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,发现更多精彩内容 >>
提交
e0aae601
编写于
1月 01, 2016
作者:
P
pah100
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev-3.0.0' of
https://github.com/ecomfe/echarts
into dev-3.0.0
上级
dc909f54
e89b16b4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
9 deletion
+33
-9
src/component/legend/LegendView.js
src/component/legend/LegendView.js
+9
-3
src/component/legend/legendFilter.js
src/component/legend/legendFilter.js
+12
-3
src/processor/dataFilter.js
src/processor/dataFilter.js
+12
-3
未找到文件。
src/component/legend/LegendView.js
浏览文件 @
e0aae601
...
...
@@ -50,7 +50,7 @@ define(function (require) {
group
.
removeAll
();
if
(
itemAlign
===
'
auto
'
)
{
itemAlign
=
(
legendModel
.
get
(
'
x
'
)
===
'
right
'
itemAlign
=
(
legendModel
.
get
(
'
left
'
)
===
'
right
'
&&
legendModel
.
get
(
'
orient
'
)
===
'
vertical
'
)
?
'
right
'
:
'
left
'
;
}
...
...
@@ -158,13 +158,19 @@ define(function (require) {
var
textStyleModel
=
itemModel
.
getModel
(
'
textStyle
'
);
legendSymbolType
=
legendSymbolType
;
var
itemIcon
=
itemModel
.
get
(
'
icon
'
);
// Use user given icon first
legendSymbolType
=
itemIcon
||
legendSymbolType
;
itemGroup
.
add
(
symbolCreator
.
createSymbol
(
legendSymbolType
,
0
,
0
,
itemWidth
,
itemHeight
,
color
));
// Compose symbols
if
(
symbolType
&&
symbolType
!==
legendSymbolType
&&
symbolType
!=
'
none
'
)
{
// PENDING
if
(
!
itemIcon
&&
symbolType
&&
symbolType
!==
legendSymbolType
&&
symbolType
!=
'
none
'
)
{
var
size
=
itemHeight
*
0.8
;
// Put symbol in the center
itemGroup
.
add
(
symbolCreator
.
createSymbol
(
...
...
src/component/legend/legendFilter.js
浏览文件 @
e0aae601
define
(
function
()
{
return
function
(
ecModel
)
{
var
legendModel
=
ecModel
.
getComponent
(
'
legend
'
);
if
(
legendModel
)
{
var
legendModels
=
ecModel
.
findComponents
({
mainType
:
'
legend
'
});
if
(
legendModels
.
length
)
{
ecModel
.
filterSeries
(
function
(
series
)
{
return
legendModel
.
isSelected
(
series
.
name
);
// If in any legend component the status is not selected.
// Because in legend series
for
(
var
i
=
0
;
i
<
legendModels
.
length
;
i
++
)
{
if
(
!
legendModels
[
i
].
isSelected
(
series
.
name
))
{
return
false
;
}
}
return
true
;
});
}
};
...
...
src/processor/dataFilter.js
浏览文件 @
e0aae601
define
(
function
()
{
return
function
(
seriesType
,
ecModel
)
{
var
legendModel
=
ecModel
.
getComponent
(
'
legend
'
);
if
(
!
legendModel
)
{
var
legendModels
=
ecModel
.
findComponents
({
mainType
:
'
legend
'
});
if
(
!
legendModels
.
length
)
{
return
;
}
ecModel
.
eachSeriesByType
(
seriesType
,
function
(
series
)
{
var
data
=
series
.
getData
();
data
.
filterSelf
(
function
(
idx
)
{
return
legendModel
.
isSelected
(
data
.
getName
(
idx
));
var
name
=
data
.
getname
(
idx
);
// If in any legend component the status is not selected.
for
(
var
i
=
0
;
i
<
legendModels
.
length
;
i
++
)
{
if
(
legendModels
[
i
].
isSelected
(
name
))
{
return
false
;
}
}
return
true
;
},
this
);
},
this
);
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录