Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
a132b8cc
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,发现更多精彩内容 >>
提交
a132b8cc
编写于
6月 27, 2016
作者:
P
pah100
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tweak
上级
c4c7278e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
19 deletion
+9
-19
src/chart/candlestick/CandlestickView.js
src/chart/candlestick/CandlestickView.js
+1
-1
src/component/helper/BrushController.js
src/component/helper/BrushController.js
+0
-16
src/component/toolbox/feature/Brush.js
src/component/toolbox/feature/Brush.js
+2
-2
test/candlestick-brush.html
test/candlestick-brush.html
+6
-0
未找到文件。
src/chart/candlestick/CandlestickView.js
浏览文件 @
a132b8cc
...
...
@@ -27,7 +27,7 @@ define(function(require) {
var
itemModel
=
data
.
getItemModel
(
idx
);
var
normalItemStyleModel
=
itemModel
.
getModel
(
normalStyleAccessPath
);
var
color
=
data
.
getItemVisual
(
idx
,
'
color
'
);
var
borderColor
=
data
.
getItemVisual
(
idx
,
'
borderColor
'
);
var
borderColor
=
data
.
getItemVisual
(
idx
,
'
borderColor
'
)
||
color
;
// Color must be excluded.
// Because symbol provide setColor individually to set fill and stroke
...
...
src/component/helper/BrushController.js
浏览文件 @
a132b8cc
...
...
@@ -633,10 +633,6 @@ define(function (require) {
}
function
driftRect
(
toRectRange
,
fromRectRange
,
controller
,
cover
,
name
,
dx
,
dy
,
e
)
{
if
(
!
isInPanel
(
controller
,
cover
,
e
))
{
return
;
}
var
brushOption
=
cover
.
__brushOption
;
var
rectRange
=
toRectRange
(
brushOption
.
range
);
var
localDelta
=
toLocalDelta
(
controller
,
dx
,
dy
);
...
...
@@ -655,10 +651,6 @@ define(function (require) {
}
function
driftPolygon
(
controller
,
cover
,
dx
,
dy
,
e
)
{
if
(
!
isInPanel
(
controller
,
cover
,
e
))
{
return
;
}
var
range
=
cover
.
__brushOption
.
range
;
var
localDelta
=
toLocalDelta
(
controller
,
dx
,
dy
);
...
...
@@ -671,14 +663,6 @@ define(function (require) {
trigger
(
controller
,
{
isEnd
:
false
});
}
function
isInPanel
(
controller
,
cover
,
e
)
{
var
panel
=
getPanelByCover
(
controller
,
cover
);
var
x
=
e
.
offsetX
;
var
y
=
e
.
offsetY
;
return
panel
===
true
||
panel
.
contain
(
x
,
y
);
}
function
toLocalDelta
(
controller
,
dx
,
dy
)
{
var
thisGroup
=
controller
.
group
;
var
localD
=
thisGroup
.
transformCoordToLocal
(
dx
,
dy
);
...
...
src/component/toolbox/feature/Brush.js
浏览文件 @
a132b8cc
...
...
@@ -30,8 +30,8 @@ define(function(require) {
icon
:
{
rect
:
'
M7.3,34.7 M0.4,10V-0.2h9.8 M89.6,10V-0.2h-9.8 M0.4,60v10.2h9.8 M89.6,60v10.2h-9.8 M12.3,22.4V10.5h13.1 M33.6,10.5h7.8 M49.1,10.5h7.8 M77.5,22.4V10.5h-13 M12.3,31.1v8.2 M77.7,31.1v8.2 M12.3,47.6v11.9h13.1 M33.6,59.5h7.6 M49.1,59.5 h7.7 M77.5,47.6v11.9h-13
'
,
polygon
:
'
M55.2,34.9c1.7,0,3.1,1.4,3.1,3.1s-1.4,3.1-3.1,3.1 s-3.1-1.4-3.1-3.1S53.5,34.9,55.2,34.9z M50.4,51c1.7,0,3.1,1.4,3.1,3.1c0,1.7-1.4,3.1-3.1,3.1c-1.7,0-3.1-1.4-3.1-3.1 C47.3,52.4,48.7,51,50.4,51z M55.6,37.1l1.5-7.8 M60.1,13.5l1.6-8.7l-7.8,4 M59,19l-1,5.3 M24,16.1l6.4,4.9l6.4-3.3 M48.5,11.6 l-5.9,3.1 M19.1,12.8L9.7,5.1l1.1,7.7 M13.4,29.8l1,7.3l6.6,1.6 M11.6,18.4l1,6.1 M32.8,41.9 M26.6,40.4 M27.3,40.2l6.1,1.6 M49.9,52.1l-5.6-7.6l-4.9-1.2
'
,
lineX
:
'
M
55.2,34.9c1.7,0,3.1,1.4,3.1,3.1s-1.4,3.1-3.1,3.1 s-3.1-1.4-3.1-3.1S53.5,34.9,55.2,34.9z M50.4,51c1.7,0,3.1,1.4,3.1,3.1c0,1.7-1.4,3.1-3.1,3.1c-1.7,0-3.1-1.4-3.1-3.1 C47.3,52.4,48.7,51,50.4,51z M55.6,37.1l1.5-7.8 M60.1,13.5l1.6-8.7l-7.8,4 M59,19l-1,5.3 M24,16.1l6.4,4.9l6.4-3.3 M48.5,11.6 l-5.9,3.1 M19.1,12.8L9.7,5.1l1.1,7.7 M13.4,29.8l1,7.3l6.6,1.6 M11.6,18.4l1,6.1 M32.8,41.9 M26.6,40.4 M27.3,40.2l6.1,1.6 M49.9,52.1l-5.6-7.6l-4.9-1.2
'
,
lineY
:
'
M
55.2,34.9c1.7,0,3.1,1.4,3.1,3.1s-1.4,3.1-3.1,3.1 s-3.1-1.4-3.1-3.1S53.5,34.9,55.2,34.9z M50.4,51c1.7,0,3.1,1.4,3.1,3.1c0,1.7-1.4,3.1-3.1,3.1c-1.7,0-3.1-1.4-3.1-3.1 C47.3,52.4,48.7,51,50.4,51z M55.6,37.1l1.5-7.8 M60.1,13.5l1.6-8.7l-7.8,4 M59,19l-1,5.3 M24,16.1l6.4,4.9l6.4-3.3 M48.5,11.6 l-5.9,3.1 M19.1,12.8L9.7,5.1l1.1,7.7 M13.4,29.8l1,7.3l6.6,1.6 M11.6,18.4l1,6.1 M32.8,41.9 M26.6,40.4 M27.3,40.2l6.1,1.6 M49.9,52.1l-5.6-7.6l-4.9-1.2
'
,
lineX
:
'
M
15.2,30 M19.7,15.6V1.9H29 M34.8,1.9H40.4 M55.3,15.6V1.9H45.9 M19.7,44.4V58.1H29 M34.8,58.1H40.4 M55.3,44.4 V58.1H45.9 M12.5,20.3l-9.4,9.6l9.6,9.8 M3.1,29.9h16.5 M62.5,20.3l9.4,9.6L62.3,39.7 M71.9,29.9H55.4
'
,
lineY
:
'
M
38.8,7.7 M52.7,12h13.2v9 M65.9,26.6V32 M52.7,46.3h13.2v-9 M24.9,12H11.8v9 M11.8,26.6V32 M24.9,46.3H11.8v-9 M48.2,5.1l-9.3-9l-9.4,9.2 M38.9-3.9V12 M48.2,53.3l-9.3,9l-9.4-9.2 M38.9,62.3V46.4
'
,
keep
:
'
M4,10.5V1h10.3 M20.7,1h6.1 M33,1h6.1 M55.4,10.5V1H45.2 M4,17.3v6.6 M55.6,17.3v6.6 M4,30.5V40h10.3 M20.7,40 h6.1 M33,40h6.1 M55.4,30.5V40H45.2 M21,18.9h62.9v48.6H21V18.9z
'
,
clear
:
'
M22,14.7l30.9,31 M52.9,14.7L22,45.7 M4.7,16.8V4.2h13.1 M26,4.2h7.8 M41.6,4.2h7.8 M70.3,16.8V4.2H57.2 M4.7,25.9v8.6 M70.3,25.9v8.6 M4.7,43.2v12.6h13.1 M26,55.8h7.8 M41.6,55.8h7.8 M70.3,43.2v12.6H57.2
'
},
...
...
test/candlestick-brush.html
浏览文件 @
a132b8cc
...
...
@@ -292,6 +292,12 @@
name
:
'
Dow-Jones index
'
,
type
:
'
candlestick
'
,
data
:
data
.
values
,
itemStyle
:
{
normal
:
{
borderColor
:
null
,
borderColor0
:
null
}
},
tooltip
:
{
formatter
:
function
(
param
)
{
var
param
=
param
[
0
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录