Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
missman
incubator-echarts
提交
c9239fe6
I
incubator-echarts
项目概览
missman
/
incubator-echarts
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
c9239fe6
编写于
12月 02, 2015
作者:
L
lang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev-3.0.0' of
https://github.com/ecomfe/echarts
into dev-3.0.0
上级
34b3959d
b63ed396
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
38 addition
and
25 deletion
+38
-25
src/model/Global.js
src/model/Global.js
+35
-22
test/treemap-obama.html
test/treemap-obama.html
+3
-3
未找到文件。
src/model/Global.js
浏览文件 @
c9239fe6
...
...
@@ -274,10 +274,9 @@ define(function (require) {
* @param {string} [condition.subType] Optional.
* @param {Object} [condition.query] like {xxxIndex, xxxId, xxxName},
* where xxx is mainType.
* If query attribute is null/undefined, do not filtering by
* query conditions, which is convenient for no-payload
* situations like visual coding, layout.
* If query.batch is an array, query by each batch item.
* If query attribute is null/undefined or has no index/id/name,
* do not filtering by query conditions, which is convenient for
* no-payload situations or when target of action is global.
* @param {Function} [condition.filter] parameter: component, return boolean.
* @return {Array.<module:echarts/model/Component>} If condition.query.batch
* exist, result by batch is stored on 'batch' prop of returned array,
...
...
@@ -286,20 +285,14 @@ define(function (require) {
findComponents
:
function
(
condition
)
{
var
query
=
condition
.
query
;
var
mainType
=
condition
.
mainType
;
var
subType
=
condition
.
subType
;
if
(
!
query
)
{
return
doFilter
(
filterBySubType
(
this
.
_componentsMap
[
mainType
],
condition
));
}
else
if
(
query
.
batch
)
{
if
(
query
&&
query
.
batch
)
{
var
result
=
[];
var
batchQueries
=
result
.
batchQueries
=
[];
each
(
query
.
batch
,
function
(
batchItem
)
{
batchItem
=
zrUtil
.
defaults
(
zrUtil
.
extend
({},
batchItem
),
query
);
batchItem
.
batch
=
null
;
var
res
=
do
Filter
(
this
.
queryComponents
(
getCond
(
batchItem
))
);
var
res
=
do
Query
.
call
(
this
,
batchItem
);
each
(
res
,
function
(
re
)
{
result
.
push
(
re
);
batchQueries
.
push
(
batchItem
);
...
...
@@ -308,17 +301,35 @@ define(function (require) {
return
result
;
}
else
{
return
do
Filter
(
this
.
queryComponents
(
getCond
(
query
))
);
return
do
Query
.
call
(
this
,
query
);
}
function
getCond
(
q
)
{
return
{
mainType
:
mainType
,
subType
:
subType
,
index
:
q
[
mainType
+
'
Index
'
],
id
:
q
[
mainType
+
'
Id
'
],
name
:
q
[
mainType
+
'
Name
'
]
};
function
doQuery
(
q
)
{
var
queryCond
=
getQueryCond
(
q
);
var
result
=
queryCond
?
this
.
queryComponents
(
queryCond
)
:
this
.
_componentsMap
[
mainType
];
return
doFilter
(
filterBySubType
(
result
,
condition
));
}
function
getQueryCond
(
q
)
{
var
indexAttr
=
mainType
+
'
Index
'
;
var
idAttr
=
mainType
+
'
Id
'
;
var
nameAttr
=
mainType
+
'
Name
'
;
return
q
&&
(
q
.
hasOwnProperty
(
indexAttr
)
||
q
.
hasOwnProperty
(
idAttr
)
||
q
.
hasOwnProperty
(
nameAttr
)
)
?
{
mainType
:
mainType
,
// subType will be filtered finally.
index
:
q
[
indexAttr
],
id
:
q
[
idAttr
],
name
:
q
[
nameAttr
]
}
:
null
;
}
function
doFilter
(
res
)
{
...
...
@@ -722,7 +733,9 @@ define(function (require) {
* @inner
*/
function
filterBySubType
(
components
,
condition
)
{
return
condition
.
subType
!==
void
0
// Using hasOwnProperty for restrict. Consider
// subType is undefined in user payload.
return
condition
.
hasOwnProperty
(
'
subType
'
)
?
filter
(
components
,
function
(
cpt
)
{
return
cpt
.
subType
===
condition
.
subType
;
})
...
...
test/treemap-obama.html
浏览文件 @
c9239fe6
...
...
@@ -282,9 +282,9 @@
chart
.
setOption
({
//
legend: {
//
data: [SERIES_NAME]
//
},
legend
:
{
data
:
[
SERIES_NAME
]
},
tooltip
:
{
formatter
:
getTooltipFormatter
(
0
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录