Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
4b8784e8
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,发现更多精彩内容 >>
提交
4b8784e8
编写于
1月 12, 2018
作者:
S
sushuang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix raw series process logic in pipeline.
上级
10bdc9d0
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
22 addition
and
29 deletion
+22
-29
src/component/visualMap/visualEncoding.js
src/component/visualMap/visualEncoding.js
+2
-2
src/echarts.js
src/echarts.js
+1
-1
src/stream/Scheduler.js
src/stream/Scheduler.js
+10
-18
src/stream/task.js
src/stream/task.js
+6
-5
src/visual/seriesColor.js
src/visual/seriesColor.js
+2
-2
src/visual/symbol.js
src/visual/symbol.js
+1
-1
未找到文件。
src/component/visualMap/visualEncoding.js
浏览文件 @
4b8784e8
...
...
@@ -6,7 +6,7 @@ import VisualMapping from '../../visual/VisualMapping';
var
VISUAL_PRIORITY
=
echarts
.
PRIORITY
.
VISUAL
.
COMPONENT
;
echarts
.
registerVisual
(
VISUAL_PRIORITY
,
{
a
llSeries
:
true
,
createOnA
llSeries
:
true
,
reset
:
function
(
seriesModel
,
ecModel
)
{
var
resetDefines
=
[];
ecModel
.
eachComponent
(
'
visualMap
'
,
function
(
visualMapModel
)
{
...
...
@@ -31,7 +31,7 @@ echarts.registerVisual(VISUAL_PRIORITY, {
// Only support color.
echarts
.
registerVisual
(
VISUAL_PRIORITY
,
{
a
llSeries
:
true
,
createOnA
llSeries
:
true
,
reset
:
function
(
seriesModel
,
ecModel
)
{
var
data
=
seriesModel
.
getData
();
var
visualMetaList
=
[];
...
...
src/echarts.js
浏览文件 @
4b8784e8
...
...
@@ -1996,7 +1996,7 @@ export function registerVisual(priority, visualTask) {
}
/**
* @param {Object|Function} fn: {seriesType,
process
RawSeries, reset}
* @param {Object|Function} fn: {seriesType,
createOnAllSeries, perform
RawSeries, reset}
*/
function
normalizeRegister
(
targetList
,
priority
,
fn
,
defaultPriority
,
visualType
)
{
if
(
isFunction
(
priority
)
||
isObject
(
priority
))
{
...
...
src/stream/Scheduler.js
浏览文件 @
4b8784e8
...
...
@@ -2,13 +2,12 @@
* @module echarts/stream/Scheduler
*/
import
{
each
,
assert
,
isFunction
,
createHashMap
,
noop
}
from
'
zrender/src/core/util
'
;
import
{
each
,
isFunction
,
createHashMap
,
noop
}
from
'
zrender/src/core/util
'
;
import
{
createTask
}
from
'
./task
'
;
import
{
getUID
}
from
'
../util/component
'
;
import
GlobalModel
from
'
../model/Global
'
;
import
ExtensionAPI
from
'
../ExtensionAPI
'
;
import
{
normalizeToArray
}
from
'
../util/model
'
;
import
{
__DEV__
}
from
'
../config
'
;
/**
* @constructor
...
...
@@ -170,27 +169,19 @@ function performStageTasks(scheduler, stageHandlers, ecModel, payload, opt) {
// then execute the overall task. And stub will call seriesModel.setData,
// which ensures that in the overallTask seriesModel.getData() will not
// return incorrect data.
ecModel
.
eachRawSeries
(
function
(
seriesModel
)
{
var
task
=
agentStubMap
.
get
(
seriesModel
.
uid
);
task
&&
task
.
perform
(
performArgs
);
agentStubMap
.
each
(
function
(
stub
)
{
stub
.
perform
(
performArgs
);
});
unfinished
|=
overallTask
.
perform
(
performArgs
);
}
else
if
(
seriesTaskMap
)
{
ecModel
.
eachRawSeries
(
function
(
seriesModel
)
{
var
pipelineId
=
seriesModel
.
uid
;
var
task
=
seriesTaskMap
.
get
(
pipelineId
);
if
(
!
task
)
{
return
;
}
seriesTaskMap
.
each
(
function
(
task
,
pipelineId
)
{
if
(
needSetDirty
(
opt
,
task
))
{
task
.
dirty
();
}
var
performArgs
=
scheduler
.
getPerformArgs
(
task
,
opt
.
block
);
// ??? chck skip necessary.
performArgs
.
skip
=
!
stageHandler
.
processRawSeries
&&
ecModel
.
isSeriesFiltered
(
seriesM
odel
);
performArgs
.
skip
=
!
stageHandler
.
performRawSeries
&&
ecModel
.
isSeriesFiltered
(
task
.
context
.
m
odel
);
updatePayload
(
task
,
payload
);
unfinished
|=
task
.
perform
(
performArgs
);
});
...
...
@@ -235,14 +226,15 @@ var updatePayload = proto.updatePayload = function (task, payload) {
};
function
createSeriesStageTask
(
scheduler
,
stageHandler
,
stageHandlerRecord
,
ecModel
,
api
)
{
var
seriesTaskMap
=
stageHandlerRecord
.
seriesTaskMap
||
(
stageHandlerRecord
.
seriesTaskMap
=
createHashMap
());
var
seriesTaskMap
=
stageHandlerRecord
.
seriesTaskMap
||
(
stageHandlerRecord
.
seriesTaskMap
=
createHashMap
());
var
seriesType
=
stageHandler
.
seriesType
;
var
getTargetSeries
=
stageHandler
.
getTargetSeries
;
// If a stageHandler should cover all series, `
a
llSeries` should be declared mandatorily,
// If a stageHandler should cover all series, `
createOnA
llSeries` should be declared mandatorily,
// to avoid some typo or abuse. Otherwise if an extension do not specify a `seriesType`,
// it works but it may cause other irrelevant charts blocked.
if
(
stageHandler
.
a
llSeries
)
{
if
(
stageHandler
.
createOnA
llSeries
)
{
ecModel
.
eachRawSeries
(
create
);
}
else
if
(
seriesType
)
{
...
...
src/stream/task.js
浏览文件 @
4b8784e8
...
...
@@ -41,6 +41,7 @@ var taskProto = Task.prototype;
taskProto
.
perform
=
function
(
performArgs
)
{
var
upTask
=
this
.
_upstream
;
var
skip
=
performArgs
&&
performArgs
.
skip
;
// TODO some refactor.
// Pull data.
...
...
@@ -54,13 +55,13 @@ taskProto.perform = function (performArgs) {
}
var
planResult
;
if
(
this
.
_plan
)
{
if
(
this
.
_plan
&&
!
skip
)
{
planResult
=
this
.
_plan
(
this
.
context
);
}
if
(
this
.
_dirty
||
planResult
===
'
reset
'
)
{
this
.
_dirty
=
false
;
reset
(
this
);
reset
(
this
,
skip
);
}
var
step
=
performArgs
&&
performArgs
.
step
;
...
...
@@ -88,7 +89,7 @@ taskProto.perform = function (performArgs) {
);
var
outputDueEnd
;
!
(
performArgs
&&
performArgs
.
skip
)
&&
start
<
end
&&
(
!
skip
&&
start
<
end
&&
(
outputDueEnd
=
this
.
_progress
({
start
:
start
,
end
:
end
},
this
.
context
)
);
...
...
@@ -120,10 +121,10 @@ taskProto.dirty = function () {
/**
* @param {Object} [params]
*/
function
reset
(
taskIns
)
{
function
reset
(
taskIns
,
skip
)
{
taskIns
.
_dueIndex
=
taskIns
.
_outputDueEnd
=
taskIns
.
_dueEnd
=
0
;
taskIns
.
_progress
=
taskIns
.
_reset
&&
taskIns
.
_reset
(
taskIns
.
_progress
=
!
skip
&&
taskIns
.
_reset
&&
taskIns
.
_reset
(
taskIns
.
context
,
taskIns
.
_upstream
&&
taskIns
.
_upstream
.
context
);
...
...
src/visual/seriesColor.js
浏览文件 @
4b8784e8
import
Gradient
from
'
zrender/src/graphic/Gradient
'
;
export
default
{
a
llSeries
:
true
,
p
rocess
RawSeries
:
true
,
createOnA
llSeries
:
true
,
p
erform
RawSeries
:
true
,
reset
:
function
(
seriesModel
,
ecModel
)
{
var
data
=
seriesModel
.
getData
();
var
colorAccessPath
=
(
seriesModel
.
visualColorAccessPath
||
'
itemStyle.color
'
).
split
(
'
.
'
);
...
...
src/visual/symbol.js
浏览文件 @
4b8784e8
...
...
@@ -3,7 +3,7 @@ export default function (seriesType, defaultSymbolType, legendSymbol) {
// Encoding visual for all series include which is filtered for legend drawing
return
{
seriesType
:
seriesType
,
p
rocess
RawSeries
:
true
,
p
erform
RawSeries
:
true
,
reset
:
function
(
seriesModel
,
ecModel
,
api
)
{
var
data
=
seriesModel
.
getData
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录