Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
alon@wen
echarts
提交
f8f9b634
E
echarts
项目概览
alon@wen
/
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,发现更多精彩内容 >>
提交
f8f9b634
编写于
1月 09, 2018
作者:
S
sushuang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix target series duplicate in task.
上级
1896f720
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
20 deletion
+18
-20
src/component/dataZoom/dataZoomProcessor.js
src/component/dataZoom/dataZoomProcessor.js
+10
-3
src/stream/Scheduler.js
src/stream/Scheduler.js
+2
-13
src/stream/task.js
src/stream/task.js
+1
-1
src/visual/dataColor.js
src/visual/dataColor.js
+5
-3
未找到文件。
src/component/dataZoom/dataZoomProcessor.js
浏览文件 @
f8f9b634
import
*
as
echarts
from
'
../../echarts
'
;
import
{
createHashMap
,
each
}
from
'
zrender/src/core/util
'
;
echarts
.
registerProcessor
({
getTargetSeries
:
function
(
ecModel
)
{
var
seriesModels
=
[];
var
seriesModelMap
=
createHashMap
();
ecModel
.
eachComponent
(
'
dataZoom
'
,
function
(
dataZoomModel
)
{
dataZoomModel
.
eachTargetAxis
(
function
(
dimNames
,
axisIndex
,
dataZoomModel
)
{
var
axisProxy
=
dataZoomModel
.
getAxisProxy
(
dimNames
.
name
,
axisIndex
);
seriesModels
=
seriesModels
.
concat
(
axisProxy
.
getTargetSeriesModels
());
each
(
axisProxy
.
getTargetSeriesModels
(),
function
(
seriesModel
)
{
seriesModelMap
.
set
(
seriesModel
.
uid
,
seriesModel
);
});
});
});
return
seriesModels
;
return
seriesModelMap
;
},
// Consider appendData, where filter should be performed. Because data process is
// in block mode currently, it is not need to worry about that the overallProgress
// execute every frame.
...
...
src/stream/Scheduler.js
浏览文件 @
f8f9b634
...
...
@@ -243,7 +243,7 @@ function createSeriesStageTask(scheduler, stageHandler, stageHandlerRecord, ecMo
ecModel
.
eachRawSeriesByType
(
seriesType
,
create
);
}
else
if
(
getTargetSeries
)
{
each
(
getTargetSeries
(
ecModel
,
api
),
create
);
getTargetSeries
(
ecModel
,
api
).
each
(
create
);
}
function
create
(
seriesModel
)
{
...
...
@@ -311,7 +311,7 @@ function createOverallStageTask(scheduler, stageHandler, stageHandlerRecord, ecM
ecModel
.
eachRawSeriesByType
(
seriesType
,
createStub
);
}
else
if
(
getTargetSeries
)
{
each
(
getTargetSeries
(
ecModel
,
api
),
createStub
);
getTargetSeries
(
ecModel
,
api
).
each
(
createStub
);
}
// Otherwise, (usually it is legancy case), the overall task will only be
// executed when upstream dirty. Otherwise the progressive rendering of all
...
...
@@ -442,12 +442,6 @@ function seriesTaskReset(context, upstreamContext) {
));
unmountTaskMethods
(
this
);
if
(
resetDefines
.
length
)
{
// ???! temp experiment
// if (resetDefines[0].filter) {
// context.model.setData(
// context.outputData = context.data.cloneShallow()
// );
// }
return
seriesTaskProgress
;
}
}
...
...
@@ -467,11 +461,6 @@ function seriesTaskProgress(params, context) {
else
if
(
resetDefine
&&
resetDefine
.
progress
)
{
resetDefine
.
progress
(
params
,
data
);
}
// else if (resetDefine && resetDefine.filter) {
// ???! temp experiment
// if (k !== 0) {throw new Error();}
// return context.data.filterTo(params, context.outputData, resetDefine.filter);
// }
}
unmountTaskMethods
(
this
);
}
...
...
src/stream/task.js
浏览文件 @
f8f9b634
...
...
@@ -132,7 +132,7 @@ taskProto.unfinished = function () {
*/
taskProto
.
pipe
=
function
(
downTask
)
{
if
(
__DEV__
)
{
assert
(
downTask
&&
!
downTask
.
_disposed
);
assert
(
downTask
&&
!
downTask
.
_disposed
&&
downTask
!==
this
);
}
// If already downstream, do not dirty downTask.
...
...
src/visual/dataColor.js
浏览文件 @
f8f9b634
// Pick color from palette for each data item.
// Applicable for charts that require applying color palette
// in data level (like pie, funnel, chord).
import
{
createHashMap
}
from
'
zrender/src/core/util
'
;
export
default
function
(
seriesType
)
{
return
{
getTargetSeries
:
function
(
ecModel
)
{
// Pie and funnel may use diferrent scope
var
paletteScope
=
{};
var
seiresModel
s
=
[]
;
var
seiresModel
Map
=
createHashMap
()
;
ecModel
.
eachSeriesByType
(
seriesType
,
function
(
seriesModel
)
{
seriesModel
.
__paletteScope
=
paletteScope
;
seiresModel
s
.
push
(
seriesModel
);
seiresModel
Map
.
set
(
seriesModel
.
uid
,
seriesModel
);
});
return
seiresModels
;
return
seiresModelMap
;
},
reset
:
function
(
seriesModel
,
ecModel
)
{
var
dataAll
=
seriesModel
.
getRawData
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录