Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
7ba19c32
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,发现更多精彩内容 >>
提交
7ba19c32
编写于
3月 18, 2017
作者:
P
pah100
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[dataZoom] Fix #5226 (enhance dataZoom default behavior when sync two category axes)
上级
5f14fa81
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
34 addition
and
10 deletion
+34
-10
src/component/dataZoom/AxisProxy.js
src/component/dataZoom/AxisProxy.js
+34
-10
未找到文件。
src/component/dataZoom/AxisProxy.js
浏览文件 @
7ba19c32
...
@@ -168,12 +168,6 @@ define(function(require) {
...
@@ -168,12 +168,6 @@ define(function(require) {
];
];
var
valueWindow
=
[];
var
valueWindow
=
[];
// In percent range is used and axis min/max/scale is set,
// window should be based on min/max/0, but should not be
// based on the extent of filtered data.
dataExtent
=
dataExtent
.
slice
();
fixExtentByAxis
(
dataExtent
,
axisModel
);
each
([
'
startValue
'
,
'
endValue
'
],
function
(
prop
)
{
each
([
'
startValue
'
,
'
endValue
'
],
function
(
prop
)
{
valueWindow
.
push
(
opt
[
prop
]
!=
null
?
scale
.
parse
(
opt
[
prop
])
:
null
);
valueWindow
.
push
(
opt
[
prop
]
!=
null
?
scale
.
parse
(
opt
[
prop
])
:
null
);
});
});
...
@@ -239,7 +233,7 @@ define(function(require) {
...
@@ -239,7 +233,7 @@ define(function(require) {
// Culculate data window and data extent, and record them.
// Culculate data window and data extent, and record them.
this
.
_dataExtent
=
calculateDataExtent
(
this
.
_dataExtent
=
calculateDataExtent
(
this
.
_dimName
,
this
.
getTargetSeriesModels
()
this
,
this
.
_dimName
,
this
.
getTargetSeriesModels
()
);
);
var
dataWindow
=
this
.
calculateDataWindow
(
dataZoomModel
.
option
);
var
dataWindow
=
this
.
calculateDataWindow
(
dataZoomModel
.
option
);
...
@@ -316,7 +310,7 @@ define(function(require) {
...
@@ -316,7 +310,7 @@ define(function(require) {
}
}
};
};
function
calculateDataExtent
(
axisDim
,
seriesModels
)
{
function
calculateDataExtent
(
axis
Proxy
,
axis
Dim
,
seriesModels
)
{
var
dataExtent
=
[
Infinity
,
-
Infinity
];
var
dataExtent
=
[
Infinity
,
-
Infinity
];
each
(
seriesModels
,
function
(
seriesModel
)
{
each
(
seriesModels
,
function
(
seriesModel
)
{
...
@@ -328,30 +322,60 @@ define(function(require) {
...
@@ -328,30 +322,60 @@ define(function(require) {
seriesExtent
[
1
]
>
dataExtent
[
1
]
&&
(
dataExtent
[
1
]
=
seriesExtent
[
1
]);
seriesExtent
[
1
]
>
dataExtent
[
1
]
&&
(
dataExtent
[
1
]
=
seriesExtent
[
1
]);
});
});
}
}
}
,
this
);
});
if
(
dataExtent
[
1
]
<
dataExtent
[
0
])
{
if
(
dataExtent
[
1
]
<
dataExtent
[
0
])
{
dataExtent
=
[
NaN
,
NaN
];
dataExtent
=
[
NaN
,
NaN
];
}
}
// It is important to get "consistent" extent when more then one axes is
// controlled by a `dataZoom`, otherwise those axes will not be synchronized
// when zooming. But it is difficult to know what is "consistent", considering
// axes have different type or even different meanings (For example, two
// time axes are used to compare data of the same date in different years).
// So basically dataZoom just obtains extent by series.data (in category axis
// extent can be obtained from axis.data).
// Nevertheless, user can set min/max/scale on axes to make extent of axes
// consistent.
fixExtentByAxis
(
axisProxy
,
dataExtent
);
return
dataExtent
;
return
dataExtent
;
}
}
function
fixExtentByAxis
(
dataExtent
,
axisModel
)
{
function
fixExtentByAxis
(
axisProxy
,
dataExtent
)
{
var
axisModel
=
axisProxy
.
getAxisModel
();
var
min
=
axisModel
.
getMin
(
true
);
var
min
=
axisModel
.
getMin
(
true
);
// For category axis, if min/max/scale are not set, extent is determined
// by axis.data by default.
var
isCategoryAxis
=
axisModel
.
get
(
'
type
'
)
===
'
category
'
;
var
axisDataLen
=
isCategoryAxis
&&
(
axisModel
.
get
(
'
data
'
)
||
[]).
length
;
if
(
min
!=
null
&&
min
!==
'
dataMin
'
)
{
if
(
min
!=
null
&&
min
!==
'
dataMin
'
)
{
dataExtent
[
0
]
=
min
;
dataExtent
[
0
]
=
min
;
}
}
else
if
(
isCategoryAxis
)
{
dataExtent
[
0
]
=
0
;
}
var
max
=
axisModel
.
getMax
(
true
);
var
max
=
axisModel
.
getMax
(
true
);
if
(
max
!=
null
&&
max
!==
'
dataMax
'
)
{
if
(
max
!=
null
&&
max
!==
'
dataMax
'
)
{
dataExtent
[
1
]
=
max
;
dataExtent
[
1
]
=
max
;
}
}
else
if
(
isCategoryAxis
)
{
dataExtent
[
1
]
=
Math
.
max
(
0
,
axisDataLen
-
1
);
}
if
(
!
axisModel
.
get
(
'
scale
'
,
true
))
{
if
(
!
axisModel
.
get
(
'
scale
'
,
true
))
{
dataExtent
[
0
]
>
0
&&
(
dataExtent
[
0
]
=
0
);
dataExtent
[
0
]
>
0
&&
(
dataExtent
[
0
]
=
0
);
dataExtent
[
1
]
<
0
&&
(
dataExtent
[
1
]
=
0
);
dataExtent
[
1
]
<
0
&&
(
dataExtent
[
1
]
=
0
);
}
}
// For value axis, if min/max/scale are not set, we just use the extent obtained
// by series data, which may be a little different from the extent calculated by
// `axisHelper.getScaleExtent`. But the different just affects the experience a
// little when zooming. So it will not be fixed until some users require it strongly.
return
dataExtent
;
return
dataExtent
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录