Skip to content

Commit 3e7bdc3

Browse files
committed
rebuild: 5.0.0-beta.2
1 parent 3564230 commit 3e7bdc3

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

dist/echarts.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62164,9 +62164,11 @@
6216462164
var sector = this;
6216562165
var label = sector.getTextContent();
6216662166
var dataIndex = this.node.dataIndex;
62167+
var labelMinAngle = normalLabelModel.get('minAngle') / 180 * Math.PI;
62168+
var isNormalShown = normalLabelModel.get('show') && !(labelMinAngle != null && Math.abs(angle) < labelMinAngle);
62169+
label.ignore = !isNormalShown;
6216762170
each(DISPLAY_STATES, function (stateName) {
6216862171
var labelStateModel = stateName === 'normal' ? itemModel.getModel('label') : itemModel.getModel([stateName, 'label']);
62169-
var labelMinAngle = labelStateModel.get('minAngle') / 180 * Math.PI;
6217062172
var isNormal = stateName === 'normal';
6217162173
var state = isNormal ? label : label.ensureState(stateName);
6217262174
var text = seriesModel.getFormattedLabel(dataIndex, stateName);
@@ -62181,7 +62183,12 @@
6218162183
state.style.text = text;
6218262184
}
6218362185

62184-
state.ignore = labelMinAngle != null && Math.abs(angle) < labelMinAngle;
62186+
var isShown = labelStateModel.get('show');
62187+
62188+
if (isShown != null && !isNormal) {
62189+
state.ignore = !isShown;
62190+
}
62191+
6218562192
var labelPosition = getLabelAttr(labelStateModel, 'position');
6218662193
var sectorState = isNormal ? sector : sector.states[stateName];
6218762194
var labelColor = sectorState.style.fill;

dist/echarts.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/echarts.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)