Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
missman
incubator-echarts
提交
aeffe90a
I
incubator-echarts
项目概览
missman
/
incubator-echarts
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
aeffe90a
编写于
3月 24, 2017
作者:
P
pah100
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
adjust references
上级
42ad1aa3
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
192 addition
and
16 deletion
+192
-16
src/chart/bar.js
src/chart/bar.js
+1
-1
src/chart/line.js
src/chart/line.js
+1
-1
src/chart/pictorialBar.js
src/chart/pictorialBar.js
+1
-1
src/chart/scatter.js
src/chart/scatter.js
+1
-1
src/component/axis/AngleAxisView.js
src/component/axis/AngleAxisView.js
+1
-2
src/component/axis/AxisView.js
src/component/axis/AxisView.js
+24
-3
src/component/axis/CartesianAxisView.js
src/component/axis/CartesianAxisView.js
+1
-2
src/component/axis/RadiusAxisView.js
src/component/axis/RadiusAxisView.js
+1
-2
src/component/axis/SingleAxisView.js
src/component/axis/SingleAxisView.js
+1
-2
src/component/axisPointer/CartesianAxisPointer.js
src/component/axisPointer/CartesianAxisPointer.js
+3
-0
src/component/axisPointer/PolarAxisPointer.js
src/component/axisPointer/PolarAxisPointer.js
+3
-0
src/component/axisPointer/SingleAxisPointer.js
src/component/axisPointer/SingleAxisPointer.js
+3
-0
src/component/axisPointer/modelHelper.js
src/component/axisPointer/modelHelper.js
+1
-1
src/component/grid.js
src/component/grid.js
+2
-0
src/component/polar.js
src/component/polar.js
+2
-0
src/component/singleAxis.js
src/component/singleAxis.js
+2
-0
test/gridSimple.html
test/gridSimple.html
+144
-0
未找到文件。
src/chart/bar.js
浏览文件 @
aeffe90a
...
...
@@ -20,5 +20,5 @@ define(function (require) {
});
// In case developer forget to include grid component
require
(
'
../component/grid
'
);
require
(
'
../component/grid
Simple
'
);
});
\ No newline at end of file
src/chart/line.js
浏览文件 @
aeffe90a
...
...
@@ -20,5 +20,5 @@ define(function (require) {
));
// In case developer forget to include grid component
require
(
'
../component/grid
'
);
require
(
'
../component/grid
Simple
'
);
});
\ No newline at end of file
src/chart/pictorialBar.js
浏览文件 @
aeffe90a
...
...
@@ -17,5 +17,5 @@ define(function (require) {
));
// In case developer forget to include grid component
require
(
'
../component/grid
'
);
require
(
'
../component/grid
Simple
'
);
});
\ No newline at end of file
src/chart/scatter.js
浏览文件 @
aeffe90a
...
...
@@ -14,5 +14,5 @@ define(function (require) {
));
// In case developer forget to include grid component
require
(
'
../component/grid
'
);
require
(
'
../component/grid
Simple
'
);
});
\ No newline at end of file
src/component/axis/AngleAxisView.js
浏览文件 @
aeffe90a
...
...
@@ -4,7 +4,6 @@ define(function (require) {
var
zrUtil
=
require
(
'
zrender/core/util
'
);
var
graphic
=
require
(
'
../../util/graphic
'
);
var
Model
=
require
(
'
../../model/Model
'
);
var
PolarAxisPointer
=
require
(
'
../axisPointer/PolarAxisPointer
'
);
var
elementList
=
[
'
axisLine
'
,
'
axisLabel
'
,
'
axisTick
'
,
'
splitLine
'
,
'
splitArea
'
];
...
...
@@ -24,7 +23,7 @@ define(function (require) {
type
:
'
angleAxis
'
,
axisPointerClass
:
PolarAxisPointer
,
axisPointerClass
:
'
PolarAxisPointer
'
,
render
:
function
(
angleAxisModel
,
ecModel
)
{
this
.
group
.
removeAll
();
...
...
src/component/axis/AxisView.js
浏览文件 @
aeffe90a
...
...
@@ -14,6 +14,10 @@ define(function (require) {
*/
_axisPointer
:
null
,
/**
* @protected
* @type {string}
*/
axisPointerClass
:
null
,
/**
...
...
@@ -25,9 +29,10 @@ define(function (require) {
// (axis scale updated), and should be performed each time update.
// So put it here temporarily, although it is not appropriate to
// put a model-writing procedure in `view`.
axisPointerModelHelper
.
fixValue
(
axisModel
);
this
.
axisPointerClass
&&
axisPointerModelHelper
.
fixValue
(
axisModel
);
AxisView
.
superApply
(
this
,
'
render
'
,
arguments
);
updateAxisPointer
(
this
,
axisModel
,
ecModel
,
api
,
payload
,
true
);
},
...
...
@@ -63,12 +68,13 @@ define(function (require) {
});
function
updateAxisPointer
(
axisView
,
axisModel
,
ecModel
,
api
,
payload
,
forceRender
)
{
if
(
!
axisView
.
axisPointerClass
)
{
var
Clazz
=
AxisView
.
getAxisPointerClass
(
axisView
.
axisPointerClass
);
if
(
!
Clazz
)
{
return
;
}
var
axisPointerModel
=
axisPointerModelHelper
.
getAxisPointerModel
(
axisModel
);
axisPointerModel
?
(
axisView
.
_axisPointer
||
(
axisView
.
_axisPointer
=
new
axisView
.
axisPointerClass
()))
?
(
axisView
.
_axisPointer
||
(
axisView
.
_axisPointer
=
new
Clazz
()))
.
render
(
axisModel
,
axisPointerModel
,
api
,
forceRender
)
:
disposeAxisPointer
(
axisView
,
api
);
}
...
...
@@ -79,5 +85,20 @@ define(function (require) {
axisView
.
_axisPointer
=
null
;
}
var
axisPointerClazz
=
[];
AxisView
.
registerAxisPointerClass
=
function
(
type
,
clazz
)
{
if
(
__DEV__
)
{
if
(
axisPointerClazz
[
type
])
{
throw
new
Error
(
'
axisPointer
'
+
type
+
'
exists
'
);
}
}
axisPointerClazz
[
type
]
=
clazz
;
};
AxisView
.
getAxisPointerClass
=
function
(
type
)
{
return
type
&&
axisPointerClazz
[
type
];
};
return
AxisView
;
});
\ No newline at end of file
src/component/axis/CartesianAxisView.js
浏览文件 @
aeffe90a
...
...
@@ -3,7 +3,6 @@ define(function (require) {
var
zrUtil
=
require
(
'
zrender/core/util
'
);
var
graphic
=
require
(
'
../../util/graphic
'
);
var
AxisBuilder
=
require
(
'
./AxisBuilder
'
);
var
CartesianAxisPointer
=
require
(
'
../axisPointer/CartesianAxisPointer
'
);
var
AxisView
=
require
(
'
./AxisView
'
);
var
cartesianAxisHelper
=
require
(
'
./cartesianAxisHelper
'
);
var
ifIgnoreOnTick
=
AxisBuilder
.
ifIgnoreOnTick
;
...
...
@@ -28,7 +27,7 @@ define(function (require) {
type
:
'
cartesianAxis
'
,
axisPointerClass
:
CartesianAxisPointer
,
axisPointerClass
:
'
CartesianAxisPointer
'
,
/**
* @override
...
...
src/component/axis/RadiusAxisView.js
浏览文件 @
aeffe90a
...
...
@@ -5,7 +5,6 @@ define(function (require) {
var
zrUtil
=
require
(
'
zrender/core/util
'
);
var
graphic
=
require
(
'
../../util/graphic
'
);
var
AxisBuilder
=
require
(
'
./AxisBuilder
'
);
var
PolarAxisPointer
=
require
(
'
../axisPointer/PolarAxisPointer
'
);
var
axisBuilderAttrs
=
[
'
axisLine
'
,
'
axisLabel
'
,
'
axisTick
'
,
'
axisName
'
...
...
@@ -18,7 +17,7 @@ define(function (require) {
type
:
'
radiusAxis
'
,
axisPointerClass
:
PolarAxisPointer
,
axisPointerClass
:
'
PolarAxisPointer
'
,
render
:
function
(
radiusAxisModel
,
ecModel
)
{
this
.
group
.
removeAll
();
...
...
src/component/axis/SingleAxisView.js
浏览文件 @
aeffe90a
...
...
@@ -3,7 +3,6 @@ define(function (require) {
var
AxisBuilder
=
require
(
'
./AxisBuilder
'
);
var
zrUtil
=
require
(
'
zrender/core/util
'
);
var
graphic
=
require
(
'
../../util/graphic
'
);
var
SingleAxisPointer
=
require
(
'
../axisPointer/SingleAxisPointer
'
);
var
singleAxisHelper
=
require
(
'
./singleAxisHelper
'
);
var
getInterval
=
AxisBuilder
.
getInterval
;
var
ifIgnoreOnTick
=
AxisBuilder
.
ifIgnoreOnTick
;
...
...
@@ -18,7 +17,7 @@ define(function (require) {
type
:
'
singleAxis
'
,
axisPointerClass
:
SingleAxisPointer
,
axisPointerClass
:
'
SingleAxisPointer
'
,
render
:
function
(
axisModel
,
ecModel
,
api
,
payload
)
{
...
...
src/component/axisPointer/CartesianAxisPointer.js
浏览文件 @
aeffe90a
...
...
@@ -5,6 +5,7 @@ define(function(require) {
var
BaseAxisPointer
=
require
(
'
./BaseAxisPointer
'
);
var
viewHelper
=
require
(
'
./viewHelper
'
);
var
cartesianAxisHelper
=
require
(
'
../axis/cartesianAxisHelper
'
);
var
AxisView
=
require
(
'
../axis/AxisView
'
);
var
CartesianAxisPointer
=
BaseAxisPointer
.
extend
({
...
...
@@ -119,5 +120,7 @@ define(function(require) {
return
axis
.
dim
===
'
x
'
?
0
:
1
;
}
AxisView
.
registerAxisPointerClass
(
'
CartesianAxisPointer
'
,
CartesianAxisPointer
);
return
CartesianAxisPointer
;
});
\ No newline at end of file
src/component/axisPointer/PolarAxisPointer.js
浏览文件 @
aeffe90a
...
...
@@ -7,6 +7,7 @@ define(function(require) {
var
viewHelper
=
require
(
'
./viewHelper
'
);
var
matrix
=
require
(
'
zrender/core/matrix
'
);
var
AxisBuilder
=
require
(
'
../axis/AxisBuilder
'
);
var
AxisView
=
require
(
'
../axis/AxisView
'
);
var
PolarAxisPointer
=
BaseAxisPointer
.
extend
({
...
...
@@ -135,5 +136,7 @@ define(function(require) {
}
};
AxisView
.
registerAxisPointerClass
(
'
PolarAxisPointer
'
,
PolarAxisPointer
);
return
PolarAxisPointer
;
});
\ No newline at end of file
src/component/axisPointer/SingleAxisPointer.js
浏览文件 @
aeffe90a
...
...
@@ -5,6 +5,7 @@ define(function(require) {
var
BaseAxisPointer
=
require
(
'
./BaseAxisPointer
'
);
var
viewHelper
=
require
(
'
./viewHelper
'
);
var
singleAxisHelper
=
require
(
'
../axis/singleAxisHelper
'
);
var
AxisView
=
require
(
'
../axis/AxisView
'
);
var
XY
=
[
'
x
'
,
'
y
'
];
var
WH
=
[
'
width
'
,
'
height
'
];
...
...
@@ -115,5 +116,7 @@ define(function(require) {
return
[
rect
[
XY
[
dimIndex
]],
rect
[
XY
[
dimIndex
]]
+
rect
[
WH
[
dimIndex
]]];
}
AxisView
.
registerAxisPointerClass
(
'
SingleAxisPointer
'
,
SingleAxisPointer
);
return
SingleAxisPointer
;
});
\ No newline at end of file
src/component/axisPointer/modelHelper.js
浏览文件 @
aeffe90a
...
...
@@ -305,7 +305,7 @@ define(function(require) {
};
helper
.
getAxisInfo
=
function
(
axisModel
)
{
var
coordSysAxesInfo
=
axisModel
.
ecModel
.
getComponent
(
'
axisPointer
'
).
coordSysAxesInfo
;
var
coordSysAxesInfo
=
(
axisModel
.
ecModel
.
getComponent
(
'
axisPointer
'
)
||
{}
).
coordSysAxesInfo
;
return
coordSysAxesInfo
&&
coordSysAxesInfo
.
axesInfo
[
makeKey
(
axisModel
)];
};
...
...
src/component/grid.js
浏览文件 @
aeffe90a
...
...
@@ -2,6 +2,8 @@ define(function(require) {
require
(
'
./gridSimple
'
);
require
(
'
./axisPointer/CartesianAxisPointer
'
);
require
(
'
./axisPointer
'
);
});
\ No newline at end of file
src/component/polar.js
浏览文件 @
aeffe90a
...
...
@@ -6,6 +6,8 @@ define(function(require) {
require
(
'
./radiusAxis
'
);
require
(
'
./axisPointer
'
);
require
(
'
./axisPointer/PolarAxisPointer
'
);
// Polar view
require
(
'
../echarts
'
).
extendComponentView
({
type
:
'
polar
'
...
...
src/component/singleAxis.js
浏览文件 @
aeffe90a
...
...
@@ -5,6 +5,8 @@ define(function (require) {
require
(
'
../coord/single/AxisModel
'
);
require
(
'
./axisPointer
'
);
require
(
'
./axisPointer/SingleAxisPointer
'
);
var
echarts
=
require
(
'
../echarts
'
);
echarts
.
extendComponentView
({
...
...
test/gridSimple.html
0 → 100644
浏览文件 @
aeffe90a
<html>
<head>
<meta
charset=
"utf-8"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
/>
<script
src=
"esl.js"
></script>
<script
src=
"config.js"
></script>
<script
src=
"lib/facePrint.js"
></script>
</head>
<body>
<style>
html
,
body
,
#main
{
width
:
100%
;
height
:
100%
;
}
</style>
<div
id=
"info"
></div>
<div
id=
"main"
></div>
<script>
require
([
'
echarts
'
,
'
echarts/chart/line
'
,
'
echarts/chart/bar
'
,
'
echarts/chart/pie
'
,
// 'echarts/component/legend',
'
echarts/component/gridSimple
'
,
// 'echarts/component/tooltip',
// 'echarts/component/dataZoomInside'
],
function
(
echarts
)
{
var
chart
=
echarts
.
init
(
document
.
getElementById
(
'
main
'
),
null
,
{
renderer
:
'
canvas
'
});
var
xAxisData
=
[];
var
data1
=
[];
var
data2
=
[];
var
data3
=
[];
for
(
var
i
=
0
;
i
<
100
;
i
++
)
{
xAxisData
.
push
(
'
类目
'
+
i
);
if
(
i
<
5
&&
i
>
1
)
{
data1
.
push
(
0
);
}
else
{
data1
.
push
(
+
(
Math
.
random
()
+
0.5
).
toFixed
(
3
));
}
data2
.
push
(
+
(
Math
.
random
()
+
0.5
).
toFixed
(
3
));
data3
.
push
(
+
(
Math
.
random
()
+
0.5
).
toFixed
(
3
));
}
var
itemStyle
=
{
normal
:
{
borderColor
:
'
white
'
,
borderWidth
:
3
,
// shadowBlur: 10,
// shadowOffsetX: 0,
// shadowOffsetY: 5,
// shadowColor: 'rgba(0, 0, 0, 0.4)',
lineStyle
:
{
width
:
1
// shadowBlur: 10,
// shadowOffsetX: 0,
// shadowOffsetY: 5,
// shadowColor: 'rgba(0, 0, 0, 0.4)'
}
}
};
chart
.
setOption
({
legend
:
{
data
:
[
'
line
'
,
'
line2
'
,
'
line3
'
]
},
visualMap
:
null
,
// 用于测试 option 中含有null的情况。
tooltip
:
{
trigger
:
'
axis
'
,
axisPointer
:
{
type
:
'
line
'
}
},
xAxis
:
{
// data: ['类目1', '类目2', '类目3', '类目4', '类目5',]
data
:
xAxisData
,
boundaryGap
:
false
,
// inverse: true,
splitArea
:
{
show
:
false
},
splitLine
:
{
show
:
false
}
},
grid
:
{
left
:
'
10%
'
,
right
:
'
10%
'
},
yAxis
:
{
splitArea
:
{
show
:
true
}
},
dataZoom
:
{
type
:
'
inside
'
,
start
:
10
,
end
:
30
},
// animation: false,
series
:
[
null
,
// 用于测试 option 中含有null的情况。
{
name
:
'
line
'
,
type
:
'
line
'
,
stack
:
'
all
'
,
symbol
:
'
circle
'
,
symbolSize
:
10
,
data
:
data1
,
itemStyle
:
itemStyle
,
step
:
'
end
'
},
{
name
:
'
line2
'
,
type
:
'
pie
'
,
stack
:
'
all
'
,
symbol
:
'
circle
'
,
symbolSize
:
10
,
data
:
echarts
.
util
.
map
(
data2
,
function
(
val
)
{
return
{
name
:
val
,
value
:
val
};
}),
itemStyle
:
itemStyle
,
step
:
'
end
'
},
{
name
:
'
line3
'
,
type
:
'
bar
'
,
stack
:
'
all
'
,
symbol
:
'
triangle
'
,
symbolSize
:
10
,
data
:
data3
,
itemStyle
:
itemStyle
,
step
:
'
end
'
}]
});
})
</script>
</body>
</html>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录