Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
c4c7278e
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,发现更多精彩内容 >>
提交
c4c7278e
编写于
6月 27, 2016
作者:
L
lang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Optimize case with two category axes
上级
839409c1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
33 addition
and
25 deletion
+33
-25
src/chart/helper/createListFromArray.js
src/chart/helper/createListFromArray.js
+32
-24
src/chart/themeRiver/ThemeRiverSeries.js
src/chart/themeRiver/ThemeRiverSeries.js
+1
-1
未找到文件。
src/chart/helper/createListFromArray.js
浏览文件 @
c4c7278e
...
@@ -39,24 +39,21 @@ define(function(require) {
...
@@ -39,24 +39,21 @@ define(function(require) {
var
creator
=
creators
[
coordSysName
];
var
creator
=
creators
[
coordSysName
];
var
registeredCoordSys
=
CoordinateSystem
.
get
(
coordSysName
);
var
registeredCoordSys
=
CoordinateSystem
.
get
(
coordSysName
);
// FIXME
// FIXME
var
result
=
creator
&&
creator
(
data
,
seriesModel
,
ecModel
);
var
axesInfo
=
creator
&&
creator
(
data
,
seriesModel
,
ecModel
);
var
dimensions
=
result
&&
result
.
dimensions
;
var
dimensions
=
axesInfo
&&
axesInfo
.
dimensions
;
if
(
!
dimensions
)
{
if
(
!
dimensions
)
{
// Get dimensions from registered coordinate system
// Get dimensions from registered coordinate system
dimensions
=
(
registeredCoordSys
&&
registeredCoordSys
.
dimensions
)
||
[
'
x
'
,
'
y
'
];
dimensions
=
(
registeredCoordSys
&&
registeredCoordSys
.
dimensions
)
||
[
'
x
'
,
'
y
'
];
dimensions
=
completeDimensions
(
dimensions
,
data
,
dimensions
.
concat
([
'
value
'
]));
dimensions
=
completeDimensions
(
dimensions
,
data
,
dimensions
.
concat
([
'
value
'
]));
}
}
var
categoryAxisModel
=
result
&&
result
.
categoryAxisModel
;
var
categoryIndex
=
axesInfo
?
axesInfo
.
categoryIndex
:
-
1
;
var
categories
;
var
categoryDimIndex
=
dimensions
[
0
].
type
===
'
ordinal
'
?
0
:
(
dimensions
[
1
].
type
===
'
ordinal
'
?
1
:
-
1
);
var
list
=
new
List
(
dimensions
,
seriesModel
);
var
list
=
new
List
(
dimensions
,
seriesModel
);
var
nameList
=
createNameList
(
result
,
data
);
var
nameList
=
createNameList
(
axesInfo
,
data
);
var
dimValueGetter
=
(
categoryAxisModel
&&
ifNeedCompleteOrdinalData
(
data
))
var
categories
=
{};
var
dimValueGetter
=
(
categoryIndex
>=
0
&&
ifNeedCompleteOrdinalData
(
data
))
?
function
(
itemOpt
,
dimName
,
dataIndex
,
dimIndex
)
{
?
function
(
itemOpt
,
dimName
,
dataIndex
,
dimIndex
)
{
// If any dataItem is like { value: 10 }
// If any dataItem is like { value: 10 }
if
(
modelUtil
.
isDataItemOption
(
itemOpt
))
{
if
(
modelUtil
.
isDataItemOption
(
itemOpt
))
{
...
@@ -64,7 +61,7 @@ define(function(require) {
...
@@ -64,7 +61,7 @@ define(function(require) {
}
}
// Use dataIndex as ordinal value in categoryAxis
// Use dataIndex as ordinal value in categoryAxis
return
dimIndex
===
category
Dim
Index
return
dimIndex
===
categoryIndex
?
dataIndex
?
dataIndex
:
converDataValue
(
getDataItemValue
(
itemOpt
),
dimensions
[
dimIndex
]);
:
converDataValue
(
getDataItemValue
(
itemOpt
),
dimensions
[
dimIndex
]);
}
}
...
@@ -76,15 +73,14 @@ define(function(require) {
...
@@ -76,15 +73,14 @@ define(function(require) {
list
.
hasItemOption
=
true
;
list
.
hasItemOption
=
true
;
}
}
// Consider case:
var
categoryAxesModels
=
axesInfo
&&
axesInfo
.
categoryAxesModels
;
// (1) [["a", "b"], ...]
if
(
categoryAxesModels
&&
categoryAxesModels
[
dimName
])
{
// (2) [[2, 4, "a"], ...]
if
(
dimensions
[
dimIndex
].
type
===
'
ordinal
'
&&
dimIndex
<
2
)
{
// If given value is a category string
// If given value is a category string
if
(
typeof
val
===
'
string
'
)
{
if
(
typeof
val
===
'
string
'
)
{
// Lazy get categories
// Lazy get categories
categories
=
categories
||
categoryAxisModel
.
getCategories
();
categories
[
dimName
]
=
categories
[
dimName
]
val
=
zrUtil
.
indexOf
(
categories
,
val
);
||
categoryAxesModels
[
dimName
].
getCategories
();
val
=
zrUtil
.
indexOf
(
categories
[
dimName
],
val
);
if
(
val
<
0
&&
!
isNaN
(
val
))
{
if
(
val
<
0
&&
!
isNaN
(
val
))
{
// In case some one write '1', '2' istead of 1, 2
// In case some one write '1', '2' istead of 1, 2
val
=
+
val
;
val
=
+
val
;
...
@@ -149,15 +145,21 @@ define(function(require) {
...
@@ -149,15 +145,21 @@ define(function(require) {
];
];
var
isXAxisCateogry
=
xAxisType
===
'
category
'
;
var
isXAxisCateogry
=
xAxisType
===
'
category
'
;
var
isYAxisCategory
=
yAxisType
===
'
category
'
;
completeDimensions
(
dimensions
,
data
,
[
'
x
'
,
'
y
'
,
'
z
'
]);
completeDimensions
(
dimensions
,
data
,
[
'
x
'
,
'
y
'
,
'
z
'
]);
var
categoryAxesModels
=
{};
if
(
isXAxisCateogry
)
{
categoryAxesModels
.
x
=
xAxisModel
;
}
if
(
isYAxisCategory
)
{
categoryAxesModels
.
y
=
yAxisModel
;
}
return
{
return
{
dimensions
:
dimensions
,
dimensions
:
dimensions
,
categoryIndex
:
isXAxisCateogry
?
0
:
1
,
categoryIndex
:
isXAxisCateogry
?
0
:
(
isYAxisCategory
?
1
:
-
1
),
categoryAxisModel
:
isXAxisCateogry
categoryAxesModels
:
categoryAxesModels
?
xAxisModel
:
(
yAxisType
===
'
category
'
?
yAxisModel
:
null
)
};
};
},
},
...
@@ -200,15 +202,21 @@ define(function(require) {
...
@@ -200,15 +202,21 @@ define(function(require) {
}
}
];
];
var
isAngleAxisCateogry
=
angleAxisType
===
'
category
'
;
var
isAngleAxisCateogry
=
angleAxisType
===
'
category
'
;
var
isRadiusAxisCateogry
=
radiusAxisType
===
'
category
'
;
completeDimensions
(
dimensions
,
data
,
[
'
radius
'
,
'
angle
'
,
'
value
'
]);
completeDimensions
(
dimensions
,
data
,
[
'
radius
'
,
'
angle
'
,
'
value
'
]);
var
categoryAxesModels
=
{};
if
(
isRadiusAxisCateogry
)
{
categoryAxesModels
.
radius
=
radiusAxisModel
;
}
if
(
isAngleAxisCateogry
)
{
categoryAxesModels
.
angle
=
angleAxisModel
;
}
return
{
return
{
dimensions
:
dimensions
,
dimensions
:
dimensions
,
categoryIndex
:
isAngleAxisCateogry
?
1
:
0
,
categoryIndex
:
isAngleAxisCateogry
?
1
:
(
isRadiusAxisCateogry
?
0
:
-
1
),
categoryAxisModel
:
isAngleAxisCateogry
categoryAxesModels
:
categoryAxesModels
?
angleAxisModel
:
(
radiusAxisType
===
'
category
'
?
radiusAxisModel
:
null
)
};
};
},
},
...
...
src/chart/themeRiver/ThemeRiverSeries.js
浏览文件 @
c4c7278e
...
@@ -137,7 +137,7 @@ define(function (require) {
...
@@ -137,7 +137,7 @@ define(function (require) {
}
}
];
];
var
data
=
this
.
fixData
(
option
.
data
);
var
data
=
this
.
fixData
(
option
.
data
||
[]
);
var
nameList
=
[];
var
nameList
=
[];
var
nameMap
=
this
.
nameMap
=
{};
var
nameMap
=
this
.
nameMap
=
{};
var
count
=
0
;
var
count
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录