Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
dc909f54
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,发现更多精彩内容 >>
提交
dc909f54
编写于
1月 01, 2016
作者:
P
pah100
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix datazoom toolbox
上级
66f1bfe5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
16 deletion
+11
-16
src/component/toolbox/feature/DataZoom.js
src/component/toolbox/feature/DataZoom.js
+11
-16
未找到文件。
src/component/toolbox/feature/DataZoom.js
浏览文件 @
dc909f54
...
@@ -94,17 +94,8 @@ define(function(require) {
...
@@ -94,17 +94,8 @@ define(function(require) {
if
(
isZoomActive
)
{
if
(
isZoomActive
)
{
zr
.
setDefaultCursorStyle
(
'
crosshair
'
);
zr
.
setDefaultCursorStyle
(
'
crosshair
'
);
// FIXME
// polar
var
coordInfoList
=
[];
ecModel
.
eachComponent
(
'
grid
'
,
function
(
gridModel
,
gridIndex
)
{
var
grid
=
gridModel
.
coordinateSystem
;
coordInfoList
.
push
(
prepareCoordInfo
(
grid
,
ecModel
));
},
this
);
this
.
_createController
(
this
.
_createController
(
controllerGroup
,
coordInfoList
,
featureModel
,
ecModel
,
api
controllerGroup
,
featureModel
,
ecModel
,
api
);
);
}
}
else
{
else
{
...
@@ -122,7 +113,7 @@ define(function(require) {
...
@@ -122,7 +113,7 @@ define(function(require) {
* @private
* @private
*/
*/
proto
.
_createController
=
function
(
proto
.
_createController
=
function
(
controllerGroup
,
coordInfoList
,
featureModel
,
ecModel
,
api
controllerGroup
,
featureModel
,
ecModel
,
api
)
{
)
{
var
controller
=
this
.
_controller
=
new
SelectController
(
var
controller
=
this
.
_controller
=
new
SelectController
(
'
rect
'
,
'
rect
'
,
...
@@ -137,7 +128,7 @@ define(function(require) {
...
@@ -137,7 +128,7 @@ define(function(require) {
controller
.
on
(
controller
.
on
(
'
selectEnd
'
,
'
selectEnd
'
,
zrUtil
.
bind
(
zrUtil
.
bind
(
this
.
_onSelected
,
this
,
controller
,
coordInfoList
,
this
.
_onSelected
,
this
,
controller
,
featureModel
,
ecModel
,
api
featureModel
,
ecModel
,
api
)
)
);
);
...
@@ -185,7 +176,7 @@ define(function(require) {
...
@@ -185,7 +176,7 @@ define(function(require) {
/**
/**
* @private
* @private
*/
*/
proto
.
_onSelected
=
function
(
controller
,
coordInfoList
,
featureModel
,
ecModel
,
api
,
selRanges
)
{
proto
.
_onSelected
=
function
(
controller
,
featureModel
,
ecModel
,
api
,
selRanges
)
{
if
(
!
selRanges
.
length
)
{
if
(
!
selRanges
.
length
)
{
return
;
return
;
}
}
...
@@ -195,7 +186,12 @@ define(function(require) {
...
@@ -195,7 +186,12 @@ define(function(require) {
var
snapshot
=
{};
var
snapshot
=
{};
each
(
coordInfoList
,
function
(
coordInfo
)
{
// FIXME
// polar
ecModel
.
eachComponent
(
'
grid
'
,
function
(
gridModel
,
gridIndex
)
{
var
grid
=
gridModel
.
coordinateSystem
;
var
coordInfo
=
prepareCoordInfo
(
grid
,
ecModel
);
var
selDataRange
=
pointToDataInCartesian
(
selRange
,
coordInfo
);
var
selDataRange
=
pointToDataInCartesian
(
selRange
,
coordInfo
);
if
(
selDataRange
)
{
if
(
selDataRange
)
{
...
@@ -205,7 +201,7 @@ define(function(require) {
...
@@ -205,7 +201,7 @@ define(function(require) {
xBatchItem
&&
(
snapshot
[
xBatchItem
.
dataZoomId
]
=
xBatchItem
);
xBatchItem
&&
(
snapshot
[
xBatchItem
.
dataZoomId
]
=
xBatchItem
);
yBatchItem
&&
(
snapshot
[
yBatchItem
.
dataZoomId
]
=
yBatchItem
);
yBatchItem
&&
(
snapshot
[
yBatchItem
.
dataZoomId
]
=
yBatchItem
);
}
}
});
}
,
this
);
history
.
push
(
ecModel
,
snapshot
);
history
.
push
(
ecModel
,
snapshot
);
...
@@ -224,7 +220,6 @@ define(function(require) {
...
@@ -224,7 +220,6 @@ define(function(require) {
if
(
!
selRect
.
intersect
(
grid
.
getRect
()))
{
if
(
!
selRect
.
intersect
(
grid
.
getRect
()))
{
return
;
return
;
}
}
var
cartesian
=
grid
.
getCartesian
(
coordInfo
[
0
].
axisIndex
,
coordInfo
[
1
].
axisIndex
);
var
cartesian
=
grid
.
getCartesian
(
coordInfo
[
0
].
axisIndex
,
coordInfo
[
1
].
axisIndex
);
var
dataLeftTop
=
cartesian
.
pointToData
([
selRange
[
0
][
0
],
selRange
[
1
][
0
]],
true
);
var
dataLeftTop
=
cartesian
.
pointToData
([
selRange
[
0
][
0
],
selRange
[
1
][
0
]],
true
);
var
dataRightBottom
=
cartesian
.
pointToData
([
selRange
[
0
][
1
],
selRange
[
1
][
1
]],
true
);
var
dataRightBottom
=
cartesian
.
pointToData
([
selRange
[
0
][
1
],
selRange
[
1
][
1
]],
true
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录