Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
45a610ce
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,发现更多精彩内容 >>
提交
45a610ce
编写于
2月 26, 2016
作者:
L
lang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Series add methods dataDimToCoordDim, coordDimToDataDim
上级
e26558a3
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
55 addition
and
51 deletion
+55
-51
src/chart/helper/whiskerBoxCommon.js
src/chart/helper/whiskerBoxCommon.js
+9
-14
src/chart/themeRiver/ThemeRiverSeries.js
src/chart/themeRiver/ThemeRiverSeries.js
+1
-1
src/component/dataZoom/AxisProxy.js
src/component/dataZoom/AxisProxy.js
+2
-2
src/component/marker/MarkLineView.js
src/component/marker/MarkLineView.js
+10
-2
src/component/marker/MarkPointView.js
src/component/marker/MarkPointView.js
+8
-3
src/component/marker/markerHelper.js
src/component/marker/markerHelper.js
+4
-4
src/component/tooltip/TooltipView.js
src/component/tooltip/TooltipView.js
+2
-2
src/coord/cartesian/Grid.js
src/coord/cartesian/Grid.js
+1
-1
src/coord/single/Single.js
src/coord/single/Single.js
+1
-1
src/model/Series.js
src/model/Series.js
+17
-21
未找到文件。
src/chart/helper/whiskerBoxCommon.js
浏览文件 @
45a610ce
...
@@ -72,7 +72,7 @@ define(function(require) {
...
@@ -72,7 +72,7 @@ define(function(require) {
* @param {string} axisDim 'x' or 'y'
* @param {string} axisDim 'x' or 'y'
* @return {Array.<string>} dimensions on the axis.
* @return {Array.<string>} dimensions on the axis.
*/
*/
getDimensionsOnAxis
:
function
(
axisDim
)
{
coordDimToDataDim
:
function
(
axisDim
)
{
var
dims
=
this
.
valueDimensions
.
slice
();
var
dims
=
this
.
valueDimensions
.
slice
();
var
baseDim
=
[
'
base
'
];
var
baseDim
=
[
'
base
'
];
var
map
=
{
var
map
=
{
...
@@ -84,25 +84,20 @@ define(function(require) {
...
@@ -84,25 +84,20 @@ define(function(require) {
/**
/**
* @override
* @override
* @param {string|number}
[dataDim]
* @param {string|number}
dataDim
* @return {
Array.<Object>} dimension info list.
* @return {
string} coord dimension
*/
*/
getCoordDimensionInfo
:
function
(
dataDim
)
{
dataDimToCoordDim
:
function
(
dataDim
)
{
var
data
=
this
.
getData
();
var
dim
;
var
infoList
=
[];
var
info
;
zrUtil
.
each
([
'
x
'
,
'
y
'
],
function
(
coordDim
,
index
)
{
zrUtil
.
each
([
'
x
'
,
'
y
'
],
function
(
coordDim
,
index
)
{
var
dataDims
=
this
.
getDimensionsOnAxis
(
coordDim
);
var
dataDims
=
this
.
coordDimToDataDim
(
coordDim
);
if
(
dataDim
!=
null
&&
zrUtil
.
indexOf
(
dataDims
,
dataDim
)
>=
0
)
{
if
(
zrUtil
.
indexOf
(
dataDims
,
dataDim
)
>=
0
)
{
info
=
data
.
getDimensionInfo
(
dataDim
);
dim
=
coordDim
;
info
.
name
=
coordDim
;
}
}
infoList
[
index
]
=
data
.
getDimensionInfo
(
dataDims
[
0
]);
infoList
[
index
].
name
=
coordDim
;
},
this
);
},
this
);
return
d
ataDim
!=
null
?
info
:
infoList
;
return
d
im
;
},
},
/**
/**
...
...
src/chart/themeRiver/ThemeRiverSeries.js
浏览文件 @
45a610ce
...
@@ -171,7 +171,7 @@ define(function (require) {
...
@@ -171,7 +171,7 @@ define(function (require) {
* @param {string} axisDim
* @param {string} axisDim
* @return {Array.<string> } specified dimensions on the axis.
* @return {Array.<string> } specified dimensions on the axis.
*/
*/
getDimensionsOnAxis
:
function
(
axisDim
)
{
coordDimToDataDim
:
function
(
axisDim
)
{
var
dims
=
{
var
dims
=
{
oneDim
:
[
'
time
'
]
oneDim
:
[
'
time
'
]
};
};
...
...
src/component/dataZoom/AxisProxy.js
浏览文件 @
45a610ce
...
@@ -221,7 +221,7 @@ define(function(require) {
...
@@ -221,7 +221,7 @@ define(function(require) {
return
;
return
;
}
}
each
(
seriesModel
.
getDimensionsOnAxis
(
axisDim
),
function
(
dim
)
{
each
(
seriesModel
.
coordDimToDataDim
(
axisDim
),
function
(
dim
)
{
if
(
filterMode
===
'
empty
'
)
{
if
(
filterMode
===
'
empty
'
)
{
seriesModel
.
setData
(
seriesModel
.
setData
(
seriesData
.
map
(
dim
,
function
(
value
)
{
seriesData
.
map
(
dim
,
function
(
value
)
{
...
@@ -247,7 +247,7 @@ define(function(require) {
...
@@ -247,7 +247,7 @@ define(function(require) {
each
(
seriesModels
,
function
(
seriesModel
)
{
each
(
seriesModels
,
function
(
seriesModel
)
{
var
seriesData
=
seriesModel
.
getData
();
var
seriesData
=
seriesModel
.
getData
();
if
(
seriesData
)
{
if
(
seriesData
)
{
each
(
seriesModel
.
getDimensionsOnAxis
(
axisDim
),
function
(
dim
)
{
each
(
seriesModel
.
coordDimToDataDim
(
axisDim
),
function
(
dim
)
{
var
seriesExtent
=
seriesData
.
getDataExtent
(
dim
);
var
seriesExtent
=
seriesData
.
getDataExtent
(
dim
);
seriesExtent
[
0
]
<
dataExtent
[
0
]
&&
(
dataExtent
[
0
]
=
seriesExtent
[
0
]);
seriesExtent
[
0
]
<
dataExtent
[
0
]
&&
(
dataExtent
[
0
]
=
seriesExtent
[
0
]);
seriesExtent
[
1
]
>
dataExtent
[
1
]
&&
(
dataExtent
[
1
]
=
seriesExtent
[
1
]);
seriesExtent
[
1
]
>
dataExtent
[
1
]
&&
(
dataExtent
[
1
]
=
seriesExtent
[
1
]);
...
...
src/component/marker/MarkLineView.js
浏览文件 @
45a610ce
...
@@ -238,8 +238,16 @@ define(function (require) {
...
@@ -238,8 +238,16 @@ define(function (require) {
* @param {module:echarts/model/Model} mpModel
* @param {module:echarts/model/Model} mpModel
*/
*/
function
createList
(
coordSys
,
seriesModel
,
mlModel
)
{
function
createList
(
coordSys
,
seriesModel
,
mlModel
)
{
var
fromData
=
new
List
(
seriesModel
.
getCoordDimensionInfo
(),
mlModel
);
var
toData
=
new
List
(
seriesModel
.
getCoordDimensionInfo
(),
mlModel
);
var
coordDimsInfos
=
zrUtil
.
map
(
coordSys
.
dimensions
,
function
(
coordDim
)
{
var
info
=
seriesModel
.
getData
().
getDimensionInfo
(
seriesModel
.
coordDimToDataDim
(
coordDim
)[
0
]
);
info
.
name
=
coordDim
;
return
info
;
});
var
fromData
=
new
List
(
coordDimsInfos
,
mlModel
);
var
toData
=
new
List
(
coordDimsInfos
,
mlModel
);
// No dimensions
// No dimensions
var
lineData
=
new
List
([],
mlModel
);
var
lineData
=
new
List
([],
mlModel
);
...
...
src/component/marker/MarkPointView.js
浏览文件 @
45a610ce
...
@@ -149,10 +149,15 @@ define(function (require) {
...
@@ -149,10 +149,15 @@ define(function (require) {
* @param {module:echarts/model/Model} mpModel
* @param {module:echarts/model/Model} mpModel
*/
*/
function
createList
(
coordSys
,
seriesModel
,
mpModel
)
{
function
createList
(
coordSys
,
seriesModel
,
mpModel
)
{
var
seriesData
=
seriesModel
.
getData
();
var
coordDimsInfos
=
zrUtil
.
map
(
coordSys
.
dimensions
,
function
(
coordDim
)
{
var
dataDimensions
=
seriesData
.
dimensions
;
var
info
=
seriesModel
.
getData
().
getDimensionInfo
(
seriesModel
.
coordDimToDataDim
(
coordDim
)[
0
]
);
info
.
name
=
coordDim
;
return
info
;
});
var
mpData
=
new
List
(
seriesModel
.
getCoordDimensionInfo
()
,
mpModel
);
var
mpData
=
new
List
(
coordDimsInfos
,
mpModel
);
if
(
coordSys
)
{
if
(
coordSys
)
{
mpData
.
initData
(
mpData
.
initData
(
...
...
src/component/marker/markerHelper.js
浏览文件 @
45a610ce
...
@@ -121,15 +121,15 @@ define(function (require) {
...
@@ -121,15 +121,15 @@ define(function (require) {
if
(
item
.
valueIndex
!=
null
||
item
.
valueDim
!=
null
)
{
if
(
item
.
valueIndex
!=
null
||
item
.
valueDim
!=
null
)
{
ret
.
valueDataDim
=
item
.
valueIndex
!=
null
ret
.
valueDataDim
=
item
.
valueIndex
!=
null
?
data
.
getDimension
(
item
.
valueIndex
)
:
item
.
valueDim
;
?
data
.
getDimension
(
item
.
valueIndex
)
:
item
.
valueDim
;
ret
.
valueAxis
=
coordSys
.
getAxis
(
seriesModel
.
getCoordDimensionInfo
(
ret
.
valueDataDim
).
name
);
ret
.
valueAxis
=
coordSys
.
getAxis
(
seriesModel
.
dataDimToCoordDim
(
ret
.
valueDataDim
)
);
ret
.
baseAxis
=
coordSys
.
getOtherAxis
(
ret
.
valueAxis
);
ret
.
baseAxis
=
coordSys
.
getOtherAxis
(
ret
.
valueAxis
);
ret
.
baseDataDim
=
seriesModel
.
getDimensionsOnAxis
(
ret
.
baseAxis
.
dim
)[
0
];
ret
.
baseDataDim
=
seriesModel
.
coordDimToDataDim
(
ret
.
baseAxis
.
dim
)[
0
];
}
}
else
{
else
{
ret
.
baseAxis
=
seriesModel
.
getBaseAxis
();
ret
.
baseAxis
=
seriesModel
.
getBaseAxis
();
ret
.
valueAxis
=
coordSys
.
getOtherAxis
(
ret
.
baseAxis
);
ret
.
valueAxis
=
coordSys
.
getOtherAxis
(
ret
.
baseAxis
);
ret
.
baseDataDim
=
seriesModel
.
getDimensionsOnAxis
(
ret
.
baseAxis
.
dim
)[
0
];
ret
.
baseDataDim
=
seriesModel
.
coordDimToDataDim
(
ret
.
baseAxis
.
dim
)[
0
];
ret
.
valueDataDim
=
seriesModel
.
getDimensionsOnAxis
(
ret
.
valueAxis
.
dim
)[
0
];
ret
.
valueDataDim
=
seriesModel
.
coordDimToDataDim
(
ret
.
valueAxis
.
dim
)[
0
];
}
}
return
ret
;
return
ret
;
...
...
src/component/tooltip/TooltipView.js
浏览文件 @
45a610ce
...
@@ -853,9 +853,9 @@ define(function (require) {
...
@@ -853,9 +853,9 @@ define(function (require) {
return
{
return
{
seriesIndex
:
series
.
seriesIndex
,
seriesIndex
:
series
.
seriesIndex
,
dataIndex
:
series
.
getAxisTooltipDataIndex
dataIndex
:
series
.
getAxisTooltipDataIndex
?
series
.
getAxisTooltipDataIndex
(
series
.
getDimensionsOnAxis
(
baseAxis
.
dim
),
value
,
baseAxis
)
?
series
.
getAxisTooltipDataIndex
(
series
.
coordDimToDataDim
(
baseAxis
.
dim
),
value
,
baseAxis
)
:
series
.
getData
().
indexOfNearest
(
:
series
.
getData
().
indexOfNearest
(
series
.
getDimensionsOnAxis
(
baseAxis
.
dim
)[
0
],
series
.
coordDimToDataDim
(
baseAxis
.
dim
)[
0
],
value
[
baseAxis
.
dim
===
'
x
'
||
baseAxis
.
dim
===
'
radius
'
?
0
:
1
]
value
[
baseAxis
.
dim
===
'
x
'
||
baseAxis
.
dim
===
'
radius
'
?
0
:
1
]
)
)
};
};
...
...
src/coord/cartesian/Grid.js
浏览文件 @
45a610ce
...
@@ -349,7 +349,7 @@ define(function(require, factory) {
...
@@ -349,7 +349,7 @@ define(function(require, factory) {
},
this
);
},
this
);
function
unionExtent
(
data
,
axis
,
seriesModel
)
{
function
unionExtent
(
data
,
axis
,
seriesModel
)
{
each
(
seriesModel
.
getDimensionsOnAxis
(
axis
.
dim
),
function
(
dim
)
{
each
(
seriesModel
.
coordDimToDataDim
(
axis
.
dim
),
function
(
dim
)
{
axis
.
scale
.
unionExtent
(
data
.
getDataExtent
(
axis
.
scale
.
unionExtent
(
data
.
getDataExtent
(
dim
,
axis
.
scale
.
type
!==
'
ordinal
'
dim
,
axis
.
scale
.
type
!==
'
ordinal
'
));
));
...
...
src/coord/single/Single.js
浏览文件 @
45a610ce
...
@@ -108,7 +108,7 @@ define(function (require) {
...
@@ -108,7 +108,7 @@ define(function (require) {
var
data
=
seriesModel
.
getData
();
var
data
=
seriesModel
.
getData
();
var
dim
=
this
.
dimension
;
var
dim
=
this
.
dimension
;
this
.
_axis
.
scale
.
unionExtent
(
this
.
_axis
.
scale
.
unionExtent
(
data
.
getDataExtent
(
seriesModel
.
getDimensionsOnAxis
(
dim
))
data
.
getDataExtent
(
seriesModel
.
coordDimToDataDim
(
dim
))
);
);
axisHelper
.
niceScaleExtent
(
this
.
_axis
,
this
.
_axis
.
model
);
axisHelper
.
niceScaleExtent
(
this
.
_axis
,
this
.
_axis
.
model
);
},
this
);
},
this
);
...
...
src/model/Series.js
浏览文件 @
45a610ce
...
@@ -128,33 +128,29 @@ define(function(require) {
...
@@ -128,33 +128,29 @@ define(function(require) {
},
},
/**
/**
* Get dimensions on the given axis.
* Coord dimension to data dimension.
* @param {string} axisDim
*
* By default the result is the same as dimensions of series data.
* But some series dimensions are different from coord dimensions (i.e.
* candlestick and boxplot). Override this method to handle those cases.
*
* Coord dimension to data dimension can be one-to-many
*
* @param {string} coordDim
* @return {Array.<string>} dimensions on the axis.
* @return {Array.<string>} dimensions on the axis.
*/
*/
getDimensionsOnAxis
:
function
(
axis
Dim
)
{
coordDimToDataDim
:
function
(
coord
Dim
)
{
return
[
axisDim
];
// Retunr axisDim default.
return
[
coordDim
];
},
},
/**
/**
* Get coordinate dimensions info.
* Convert data dimension to coord dimension.
* By default the result is the same as dimensions info of series data.
*
* But some series dimensions are different from coord dimensions (i.e.
* @param {string|number} dataDim
* candlestick and boxplot). Override this method to handle those cases.
* @return {string}
* @param {string|number} [dataDim]
* @return {Array.<Object>} If dataDim specified, return cooresponding
* coord dim info, otherwise return dimension
* info list. If no coordinate system, reutrn [].
*/
*/
getCoordDimensionInfo
:
function
(
dataDim
)
{
dataDimToCoordDim
:
function
(
dataDim
)
{
var
data
=
this
.
getData
();
return
dataDim
;
return
this
.
coordinateSystem
?
(
dataDim
!=
null
?
data
.
getDimensionInfo
(
dataDim
)
:
zrUtil
.
map
(
data
.
dimensions
,
data
.
getDimensionInfo
,
data
)
)
:
[];
},
},
/**
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录