Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
e336b7e5
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,发现更多精彩内容 >>
提交
e336b7e5
编写于
3月 16, 2016
作者:
L
lang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Marker on pie. Fix #2827
上级
06ed9a7b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
64 addition
and
47 deletion
+64
-47
src/component/marker/MarkLineView.js
src/component/marker/MarkLineView.js
+37
-27
src/component/marker/MarkPointView.js
src/component/marker/MarkPointView.js
+26
-17
src/component/marker/markerHelper.js
src/component/marker/markerHelper.js
+1
-1
src/model/Global.js
src/model/Global.js
+0
-2
未找到文件。
src/component/marker/MarkLineView.js
浏览文件 @
e336b7e5
...
...
@@ -147,7 +147,6 @@ define(function (require) {
this
.
group
.
add
(
lineDraw
.
group
);
var
mlData
=
createList
(
coordSys
,
seriesModel
,
mlModel
);
var
dims
=
coordSys
.
dimensions
;
var
fromData
=
mlData
.
from
;
var
toData
=
mlData
.
to
;
...
...
@@ -218,6 +217,7 @@ define(function (require) {
);
}
else
{
var
dims
=
coordSys
.
dimensions
;
var
x
=
data
.
get
(
dims
[
0
],
idx
);
var
y
=
data
.
get
(
dims
[
1
],
idx
);
point
=
coordSys
.
dataToPoint
([
x
,
y
]);
...
...
@@ -259,40 +259,50 @@ define(function (require) {
*/
function
createList
(
coordSys
,
seriesModel
,
mlModel
)
{
var
coordDimsInfos
=
zrUtil
.
map
(
coordSys
.
dimensions
,
function
(
coordDim
)
{
var
info
=
seriesModel
.
getData
().
getDimensionInfo
(
seriesModel
.
coordDimToDataDim
(
coordDim
)[
0
]
);
info
.
name
=
coordDim
;
return
info
;
});
var
coordDimsInfos
;
if
(
coordSys
)
{
coordDimsInfos
=
zrUtil
.
map
(
coordSys
&&
coordSys
.
dimensions
,
function
(
coordDim
)
{
var
info
=
seriesModel
.
getData
().
getDimensionInfo
(
seriesModel
.
coordDimToDataDim
(
coordDim
)[
0
]
);
info
.
name
=
coordDim
;
return
info
;
});
}
else
{
coordDimsInfos
=
[{
name
:
'
value
'
,
type
:
'
float
'
}];
}
var
fromData
=
new
List
(
coordDimsInfos
,
mlModel
);
var
toData
=
new
List
(
coordDimsInfos
,
mlModel
);
// No dimensions
var
lineData
=
new
List
([],
mlModel
);
var
optData
=
zrUtil
.
map
(
mlModel
.
get
(
'
data
'
),
zrUtil
.
curry
(
markLineTransform
,
seriesModel
,
coordSys
,
mlModel
));
if
(
coordSys
)
{
var
optData
=
zrUtil
.
filter
(
zrUtil
.
map
(
mlModel
.
get
(
'
data
'
),
zrUtil
.
curry
(
markLineTransform
,
seriesModel
,
coordSys
,
mlModel
)),
zrUtil
.
curry
(
markLineFilter
,
coordSys
)
);
fromData
.
initData
(
zrUtil
.
map
(
optData
,
function
(
item
)
{
return
item
[
0
];
}),
null
,
markerHelper
.
dimValueGetter
);
toData
.
initData
(
zrUtil
.
map
(
optData
,
function
(
item
)
{
return
item
[
1
];
}),
null
,
markerHelper
.
dimValueGetter
optData
=
zrUtil
.
filter
(
optData
,
zrUtil
.
curry
(
markLineFilter
,
coordSys
)
);
lineData
.
initData
(
zrUtil
.
map
(
optData
,
function
(
item
)
{
return
item
[
2
];
})
);
}
var
dimValueGetter
=
coordSys
?
markerHelper
.
dimValueGetter
:
function
(
item
)
{
return
item
.
value
;
};
fromData
.
initData
(
zrUtil
.
map
(
optData
,
function
(
item
)
{
return
item
[
0
];
}),
null
,
dimValueGetter
);
toData
.
initData
(
zrUtil
.
map
(
optData
,
function
(
item
)
{
return
item
[
1
];
}),
null
,
dimValueGetter
);
lineData
.
initData
(
zrUtil
.
map
(
optData
,
function
(
item
)
{
return
item
[
2
];
})
);
return
{
from
:
fromData
,
to
:
toData
,
...
...
src/component/marker/MarkPointView.js
浏览文件 @
e336b7e5
...
...
@@ -149,29 +149,38 @@ define(function (require) {
* @param {module:echarts/model/Model} mpModel
*/
function
createList
(
coordSys
,
seriesModel
,
mpModel
)
{
var
coordDimsInfos
=
zrUtil
.
map
(
coordSys
.
dimensions
,
function
(
coordDim
)
{
var
info
=
seriesModel
.
getData
().
getDimensionInfo
(
seriesModel
.
coordDimToDataDim
(
coordDim
)[
0
]
);
info
.
name
=
coordDim
;
return
info
;
});
var
coordDimsInfos
;
if
(
coordSys
)
{
coordDimsInfos
=
zrUtil
.
map
(
coordSys
&&
coordSys
.
dimensions
,
function
(
coordDim
)
{
var
info
=
seriesModel
.
getData
().
getDimensionInfo
(
seriesModel
.
coordDimToDataDim
(
coordDim
)[
0
]
);
info
.
name
=
coordDim
;
return
info
;
});
}
else
{
coordDimsInfos
=
[{
name
:
'
value
'
,
type
:
'
float
'
}];
}
var
mpData
=
new
List
(
coordDimsInfos
,
mpModel
);
var
dataOpt
=
zrUtil
.
map
(
mpModel
.
get
(
'
data
'
),
zrUtil
.
curry
(
markerHelper
.
dataTransform
,
seriesModel
));
if
(
coordSys
)
{
mpData
.
initData
(
zrUtil
.
filter
(
zrUtil
.
map
(
mpModel
.
get
(
'
data
'
),
zrUtil
.
curry
(
markerHelper
.
dataTransform
,
seriesModel
)),
zrUtil
.
curry
(
markerHelper
.
dataFilter
,
coordSys
)
),
null
,
markerHelper
.
dimValueGetter
dataOpt
=
zrUtil
.
filter
(
dataOpt
,
zrUtil
.
curry
(
markerHelper
.
dataFilter
,
coordSys
)
);
}
mpData
.
initData
(
dataOpt
,
null
,
coordSys
?
markerHelper
.
dimValueGetter
:
function
(
item
)
{
return
item
.
value
;
}
);
return
mpData
;
}
...
...
src/component/marker/markerHelper.js
浏览文件 @
e336b7e5
...
...
@@ -154,7 +154,7 @@ define(function (require) {
return
item
.
coord
&&
item
.
coord
[
dimIndex
];
}
else
{
item
.
value
;
return
item
.
value
;
}
};
...
...
src/model/Global.js
浏览文件 @
e336b7e5
...
...
@@ -748,8 +748,6 @@ define(function (require) {
// Components that use _seriesIndices should depends on series component,
// which make sure that their initialization is after series.
if
(
!
ecModel
.
_seriesIndices
)
{
// FIXME
// 验证和提示怎么写
throw
new
Error
(
'
Series has not been initialized yet.
'
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录