Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Five-菜鸟级
echarts
提交
02115782
E
echarts
项目概览
Five-菜鸟级
/
echarts
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
echarts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
02115782
编写于
1月 13, 2020
作者:
1
100pah
提交者:
sushuang
1月 13, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: fix candlestick throw error when some series filtered by legend. fix #11611
上级
502afef9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
169 addition
and
3 deletion
+169
-3
src/chart/candlestick/candlestickVisual.js
src/chart/candlestick/candlestickVisual.js
+1
-1
src/chart/helper/createRenderPlanner.js
src/chart/helper/createRenderPlanner.js
+5
-2
src/stream/Scheduler.js
src/stream/Scheduler.js
+8
-0
test/stream-filter2.html
test/stream-filter2.html
+155
-0
未找到文件。
src/chart/candlestick/candlestickVisual.js
浏览文件 @
02115782
...
...
@@ -36,7 +36,6 @@ export default {
reset
:
function
(
seriesModel
,
ecModel
)
{
var
data
=
seriesModel
.
getData
();
var
isLargeRender
=
seriesModel
.
pipelineContext
.
large
;
data
.
setVisual
({
legendSymbol
:
'
roundRect
'
,
...
...
@@ -51,6 +50,7 @@ export default {
return
;
}
var
isLargeRender
=
seriesModel
.
pipelineContext
.
large
;
return
!
isLargeRender
&&
{
progress
:
progress
};
...
...
src/chart/helper/createRenderPlanner.js
浏览文件 @
02115782
...
...
@@ -32,8 +32,11 @@ export default function () {
var
originalLarge
=
fields
.
large
;
var
originalProgressive
=
fields
.
progressiveRender
;
var
large
=
fields
.
large
=
pipelineContext
.
large
;
var
progressive
=
fields
.
progressiveRender
=
pipelineContext
.
progressiveRender
;
// FIXME: if the planner works on a filtered series, `pipelineContext` does not
// exists. See #11611 . Probably we need to modify this structure, see the comment
// on `performRawSeries` in `Schedular.js`.
var
large
=
fields
.
large
=
pipelineContext
&&
pipelineContext
.
large
;
var
progressive
=
fields
.
progressiveRender
=
pipelineContext
&&
pipelineContext
.
progressiveRender
;
return
!!
((
originalLarge
^
large
)
||
(
originalProgressive
^
progressive
))
&&
'
reset
'
;
};
...
...
src/stream/Scheduler.js
浏览文件 @
02115782
...
...
@@ -260,6 +260,14 @@ function performStageTasks(scheduler, stageHandlers, ecModel, payload, opt) {
task
.
dirty
();
}
var
performArgs
=
scheduler
.
getPerformArgs
(
task
,
opt
.
block
);
// FIXME
// if intending to decalare `performRawSeries` in handlers, only
// stream-independent (specifically, data item independent) operations can be
// performed. Because is a series is filtered, most of the tasks will not
// be performed. A stream-dependent operation probably cause wrong biz logic.
// Perhaps we should not provide a separate callback for this case instead
// of providing the config `performRawSeries`. The stream-dependent operaions
// and stream-independent operations should better not be mixed.
performArgs
.
skip
=
!
stageHandler
.
performRawSeries
&&
ecModel
.
isSeriesFiltered
(
task
.
context
.
model
);
updatePayload
(
task
,
payload
);
...
...
test/stream-filter2.html
0 → 100644
浏览文件 @
02115782
<!DOCTYPE html>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<html>
<head>
<meta
charset=
"utf-8"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
/>
<script
src=
"lib/esl.js"
></script>
<script
src=
"lib/config.js"
></script>
<script
src=
"lib/jquery.min.js"
></script>
<script
src=
"lib/facePrint.js"
></script>
<script
src=
"lib/testHelper.js"
></script>
<!-- <script src="ut/lib/canteen.js"></script> -->
<link
rel=
"stylesheet"
href=
"lib/reset.css"
/>
</head>
<body>
<style>
</style>
<div
id=
"main0"
></div>
<script>
require
([
'
echarts
'
/*, 'map/js/china' */
],
function
(
echarts
)
{
var
option
;
option
=
{
legend
:
{
left
:
'
center
'
,
data
:
[
'
K
'
,
'
CK
'
],
selected
:
{
'
K
'
:
false
,
'
CK
'
:
true
}
},
grid
:
[{
left
:
'
10%
'
,
right
:
'
10%
'
,
height
:
'
50%
'
}],
xAxis
:
[{
type
:
'
category
'
,
boundaryGap
:
true
,
axisLine
:
{
onZero
:
false
},
splitLine
:
{
show
:
false
},
data
:
[
'
2012-10-10
'
]
}],
yAxis
:
[{
scale
:
true
,
splitArea
:
{
show
:
true
}
}],
axisPointer
:
{
link
:
[{
xAxisIndex
:
[
0
,
1
]
}]
},
dataZoom
:
[
{
type
:
'
inside
'
,
xAxisIndex
:
[
0
,
0
],
start
:
0
,
end
:
100
}
],
tooltip
:
{
trigger
:
'
axis
'
,
axisPointer
:
{
type
:
'
line
'
}
},
toolbox
:
{
show
:
true
,
feature
:
{
dataZoom
:
{
yAxisIndex
:
false
},
dataView
:
{
readOnly
:
false
},
restore
:
{},
saveAsImage
:
{}
}
},
series
:
[
{
name
:
'
K
'
,
type
:
'
candlestick
'
,
itemStyle
:
{
normal
:
{
color
:
'
#B22222
'
,
color0
:
'
#008000
'
,
opacity
:
0.4
}
},
data
:
[
[
2993.9617
,
3007.8834
,
2989.8125
,
3026.3834
,
20861480200.0
,
221201755725.0
]
]
},
{
name
:
'
CK
'
,
type
:
'
candlestick
'
,
data
:
[
[
2934.3873
,
2954.6415
,
2934.3873
,
2954.6415
]
]
}
]
};
var
chart
=
testHelper
.
create
(
echarts
,
'
main0
'
,
{
title
:
[
'
The chart should rendered normally when a series is filtered
'
],
option
:
option
// height: 300,
// buttons: [{text: 'btn-txt', onclick: function () {}}],
// recordCanvas: true,
});
});
</script>
</body>
</html>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录