[incubator-echarts] 01/02: Merge branch 'next' into label-enhancement

[shenyi]

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

commit bda15a29b7431ce833fcc58f1cceb5a720e9d57c
Merge: 7f53a78 285be45
Author: pissang 
AuthorDate: Wed May 27 13:45:36 2020 +0800

Merge branch 'next' into label-enhancement

 build/dev-fast.js | 37 +++--
 package.json  |  1 -
 2 files changed, 23 insertions(+), 15 deletions(-)


-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org

[incubator-echarts] 01/02: Merge branch 'next' into label-enhancement

[shenyi]

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

commit 8c467f2bcdadbe7e25f021a2fa2dd65854b9d9b3
Merge: 2b8da72 a96d971
Author: pissang 
AuthorDate: Fri Apr 24 14:23:01 2020 +0800

Merge branch 'next' into label-enhancement

 src/echarts.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --cc src/echarts.ts
index ecaa352,d60e366..3121e9f
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@@ -1664,9 -1651,10 +1666,10 @@@ class ECharts extends Eventful 
  renderTask.dirty();
  }
  
 -unfinished |= 
+renderTask.perform(scheduler.getPerformArgs(renderTask));
 +unfinished = 
renderTask.perform(scheduler.getPerformArgs(renderTask)) || unfinished;
  
  chartView.group.silent = !!seriesModel.get('silent');
+ chartView.group.markRedraw();
  
  updateZ(seriesModel, chartView);
  


-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org