Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
ce5a20ef
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,发现更多精彩内容 >>
提交
ce5a20ef
编写于
5月 04, 2016
作者:
L
lang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Reset element style when updating. Avoid failure of removing shadow in option
上级
773511ee
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
35 addition
and
30 deletion
+35
-30
src/chart/bar/BarView.js
src/chart/bar/BarView.js
+1
-1
src/chart/candlestick/CandlestickView.js
src/chart/candlestick/CandlestickView.js
+2
-4
src/chart/funnel/FunnelView.js
src/chart/funnel/FunnelView.js
+4
-0
src/chart/gauge/GaugeView.js
src/chart/gauge/GaugeView.js
+9
-10
src/chart/heatmap/HeatmapView.js
src/chart/heatmap/HeatmapView.js
+1
-1
src/chart/helper/LargeSymbolDraw.js
src/chart/helper/LargeSymbolDraw.js
+1
-1
src/chart/helper/Line.js
src/chart/helper/Line.js
+2
-1
src/chart/helper/Symbol.js
src/chart/helper/Symbol.js
+5
-3
src/chart/line/LineView.js
src/chart/line/LineView.js
+4
-3
src/chart/parallel/ParallelView.js
src/chart/parallel/ParallelView.js
+1
-1
src/chart/pie/PieView.js
src/chart/pie/PieView.js
+1
-1
src/chart/radar/RadarView.js
src/chart/radar/RadarView.js
+3
-3
src/chart/sankey/SankeyView.js
src/chart/sankey/SankeyView.js
+1
-1
未找到文件。
src/chart/bar/BarView.js
浏览文件 @
ce5a20ef
...
...
@@ -145,7 +145,7 @@ define(function (require) {
rect
.
setShape
(
'
r
'
,
itemStyleModel
.
get
(
'
barBorderRadius
'
)
||
0
);
rect
.
set
Style
(
zrUtil
.
defaults
(
rect
.
use
Style
(
zrUtil
.
defaults
(
{
fill
:
color
,
opacity
:
opacity
...
...
src/chart/candlestick/CandlestickView.js
浏览文件 @
ce5a20ef
...
...
@@ -36,15 +36,13 @@ define(function(require) {
);
var
whiskerEl
=
itemGroup
.
childAt
(
itemGroup
.
whiskerIndex
);
whiskerEl
.
style
.
set
(
itemStyle
);
whiskerEl
.
useStyle
(
itemStyle
);
whiskerEl
.
style
.
stroke
=
borderColor
;
whiskerEl
.
dirty
();
var
bodyEl
=
itemGroup
.
childAt
(
itemGroup
.
bodyIndex
);
bodyEl
.
style
.
set
(
itemStyle
);
bodyEl
.
useStyle
(
itemStyle
);
bodyEl
.
style
.
fill
=
color
;
bodyEl
.
style
.
stroke
=
borderColor
;
bodyEl
.
dirty
();
var
hoverStyle
=
itemModel
.
getModel
(
emphasisStyleAccessPath
).
getItemStyle
();
graphic
.
setHoverStyle
(
itemGroup
,
hoverStyle
);
...
...
src/chart/funnel/FunnelView.js
浏览文件 @
ce5a20ef
...
...
@@ -63,6 +63,10 @@ define(function (require) {
var
layout
=
data
.
getItemLayout
(
idx
);
var
opacity
=
data
.
getItemModel
(
idx
).
get
(
opacityAccessPath
);
opacity
=
opacity
==
null
?
1
:
opacity
;
// Reset style
polygon
.
useStyle
({});
if
(
firstCreate
)
{
polygon
.
setShape
({
points
:
layout
.
points
...
...
src/chart/gauge/GaugeView.js
浏览文件 @
ce5a20ef
...
...
@@ -314,18 +314,17 @@ define(function (require) {
var
itemModel
=
data
.
getItemModel
(
idx
);
var
pointerModel
=
itemModel
.
getModel
(
'
pointer
'
);
pointer
.
attr
({
shape
:
{
x
:
posInfo
.
cx
,
y
:
posInfo
.
cy
,
width
:
parsePercent
(
pointerModel
.
get
(
'
width
'
),
posInfo
.
r
),
r
:
parsePercent
(
pointerModel
.
get
(
'
length
'
),
posInfo
.
r
)
},
style
:
itemModel
.
getModel
(
'
itemStyle.normal
'
).
getItemStyle
()
pointer
.
setShape
({
x
:
posInfo
.
cx
,
y
:
posInfo
.
cy
,
width
:
parsePercent
(
pointerModel
.
get
(
'
width
'
),
posInfo
.
r
),
r
:
parsePercent
(
pointerModel
.
get
(
'
length
'
),
posInfo
.
r
)
});
pointer
.
useStyle
(
itemModel
.
getModel
(
'
itemStyle.normal
'
).
getItemStyle
());
if
(
pointer
.
style
.
fill
===
'
auto
'
)
{
pointer
.
setStyle
(
'
fill
'
,
getColor
(
(
data
.
get
(
'
value
'
,
idx
)
-
valueExtent
[
0
])
/
(
valueExtent
[
1
]
-
valueExtent
[
0
])
...
...
src/chart/heatmap/HeatmapView.js
浏览文件 @
ce5a20ef
...
...
@@ -138,7 +138,7 @@ define(function (require) {
hoverStl
.
text
=
seriesModel
.
getFormattedLabel
(
idx
,
'
emphasis
'
)
||
defaultText
;
}
rect
.
set
Style
(
style
);
rect
.
use
Style
(
style
);
graphic
.
setHoverStyle
(
rect
,
hoverStl
);
...
...
src/chart/helper/LargeSymbolDraw.js
浏览文件 @
ce5a20ef
...
...
@@ -81,7 +81,7 @@ define(function (require) {
// Use symbolProxy setColor method
symbolEl
.
setColor
=
symbolEl
.
symbolProxy
.
setColor
;
symbolEl
.
set
Style
(
symbolEl
.
use
Style
(
seriesModel
.
getModel
(
'
itemStyle.normal
'
).
getItemStyle
([
'
color
'
])
);
...
...
src/chart/helper/Line.js
浏览文件 @
ce5a20ef
...
...
@@ -234,8 +234,9 @@ define(function (require) {
// Use name
defaultText
=
lineData
.
getName
(
idx
);
}
line
.
set
Style
(
zrUtil
.
extend
(
line
.
use
Style
(
zrUtil
.
extend
(
{
fill
:
'
none
'
,
stroke
:
lineData
.
getItemVisual
(
idx
,
'
color
'
)
},
itemModel
.
getModel
(
'
lineStyle.normal
'
).
getLineStyle
()
...
...
src/chart/helper/Symbol.js
浏览文件 @
ce5a20ef
...
...
@@ -46,9 +46,6 @@ define(function (require) {
);
symbolPath
.
attr
({
style
:
{
strokeNoScale
:
true
},
z2
:
100
,
culling
:
true
,
scale
:
[
0
,
0
]
...
...
@@ -149,6 +146,11 @@ define(function (require) {
var
itemModel
=
data
.
getItemModel
(
idx
);
var
normalItemStyleModel
=
itemModel
.
getModel
(
normalStyleAccessPath
);
var
color
=
data
.
getItemVisual
(
idx
,
'
color
'
);
// Reset style
symbolPath
.
useStyle
({
strokeNoScale
:
true
});
var
elStyle
=
symbolPath
.
style
;
var
hoverStyle
=
itemModel
.
getModel
(
emphasisStyleAccessPath
).
getItemStyle
();
...
...
src/chart/line/LineView.js
浏览文件 @
ce5a20ef
...
...
@@ -292,10 +292,11 @@ define(function(require) {
}
}
polyline
.
set
Style
(
zrUtil
.
defaults
(
polyline
.
use
Style
(
zrUtil
.
defaults
(
// Use color in lineStyle first
lineStyleModel
.
getLineStyle
(),
{
fill
:
'
none
'
,
stroke
:
data
.
getVisual
(
'
color
'
),
lineJoin
:
'
bevel
'
}
...
...
@@ -312,11 +313,11 @@ define(function(require) {
var
stackedOn
=
data
.
stackedOn
;
var
stackedOnSmooth
=
0
;
polygon
.
style
.
opacity
=
0.7
;
polygon
.
setStyle
(
zrUtil
.
defaults
(
polygon
.
useStyle
(
zrUtil
.
defaults
(
areaStyleModel
.
getAreaStyle
(),
{
fill
:
data
.
getVisual
(
'
color
'
),
opacity
:
0.7
,
lineJoin
:
'
bevel
'
}
));
...
...
src/chart/parallel/ParallelView.js
浏览文件 @
ce5a20ef
...
...
@@ -44,7 +44,7 @@ define(function (require) {
var
itemModel
=
data
.
getItemModel
(
idx
);
var
lineStyleModel
=
itemModel
.
getModel
(
'
lineStyle.normal
'
);
elGroup
.
eachChild
(
function
(
child
)
{
child
.
set
Style
(
zrUtil
.
extend
(
child
.
use
Style
(
zrUtil
.
extend
(
lineStyleModel
.
getLineStyle
(),
{
stroke
:
data
.
getItemVisual
(
idx
,
'
color
'
),
...
...
src/chart/pie/PieView.js
浏览文件 @
ce5a20ef
...
...
@@ -138,7 +138,7 @@ define(function (require) {
var
itemStyleModel
=
itemModel
.
getModel
(
'
itemStyle
'
);
var
visualColor
=
data
.
getItemVisual
(
idx
,
'
color
'
);
sector
.
set
Style
(
sector
.
use
Style
(
zrUtil
.
defaults
(
{
fill
:
visualColor
...
...
src/chart/radar/RadarView.js
浏览文件 @
ce5a20ef
...
...
@@ -133,7 +133,7 @@ define(function (require) {
group
.
add
(
itemGroup
);
polyline
.
set
Style
(
polyline
.
use
Style
(
zrUtil
.
extend
(
itemModel
.
getModel
(
'
lineStyle.normal
'
).
getLineStyle
(),
{
...
...
@@ -151,7 +151,7 @@ define(function (require) {
hoverPolygonIgnore
=
hoverPolygonIgnore
&&
polygonIgnore
;
polygon
.
ignore
=
polygonIgnore
;
polygon
.
set
Style
(
polygon
.
use
Style
(
zrUtil
.
defaults
(
areaStyleModel
.
getAreaStyle
(),
{
...
...
@@ -167,7 +167,7 @@ define(function (require) {
var
labelModel
=
itemModel
.
getModel
(
'
label.normal
'
);
var
labelHoverModel
=
itemModel
.
getModel
(
'
label.emphasis
'
);
symbolGroup
.
eachChild
(
function
(
symbolPath
)
{
symbolPath
.
set
Style
(
itemStyle
);
symbolPath
.
use
Style
(
itemStyle
);
symbolPath
.
hoverStyle
=
zrUtil
.
clone
(
itemHoverStyle
);
var
defaultText
=
data
.
get
(
data
.
dimensions
[
symbolPath
.
__dimIdx
],
idx
);
...
...
src/chart/sankey/SankeyView.js
浏览文件 @
ce5a20ef
...
...
@@ -95,7 +95,7 @@ define(function (require) {
}
});
rect
.
set
Style
(
zrUtil
.
defaults
(
rect
.
use
Style
(
zrUtil
.
defaults
(
{
fill
:
node
.
getVisual
(
'
color
'
)
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录