Merge pull request #13654 from apache/release-next

release: 5.0.0-rc.3

Merge pull request #13654 from apache/release-next
release: 5.0.0-rc.3
de46c551 · sushuang · GitHub · 3d6e3ea8 · a0c485ce · de46c551
15 changed file
--- a/dist/echarts.common.js
+++ b/dist/echarts.common.js
@@ -189,7 +189,7 @@
    }

    if (typeof console !== 'undefined') {
-      console.error.apply(args);
+      console.error.apply(console, args);
    }
  }

@@ -3698,7 +3698,7 @@
      this._target = target;
      this._loop = loop;

-      if (loop) {
+      if (loop && additiveTo) {
        logError('Can\' use additive animation on looped animation.');
        return;
      }
@@ -14046,7 +14046,7 @@
    ZRender.prototype.refreshHoverImmediately = function () {
      this._needsRefreshHover = false;

-      if (this.painter.refreshHover) {
+      if (this.painter.refreshHover && this.painter.getType() === 'canvas') {
        this.painter.refreshHover();
      }
    };
@@ -14150,7 +14150,7 @@
    painterCtors[name] = Ctor;
  }

-  var version = '5.0.0';
+  var version = '5.0.1';
  var zrender = /*#__PURE__*/Object.freeze({
    __proto__: null,
    init: init,
@@ -17371,7 +17371,7 @@
  var fullDayFormatter = '{yyyy}-{MM}-{dd}';
  var fullLeveledFormatter = {
    year: '{yyyy}',
-    month: '{yyyy}:{MM}',
+    month: '{yyyy}-{MM}',
    day: fullDayFormatter,
    hour: fullDayFormatter + ' ' + defaultLeveledFormatter.hour,
    minute: fullDayFormatter + ' ' + defaultLeveledFormatter.minute,
@@ -26925,7 +26925,7 @@

  var wmUniqueIndex = Math.round(Math.random() * 9);

-  var WeakMap$1 = function () {
+  var WeakMap = function () {
    function WeakMap() {
      this._id = '__ec_inner_' + wmUniqueIndex++;
    }
@@ -27224,7 +27224,7 @@
    return symbolPath;
  }

-  var decalMap = new WeakMap$1();
+  var decalMap = new WeakMap();
  var decalCache = new LRU(100);
  var decalKeys = ['symbol', 'symbolSize', 'symbolKeepAspect', 'color', 'backgroundColor', 'dashArrayX', 'dashArrayY', 'dashLineOffset', 'maxTileWidth', 'maxTileHeight'];

@@ -27607,7 +27607,7 @@
  var isObject$2 = isObject;
  var version$1 = '5.0.0';
  var dependencies = {
-    zrender: '5.0.0'
+    zrender: '5.0.1'
  };
  var TEST_FRAME_REMAIN_TIME = 1;
  var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
@@ -52930,6 +52930,10 @@
    return value.type === 'radial';
  }

+  function isGradient(value) {
+    return value && (value.type === 'linear' || value.type === 'radial');
+  }
+
  var GradientManager = function (_super) {
    __extends(GradientManager, _super);

@@ -52943,7 +52947,7 @@
        each(['fill', 'stroke'], function (fillOrStroke) {
          var value = displayable.style[fillOrStroke];

-          if (value && (value.type === 'linear' || value.type === 'radial')) {
+          if (isGradient(value)) {
            var gradient = value;
            var defs = that_1.getDefs(true);
            var dom = void 0;
@@ -52986,6 +52990,10 @@
    };

    GradientManager.prototype.update = function (gradient) {
+      if (!isGradient(gradient)) {
+        return;
+      }
+
      var that = this;
      this.doUpdate(gradient, function () {
        var dom = gradient.__dom;
@@ -53211,7 +53219,7 @@
        }

        if (isPattern(displayable.style.stroke)) {
-          _super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.fill));
+          _super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.stroke));
        }
      }
    };
--- a/dist/echarts.common.js.map
+++ b/dist/echarts.common.js.map
--- a/dist/echarts.common.min.js
+++ b/dist/echarts.common.min.js
--- a/dist/echarts.esm.js
+++ b/dist/echarts.esm.js
@@ -186,7 +186,7 @@ function logError() {
  }

  if (typeof console !== 'undefined') {
-    console.error.apply(args);
+    console.error.apply(console, args);
  }
 }

@@ -3695,7 +3695,7 @@ var Animator = function () {
    this._target = target;
    this._loop = loop;

-    if (loop) {
+    if (loop && additiveTo) {
      logError('Can\' use additive animation on looped animation.');
      return;
    }
@@ -15430,7 +15430,7 @@ var ZRender = function () {
  ZRender.prototype.refreshHoverImmediately = function () {
    this._needsRefreshHover = false;

-    if (this.painter.refreshHover) {
+    if (this.painter.refreshHover && this.painter.getType() === 'canvas') {
      this.painter.refreshHover();
    }
  };
@@ -15534,7 +15534,7 @@ function registerPainter(name, Ctor) {
  painterCtors[name] = Ctor;
 }

-var version = '5.0.0';
+var version = '5.0.1';
 var zrender = /*#__PURE__*/Object.freeze({
  __proto__: null,
  init: init,
@@ -18819,7 +18819,7 @@ var defaultLeveledFormatter = {
 var fullDayFormatter = '{yyyy}-{MM}-{dd}';
 var fullLeveledFormatter = {
  year: '{yyyy}',
-  month: '{yyyy}:{MM}',
+  month: '{yyyy}-{MM}',
  day: fullDayFormatter,
  hour: fullDayFormatter + ' ' + defaultLeveledFormatter.hour,
  minute: fullDayFormatter + ' ' + defaultLeveledFormatter.minute,
@@ -28492,7 +28492,7 @@ function findEventDispatcher(target, det, returnFirstMatch) {

 var wmUniqueIndex = Math.round(Math.random() * 9);

-var WeakMap$1 = function () {
+var WeakMap = function () {
  function WeakMap() {
    this._id = '__ec_inner_' + wmUniqueIndex++;
  }
@@ -28791,7 +28791,7 @@ function createSymbol(symbolType, x, y, w, h, color, keepAspect) {
  return symbolPath;
 }

-var decalMap = new WeakMap$1();
+var decalMap = new WeakMap();
 var decalCache = new LRU(100);
 var decalKeys = ['symbol', 'symbolSize', 'symbolKeepAspect', 'color', 'backgroundColor', 'dashArrayX', 'dashArrayY', 'dashLineOffset', 'maxTileWidth', 'maxTileHeight'];

@@ -29174,7 +29174,7 @@ var isFunction$1 = isFunction;
 var isObject$2 = isObject;
 var version$1 = '5.0.0';
 var dependencies = {
-  zrender: '5.0.0'
+  zrender: '5.0.1'
 };
 var TEST_FRAME_REMAIN_TIME = 1;
 var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
@@ -65915,7 +65915,7 @@ var GeoView = function (_super) {
    var current = e.target;
    var eventData;

-    while ((eventData = getECData(current).eventData) == null) {
+    while (current && (eventData = getECData(current).eventData) == null) {
      current = current.__hostTarget || current.parent;
    }

@@ -79410,6 +79410,10 @@ function isRadialGradient(value) {
  return value.type === 'radial';
 }

+function isGradient(value) {
+  return value && (value.type === 'linear' || value.type === 'radial');
+}
+
 var GradientManager = function (_super) {
  __extends(GradientManager, _super);

@@ -79423,7 +79427,7 @@ var GradientManager = function (_super) {
      each(['fill', 'stroke'], function (fillOrStroke) {
        var value = displayable.style[fillOrStroke];

-        if (value && (value.type === 'linear' || value.type === 'radial')) {
+        if (isGradient(value)) {
          var gradient = value;
          var defs = that_1.getDefs(true);
          var dom = void 0;
@@ -79466,6 +79470,10 @@ var GradientManager = function (_super) {
  };

  GradientManager.prototype.update = function (gradient) {
+    if (!isGradient(gradient)) {
+      return;
+    }
+
    var that = this;
    this.doUpdate(gradient, function () {
      var dom = gradient.__dom;
@@ -79691,7 +79699,7 @@ var PatternManager = function (_super) {
      }

      if (isPattern(displayable.style.stroke)) {
-        _super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.fill));
+        _super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.stroke));
      }
    }
  };
--- a/dist/echarts.esm.js.map
+++ b/dist/echarts.esm.js.map
--- a/dist/echarts.esm.min.js
+++ b/dist/echarts.esm.min.js
--- a/dist/echarts.js
+++ b/dist/echarts.js
@@ -189,7 +189,7 @@
    }

    if (typeof console !== 'undefined') {
-      console.error.apply(args);
+      console.error.apply(console, args);
    }
  }

@@ -3698,7 +3698,7 @@
      this._target = target;
      this._loop = loop;

-      if (loop) {
+      if (loop && additiveTo) {
        logError('Can\' use additive animation on looped animation.');
        return;
      }
@@ -15433,7 +15433,7 @@
    ZRender.prototype.refreshHoverImmediately = function () {
      this._needsRefreshHover = false;

-      if (this.painter.refreshHover) {
+      if (this.painter.refreshHover && this.painter.getType() === 'canvas') {
        this.painter.refreshHover();
      }
    };
@@ -15537,7 +15537,7 @@
    painterCtors[name] = Ctor;
  }

-  var version = '5.0.0';
+  var version = '5.0.1';
  var zrender = /*#__PURE__*/Object.freeze({
    __proto__: null,
    init: init,
@@ -18822,7 +18822,7 @@
  var fullDayFormatter = '{yyyy}-{MM}-{dd}';
  var fullLeveledFormatter = {
    year: '{yyyy}',
-    month: '{yyyy}:{MM}',
+    month: '{yyyy}-{MM}',
    day: fullDayFormatter,
    hour: fullDayFormatter + ' ' + defaultLeveledFormatter.hour,
    minute: fullDayFormatter + ' ' + defaultLeveledFormatter.minute,
@@ -28495,7 +28495,7 @@

  var wmUniqueIndex = Math.round(Math.random() * 9);

-  var WeakMap$1 = function () {
+  var WeakMap = function () {
    function WeakMap() {
      this._id = '__ec_inner_' + wmUniqueIndex++;
    }
@@ -28794,7 +28794,7 @@
    return symbolPath;
  }

-  var decalMap = new WeakMap$1();
+  var decalMap = new WeakMap();
  var decalCache = new LRU(100);
  var decalKeys = ['symbol', 'symbolSize', 'symbolKeepAspect', 'color', 'backgroundColor', 'dashArrayX', 'dashArrayY', 'dashLineOffset', 'maxTileWidth', 'maxTileHeight'];

@@ -29177,7 +29177,7 @@
  var isObject$2 = isObject;
  var version$1 = '5.0.0';
  var dependencies = {
-    zrender: '5.0.0'
+    zrender: '5.0.1'
  };
  var TEST_FRAME_REMAIN_TIME = 1;
  var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
@@ -65918,7 +65918,7 @@
      var current = e.target;
      var eventData;

-      while ((eventData = getECData(current).eventData) == null) {
+      while (current && (eventData = getECData(current).eventData) == null) {
        current = current.__hostTarget || current.parent;
      }

@@ -79413,6 +79413,10 @@
    return value.type === 'radial';
  }

+  function isGradient(value) {
+    return value && (value.type === 'linear' || value.type === 'radial');
+  }
+
  var GradientManager = function (_super) {
    __extends(GradientManager, _super);

@@ -79426,7 +79430,7 @@
        each(['fill', 'stroke'], function (fillOrStroke) {
          var value = displayable.style[fillOrStroke];

-          if (value && (value.type === 'linear' || value.type === 'radial')) {
+          if (isGradient(value)) {
            var gradient = value;
            var defs = that_1.getDefs(true);
            var dom = void 0;
@@ -79469,6 +79473,10 @@
    };

    GradientManager.prototype.update = function (gradient) {
+      if (!isGradient(gradient)) {
+        return;
+      }
+
      var that = this;
      this.doUpdate(gradient, function () {
        var dom = gradient.__dom;
@@ -79694,7 +79702,7 @@
        }

        if (isPattern(displayable.style.stroke)) {
-          _super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.fill));
+          _super.prototype.markDomUsed.call(this, patternDomMap.get(displayable.style.stroke));
        }
      }
    };
--- a/dist/echarts.js.map
+++ b/dist/echarts.js.map
--- a/dist/echarts.min.js
+++ b/dist/echarts.min.js
--- a/dist/echarts.simple.js
+++ b/dist/echarts.simple.js
@@ -189,7 +189,7 @@
    }

    if (typeof console !== 'undefined') {
-      console.error.apply(args);
+      console.error.apply(console, args);
    }
  }

@@ -3349,7 +3349,7 @@
      this._target = target;
      this._loop = loop;

-      if (loop) {
+      if (loop && additiveTo) {
        logError('Can\' use additive animation on looped animation.');
        return;
      }
@@ -13614,7 +13614,7 @@
    ZRender.prototype.refreshHoverImmediately = function () {
      this._needsRefreshHover = false;

-      if (this.painter.refreshHover) {
+      if (this.painter.refreshHover && this.painter.getType() === 'canvas') {
        this.painter.refreshHover();
      }
    };
@@ -16575,7 +16575,7 @@
  var fullDayFormatter = '{yyyy}-{MM}-{dd}';
  var fullLeveledFormatter = {
    year: '{yyyy}',
-    month: '{yyyy}:{MM}',
+    month: '{yyyy}-{MM}',
    day: fullDayFormatter,
    hour: fullDayFormatter + ' ' + defaultLeveledFormatter.hour,
    minute: fullDayFormatter + ' ' + defaultLeveledFormatter.minute,
@@ -26269,7 +26269,7 @@
  var isObject$2 = isObject;
  var version = '5.0.0';
  var dependencies = {
-    zrender: '5.0.0'
+    zrender: '5.0.1'
  };
  var TEST_FRAME_REMAIN_TIME = 1;
  var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
--- a/dist/echarts.simple.js.map
+++ b/dist/echarts.simple.js.map
--- a/dist/echarts.simple.min.js
+++ b/dist/echarts.simple.min.js
--- a/package-lock.json
+++ b/package-lock.json
@@ -9534,9 +9534,9 @@
      }
    },
    "zrender": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.0.0.tgz",
-      "integrity": "sha512-bOHqJkAKQOEbEXNNSbHUrXQybeOjR3lXyHebSn7LYVvXmXaYQHEaVwT6q2AItNl18EdMBcMrrZPgmLM8ZgJMjg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.0.1.tgz",
+      "integrity": "sha512-i8FNCKAKfF0EfZFJ6w2p30umBrCyy481/PePFQqPdtNgCl5Hp5z7/dovqb7soEoFkhNvhjJ/J4W9zFALeae6yA==",
      "requires": {
        "tslib": "1.10.0"
      }

--- a/package.json
+++ b/package.json
@@ -37,8 +37,8 @@
    "lint:dist": "echo 'It might take a while. Please wait ...' && ./node_modules/.bin/jshint --config .jshintrc-dist dist/echarts.js"
  },
  "dependencies": {
-    "zrender": "5.0.0",
-    "tslib": "1.10.0"
+    "tslib": "1.10.0",
+    "zrender": "5.0.1"
  },
  "devDependencies": {
    "@babel/core": "7.3.4",

--- a/src/echarts.ts
+++ b/src/echarts.ts
@@ -120,7 +120,7 @@ const isObject = zrUtil.isObject;
 export const version = '5.0.0';

 export const dependencies = {
-    zrender: '5.0.0'
+    zrender: '5.0.1'
 };

 const TEST_FRAME_REMAIN_TIME = 1;