[incubator-echarts] branch master updated: (fix) bar progressive was blocked.

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git


The following commit(s) were added to refs/heads/master by this push:
     new 58efe5a  (fix) bar progressive was blocked.
58efe5a is described below

commit 58efe5a959c367b1927cf24db76ff15e5c800d2f
Author: sushuang <su...@gmail.com>
AuthorDate: Tue Oct 16 02:53:55 2018 +0800

    (fix) bar progressive was blocked.
---
 src/chart/bar.js       | 7 ++++---
 src/echarts.js         | 2 ++
 src/layout/barPolar.js | 7 +------
 src/model/Global.js    | 2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/chart/bar.js b/src/chart/bar.js
index bae5013..db4bbef 100644
--- a/src/chart/bar.js
+++ b/src/chart/bar.js
@@ -28,9 +28,10 @@ import './bar/BarView';
 import '../component/gridSimple';
 
 
-echarts.registerLayout(zrUtil.curry(layout, 'bar'));
-// Should after normal bar layout, otherwise it is blocked by normal bar layout.
-echarts.registerLayout(largeLayout);
+echarts.registerLayout(echarts.PRIORITY.VISUAL.LAYOUT, zrUtil.curry(layout, 'bar'));
+// Use higher prority to avoid to be blocked by other overall layout, which do not
+// only exist in this module, but probably also exist in other modules, like `barPolar`.
+echarts.registerLayout(echarts.PRIORITY.VISUAL.PROGRESSIVE_LAYOUT, largeLayout);
 
 echarts.registerVisual({
     seriesType: 'bar',
diff --git a/src/echarts.js b/src/echarts.js
index 41eb9a7..c505826 100644
--- a/src/echarts.js
+++ b/src/echarts.js
@@ -63,6 +63,7 @@ var PRIORITY_PROCESSOR_FILTER = 1000;
 var PRIORITY_PROCESSOR_STATISTIC = 5000;
 
 var PRIORITY_VISUAL_LAYOUT = 1000;
+var PRIORITY_VISUAL_PROGRESSIVE_LAYOUT = 1100;
 var PRIORITY_VISUAL_GLOBAL = 2000;
 var PRIORITY_VISUAL_CHART = 3000;
 var PRIORITY_VISUAL_COMPONENT = 4000;
@@ -77,6 +78,7 @@ export var PRIORITY = {
     },
     VISUAL: {
         LAYOUT: PRIORITY_VISUAL_LAYOUT,
+        PROGRESSIVE_LAYOUT: PRIORITY_VISUAL_PROGRESSIVE_LAYOUT,
         GLOBAL: PRIORITY_VISUAL_GLOBAL,
         CHART: PRIORITY_VISUAL_CHART,
         COMPONENT: PRIORITY_VISUAL_COMPONENT,
diff --git a/src/layout/barPolar.js b/src/layout/barPolar.js
index 5a418ab..c788e9a 100644
--- a/src/layout/barPolar.js
+++ b/src/layout/barPolar.js
@@ -37,12 +37,6 @@ function getAxisKey(axis) {
  */
 function barLayoutPolar(seriesType, ecModel, api) {
 
-    // FIXME
-    // Revert becuase it brings bar progressive bug.
-    // The complete fix will be added in the next version.
-    var width = api.getWidth();
-    var height = api.getHeight();
-
     var lastStackCoords = {};
 
     var barWidthAndOffset = calRadialBar(
@@ -57,6 +51,7 @@ function barLayoutPolar(seriesType, ecModel, api) {
     );
 
     ecModel.eachSeriesByType(seriesType, function (seriesModel) {
+
         // Check series coordinate, do layout for polar only
         if (seriesModel.coordinateSystem.type !== 'polar') {
             return;
diff --git a/src/model/Global.js b/src/model/Global.js
index 78945c5..a8900e4 100644
--- a/src/model/Global.js
+++ b/src/model/Global.js
@@ -546,7 +546,7 @@ var GlobalModel = Model.extend({
      * After filtering, series may be different.
      * frome raw series.
      *
-     * @parma {string} subType
+     * @param {string} subType.
      * @param {Function} cb
      * @param {*} context
      */


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