Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
missman
incubator-echarts
提交
3cbd28d0
I
incubator-echarts
项目概览
missman
/
incubator-echarts
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
3cbd28d0
编写于
12月 21, 2017
作者:
S
sushuang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update transform
上级
23a1ab78
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
100 addition
and
62 deletion
+100
-62
src/action/geoRoam.js
src/action/geoRoam.js
+1
-1
src/chart/lines/LinesView.js
src/chart/lines/LinesView.js
+4
-0
src/chart/lines/linesLayout.js
src/chart/lines/linesLayout.js
+2
-2
src/component/timeline/SliderTimelineView.js
src/component/timeline/SliderTimelineView.js
+1
-1
src/coord/cartesian/Grid.js
src/coord/cartesian/Grid.js
+2
-2
src/echarts.js
src/echarts.js
+49
-8
src/layout/points.js
src/layout/points.js
+0
-32
src/stream/Scheduler.js
src/stream/Scheduler.js
+7
-2
src/util/layout.js
src/util/layout.js
+1
-1
src/view/Chart.js
src/view/Chart.js
+33
-13
未找到文件。
src/action/geoRoam.js
浏览文件 @
3cbd28d0
...
...
@@ -14,7 +14,7 @@ import {updateCenterAndZoom} from './roamHelper';
echarts
.
registerAction
({
type
:
'
geoRoam
'
,
event
:
'
geoRoam
'
,
update
:
'
update
Layout
'
update
:
'
update
Transform
'
},
function
(
payload
,
ecModel
)
{
var
componentType
=
payload
.
componentType
||
'
series
'
;
...
...
src/chart/lines/LinesView.js
浏览文件 @
3cbd28d0
...
...
@@ -14,6 +14,8 @@ export default echarts.extendChartView({
init
:
function
()
{},
render
:
function
(
seriesModel
,
ecModel
,
api
)
{
this
.
remove
(
ecModel
,
api
);
var
data
=
seriesModel
.
getData
();
var
lineDraw
=
this
.
_updateLineDraw
(
data
,
seriesModel
);
...
...
@@ -65,6 +67,8 @@ export default echarts.extendChartView({
},
incrementalPrepareRender
:
function
(
seriesModel
,
ecModel
,
api
)
{
this
.
remove
(
ecModel
,
api
);
var
data
=
seriesModel
.
getData
();
var
lineDraw
=
this
.
_updateLineDraw
(
data
,
seriesModel
);
lineDraw
.
incrementalPrepareRender
(
data
);
...
...
src/chart/lines/linesLayout.js
浏览文件 @
3cbd28d0
...
...
@@ -44,8 +44,8 @@ export default {
var
pts
=
[];
if
(
isPolyline
)
{
for
(
var
i
=
0
;
i
<
len
;
i
++
)
{
pts
.
push
(
coordSys
.
dataToPoint
(
lineCoords
[
i
]));
for
(
var
j
=
0
;
j
<
len
;
j
++
)
{
pts
.
push
(
coordSys
.
dataToPoint
(
lineCoords
[
j
]));
}
}
else
{
...
...
src/component/timeline/SliderTimelineView.js
浏览文件 @
3cbd28d0
...
...
@@ -222,7 +222,7 @@ export default TimelineView.extend({
var
viewRect
=
layoutInfo
.
viewRect
;
if
(
layoutInfo
.
orient
===
'
vertical
'
)
{
// transf
ro
m to horizontal, inverse rotate by left-top point.
// transf
or
m to horizontal, inverse rotate by left-top point.
var
m
=
matrix
.
create
();
var
rotateOriginX
=
viewRect
.
x
;
var
rotateOriginY
=
viewRect
.
y
+
viewRect
.
height
;
...
...
src/coord/cartesian/Grid.js
浏览文件 @
3cbd28d0
...
...
@@ -214,7 +214,7 @@ gridProto.resize = function (gridModel, api, ignoreContainLabel) {
var
extent
=
isHorizontal
?
[
0
,
gridRect
.
width
]
:
[
0
,
gridRect
.
height
];
var
idx
=
axis
.
inverse
?
1
:
0
;
axis
.
setExtent
(
extent
[
idx
],
extent
[
1
-
idx
]);
updateAxisTransf
ro
m
(
axis
,
isHorizontal
?
gridRect
.
x
:
gridRect
.
y
);
updateAxisTransf
or
m
(
axis
,
isHorizontal
?
gridRect
.
x
:
gridRect
.
y
);
});
}
};
...
...
@@ -535,7 +535,7 @@ gridProto.getTooltipAxes = function (dim) {
/**
* @inner
*/
function
updateAxisTransf
ro
m
(
axis
,
coordBase
)
{
function
updateAxisTransf
or
m
(
axis
,
coordBase
)
{
var
axisExtent
=
axis
.
getExtent
();
var
axisExtentSum
=
axisExtent
[
0
]
+
axisExtent
[
1
];
...
...
src/echarts.js
浏览文件 @
3cbd28d0
...
...
@@ -281,7 +281,7 @@ echartsProto._onframe = function () {
// console.log('------------- ec frame visual -------------', remainTime);
scheduler
.
performStageTasks
(
visualFuncs
,
ecModel
);
performR
ender
(
this
,
this
.
_model
,
this
.
_api
,
'
none
'
);
r
ender
(
this
,
this
.
_model
,
this
.
_api
,
'
none
'
);
remainTime
-=
(
+
new
Date
()
-
startTime
);
}
...
...
@@ -781,7 +781,7 @@ var updateMethods = {
clearColorPalette
(
ecModel
);
scheduler
.
performStageTasks
(
visualFuncs
,
ecModel
,
payload
);
performR
ender
(
this
,
ecModel
,
api
,
payload
,
true
);
r
ender
(
this
,
ecModel
,
api
,
payload
,
true
);
// Set background
var
backgroundColor
=
ecModel
.
get
(
'
backgroundColor
'
)
||
'
transparent
'
;
...
...
@@ -829,6 +829,46 @@ var updateMethods = {
// console.profile && console.profileEnd('update');
},
/**
* @param {Object} payload
* @private
*/
updateTransform
:
function
(
payload
)
{
var
ecModel
=
this
.
_model
;
var
ecIns
=
this
;
var
api
=
this
.
_api
;
// update before setOption
if
(
!
ecModel
)
{
return
;
}
ChartView
.
markUpdateMethod
(
payload
,
'
updateTransform
'
);
var
seriesModels
=
[];
ecModel
.
eachSeries
(
function
(
seriesModel
)
{
var
chartView
=
ecIns
.
_chartsMap
[
seriesModel
.
__viewId
];
if
(
chartView
.
updateTransform
)
{
var
result
=
chartView
.
updateTransform
&&
chartView
.
updateTransform
(
seriesModel
,
ecModel
,
api
,
payload
);
result
&&
result
.
update
&&
seriesModels
.
push
(
seriesModel
);
}
else
{
seriesModels
.
push
(
seriesModel
);
}
});
// Keep pipe to the exist pipeline because it depends on the render task of the full pipeline.
// this._scheduler.performStageTasks(visualFuncs, ecModel, payload, 'layout', true);
this
.
_scheduler
.
performStageTasks
(
visualFuncs
,
ecModel
,
payload
,
{
setDirty
:
true
,
seriesModels
:
seriesModels
}
);
render
(
this
,
ecModel
,
this
.
_api
,
payload
,
true
,
seriesModels
);
performPostUpdateFuncs
(
ecModel
,
this
.
_api
);
},
/**
* @param {Object} payload
* @private
...
...
@@ -848,7 +888,7 @@ var updateMethods = {
// Keep pipe to the exist pipeline because it depends on the render task of the full pipeline.
this
.
_scheduler
.
performStageTasks
(
visualFuncs
,
ecModel
,
payload
,
{
setDirty
:
true
});
performR
ender
(
this
,
this
.
_model
,
this
.
_api
,
payload
,
true
);
r
ender
(
this
,
this
.
_model
,
this
.
_api
,
payload
,
true
);
performPostUpdateFuncs
(
ecModel
,
this
.
_api
);
},
...
...
@@ -872,7 +912,7 @@ var updateMethods = {
// Keep pipe to the exist pipeline because it depends on the render task of the full pipeline.
this
.
_scheduler
.
performStageTasks
(
visualFuncs
,
ecModel
,
payload
,
{
visualType
:
'
visual
'
,
setDirty
:
true
});
performR
ender
(
this
,
this
.
_model
,
this
.
_api
,
payload
,
true
);
r
ender
(
this
,
this
.
_model
,
this
.
_api
,
payload
,
true
);
performPostUpdateFuncs
(
ecModel
,
this
.
_api
);
},
...
...
@@ -895,7 +935,7 @@ var updateMethods = {
// this._scheduler.performStageTasks(visualFuncs, ecModel, payload, 'layout', true);
this
.
_scheduler
.
performStageTasks
(
visualFuncs
,
ecModel
,
payload
,
{
setDirty
:
true
});
performR
ender
(
this
,
this
.
_model
,
this
.
_api
,
payload
,
true
);
r
ender
(
this
,
this
.
_model
,
this
.
_api
,
payload
,
true
);
performPostUpdateFuncs
(
ecModel
,
this
.
_api
);
}
...
...
@@ -1326,7 +1366,7 @@ function clearColorPalette(ecModel) {
* Render each chart and component
* @private
*/
function
performRender
(
ecIns
,
ecModel
,
api
,
payload
,
isReset
)
{
function
render
(
ecIns
,
ecModel
,
api
,
payload
,
isReset
,
seriesModels
)
{
if
(
isReset
)
{
// Render all components
each
(
ecIns
.
_componentsViews
,
function
(
componentView
)
{
...
...
@@ -1344,7 +1384,8 @@ function performRender(ecIns, ecModel, api, payload, isReset) {
// Render all charts
var
scheduler
=
ecIns
.
_scheduler
;
var
unfinished
;
ecModel
.
eachSeries
(
function
(
seriesModel
)
{
seriesModels
?
each
(
seriesModels
,
doEach
)
:
ecModel
.
eachSeries
(
doEach
);
function
doEach
(
seriesModel
)
{
var
chartView
=
ecIns
.
_chartsMap
[
seriesModel
.
__viewId
];
chartView
.
__alive
=
true
;
...
...
@@ -1360,7 +1401,7 @@ function performRender(ecIns, ecModel, api, payload, isReset) {
updateZ
(
seriesModel
,
chartView
);
// ??? updateProgressiveAndBlend(seriesModel, chartView);
}
);
}
scheduler
.
unfinished
|=
unfinished
;
// If use hover layer
...
...
src/layout/points.js
浏览文件 @
3cbd28d0
...
...
@@ -35,35 +35,3 @@ export default function (seriesType) {
}
};
}
// function createTask(seriesType, seriesModel) {
// var coordSys = seriesModel.coordinateSystem;
// if (!coordSys) {
// return;
// }
// var data = seriesModel.getData();
// var dims = [];
// for (var i = 0; i < coordSys.dimensions.length; i++) {
// dims.push(seriesModel.coordDimToDataDim(coordSys.dimensions[i])[0]);
// }
// var task;
// // ??? no task support ?
// if (dims.length === 1) {
// task = data.createEachTask(dims[0], function (x, idx) {
// // Also {Array.<number>}, not undefined to avoid if...else... statement
// data.setItemLayout(idx, isNaN(x) ? [NaN, NaN] : coordSys.dataToPoint(x));
// });
// }
// else if (dims.length === 2) {
// task = data.createEachTask(dims, function (x, y, idx) {
// // Also {Array.<number>}, not undefined to avoid if...else... statement
// data.setItemLayout(
// idx, (isNaN(x) || isNaN(y)) ? [NaN, NaN] : coordSys.dataToPoint([x, y])
// );
// });
// }
// return task;
// }
src/stream/Scheduler.js
浏览文件 @
3cbd28d0
...
...
@@ -131,13 +131,18 @@ proto.performStageTasks = function (stageHandlers, ecModel, payload, opt) {
}
}
else
if
(
seriesTaskMap
)
{
stageHandler
.
seriesType
?
e
cModel
.
eachRawSeriesByType
(
stageHandler
.
seriesType
,
eachSeries
)
opt
.
seriesModels
?
e
ach
(
opt
.
seriesModels
,
eachSeries
)
:
ecModel
.
eachRawSeries
(
eachSeries
);
}
function
eachSeries
(
seriesModel
)
{
var
task
=
seriesTaskMap
.
get
(
seriesModel
.
uid
);
if
(
!
task
)
{
return
;
}
if
(
opt
.
setDirty
)
{
task
.
dirty
();
unfinished
=
true
;
...
...
src/util/layout.js
浏览文件 @
3cbd28d0
...
...
@@ -339,7 +339,7 @@ export function positionElement(el, positionInfo, containerRect, margin, opt) {
);
// Because 'tranlate' is the last step in transform
// (see zrender/core/Transformable#getLocalTransf
ro
m),
// (see zrender/core/Transformable#getLocalTransf
or
m),
// we can just only modify el.position to get final result.
var
elPos
=
el
.
position
;
var
dx
=
h
?
positionInfo
.
x
-
rect
.
x
:
0
;
...
...
src/view/Chart.js
浏览文件 @
3cbd28d0
...
...
@@ -32,14 +32,14 @@ Chart.prototype = {
type
:
'
chart
'
,
/**
* Init the chart
* Init the chart
.
* @param {module:echarts/model/Global} ecModel
* @param {module:echarts/ExtensionAPI} api
*/
init
:
function
(
ecModel
,
api
)
{},
/**
* Render the chart
* Render the chart
.
* @param {module:echarts/model/Series} seriesModel
* @param {module:echarts/model/Global} ecModel
* @param {module:echarts/ExtensionAPI} api
...
...
@@ -48,7 +48,7 @@ Chart.prototype = {
render
:
function
(
seriesModel
,
ecModel
,
api
,
payload
)
{},
/**
* Highlight series or specified data item
* Highlight series or specified data item
.
* @param {module:echarts/model/Series} seriesModel
* @param {module:echarts/model/Global} ecModel
* @param {module:echarts/ExtensionAPI} api
...
...
@@ -59,7 +59,7 @@ Chart.prototype = {
},
/**
* Downplay series or specified data item
* Downplay series or specified data item
.
* @param {module:echarts/model/Series} seriesModel
* @param {module:echarts/model/Global} ecModel
* @param {module:echarts/ExtensionAPI} api
...
...
@@ -70,7 +70,7 @@ Chart.prototype = {
},
/**
* Remove self
* Remove self
.
* @param {module:echarts/model/Global} ecModel
* @param {module:echarts/ExtensionAPI} api
*/
...
...
@@ -79,19 +79,39 @@ Chart.prototype = {
},
/**
* Dispose self
* Dispose self
.
* @param {module:echarts/model/Global} ecModel
* @param {module:echarts/ExtensionAPI} api
*/
dispose
:
function
()
{},
/**
* Rendering preparation in progressive mode.
* @param {module:echarts/model/Series} seriesModel
* @param {module:echarts/model/Global} ecModel
* @param {module:echarts/ExtensionAPI} api
* @param {Object} payload
*/
incrementalPrepareRender
:
null
,
/**
* Render in progressive mode.
* @param {module:echarts/model/Series} seriesModel
* @param {module:echarts/model/Global} ecModel
* @param {module:echarts/ExtensionAPI} api
* @param {Object} payload
*/
incrementalRender
:
null
,
incrementalPrepareLayout
:
null
,
incrementalLayout
:
null
,
/**
* Update transform directly.
* @param {module:echarts/model/Series} seriesModel
* @param {module:echarts/model/Global} ecModel
* @param {module:echarts/ExtensionAPI} api
* @param {Object} payload
* @return {Object} {update: true}
*/
updateTransform
:
null
/**
* The view contains the given point.
...
...
@@ -166,10 +186,10 @@ function renderTaskReset(context) {
var
incremental
=
context
.
incremental
;
var
view
=
context
.
view
;
if
(
inner
(
view
).
incremental
^
incremental
)
{
view
.
remove
(
ecModel
,
api
);
}
inner
(
view
).
incremental
=
incremental
;
//
if (inner(view).incremental ^ incremental) {
//
view.remove(ecModel, api);
//
}
//
inner(view).incremental = incremental;
var
updateMethod
=
payload
&&
inner
(
payload
).
updateMethod
;
var
methodName
=
incremental
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录