Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
半栈学徒
incubator-echarts
提交
25ae5528
I
incubator-echarts
项目概览
半栈学徒
/
incubator-echarts
与 Fork 源项目一致
从无法访问的项目Fork
通知
5
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,发现更多精彩内容 >>
提交
25ae5528
编写于
6月 19, 2013
作者:
K
kener
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
【重要】图表类型自注册,按需加载
上级
3fd43984
变更
24
隐藏空白更改
内联
并排
Showing
24 changed file
with
85 addition
and
60 deletion
+85
-60
doc/asset/js/echartsExample.js
doc/asset/js/echartsExample.js
+10
-1
src/chart.js
src/chart.js
+0
-15
src/chart/bar.js
src/chart/bar.js
+3
-0
src/chart/island.js
src/chart/island.js
+3
-0
src/chart/k.js
src/chart/k.js
+5
-3
src/chart/line.js
src/chart/line.js
+3
-0
src/chart/map.js
src/chart/map.js
+3
-0
src/chart/pie.js
src/chart/pie.js
+3
-0
src/chart/scatter.js
src/chart/scatter.js
+6
-4
src/component.js
src/component.js
+0
-21
src/component/axis.js
src/component/axis.js
+2
-0
src/component/categoryAxis.js
src/component/categoryAxis.js
+2
-0
src/component/dataRange.js
src/component/dataRange.js
+2
-0
src/component/dataView.js
src/component/dataView.js
+2
-0
src/component/dataZoom.js
src/component/dataZoom.js
+2
-0
src/component/grid.js
src/component/grid.js
+2
-0
src/component/legend.js
src/component/legend.js
+2
-0
src/component/toolbox.js
src/component/toolbox.js
+5
-0
src/component/tooltip.js
src/component/tooltip.js
+2
-0
src/component/valueAxis.js
src/component/valueAxis.js
+2
-0
src/echarts.js
src/echarts.js
+17
-7
src/util/shape/candle.js
src/util/shape/candle.js
+3
-3
src/util/shape/icon.js
src/util/shape/icon.js
+3
-3
src/util/shape/symbol.js
src/util/shape/symbol.js
+3
-3
未找到文件。
doc/asset/js/echartsExample.js
浏览文件 @
25ae5528
...
@@ -65,6 +65,7 @@ require.config({
...
@@ -65,6 +65,7 @@ require.config({
{
{
name
:
'
zrender
'
,
name
:
'
zrender
'
,
location
:
'
http://ecomfe.github.io/zrender/src
'
,
location
:
'
http://ecomfe.github.io/zrender/src
'
,
//location: '../../../zrender/src',
main
:
'
zrender
'
main
:
'
zrender
'
}
}
]
]
...
@@ -72,7 +73,15 @@ require.config({
...
@@ -72,7 +73,15 @@ require.config({
var
echarts
;
var
echarts
;
require
(
require
(
[
'
echarts/echarts
'
],
[
'
echarts/echarts
'
,
'
echarts/chart/line
'
,
'
echarts/chart/bar
'
,
'
echarts/chart/scatter
'
,
'
echarts/chart/k
'
,
'
echarts/chart/pie
'
,
'
echarts/chart/map
'
],
function
(
ec
)
{
function
(
ec
)
{
echarts
=
ec
;
echarts
=
ec
;
if
(
myChart
&&
myChart
.
dispose
)
{
if
(
myChart
&&
myChart
.
dispose
)
{
...
...
src/chart.js
浏览文件 @
25ae5528
...
@@ -28,20 +28,5 @@ define(function(require) { //chart
...
@@ -28,20 +28,5 @@ define(function(require) { //chart
return
_chartLibrary
[
name
];
return
_chartLibrary
[
name
];
};
};
// 内置图表注册
self
.
define
(
'
island
'
,
require
(
'
./chart/island
'
));
self
.
define
(
'
pie
'
,
require
(
'
./chart/pie
'
));
self
.
define
(
'
bar
'
,
require
(
'
./chart/bar
'
));
self
.
define
(
'
line
'
,
require
(
'
./chart/line
'
));
self
.
define
(
'
map
'
,
require
(
'
./chart/map
'
));
self
.
define
(
'
k
'
,
require
(
'
./chart/k
'
));
self
.
define
(
'
scatter
'
,
require
(
'
./chart/scatter
'
));
return
self
;
return
self
;
});
});
\ No newline at end of file
src/chart/bar.js
浏览文件 @
25ae5528
...
@@ -760,5 +760,8 @@ define(function(require) {
...
@@ -760,5 +760,8 @@ define(function(require) {
init
(
option
,
component
);
init
(
option
,
component
);
}
}
// 图表注册
require
(
'
../chart
'
).
define
(
'
bar
'
,
Bar
);
return
Bar
;
return
Bar
;
});
});
\ No newline at end of file
src/chart/island.js
浏览文件 @
25ae5528
...
@@ -233,5 +233,8 @@ define(function (require) {
...
@@ -233,5 +233,8 @@ define(function (require) {
self
.
ondragend
=
ondragend
;
self
.
ondragend
=
ondragend
;
}
}
// 图表注册
require
(
'
../chart
'
).
define
(
'
island
'
,
Island
);
return
Island
;
return
Island
;
});
});
\ No newline at end of file
src/chart/k.js
浏览文件 @
25ae5528
...
@@ -433,9 +433,11 @@ define(function(require) {
...
@@ -433,9 +433,11 @@ define(function(require) {
init
(
option
,
component
);
init
(
option
,
component
);
}
}
var
shape
=
require
(
'
zrender/shape
'
);
// 动态扩展zrender shape:candle
var
Candle
=
require
(
'
../util/shape/candle
'
);
require
(
'
../util/shape/candle
'
);
shape
.
define
(
'
candle
'
,
new
Candle
());
// 图表注册
require
(
'
../chart
'
).
define
(
'
k
'
,
K
);
return
K
;
return
K
;
});
});
\ No newline at end of file
src/chart/line.js
浏览文件 @
25ae5528
...
@@ -797,5 +797,8 @@ define(function(require) {
...
@@ -797,5 +797,8 @@ define(function(require) {
init
(
option
,
component
);
init
(
option
,
component
);
}
}
// 图表注册
require
(
'
../chart
'
).
define
(
'
line
'
,
Line
);
return
Line
;
return
Line
;
});
});
\ No newline at end of file
src/chart/map.js
浏览文件 @
25ae5528
...
@@ -515,5 +515,8 @@ define(function(require) {
...
@@ -515,5 +515,8 @@ define(function(require) {
init
(
option
,
component
);
init
(
option
,
component
);
}
}
// 图表注册
require
(
'
../chart
'
).
define
(
'
map
'
,
Map
);
return
Map
;
return
Map
;
});
});
\ No newline at end of file
src/chart/pie.js
浏览文件 @
25ae5528
...
@@ -876,5 +876,8 @@ define(function(require) {
...
@@ -876,5 +876,8 @@ define(function(require) {
init
(
option
,
component
);
init
(
option
,
component
);
}
}
// 图表注册
require
(
'
../chart
'
).
define
(
'
pie
'
,
Pie
);
return
Pie
;
return
Pie
;
});
});
\ No newline at end of file
src/chart/scatter.js
浏览文件 @
25ae5528
...
@@ -420,9 +420,11 @@ define(function(require) {
...
@@ -420,9 +420,11 @@ define(function(require) {
init
(
option
,
component
);
init
(
option
,
component
);
}
}
var
shape
=
require
(
'
zrender/shape
'
);
// 动态扩展zrender shape:symbol
var
Symbol
=
require
(
'
../util/shape/symbol
'
);
require
(
'
../util/shape/symbol
'
);
shape
.
define
(
'
symbol
'
,
new
Symbol
());
// 自注册
require
(
'
../chart
'
).
define
(
'
scatter
'
,
Scatter
);
return
Scatter
;
return
Scatter
;
});
});
\ No newline at end of file
src/component.js
浏览文件 @
25ae5528
...
@@ -29,26 +29,5 @@ define(function(require) { //component
...
@@ -29,26 +29,5 @@ define(function(require) { //component
return
_componentLibrary
[
name
];
return
_componentLibrary
[
name
];
};
};
// 内置组件注册
self
.
define
(
'
axis
'
,
require
(
'
./component/axis
'
));
self
.
define
(
'
categoryAxis
'
,
require
(
'
./component/categoryAxis
'
));
self
.
define
(
'
valueAxis
'
,
require
(
'
./component/valueAxis
'
));
self
.
define
(
'
grid
'
,
require
(
'
./component/grid
'
));
self
.
define
(
'
dataZoom
'
,
require
(
'
./component/dataZoom
'
));
self
.
define
(
'
legend
'
,
require
(
'
./component/legend
'
));
self
.
define
(
'
dataRange
'
,
require
(
'
./component/dataRange
'
));
self
.
define
(
'
tooltip
'
,
require
(
'
./component/tooltip
'
));
self
.
define
(
'
toolbox
'
,
require
(
'
./component/toolbox
'
));
self
.
define
(
'
dataView
'
,
require
(
'
./component/dataView
'
));
return
self
;
return
self
;
});
});
\ No newline at end of file
src/component/axis.js
浏览文件 @
25ae5528
...
@@ -184,5 +184,7 @@ define(function (require) {
...
@@ -184,5 +184,7 @@ define(function (require) {
init
(
option
,
component
,
axisType
);
init
(
option
,
component
,
axisType
);
}
}
require
(
'
../component
'
).
define
(
'
axis
'
,
Axis
);
return
Axis
;
return
Axis
;
});
});
\ No newline at end of file
src/component/categoryAxis.js
浏览文件 @
25ae5528
...
@@ -639,5 +639,7 @@ define(function (require) {
...
@@ -639,5 +639,7 @@ define(function (require) {
init
(
option
,
grid
);
init
(
option
,
grid
);
}
}
require
(
'
../component
'
).
define
(
'
categoryAxis
'
,
CategoryAxis
);
return
CategoryAxis
;
return
CategoryAxis
;
});
});
\ No newline at end of file
src/component/dataRange.js
浏览文件 @
25ae5528
...
@@ -1130,6 +1130,8 @@ define(function (require) {
...
@@ -1130,6 +1130,8 @@ define(function (require) {
init
(
option
);
init
(
option
);
}
}
require
(
'
../component
'
).
define
(
'
dataRange
'
,
DataRange
);
return
DataRange
;
return
DataRange
;
});
});
...
...
src/component/dataView.js
浏览文件 @
25ae5528
...
@@ -433,5 +433,7 @@ define(function (require) {
...
@@ -433,5 +433,7 @@ define(function (require) {
_init
();
_init
();
}
}
require
(
'
../component
'
).
define
(
'
dataView
'
,
DataView
);
return
DataView
;
return
DataView
;
});
});
\ No newline at end of file
src/component/dataZoom.js
浏览文件 @
25ae5528
...
@@ -679,5 +679,7 @@ define(function (require) {
...
@@ -679,5 +679,7 @@ define(function (require) {
init
(
option
);
init
(
option
);
}
}
require
(
'
../component
'
).
define
(
'
dataZoom
'
,
DataZoom
);
return
DataZoom
;
return
DataZoom
;
});
});
\ No newline at end of file
src/component/grid.js
浏览文件 @
25ae5528
...
@@ -132,5 +132,7 @@ define(function (require) {
...
@@ -132,5 +132,7 @@ define(function (require) {
init
(
option
);
init
(
option
);
}
}
require
(
'
../component
'
).
define
(
'
grid
'
,
Grid
);
return
Grid
;
return
Grid
;
});
});
\ No newline at end of file
src/component/legend.js
浏览文件 @
25ae5528
...
@@ -498,6 +498,8 @@ define(function (require) {
...
@@ -498,6 +498,8 @@ define(function (require) {
init
(
option
);
init
(
option
);
}
}
require
(
'
../component
'
).
define
(
'
legend
'
,
Legend
);
return
Legend
;
return
Legend
;
});
});
...
...
src/component/toolbox.js
浏览文件 @
25ae5528
...
@@ -633,5 +633,10 @@ define(function (require) {
...
@@ -633,5 +633,10 @@ define(function (require) {
self
.
resetMagicType
=
resetMagicType
;
self
.
resetMagicType
=
resetMagicType
;
}
}
// 动态扩展zrender shape:icon
require
(
'
../util/shape/icon
'
);
require
(
'
../component
'
).
define
(
'
toolbox
'
,
Toolbox
);
return
Toolbox
;
return
Toolbox
;
});
});
\ No newline at end of file
src/component/tooltip.js
浏览文件 @
25ae5528
...
@@ -778,5 +778,7 @@ define(function (require) {
...
@@ -778,5 +778,7 @@ define(function (require) {
init
(
option
,
dom
);
init
(
option
,
dom
);
}
}
require
(
'
../component
'
).
define
(
'
tooltip
'
,
Tooltip
);
return
Tooltip
;
return
Tooltip
;
});
});
\ No newline at end of file
src/component/valueAxis.js
浏览文件 @
25ae5528
...
@@ -790,6 +790,8 @@ define(function (require) {
...
@@ -790,6 +790,8 @@ define(function (require) {
init
(
option
,
grid
,
series
);
init
(
option
,
grid
,
series
);
}
}
require
(
'
../component
'
).
define
(
'
valueAxis
'
,
ValueAxis
);
return
ValueAxis
;
return
ValueAxis
;
});
});
src/echarts.js
浏览文件 @
25ae5528
...
@@ -92,17 +92,27 @@ define(function(require) {
...
@@ -92,17 +92,27 @@ define(function(require) {
_zr
.
on
(
zrConfig
.
EVENT
.
DROP
,
_ondrop
);
_zr
.
on
(
zrConfig
.
EVENT
.
DROP
,
_ondrop
);
var
shape
=
require
(
'
zrender/shape
'
);
// 内置图表注册
var
Icon
=
require
(
'
./util/shape/icon
'
);
shape
.
define
(
'
icon
'
,
new
Icon
());
// 孤岛
var
chartLibrary
=
require
(
'
./chart
'
);
var
chartLibrary
=
require
(
'
./chart
'
);
require
(
'
./chart/island
'
);
// 孤岛
var
Island
=
chartLibrary
.
get
(
'
island
'
);
var
Island
=
chartLibrary
.
get
(
'
island
'
);
_island
=
new
Island
(
_messageCenter
,
_zr
);
_island
=
new
Island
(
_messageCenter
,
_zr
);
// 工具箱
// 内置组件注册
var
componentLibrary
=
require
(
'
./component
'
);
var
componentLibrary
=
require
(
'
./component
'
);
require
(
'
./component/axis
'
);
require
(
'
./component/categoryAxis
'
);
require
(
'
./component/valueAxis
'
);
require
(
'
./component/grid
'
);
require
(
'
./component/dataZoom
'
);
require
(
'
./component/legend
'
);
require
(
'
./component/dataRange
'
);
require
(
'
./component/tooltip
'
);
require
(
'
./component/toolbox
'
);
require
(
'
./component/dataView
'
);
// 工具箱
var
Toolbox
=
componentLibrary
.
get
(
'
toolbox
'
);
var
Toolbox
=
componentLibrary
.
get
(
'
toolbox
'
);
_toolbox
=
new
Toolbox
(
_messageCenter
,
_zr
,
dom
);
_toolbox
=
new
Toolbox
(
_messageCenter
,
_zr
,
dom
);
}
}
...
...
src/util/shape/candle.js
浏览文件 @
25ae5528
...
@@ -183,9 +183,9 @@ define(
...
@@ -183,9 +183,9 @@ define(
}
}
};
};
var
base
=
require
(
'
zrender/shape/base
'
);
require
(
'
zrender/shape/base
'
).
derive
(
Candle
);
base
.
derive
(
Candle
);
require
(
'
zrender/shape
'
).
define
(
'
candle
'
,
new
Candle
()
);
return
Candle
;
return
Candle
;
}
}
);
);
\ No newline at end of file
src/util/shape/icon.js
浏览文件 @
25ae5528
...
@@ -328,9 +328,9 @@ define(
...
@@ -328,9 +328,9 @@ define(
}
}
};
};
var
base
=
require
(
'
zrender/shape/base
'
);
require
(
'
zrender/shape/base
'
).
derive
(
Icon
);
base
.
derive
(
Icon
);
require
(
'
zrender/shape
'
).
define
(
'
icon
'
,
new
Icon
()
);
return
Icon
;
return
Icon
;
}
}
);
);
\ No newline at end of file
src/util/shape/symbol.js
浏览文件 @
25ae5528
...
@@ -206,9 +206,9 @@ define(
...
@@ -206,9 +206,9 @@ define(
}
}
};
};
var
base
=
require
(
'
zrender/shape/base
'
);
require
(
'
zrender/shape/base
'
).
derive
(
Symbol
);
base
.
derive
(
Symbol
);
require
(
'
zrender/shape
'
).
define
(
'
symbol
'
,
new
Symbol
()
);
return
Symbol
;
return
Symbol
;
}
}
);
);
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录