提交 804a99c6 编写于 作者: P pissang

feat(pie): support overflow wrap

上级 306779e2
...@@ -247,6 +247,7 @@ class PieSeriesModel extends SeriesModel<PieSeriesOption> { ...@@ -247,6 +247,7 @@ class PieSeriesModel extends SeriesModel<PieSeriesOption> {
// If rotate around circle // If rotate around circle
rotate: 0, rotate: 0,
show: true, show: true,
overflow: 'truncate',
// 'outer', 'inside', 'center' // 'outer', 'inside', 'center'
position: 'outer', position: 'outer',
// 'none', 'labelLine', 'edge'. Works only when position is 'outer' // 'none', 'labelLine', 'edge'. Works only when position is 'outer'
......
...@@ -197,7 +197,6 @@ function avoidOverlap( ...@@ -197,7 +197,6 @@ function avoidOverlap(
// TODOTODO // TODOTODO
// layout.text = textContain.truncateText(layout.text, targetTextWidth, layout.font); // layout.text = textContain.truncateText(layout.text, targetTextWidth, layout.font);
layout.label.style.width = targetTextWidth; layout.label.style.width = targetTextWidth;
layout.label.style.overflow = 'truncate';
if (layout.labelAlignTo === 'edge') { if (layout.labelAlignTo === 'edge') {
realTextWidth = targetTextWidth; realTextWidth = targetTextWidth;
// realTextWidth = textContain.getWidth(layout.text, layout.font); // realTextWidth = textContain.getWidth(layout.text, layout.font);
......
...@@ -408,7 +408,7 @@ const tmpProjPoint = new Point(); ...@@ -408,7 +408,7 @@ const tmpProjPoint = new Point();
* @param minTurnAngle Radian of minimum turn angle. 0 - 180 * @param minTurnAngle Radian of minimum turn angle. 0 - 180
*/ */
export function limitTurnAngle(linePoints: number[][], minTurnAngle: number) { export function limitTurnAngle(linePoints: number[][], minTurnAngle: number) {
if (!(minTurnAngle < 180 && minTurnAngle > 0)) { if (!(minTurnAngle <= 180 && minTurnAngle > 0)) {
return; return;
} }
minTurnAngle = minTurnAngle / 180 * Math.PI; minTurnAngle = minTurnAngle / 180 * Math.PI;
......
...@@ -681,12 +681,14 @@ under the License. ...@@ -681,12 +681,14 @@ under the License.
labelLine: { labelLine: {
length: 15, length: 15,
length2: 15, length2: 15,
smooth: 0.3 smooth: 0.3,
minTurnAngle: 110
}, },
label: { label: {
margin: 25, margin: 25,
bleedMargin: 10, bleedMargin: 10,
alignTo: 'none' alignTo: 'none',
overflow: 'truncate'
} }
}; };
...@@ -706,10 +708,12 @@ under the License. ...@@ -706,10 +708,12 @@ under the License.
labelFolder.open(); labelFolder.open();
labelLineFolder.open(); labelLineFolder.open();
labelFolder.add(config.label, 'alignTo', ['none', 'edge', 'labelLine']).onChange(update); labelFolder.add(config.label, 'alignTo', ['none', 'edge', 'labelLine']).onChange(update);
labelFolder.add(config.label, 'overflow', ['truncate', 'wrap']).onChange(update);
labelFolder.add(config.label, 'margin', 0, 50).onChange(update); labelFolder.add(config.label, 'margin', 0, 50).onChange(update);
labelFolder.add(config.label, 'bleedMargin', 0, 500).onChange(update); labelFolder.add(config.label, 'bleedMargin', 0, 500).onChange(update);
labelLineFolder.add(config.labelLine, 'length', 0, 500).onChange(update); labelLineFolder.add(config.labelLine, 'length', 0, 500).onChange(update);
labelLineFolder.add(config.labelLine, 'length2', 0, 500).onChange(update); labelLineFolder.add(config.labelLine, 'length2', 0, 500).onChange(update);
labelLineFolder.add(config.labelLine, 'minTurnAngle', 0, 180).onChange(update);
labelLineFolder.add(config.labelLine, 'smooth', 0, 1).onChange(update); labelLineFolder.add(config.labelLine, 'smooth', 0, 1).onChange(update);
}); });
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册