Merge pull request #14778 from apache/release-dev

Release 5.1.1
apache · Apr 23, 2021 · 786af8b · 786af8b
2 parents dad3b3b + 737e23c
commit 786af8b
Show file tree

Hide file tree

Showing 15 changed files with 126 additions and 135 deletions.
diff --git a/dist/echarts.common.js b/dist/echarts.common.js
@@ -28986,7 +28986,7 @@
     var isObject$2 = isObject;
     var indexOf$1 = indexOf;
     var hasWindow = typeof window !== 'undefined';
-    var version$1 = '5.1.0';
+    var version$1 = '5.1.1';
     var dependencies = {
       zrender: '5.1.0'
     };
@@ -44527,11 +44527,8 @@
         var _this = _super.call(this) || this;
 
         _this.z2 = 2;
-        var polyline = new Polyline();
         var text = new ZRText();
 
-        _this.setTextGuideLine(polyline);
-
         _this.setTextContent(text);
 
         _this.updateData(data, idx, startAngle, true);
@@ -44630,8 +44627,6 @@
       };
 
       PiePiece.prototype._updateLabel = function (seriesModel, data, idx) {
-        var _a;
-
         var sector = this;
         var itemModel = data.getItemModel(idx);
         var labelLineModel = itemModel.getModel('labelLine');
@@ -44660,15 +44655,21 @@
         var labelPosition = seriesModel.get(['label', 'position']);
 
         if (labelPosition !== 'outside' && labelPosition !== 'outer') {
-          (_a = sector.getTextGuideLine()) === null || _a === void 0 ? void 0 : _a.hide();
-          return;
-        } // Default use item visual color
+          sector.removeTextGuideLine();
+        } else {
+          var polyline = this.getTextGuideLine();
 
+          if (!polyline) {
+            polyline = new Polyline();
+            this.setTextGuideLine(polyline);
+          } // Default use item visual color
 
-        setLabelLineStyle(this, getLabelLineStatesModels(itemModel), {
-          stroke: visualColor,
-          opacity: retrieve3(labelLineModel.get(['lineStyle', 'opacity']), visualOpacity, 1)
-        });
+
+          setLabelLineStyle(this, getLabelLineStatesModels(itemModel), {
+            stroke: visualColor,
+            opacity: retrieve3(labelLineModel.get(['lineStyle', 'opacity']), visualOpacity, 1)
+          });
+        }
       };
 
       return PiePiece;
@@ -54046,26 +54047,20 @@
       return CSS_TRANSITION_VENDOR + ':' + transitionText;
     }
 
