You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2020/10/26 11:49:51 UTC
[incubator-echarts] 03/03: rebuild: 5.0.0-beta.2
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 3e7bdc37ffadcc10fbeda1bfb7d711c7906c83d1
Author: 100pah <su...@gmail.com>
AuthorDate: Mon Oct 26 19:44:06 2020 +0800
rebuild: 5.0.0-beta.2
---
dist/echarts.js | 11 +++++++++--
dist/echarts.js.map | 2 +-
dist/echarts.min.js | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/dist/echarts.js b/dist/echarts.js
index 36d741e..0b9ef45 100644
--- a/dist/echarts.js
+++ b/dist/echarts.js
@@ -62164,9 +62164,11 @@
var sector = this;
var label = sector.getTextContent();
var dataIndex = this.node.dataIndex;
+ var labelMinAngle = normalLabelModel.get('minAngle') / 180 * Math.PI;
+ var isNormalShown = normalLabelModel.get('show') && !(labelMinAngle != null && Math.abs(angle) < labelMinAngle);
+ label.ignore = !isNormalShown;
each(DISPLAY_STATES, function (stateName) {
var labelStateModel = stateName === 'normal' ? itemModel.getModel('label') : itemModel.getModel([stateName, 'label']);
- var labelMinAngle = labelStateModel.get('minAngle') / 180 * Math.PI;
var isNormal = stateName === 'normal';
var state = isNormal ? label : label.ensureState(stateName);
var text = seriesModel.getFormattedLabel(dataIndex, stateName);
@@ -62181,7 +62183,12 @@
state.style.text = text;
}
- state.ignore = labelMinAngle != null && Math.abs(angle) < labelMinAngle;
+ var isShown = labelStateModel.get('show');
+
+ if (isShown != null && !isNormal) {
+ state.ignore = !isShown;
+ }
+
var labelPosition = getLabelAttr(labelStateModel, 'position');
var sectorState = isNormal ? sector : sector.states[stateName];
var labelColor = sectorState.style.fill;
diff --git a/dist/echarts.js.map b/dist/echarts.js.map
index 1eabfce..48febd7 100644
--- a/dist/echarts.js.map
+++ b/dist/echarts.js.map
@@ -1 +1 @@
-{"version":3,"sources":["unknown"],"names":["global","factory","exports","module","define","amd","self","echarts","extendStatics","d","b","Object","setPrototypeOf","__proto__","Array","p","hasOwnProperty","__extends","__","constructor","prototype","create","__assign","assign","t","s","i","n","arguments","length","call","apply","__spreadArrays","il","r","k","a","j","jl","Browser","firefox","ie","edge","weChat","Env","browser","node","wxa","worker","canvasSupported","svgSupported","touchEv [...]
\ No newline at end of file
+{"version":3,"sources":["unknown"],"names":["global","factory","exports","module","define","amd","self","echarts","extendStatics","d","b","Object","setPrototypeOf","__proto__","Array","p","hasOwnProperty","__extends","__","constructor","prototype","create","__assign","assign","t","s","i","n","arguments","length","call","apply","__spreadArrays","il","r","k","a","j","jl","Browser","firefox","ie","edge","weChat","Env","browser","node","wxa","worker","canvasSupported","svgSupported","touchEv [...]
\ No newline at end of file
diff --git a/dist/echarts.min.js b/dist/echarts.min.js
index 6def60e..f96d08c 100644
--- a/dist/echarts.min.js
+++ b/dist/echarts.min.js
@@ -19,4 +19,4 @@
*/
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t=t||self).echarts={})}(this,function(t){"use strict";var i=function(t,e){return(i=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])})(t,e)};function l(t,e){function n(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prot [...]
\ No newline at end of file
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t=t||self).echarts={})}(this,function(t){"use strict";var i=function(t,e){return(i=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])})(t,e)};function l(t,e){function n(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prot [...]
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org