This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch label-enhancement
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/label-enhancement by this push:
new 447c0a6 fix(progressive): fix task may not been executed in
progressive rendering.
447c0a6 is described below
commit 447c0a625477cc148214a474943b174c1df5f315
Author: pissang <[email protected]>
AuthorDate: Thu Apr 30 13:07:20 2020 +0800
fix(progressive): fix task may not been executed in progressive rendering.
---
src/component/geo.ts | 1 -
src/component/legend/LegendView.ts | 1 +
src/component/parallel.ts | 1 -
src/component/title.ts | 1 +
src/echarts.ts | 10 ++++------
src/stream/Scheduler.ts | 11 ++++++++---
6 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/component/geo.ts b/src/component/geo.ts
index 44db79e..4f8f8ea 100644
--- a/src/component/geo.ts
+++ b/src/component/geo.ts
@@ -21,7 +21,6 @@
import * as echarts from '../echarts';
import * as zrUtil from 'zrender/src/core/util';
-import '../coord/geo/GeoModel';
import '../coord/geo/geoCreator';
import './geo/GeoView';
import '../action/geoRoam';
diff --git a/src/component/legend/LegendView.ts
b/src/component/legend/LegendView.ts
index dafa108..4a07bc0 100644
--- a/src/component/legend/LegendView.ts
+++ b/src/component/legend/LegendView.ts
@@ -140,6 +140,7 @@ class LegendView extends ComponentView {
);
this.group.x = layoutRect.x - mainRect.x;
this.group.y = layoutRect.y - mainRect.y;
+ this.group.markRedraw();
// Render background after group is layout.
this.group.add(
diff --git a/src/component/parallel.ts b/src/component/parallel.ts
index f273a20..6b691f5 100644
--- a/src/component/parallel.ts
+++ b/src/component/parallel.ts
@@ -23,7 +23,6 @@ import * as zrUtil from 'zrender/src/core/util';
import * as throttleUtil from '../util/throttle';
import parallelPreprocessor from '../coord/parallel/parallelPreprocessor';
import '../coord/parallel/parallelCreator';
-import '../coord/parallel/ParallelModel';
import './parallelAxis';
import GlobalModel from '../model/Global';
import ParallelModel, { ParallelCoordinateSystemOption } from
'../coord/parallel/ParallelModel';
diff --git a/src/component/title.ts b/src/component/title.ts
index c58d6ee..e4e508c 100644
--- a/src/component/title.ts
+++ b/src/component/title.ts
@@ -243,6 +243,7 @@ class TitleView extends ComponentView {
group.x = layoutRect.x;
group.y = layoutRect.y;
+ group.markRedraw();
const alignStyle = {
align: textAlign,
verticalAlign: textVerticalAlign
diff --git a/src/echarts.ts b/src/echarts.ts
index 3121e9f..4b29d76 100644
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@ -1631,8 +1631,6 @@ class ECharts extends Eventful {
const componentModel = componentView.__model;
componentView.render(componentModel, ecModel, api, payload);
- componentView.group.markRedraw();
-
updateZ(componentModel, componentView);
updateHoverEmphasisHandler(componentView);
});
@@ -1654,7 +1652,7 @@ class ECharts extends Eventful {
labelManager.clearLabels();
- let unfinished: boolean;
+ let unfinished: boolean = false;
ecModel.eachSeries(function (seriesModel) {
const chartView = ecIns._chartsMap[seriesModel.__viewId];
chartView.__alive = true;
@@ -1665,11 +1663,11 @@ class ECharts extends Eventful {
if (dirtyMap && dirtyMap.get(seriesModel.uid)) {
renderTask.dirty();
}
-
- unfinished =
renderTask.perform(scheduler.getPerformArgs(renderTask)) || unfinished;
+ if (renderTask.perform(scheduler.getPerformArgs(renderTask))) {
+ unfinished = true;
+ }
chartView.group.silent = !!seriesModel.get('silent');
- chartView.group.markRedraw();
updateZ(seriesModel, chartView);
diff --git a/src/stream/Scheduler.ts b/src/stream/Scheduler.ts
index ff156b7..6bcaa15 100644
--- a/src/stream/Scheduler.ts
+++ b/src/stream/Scheduler.ts
@@ -301,7 +301,7 @@ class Scheduler {
opt?: PerformStageTaskOpt
): void {
opt = opt || {};
- let unfinished: boolean;
+ let unfinished: boolean = false;
const scheduler = this;
each(stageHandlers, function (stageHandler, idx) {
@@ -332,7 +332,9 @@ class Scheduler {
agentStubMap.each(function (stub) {
stub.perform(performArgs);
});
- unfinished = unfinished || overallTask.perform(performArgs);
+ if (overallTask.perform(performArgs)) {
+ unfinished = true;
+ }
}
else if (seriesTaskMap) {
seriesTaskMap.each(function (task, pipelineId) {
@@ -351,7 +353,10 @@ class Scheduler {
performArgs.skip = !stageHandler.performRawSeries
&& ecModel.isSeriesFiltered(task.context.model);
scheduler.updatePayload(task, payload);
- unfinished = unfinished || task.perform(performArgs);
+
+ if (task.perform(performArgs)) {
+ unfinished = true;
+ }
});
}
});
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