-    function assembleTransform(el, x, y, toString) {
+    function assembleTransform(x, y, toString) {
       // If using float on style, the final width of the dom might
       // keep changing slightly while mouse move. So `toFixed(0)` them.
-      var x0;
-      var y0; // not support transform, use `left` and `top` instead.
+      var x0 = x.toFixed(0) + 'px';
+      var y0 = y.toFixed(0) + 'px'; // not support transform, use `left` and `top` instead.
 
       if (!env.transformSupported) {
-        x0 = x.toFixed(0);
-        y0 = y.toFixed(0);
-        return toString ? "top:" + y0 + "px;left:" + x0 + "px;" : [['top', y0 + "px"], ['left', x0 + "px"]];
+        return toString ? "top:" + y0 + ";left:" + x0 + ";" : [['top', y0], ['left', x0]];
       } // support transform
-      // FIXME: the padding of parent element will affect the position of tooltip
 
 
-      var stl = getComputedStyle(el.parentElement);
-      x0 = (x - parseInt(stl.paddingLeft, 10)).toFixed(0);
-      y0 = (y - parseInt(stl.paddingTop, 10)).toFixed(0);
       var is3d = env.transform3dSupported;
-      var translate = "translate" + (is3d ? '3d' : '') + "(" + x0 + "px," + y0 + "px" + (is3d ? ',0' : '') + ")";
-      return toString ? CSS_TRANSFORM_VENDOR + ':' + translate + ';' : [[TRANSFORM_VENDOR, translate]];
+      var translate = "translate" + (is3d ? '3d' : '') + "(" + x0 + "," + y0 + (is3d ? ',0' : '') + ")";
+      return toString ? 'top:0;left:0;' + CSS_TRANSFORM_VENDOR + ':' + translate + ';' : [['top', 0], ['left', 0], [TRANSFORM_VENDOR, translate]];
     }
     /**
      * @param {Object} textStyle
@@ -54190,8 +54185,7 @@
         if (appendToBody) {
           document.body.appendChild(el);
         } else {
-          // PENDING
-          container.prepend(el);
+          container.appendChild(el);
         }
 
         this._container = container; // FIXME
@@ -54274,7 +54268,7 @@
           style.display = 'none';
         } else {
           style.cssText = gCssText + assembleCssText(tooltipModel, !this._firstShow, this._longHide) // initial transform
-          + assembleTransform(el, styleCoord[0], styleCoord[1], true) + ("border-color:" + convertToColorString(nearPointColor) + ";") + (tooltipModel.get('extraCssText') || '') // If mouse occasionally move over the tooltip, a mouseout event will be
+          + assembleTransform(styleCoord[0], styleCoord[1], true) + ("border-color:" + convertToColorString(nearPointColor) + ";") + (tooltipModel.get('extraCssText') || '') // If mouse occasionally move over the tooltip, a mouseout event will be
           // triggered by canvas, and cause some unexpectable result like dragging
           // stop, "unfocusAdjacency". Here `pointer-events: none` is used to solve
           // it. Although it is not supported by IE8~IE10, fortunately it is a rare
@@ -54331,7 +54325,7 @@
 
         if (styleCoord[0] != null && styleCoord[1] != null) {
           var style_1 = this.el.style;
-          var transforms = assembleTransform(this.el, styleCoord[0], styleCoord[1]);
+          var transforms = assembleTransform(styleCoord[0], styleCoord[1]);
           each(transforms, function (transform) {
             style_1[transform[0]] = transform[1];
           });

diff --git a/dist/echarts.common.js.map b/dist/echarts.common.js.map
diff --git a/dist/echarts.common.min.js b/dist/echarts.common.min.js
diff --git a/dist/echarts.esm.js b/dist/echarts.esm.js
@@ -29260,7 +29260,7 @@ var isFunction$1 = isFunction;
 var isObject$2 = isObject;
 var indexOf$1 = indexOf;
 var hasWindow = typeof window !== 'undefined';
-var version$1 = '5.1.0';
+var version$1 = '5.1.1';
 var dependencies = {
   zrender: '5.1.0'
 };
@@ -44836,11 +44836,8 @@ function (_super) {
     var _this = _super.call(this) || this;
 
     _this.z2 = 2;
-    var polyline = new Polyline();
     var text = new ZRText();
 
-    _this.setTextGuideLine(polyline);
-
     _this.setTextContent(text);
 
     _this.updateData(data, idx, startAngle, true);
@@ -44939,8 +44936,6 @@ function (_super) {
   };
 
   PiePiece.prototype._updateLabel = function (seriesModel, data, idx) {
-    var _a;
-
     var sector = this;
     var itemModel = data.getItemModel(idx);
     var labelLineModel = itemModel.getModel('labelLine');
@@ -44969,15 +44964,21 @@ function (_super) {
     var labelPosition = seriesModel.get(['label', 'position']);
 
     if (labelPosition !== 'outside' && labelPosition !== 'outer') {
-      (_a = sector.getTextGuideLine()) === null || _a === void 0 ? void 0 : _a.hide();
-      return;
-    } // Default use item visual color
+      sector.removeTextGuideLine();
+    } else {
+      var polyline = this.getTextGuideLine();
 
+      if (!polyline) {
+        polyline = new Polyline();
+        this.setTextGuideLine(polyline);
+      } // Default use item visual color
 
-    setLabelLineStyle(this, getLabelLineStatesModels(itemModel), {
-      stroke: visualColor,
-      opacity: retrieve3(labelLineModel.get(['lineStyle', 'opacity']), visualOpacity, 1)
-    });
+
+      setLabelLineStyle(this, getLabelLineStatesModels(itemModel), {
+        stroke: visualColor,
+        opacity: retrieve3(labelLineModel.get(['lineStyle', 'opacity']), visualOpacity, 1)
+      });
+    }
   };
 
   return PiePiece;
@@ -49667,13 +49668,11 @@ function () {
       // location calculation.
 
       var regionGroup = nameMap.get(regionName);
+      var hasRegionGroup = !!regionGroup;
 
-      if (!regionGroup) {
+      if (!hasRegionGroup) {
         regionGroup = nameMap.set(regionName, new Group());
         regionsGroup.add(regionGroup);
-        resetEventTriggerForRegion(viewBuildCtx, regionGroup, regionName, regionModel, mapOrGeoModel, dataIdx);
-        resetTooltipForRegion(viewBuildCtx, regionGroup, regionName, regionModel, mapOrGeoModel);
-        resetStateTriggerForRegion(viewBuildCtx, regionGroup, regionName, regionModel, mapOrGeoModel);
       }
 
       var compoundPath = new CompoundPath({
@@ -49683,6 +49682,14 @@ function () {
         }
       });
       regionGroup.add(compoundPath);
+
+      if (!hasRegionGroup) {
+        // ensure children have been added to group before calling resetEventTriggerForRegion
+        resetEventTriggerForRegion(viewBuildCtx, regionGroup, regionName, regionModel, mapOrGeoModel, dataIdx);
+        resetTooltipForRegion(viewBuildCtx, regionGroup, regionName, regionModel, mapOrGeoModel);
+        resetStateTriggerForRegion(viewBuildCtx, regionGroup, regionName, regionModel, mapOrGeoModel);
+      }
+
       each(region.geometries, function (geometry) {
         if (geometry.type !== 'polygon') {
           return;
@@ -50279,7 +50286,7 @@ function (_super) {
         }
 
         regionGroup.onHoverStateChange = function (toState) {
-          circle.useState(toState);
+          setStatesFlag(circle, toState);
         };
       }
 
@@ -51378,10 +51385,10 @@ function (_super) {
         color: 'rgba(255,215,0,0.8)'
       }
     },
-    regions: [],
-    tooltip: {
-      show: false
-    }
+    regions: [] // tooltip: {
+    //     show: false
+    // }
+
   };
   return GeoModel;
 }(ComponentModel);
@@ -65160,8 +65167,6 @@ function (_super) {
   return EffectSymbol;
 }(Group);
 
-inherits(EffectSymbol, Group);
-
 var EffectScatterView =
 /** @class */
 function (_super) {
@@ -80150,26 +80155,20 @@ function assembleTransition(duration, onlyFade) {
   return CSS_TRANSITION_VENDOR + ':' + transitionText;
 }
 
-function assembleTransform(el, x, y, toString) {
+function assembleTransform(x, y, toString) {
   // If using float on style, the final width of the dom might
   // keep changing slightly while mouse move. So `toFixed(0)` them.
-  var x0;
-  var y0; // not support transform, use `left` and `top` instead.
+  var x0 = x.toFixed(0) + 'px';
+  var y0 = y.toFixed(0) + 'px'; // not support transform, use `left` and `top` instead.
 
   if (!env.transformSupported) {
-    x0 = x.toFixed(0);
-    y0 = y.toFixed(0);
-    return toString ? "top:" + y0 + "px;left:" + x0 + "px;" : [['top', y0 + "px"], ['left', x0 + "px"]];
+    return toString ? "top:" + y0 + ";left:" + x0 + ";" : [['top', y0], ['left', x0]];
   } // support transform
-  // FIXME: the padding of parent element will affect the position of tooltip
 
 
-  var stl = getComputedStyle(el.parentElement);
-  x0 = (x - parseInt(stl.paddingLeft, 10)).toFixed(0);
-  y0 = (y - parseInt(stl.paddingTop, 10)).toFixed(0);
   var is3d = env.transform3dSupported;
-  var translate = "translate" + (is3d ? '3d' : '') + "(" + x0 + "px," + y0 + "px" + (is3d ? ',0' : '') + ")";
-  return toString ? CSS_TRANSFORM_VENDOR + ':' + translate + ';' : [[TRANSFORM_VENDOR, translate]];
+  var translate = "translate" + (is3d ? '3d' : '') + "(" + x0 + "," + y0 + (is3d ? ',0' : '') + ")";
+  return toString ? 'top:0;left:0;' + CSS_TRANSFORM_VENDOR + ':' + translate + ';' : [['top', 0], ['left', 0], [TRANSFORM_VENDOR, translate]];
 }
 /**
  * @param {Object} textStyle
@@ -80294,8 +80293,7 @@ function () {
     if (appendToBody) {
       document.body.appendChild(el);
     } else {
-      // PENDING
-      container.prepend(el);
+      container.appendChild(el);
     }
 
     this._container = container; // FIXME
@@ -80378,7 +80376,7 @@ function () {
       style.display = 'none';
     } else {
       style.cssText = gCssText + assembleCssText(tooltipModel, !this._firstShow, this._longHide) // initial transform
-      + assembleTransform(el, styleCoord[0], styleCoord[1], true) + ("border-color:" + convertToColorString(nearPointColor) + ";") + (tooltipModel.get('extraCssText') || '') // If mouse occasionally move over the tooltip, a mouseout event will be
+      + assembleTransform(styleCoord[0], styleCoord[1], true) + ("border-color:" + convertToColorString(nearPointColor) + ";") + (tooltipModel.get('extraCssText') || '') // If mouse occasionally move over the tooltip, a mouseout event will be
       // triggered by canvas, and cause some unexpectable result like dragging
       // stop, "unfocusAdjacency". Here `pointer-events: none` is used to solve
       // it. Although it is not supported by IE8~IE10, fortunately it is a rare
@@ -80435,7 +80433,7 @@ function () {
 
     if (styleCoord[0] != null && styleCoord[1] != null) {
       var style_1 = this.el.style;
-      var transforms = assembleTransform(this.el, styleCoord[0], styleCoord[1]);
+      var transforms = assembleTransform(styleCoord[0], styleCoord[1]);
       each(transforms, function (transform) {
         style_1[transform[0]] = transform[1];
       });
@@ -91470,7 +91468,7 @@ use(install$K); // `dataZoom` component providing a slider bar, for example:
 //     dataZoom: {type: 'slider'}
 // });
 
-use(install$L); // `dataZoom` component including both `visualMapContinuous` and `visualMapPiecewise`.
+use(install$L); // `visualMap` component including both `visualMapContinuous` and `visualMapPiecewise`.
 
 use(install$P); // `visualMap` component providing continuous bar, for example:
 // chart.setOption({

diff --git a/dist/echarts.esm.js.map b/dist/echarts.esm.js.map
diff --git a/dist/echarts.esm.min.js b/dist/echarts.esm.min.js