提交 d39cdc7f 编写于 作者: O Ovilia

feat(pie): introduce bleed margin

上级 b4422b39
......@@ -159,7 +159,8 @@ var PieSeries = echarts.extendSeriesModel({
alignTo: 'none',
// Closest distance between label and chart edge.
// Works only position is 'outer' and alignTo is 'labelLine' or 'edge'.
margin: '20%',
margin: '25%',
bleedMargin: 10,
distanceToLabelLine: 5,
// formatter: 标签文本格式器,同Tooltip.formatter,不支持异步回调
// 默认使用全局文本样式,详见TEXTSTYLE
......
......@@ -179,10 +179,10 @@ function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight, viewLef
}
else {
if (layout.x < cx) {
targetTextWidth = layout.x - viewLeft - layout.labelMargin;
targetTextWidth = layout.x - viewLeft - layout.bleedingMargin;
}
else {
targetTextWidth = viewLeft + viewWidth - layout.x - layout.labelMargin;
targetTextWidth = viewLeft + viewWidth - layout.x - layout.bleedingMargin;
}
}
if (targetTextWidth < layout.textRect.width) {
......@@ -228,7 +228,6 @@ export default function (seriesModel, r, viewWidth, viewHeight, viewLeft, viewTo
var cy;
var hasLabelRotate = false;
var minShowLabelRadian = (seriesModel.get('minShowLabelAngle') || 0) * RADIAN;
var viewSize = Math.min(viewWidth, viewHeight);
data.each(function (idx) {
var layout = data.getItemLayout(idx);
......@@ -239,7 +238,8 @@ export default function (seriesModel, r, viewWidth, viewHeight, viewLeft, viewTo
var labelPosition = labelModel.get('position') || itemModel.get('emphasis.label.position');
var labelDistance = labelModel.get('distanceToLabelLine');
var labelAlignTo = labelModel.get('alignTo');
var labelMargin = parsePercent(labelModel.get('margin'), viewSize);
var labelMargin = parsePercent(labelModel.get('margin'), viewWidth);
var bleedingMargin = labelModel.get('bleedMargin');
var font = labelModel.getFont();
var labelLineModel = itemModel.getModel('labelLine');
......@@ -337,6 +337,7 @@ export default function (seriesModel, r, viewWidth, viewHeight, viewLeft, viewTo
labelDistance: labelDistance,
labelAlignTo: labelAlignTo,
labelMargin:labelMargin,
bleedingMargin: bleedingMargin,
textRect: textRect,
text: text,
font: font
......
......@@ -145,10 +145,7 @@ under the License.
{value:35, name:'rose6'},
{value:30, name:'rose7'},
{value:40, name:'rose8'}
],
label: {
margin: 10
}
]
}
]
},
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册