Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
09541038
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,体验更适合开发者的 AI 搜索 >>
提交
09541038
编写于
4月 01, 2014
作者:
K
kener
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
jshint代码规范
上级
a03bcc67
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
31 addition
and
43 deletion
+31
-43
.jshintrc
.jshintrc
+1
-1
src/chart/line.js
src/chart/line.js
+1
-1
src/chart/pie.js
src/chart/pie.js
+1
-2
src/chart/scatter.js
src/chart/scatter.js
+1
-1
src/component/base.js
src/component/base.js
+7
-6
src/component/dataRange.js
src/component/dataRange.js
+3
-3
src/component/legend.js
src/component/legend.js
+3
-5
src/component/toolbox.js
src/component/toolbox.js
+0
-10
src/component/tooltip.js
src/component/tooltip.js
+4
-4
src/echarts.js
src/echarts.js
+10
-10
未找到文件。
.jshintrc
浏览文件 @
09541038
...
...
@@ -19,7 +19,7 @@
"trailing": false,
"maxparams": 20,
"maxdepth": 6,
"maxlen":
8
0,
"maxlen":
10
0,
"asi": false,
"boss": false,
...
...
src/chart/line.js
浏览文件 @
09541038
...
...
@@ -358,7 +358,7 @@ define(function(require) {
for
(
var
m
=
0
,
n
=
locationMap
[
j
].
length
;
m
<
n
;
m
++
)
{
seriesIndex
=
locationMap
[
j
][
m
];
xMarkMap
[
seriesIndex
].
average
=
(
xMarkMap
[
seriesIndex
].
sum
/
xMarkMap
[
seriesIndex
].
counter
).
toFixed
(
2
)
-
0
(
xMarkMap
[
seriesIndex
].
sum
/
xMarkMap
[
seriesIndex
].
counter
).
toFixed
(
2
)
-
0
;
y
=
component
.
yAxis
.
getAxis
(
series
[
seriesIndex
].
yAxisIndex
||
0
)
.
getCoord
(
xMarkMap
[
seriesIndex
].
average
);
...
...
src/chart/pie.js
浏览文件 @
09541038
...
...
@@ -301,7 +301,7 @@ define(function(require) {
var
normalColor
=
self
.
getItemStyleColor
(
normal
.
color
,
seriesIndex
,
dataIndex
,
data
)
||
defaultColor
;
var
emphasisColor
=
self
.
getItemStyleColor
(
emphasis
.
color
,
seriesIndex
,
dataIndex
,
data
)
var
emphasisColor
=
self
.
getItemStyleColor
(
emphasis
.
color
,
seriesIndex
,
dataIndex
,
data
)
||
(
typeof
normalColor
==
'
string
'
?
zrColor
.
lift
(
normalColor
,
-
0.2
)
:
normalColor
...
...
@@ -326,7 +326,6 @@ define(function(require) {
},
highlightStyle
:
{
color
:
emphasisColor
,
strokeColor
:
'
rgba(0,0,0,0)
'
,
lineWidth
:
emphasis
.
borderWidth
,
strokeColor
:
emphasis
.
borderColor
,
lineJoin
:
'
round
'
...
...
src/chart/scatter.js
浏览文件 @
09541038
...
...
@@ -152,7 +152,7 @@ define(function(require) {
]);
}
_markMap
(
xAxis
,
yAxis
,
serie
.
data
,
pointList
[
seriesIndex
])
_markMap
(
xAxis
,
yAxis
,
serie
.
data
,
pointList
[
seriesIndex
])
;
self
.
buildMark
(
serie
,
seriesIndex
,
...
...
src/component/base.js
浏览文件 @
09541038
...
...
@@ -514,7 +514,8 @@ define(function(require) {
}
// 标准化一些参数
data
[
i
][
0
].
tooltip
=
mergeData
.
tooltip
||
{
trigger
:
'
item
'
};
// tooltip.trigger指定为item
data
[
i
][
0
].
tooltip
=
mergeData
.
tooltip
||
{
trigger
:
'
item
'
};
// tooltip.trigger指定为item
data
[
i
][
0
].
name
=
typeof
data
[
i
][
0
].
name
!=
'
undefined
'
?
data
[
i
][
0
].
name
:
''
;
data
[
i
][
1
].
name
=
typeof
data
[
i
][
1
].
name
!=
'
undefined
'
...
...
@@ -547,7 +548,7 @@ define(function(require) {
itemShape
,
serie
,
seriesIndex
,
data
[
i
][
0
],
0
,
data
[
i
][
0
].
name
+
(
data
[
i
][
1
].
name
!=
''
data
[
i
][
0
].
name
+
(
data
[
i
][
1
].
name
!=
=
''
?
(
'
>
'
+
data
[
i
][
1
].
name
)
:
''
)
);
pList
.
push
(
itemShape
);
...
...
@@ -866,7 +867,6 @@ define(function(require) {
}
function
animationMark
(
duration
,
easing
)
{
var
mlShape
=
require
(
'
zrender/shape
'
).
get
(
'
markLine
'
);
var
x
;
var
y
;
for
(
var
i
=
0
,
l
=
self
.
shapeList
.
length
;
i
<
l
;
i
++
)
{
...
...
@@ -1063,9 +1063,10 @@ define(function(require) {
else
if
(
shape
.
_mark
===
'
line
'
)
{
effectShape
.
style
.
x
=
shape
.
style
.
xStart
-
Offset
;
effectShape
.
style
.
y
=
shape
.
style
.
yStart
-
Offset
;
var
distance
=
(
shape
.
style
.
xStart
-
shape
.
_x
)
*
(
shape
.
style
.
xStart
-
shape
.
_x
)
+
(
shape
.
style
.
yStart
-
shape
.
_y
)
*
(
shape
.
style
.
yStart
-
shape
.
_y
);
var
distance
=
(
shape
.
style
.
xStart
-
shape
.
_x
)
*
(
shape
.
style
.
xStart
-
shape
.
_x
)
+
(
shape
.
style
.
yStart
-
shape
.
_y
)
*
(
shape
.
style
.
yStart
-
shape
.
_y
);
duration
=
Math
.
round
(
Math
.
sqrt
(
Math
.
round
(
distance
*
effect
.
period
*
effect
.
period
)));
...
...
src/component/dataRange.js
浏览文件 @
09541038
...
...
@@ -350,7 +350,7 @@ define(function (require) {
var
pointListEnd
;
var
textXEnd
;
var
textYEnd
;
var
coverRectEnd
var
coverRectEnd
;
if
(
dataRangeOption
.
orient
==
'
horizontal
'
)
{
// 水平
if
(
dataRangeOption
.
y
!=
'
bottom
'
)
{
...
...
@@ -459,7 +459,7 @@ define(function (require) {
y
:
y
+
height
,
width
:
textWidth
+
textHeight
,
height
:
textHeight
}
}
;
}
else
{
// 手柄在左侧
...
...
@@ -539,7 +539,7 @@ define(function (require) {
_endShape
.
highlightStyle
=
{
strokeColor
:
_endShape
.
style
.
color
,
lineWidth
:
1
}
}
;
// 统一参数
_startShape
.
zlevel
=
_endShape
.
zlevel
=
_zlevelBase
+
1
;
...
...
src/component/legend.js
浏览文件 @
09541038
...
...
@@ -62,7 +62,6 @@ define(function (require) {
var
itemShape
;
var
textShape
;
var
textStyle
=
legendOption
.
textStyle
;
var
font
=
self
.
getFont
(
textStyle
);
var
dataTextStyle
;
var
dataFont
;
...
...
@@ -449,7 +448,6 @@ define(function (require) {
*/
function
_getSomethingByName
(
name
)
{
var
series
=
option
.
series
;
var
hasFind
;
var
data
;
for
(
var
i
=
0
,
l
=
series
.
length
;
i
<
l
;
i
++
)
{
if
(
series
[
i
].
name
==
name
)
{
...
...
@@ -460,7 +458,7 @@ define(function (require) {
seriesIndex
:
i
,
data
:
null
,
dataIndex
:
-
1
}
}
;
}
if
(
...
...
@@ -480,7 +478,7 @@ define(function (require) {
seriesIndex
:
i
,
data
:
data
[
j
],
dataIndex
:
j
}
}
;
}
}
}
...
...
@@ -491,7 +489,7 @@ define(function (require) {
seriesIndex
:
-
1
,
data
:
null
,
dataIndex
:
-
1
}
}
;
}
function
_getItemShapeByType
(
x
,
y
,
width
,
height
,
color
,
itemType
,
defaultColor
)
{
...
...
src/component/toolbox.js
浏览文件 @
09541038
...
...
@@ -853,7 +853,6 @@ define(function (require) {
len
=
newOption
.
series
.
length
;
var
oriType
;
// 备份还原可控类型
var
oriStack
;
// 备份还原堆积名称
var
axis
;
while
(
len
--
)
{
oriType
=
newOption
.
series
[
len
].
type
;
...
...
@@ -924,15 +923,6 @@ define(function (require) {
}
}
function
_hasMagicType
()
{
for
(
var
k
in
_magicType
)
{
if
(
_magicType
[
k
])
{
return
true
;
}
}
return
false
;
}
function
getMagicOption
(){
var
axis
;
if
(
_magicType
[
ecConfig
.
CHART_TYPE_LINE
]
||
_magicType
[
ecConfig
.
CHART_TYPE_BAR
])
{
...
...
src/component/tooltip.js
浏览文件 @
09541038
...
...
@@ -396,7 +396,7 @@ define(function (require) {
right
=
curCoord
;
}
if
(
x
-
left
<
right
-
x
)
{
dataIndex
-=
dataIndex
!=
0
?
1
:
0
;
dataIndex
-=
dataIndex
!=
=
0
?
1
:
0
;
}
else
{
// 离右边近,看是否为最后一个
...
...
@@ -426,7 +426,7 @@ define(function (require) {
}
if
(
y
-
top
>
bottom
-
y
)
{
dataIndex
-=
dataIndex
!=
0
?
1
:
0
;
dataIndex
-=
dataIndex
!=
=
0
?
1
:
0
;
}
else
{
// 离上方边近,看是否为最后一个
...
...
@@ -1356,7 +1356,7 @@ define(function (require) {
return
;
}
var
polarIndex
=
serie
.
polarIndex
||
0
;
var
vector
=
polar
.
getVector
(
polarIndex
,
dataIndex
,
'
max
'
)
var
vector
=
polar
.
getVector
(
polarIndex
,
dataIndex
,
'
max
'
)
;
_event
=
{
zrenderX
:
vector
[
0
],
zrenderY
:
vector
[
1
]
...
...
@@ -1399,7 +1399,7 @@ define(function (require) {
&&
ecData
.
get
(
shapeList
[
i
],
'
dataIndex
'
)
==
dataIndex
)
{
_curTarget
=
shapeList
[
i
];
var
vector
=
polar
.
getCenter
(
serie
.
polarIndex
||
0
)
var
vector
=
polar
.
getCenter
(
serie
.
polarIndex
||
0
)
;
x
=
vector
[
0
];
y
=
vector
[
1
];
break
;
...
...
src/echarts.js
浏览文件 @
09541038
...
...
@@ -55,7 +55,7 @@ define(function(require) {
*/
self
.
getInstanceById
=
function
(
key
)
{
return
_instances
[
key
];
}
}
;
/**
* 基于zrender实现Echarts接口层
...
...
@@ -165,9 +165,9 @@ define(function(require) {
*/
var
_curEventType
=
null
;
// 破循环信号灯
function
_onevent
(
param
){
param
.
__echarts
_id__
=
param
.
__echarts_id__
||
self
.
id
;
param
.
__echarts
Id
=
param
.
__echartsId
||
self
.
id
;
var
fromMyself
=
true
;
if
(
param
.
__echarts
_id__
!=
self
.
id
)
{
if
(
param
.
__echarts
Id
!=
self
.
id
)
{
// 来自其他联动图表的事件
fromMyself
=
false
;
}
...
...
@@ -793,9 +793,9 @@ define(function(require) {
_chartList
.
push
(
chart
);
self
.
chart
[
chartType
]
=
chart
;
}
}
else
{
console
.
error
(
chartType
+
'
has not been required.
'
);
else
{
console
.
error
(
chartType
+
'
has not been required.
'
);
}
}
}
...
...
@@ -1338,7 +1338,7 @@ define(function(require) {
}
var
tempDom
;
var
domSize
=
domSize
=
[
var
domSize
=
[
dom
.
offsetLeft
,
dom
.
offsetTop
,
dom
.
offsetWidth
,
dom
.
offsetHeight
];
...
...
@@ -1367,7 +1367,7 @@ define(function(require) {
top
:
domSize
[
1
],
right
:
domSize
[
0
]
+
domSize
[
2
],
bottom
:
domSize
[
1
]
+
domSize
[
3
]
}
}
;
minLeft
=
Math
.
min
(
minLeft
,
imgList
[
c
].
left
);
minTop
=
Math
.
min
(
minTop
,
imgList
[
c
].
top
);
maxRight
=
Math
.
max
(
maxRight
,
imgList
[
c
].
right
);
...
...
@@ -1499,7 +1499,7 @@ define(function(require) {
* 联动事件响应
*/
function
connectedEventHandler
(
param
)
{
if
(
param
.
__echarts
_id__
!=
self
.
id
)
{
if
(
param
.
__echarts
Id
!=
self
.
id
)
{
// 来自其他联动图表的事件
_onevent
(
param
);
}
...
...
@@ -1509,7 +1509,7 @@ define(function(require) {
* 是否存在多图联动
*/
function
isConnected
()
{
return
!!
_connected
return
!!
_connected
;
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录