Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
1914f8b3
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,发现更多精彩内容 >>
提交
1914f8b3
编写于
9月 25, 2015
作者:
L
lang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
List stack fix, LegendView tweak
上级
ecaf64e7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
41 deletion
+37
-41
src/component/legend/LegendView.js
src/component/legend/LegendView.js
+30
-36
src/data/List.js
src/data/List.js
+7
-5
未找到文件。
src/component/legend/LegendView.js
浏览文件 @
1914f8b3
...
...
@@ -6,10 +6,7 @@ define(function (require) {
var
legendLayout
=
require
(
'
./legendLayout
'
);
var
graphic
=
require
(
'
../../util/graphic
'
);
var
LEGEND_DISABLE_STYLE
=
{
fill
:
'
#ccc
'
,
stroke
:
'
#ccc
'
};
var
LEGEND_DISABLE_COLOR
=
'
#ccc
'
;
function
createSelectActionDispatcher
(
uid
,
seriesName
,
api
)
{
api
.
dispatch
({
...
...
@@ -24,7 +21,7 @@ define(function (require) {
type
:
'
legend
'
,
init
:
function
()
{
this
.
_
itemElMap
=
{};
this
.
_
symbolTypeStore
=
{};
},
render
:
function
(
legendModel
,
ecModel
,
api
)
{
...
...
@@ -49,41 +46,38 @@ define(function (require) {
zrUtil
.
each
(
legendModel
.
getData
(),
function
(
itemModel
)
{
var
seriesName
=
itemModel
.
get
(
'
name
'
);
var
seriesModel
=
ecModel
.
getSeriesByName
(
seriesName
,
true
);
if
(
!
seriesModel
)
{
// Series not exists
return
;
}
var
data
=
seriesModel
.
getData
();
var
color
=
data
.
getVisual
(
'
color
'
);
var
itemElMap
=
this
.
_itemElMap
;
var
itemGroup
=
itemElMap
[
seriesName
];
if
(
legendModel
.
isSelected
(
seriesName
))
{
itemGroup
=
new
graphic
.
Group
();
this
.
_createSymbol
(
data
,
0
,
0
,
itemWidth
,
itemHeight
,
color
,
itemGroup
);
itemElMap
[
seriesName
]
=
itemGroup
;
var
textX
=
itemAlign
===
'
left
'
?
itemWidth
+
5
:
-
5
;
var
textAlign
=
itemAlign
;
var
text
=
new
graphic
.
Text
({
style
:
{
text
:
seriesName
,
x
:
textX
,
y
:
itemHeight
/
2
,
fill
:
'
#000
'
,
textAlign
:
textAlign
,
textBaseline
:
'
middle
'
}
});
itemGroup
.
add
(
text
);
}
else
{
itemGroup
.
eachChild
(
function
(
child
)
{
if
(
child
.
type
!==
'
text
'
)
{
child
.
style
.
set
(
LEGEND_DISABLE_STYLE
);
}
});
itemGroup
.
off
(
'
click
'
);
if
(
!
legendModel
.
isSelected
(
seriesName
))
{
color
=
LEGEND_DISABLE_COLOR
;
}
var
itemGroup
=
new
graphic
.
Group
();
this
.
_createSymbol
(
data
,
0
,
0
,
itemWidth
,
itemHeight
,
color
,
itemGroup
);
var
textX
=
itemAlign
===
'
left
'
?
itemWidth
+
5
:
-
5
;
var
textAlign
=
itemAlign
;
var
text
=
new
graphic
.
Text
({
style
:
{
text
:
seriesName
,
x
:
textX
,
y
:
itemHeight
/
2
,
fill
:
'
#000
'
,
textAlign
:
textAlign
,
textBaseline
:
'
middle
'
}
});
itemGroup
.
add
(
text
);
itemGroup
.
eachChild
(
function
(
child
)
{
child
.
silent
=
!
enableSelect
;
});
...
...
src/data/List.js
浏览文件 @
1914f8b3
...
...
@@ -153,6 +153,8 @@ define(function (require) {
var
dimensions
=
this
.
dimensions
;
var
size
=
data
.
length
;
nameList
=
nameList
||
[];
// Init storage
for
(
var
i
=
0
;
i
<
dimensions
.
length
;
i
++
)
{
var
dimInfo
=
this
.
_dimensionInfos
[
i
];
...
...
@@ -216,7 +218,7 @@ define(function (require) {
// Use the name in option as data id in two value axis case
for
(
var
i
=
0
;
i
<
optionModelIndices
.
length
;
i
++
)
{
if
(
!
nameList
[
i
])
{
if
(
!
nameList
[
i
])
{
var
modelIdx
=
optionModelIndices
[
i
];
var
model
=
optionModels
[
modelIdx
];
if
(
model
&&
model
.
option
)
{
...
...
@@ -409,7 +411,7 @@ define(function (require) {
// Only stacked on the value axis
var
stackDimMap
=
getStackDimMap
(
this
.
_rawValueDims
,
dimensions
);
// Optimizing for 1 dim case
var
firstDimStack
=
stackDimMap
[
dimensions
[
0
]];
var
firstDimStack
=
stack
&&
stack
DimMap
[
dimensions
[
0
]];
context
=
context
||
this
;
...
...
@@ -424,7 +426,7 @@ define(function (require) {
}
else
{
for
(
var
k
=
0
;
k
<
dimSize
;
k
++
)
{
value
[
k
]
=
this
.
get
(
dimensions
[
k
],
i
,
stackDimMap
[
dimensions
[
k
]]);
value
[
k
]
=
this
.
get
(
dimensions
[
k
],
i
,
stack
&&
stack
DimMap
[
dimensions
[
k
]]);
}
// Index
value
[
k
]
=
i
;
...
...
@@ -451,7 +453,7 @@ define(function (require) {
// Only stacked on the value axis
var
stackDimMap
=
getStackDimMap
(
this
.
_rawValueDims
,
dimensions
);
// Optimizing for 1 dim case
var
firstDimStack
=
stackDimMap
[
dimensions
[
0
]];
var
firstDimStack
=
stack
&&
stack
DimMap
[
dimensions
[
0
]];
context
=
context
||
this
;
...
...
@@ -465,7 +467,7 @@ define(function (require) {
}
else
{
for
(
var
k
=
0
;
k
<
dimSize
;
k
++
)
{
value
[
k
]
=
this
.
get
(
dimensions
[
k
],
i
,
stackDimMap
[
dimensions
[
k
]]);
value
[
k
]
=
this
.
get
(
dimensions
[
k
],
i
,
stack
&&
stack
DimMap
[
dimensions
[
k
]]);
}
value
[
k
]
=
i
;
keep
=
cb
.
apply
(
context
,
value
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录