You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2021/04/23 14:07:32 UTC
[echarts] 01/01: release 5.1.1
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch release-dev
in repository https://gitbox.apache.org/repos/asf/echarts.git
commit 737e23c0054e6b501ecc6f562920cffae953b5c6
Author: pissang <bm...@gmail.com>
AuthorDate: Fri Apr 23 22:05:32 2021 +0800
release 5.1.1
---
dist/echarts.common.js | 52 +++++++++++++-----------------
dist/echarts.common.js.map | 2 +-
dist/echarts.common.min.js | 2 +-
dist/echarts.esm.js | 80 ++++++++++++++++++++++------------------------
dist/echarts.esm.js.map | 2 +-
dist/echarts.esm.min.js | 2 +-
dist/echarts.js | 80 ++++++++++++++++++++++------------------------
dist/echarts.js.map | 2 +-
dist/echarts.min.js | 2 +-
dist/echarts.simple.js | 27 ++++++++--------
dist/echarts.simple.js.map | 2 +-
dist/echarts.simple.min.js | 2 +-
package-lock.json | 2 +-
package.json | 2 +-
src/core/echarts.ts | 2 +-
15 files changed, 126 insertions(+), 135 deletions(-)
diff --git a/dist/echarts.common.js b/dist/echarts.common.js
index 1332c43..1d530fb 100644
--- 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
index 0914d45..9db0f83 100644
--- a/dist/echarts.common.js.map
+++ b/dist/echarts.common.js.map
@@ -1 +1 @@
-{"version":3,"file":"echarts.common.js","sources":["../node_modules/tslib/tslib.es6.js","../node_modules/zrender/lib/core/env.js","../node_modules/zrender/lib/core/util.js","../node_modules/zrender/lib/core/vector.js","../node_modules/zrender/lib/mixin/Draggable.js","../node_modules/zrender/lib/core/Eventful.js","../node_modules/zrender/lib/core/fourPointsTransform.js","../node_modules/zrender/lib/core/dom.js","../node_modules/zrender/lib/core/event.js","../node_modules/zrender/lib/core/ [...]
\ No newline at end of file
+{"version":3,"file":"echarts.common.js","sources":["../node_modules/tslib/tslib.es6.js","../node_modules/zrender/lib/core/env.js","../node_modules/zrender/lib/core/util.js","../node_modules/zrender/lib/core/vector.js","../node_modules/zrender/lib/mixin/Draggable.js","../node_modules/zrender/lib/core/Eventful.js","../node_modules/zrender/lib/core/fourPointsTransform.js","../node_modules/zrender/lib/core/dom.js","../node_modules/zrender/lib/core/event.js","../node_modules/zrender/lib/core/ [...]
\ No newline at end of file
diff --git a/dist/echarts.common.min.js b/dist/echarts.common.min.js
index 1ab19bc..ac182db 100644
--- a/dist/echarts.common.min.js
+++ b/dist/echarts.common.min.js
@@ -42,4 +42,4 @@
* LICENSE
* https://github.com/ecomfe/zrender/blob/master/LICENSE.txt
*/
-var Li=!a.canvasSupported,Pi={},Oi={};var Ri=function(){function t(t,e,n){var i=this;this._sleepAfterStill=10,this._stillFrameAccum=0,this._needsRefresh=!0,this._needsRefreshHover=!0,this._darkMode=!1,n=n||{},this.dom=e,this.id=t;var r=new hi,o=n.renderer||"canvas";if(Li)throw new Error("IE8 support has been dropped since 5.0");if(Pi[o]||(o=E(Pi)[0]),!Pi[o])throw new Error("Renderer '"+o+"' is not imported. Please import it first.");n.useDirtyRect=null!=n.useDirtyRect&&n.useDirtyRect;var [...]
+var Li=!a.canvasSupported,Pi={},Oi={};var Ri=function(){function t(t,e,n){var i=this;this._sleepAfterStill=10,this._stillFrameAccum=0,this._needsRefresh=!0,this._needsRefreshHover=!0,this._darkMode=!1,n=n||{},this.dom=e,this.id=t;var r=new hi,o=n.renderer||"canvas";if(Li)throw new Error("IE8 support has been dropped since 5.0");if(Pi[o]||(o=E(Pi)[0]),!Pi[o])throw new Error("Renderer '"+o+"' is not imported. Please import it first.");n.useDirtyRect=null!=n.useDirtyRect&&n.useDirtyRect;var [...]
diff --git a/dist/echarts.esm.js b/dist/echarts.esm.js
index 2ff84cb..68a675a 100644
--- 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
index 41706ff..083caa0 100644
--- a/dist/echarts.esm.js.map
+++ b/dist/echarts.esm.js.map
@@ -1 +1 @@
-{"version":3,"file":"echarts.esm.js","sources":["../node_modules/tslib/tslib.es6.js","../node_modules/zrender/lib/core/env.js","../node_modules/zrender/lib/core/util.js","../node_modules/zrender/lib/core/vector.js","../node_modules/zrender/lib/mixin/Draggable.js","../node_modules/zrender/lib/core/Eventful.js","../node_modules/zrender/lib/core/fourPointsTransform.js","../node_modules/zrender/lib/core/dom.js","../node_modules/zrender/lib/core/event.js","../node_modules/zrender/lib/core/Ges [...]
\ No newline at end of file
+{"version":3,"file":"echarts.esm.js","sources":["../node_modules/tslib/tslib.es6.js","../node_modules/zrender/lib/core/env.js","../node_modules/zrender/lib/core/util.js","../node_modules/zrender/lib/core/vector.js","../node_modules/zrender/lib/mixin/Draggable.js","../node_modules/zrender/lib/core/Eventful.js","../node_modules/zrender/lib/core/fourPointsTransform.js","../node_modules/zrender/lib/core/dom.js","../node_modules/zrender/lib/core/event.js","../node_modules/zrender/lib/core/Ges [...]
\ No newline at end of file
diff --git a/dist/echarts.esm.min.js b/dist/echarts.esm.min.js
index ae29333..5b5f857 100644
--- a/dist/echarts.esm.min.js
+++ b/dist/echarts.esm.min.js
@@ -42,4 +42,4 @@ var t=function(e,n){return(t=Object.setPrototypeOf||{__proto__:[]}instanceof Arr
* LICENSE
* https://github.com/ecomfe/zrender/blob/master/LICENSE.txt
*/
-var ki=!o.canvasSupported,Pi={},Oi={};var Ri=function(){function t(t,e,n){var i=this;this._sleepAfterStill=10,this._stillFrameAccum=0,this._needsRefresh=!0,this._needsRefreshHover=!0,this._darkMode=!1,n=n||{},this.dom=e,this.id=t;var r=new hi,a=n.renderer||"canvas";if(ki)throw new Error("IE8 support has been dropped since 5.0");if(Pi[a]||(a=E(Pi)[0]),!Pi[a])throw new Error("Renderer '"+a+"' is not imported. Please import it first.");n.useDirtyRect=null!=n.useDirtyRect&&n.useDirtyRect;var [...]
+var ki=!o.canvasSupported,Pi={},Oi={};var Ri=function(){function t(t,e,n){var i=this;this._sleepAfterStill=10,this._stillFrameAccum=0,this._needsRefresh=!0,this._needsRefreshHover=!0,this._darkMode=!1,n=n||{},this.dom=e,this.id=t;var r=new hi,a=n.renderer||"canvas";if(ki)throw new Error("IE8 support has been dropped since 5.0");if(Pi[a]||(a=E(Pi)[0]),!Pi[a])throw new Error("Renderer '"+a+"' is not imported. Please import it first.");n.useDirtyRect=null!=n.useDirtyRect&&n.useDirtyRect;var [...]
diff --git a/dist/echarts.js b/dist/echarts.js
index dd8d6b1..d0d09cb 100644
--- a/dist/echarts.js
+++ b/dist/echarts.js
@@ -29266,7 +29266,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'
};
@@ -44842,11 +44842,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);
@@ -44945,8 +44942,6 @@
};
PiePiece.prototype._updateLabel = function (seriesModel, data, idx) {
- var _a;
-
var sector = this;
var itemModel = data.getItemModel(idx);
var labelLineModel = itemModel.getModel('labelLine');
@@ -44975,15 +44970,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;
@@ -49673,13 +49674,11 @@
// 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({
@@ -49689,6 +49688,14 @@
}
});
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;
@@ -50285,7 +50292,7 @@
}
regionGroup.onHoverStateChange = function (toState) {
- circle.useState(toState);
+ setStatesFlag(circle, toState);
};
}
@@ -51384,10 +51391,10 @@
color: 'rgba(255,215,0,0.8)'
}
},
- regions: [],
- tooltip: {
- show: false
- }
+ regions: [] // tooltip: {
+ // show: false
+ // }
+
};
return GeoModel;
}(ComponentModel);
@@ -65166,8 +65173,6 @@
return EffectSymbol;
}(Group);
- inherits(EffectSymbol, Group);
-
var EffectScatterView =
/** @class */
function (_super) {
@@ -80156,26 +80161,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
@@ -80300,8 +80299,7 @@
if (appendToBody) {
document.body.appendChild(el);
} else {
- // PENDING
- container.prepend(el);
+ container.appendChild(el);
}
this._container = container; // FIXME
@@ -80384,7 +80382,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
@@ -80441,7 +80439,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];
});
@@ -91476,7 +91474,7 @@
// 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.js.map b/dist/echarts.js.map
index 43feb81..1280c26 100644
--- a/dist/echarts.js.map
+++ b/dist/echarts.js.map
@@ -1 +1 @@
-{"version":3,"file":"echarts.js","sources":["../node_modules/tslib/tslib.es6.js","../node_modules/zrender/lib/core/env.js","../node_modules/zrender/lib/core/util.js","../node_modules/zrender/lib/core/vector.js","../node_modules/zrender/lib/mixin/Draggable.js","../node_modules/zrender/lib/core/Eventful.js","../node_modules/zrender/lib/core/fourPointsTransform.js","../node_modules/zrender/lib/core/dom.js","../node_modules/zrender/lib/core/event.js","../node_modules/zrender/lib/core/Gesture [...]
\ No newline at end of file
+{"version":3,"file":"echarts.js","sources":["../node_modules/tslib/tslib.es6.js","../node_modules/zrender/lib/core/env.js","../node_modules/zrender/lib/core/util.js","../node_modules/zrender/lib/core/vector.js","../node_modules/zrender/lib/mixin/Draggable.js","../node_modules/zrender/lib/core/Eventful.js","../node_modules/zrender/lib/core/fourPointsTransform.js","../node_modules/zrender/lib/core/dom.js","../node_modules/zrender/lib/core/event.js","../node_modules/zrender/lib/core/Gesture [...]
\ No newline at end of file
diff --git a/dist/echarts.min.js b/dist/echarts.min.js
index acccd70..01f975c 100644
--- a/dist/echarts.min.js
+++ b/dist/echarts.min.js
@@ -42,4 +42,4 @@
* LICENSE
* https://github.com/ecomfe/zrender/blob/master/LICENSE.txt
*/
-var Bi=!a.canvasSupported,Vi={},Fi={};var Gi=function(){function t(t,e,n){var i=this;this._sleepAfterStill=10,this._stillFrameAccum=0,this._needsRefresh=!0,this._needsRefreshHover=!0,this._darkMode=!1,n=n||{},this.dom=e,this.id=t;var r=new vi,o=n.renderer||"canvas";if(Bi)throw new Error("IE8 support has been dropped since 5.0");if(Vi[o]||(o=z(Vi)[0]),!Vi[o])throw new Error("Renderer '"+o+"' is not imported. Please import it first.");n.useDirtyRect=null!=n.useDirtyRect&&n.useDirtyRect;var [...]
+var Bi=!a.canvasSupported,Vi={},Fi={};var Gi=function(){function t(t,e,n){var i=this;this._sleepAfterStill=10,this._stillFrameAccum=0,this._needsRefresh=!0,this._needsRefreshHover=!0,this._darkMode=!1,n=n||{},this.dom=e,this.id=t;var r=new vi,o=n.renderer||"canvas";if(Bi)throw new Error("IE8 support has been dropped since 5.0");if(Vi[o]||(o=z(Vi)[0]),!Vi[o])throw new Error("Renderer '"+o+"' is not imported. Please import it first.");n.useDirtyRect=null!=n.useDirtyRect&&n.useDirtyRect;var [...]
diff --git a/dist/echarts.simple.js b/dist/echarts.simple.js
index 7175de2..31cf58c 100644
--- a/dist/echarts.simple.js
+++ b/dist/echarts.simple.js
@@ -28098,7 +28098,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'
};
@@ -42250,11 +42250,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);
@@ -42353,8 +42350,6 @@
};
PiePiece.prototype._updateLabel = function (seriesModel, data, idx) {
- var _a;
-
var sector = this;
var itemModel = data.getItemModel(idx);
var labelLineModel = itemModel.getModel('labelLine');
@@ -42383,15 +42378,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;
diff --git a/dist/echarts.simple.js.map b/dist/echarts.simple.js.map
index 70412ee..c9a45bf 100644
--- a/dist/echarts.simple.js.map
+++ b/dist/echarts.simple.js.map
@@ -1 +1 @@
-{"version":3,"file":"echarts.simple.js","sources":["../node_modules/tslib/tslib.es6.js","../node_modules/zrender/lib/core/env.js","../node_modules/zrender/lib/core/util.js","../node_modules/zrender/lib/core/vector.js","../node_modules/zrender/lib/mixin/Draggable.js","../node_modules/zrender/lib/core/Eventful.js","../node_modules/zrender/lib/core/fourPointsTransform.js","../node_modules/zrender/lib/core/dom.js","../node_modules/zrender/lib/core/event.js","../node_modules/zrender/lib/core/ [...]
\ No newline at end of file
+{"version":3,"file":"echarts.simple.js","sources":["../node_modules/tslib/tslib.es6.js","../node_modules/zrender/lib/core/env.js","../node_modules/zrender/lib/core/util.js","../node_modules/zrender/lib/core/vector.js","../node_modules/zrender/lib/mixin/Draggable.js","../node_modules/zrender/lib/core/Eventful.js","../node_modules/zrender/lib/core/fourPointsTransform.js","../node_modules/zrender/lib/core/dom.js","../node_modules/zrender/lib/core/event.js","../node_modules/zrender/lib/core/ [...]
\ No newline at end of file
diff --git a/dist/echarts.simple.min.js b/dist/echarts.simple.min.js
index f0a334e..d3b3549 100644
--- a/dist/echarts.simple.min.js
+++ b/dist/echarts.simple.min.js
@@ -42,4 +42,4 @@
* LICENSE
* https://github.com/ecomfe/zrender/blob/master/LICENSE.txt
*/
-var Ti=!o.canvasSupported,Ci={},Ai={};var Di=function(){function t(t,e,n){var i=this;this._sleepAfterStill=10,this._stillFrameAccum=0,this._needsRefresh=!0,this._needsRefreshHover=!0,this._darkMode=!1,n=n||{},this.dom=e,this.id=t;var r=new ri,a=n.renderer||"canvas";if(Ti)throw new Error("IE8 support has been dropped since 5.0");if(Ci[a]||(a=N(Ci)[0]),!Ci[a])throw new Error("Renderer '"+a+"' is not imported. Please import it first.");n.useDirtyRect=null!=n.useDirtyRect&&n.useDirtyRect;var [...]
+var Ti=!o.canvasSupported,Ci={},Ai={};var Di=function(){function t(t,e,n){var i=this;this._sleepAfterStill=10,this._stillFrameAccum=0,this._needsRefresh=!0,this._needsRefreshHover=!0,this._darkMode=!1,n=n||{},this.dom=e,this.id=t;var r=new ri,a=n.renderer||"canvas";if(Ti)throw new Error("IE8 support has been dropped since 5.0");if(Ci[a]||(a=N(Ci)[0]),!Ci[a])throw new Error("Renderer '"+a+"' is not imported. Please import it first.");n.useDirtyRect=null!=n.useDirtyRect&&n.useDirtyRect;var [...]
diff --git a/package-lock.json b/package-lock.json
index d18c1cc..662f997 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "echarts",
- "version": "5.1.0",
+ "version": "5.1.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 988df4d..0e49490 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "echarts",
- "version": "5.1.0",
+ "version": "5.1.1",
"description": "Apache ECharts is a powerful, interactive charting and data visualization library for browser",
"license": "Apache-2.0",
"keywords": [
diff --git a/src/core/echarts.ts b/src/core/echarts.ts
index b9f3c4f..f9da887 100644
--- a/src/core/echarts.ts
+++ b/src/core/echarts.ts
@@ -123,7 +123,7 @@ const indexOf = zrUtil.indexOf;
const hasWindow = typeof window !== 'undefined';
-export const version = '5.1.0';
+export const version = '5.1.1';
export const dependencies = {
zrender: '5.1.0'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org