Skip to content

Commit 86154c5

Browse files
committed
Improvement - VueUiDonut - Set smaller marker link on small labels and better font size management
1 parent 15818a1 commit 86154c5

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/components/vue-ui-donut.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ const smallArcLayoutsClassic = computed(() => {
986986
const baseLineHeight = labels_inline_fontSize.value * 1.5;
987987
988988
const markerTextGap = 8;
989-
const radialOffset = 24;
989+
const radialOffset = 6;
990990
991991
const leftBandMarkerX = centerX - (minSize.value + radialOffset);
992992
const rightBandMarkerX = centerX + (minSize.value + radialOffset);
@@ -1089,7 +1089,7 @@ const smallArcLayoutsClassic = computed(() => {
10891089
layouts[index] = {
10901090
side: "left",
10911091
labelX: bandMarkerX - markerTextGap,
1092-
labelY,
1092+
labelY: labelY + labels_inline_fontSize.value / 3,
10931093
textAnchor: "end",
10941094
markerX: bandMarkerX,
10951095
markerY: bandMarkerY,
@@ -1118,7 +1118,7 @@ const smallArcLayoutsClassic = computed(() => {
11181118
layouts[index] = {
11191119
side: "right",
11201120
labelX: bandMarkerX + markerTextGap,
1121-
labelY,
1121+
labelY: labelY + labels_inline_fontSize.value / 3,
11221122
textAnchor: "start",
11231123
markerX: bandMarkerX,
11241124
markerY: bandMarkerY,
@@ -1149,7 +1149,7 @@ const smallArcLayoutsClassic = computed(() => {
11491149
layouts[index] = {
11501150
side: "left",
11511151
labelX: bandMarkerX - markerTextGap,
1152-
labelY,
1152+
labelY: labelY + labels_inline_fontSize.value / 3,
11531153
textAnchor: "end",
11541154
markerX: bandMarkerX,
11551155
markerY: bandMarkerY,
@@ -1179,7 +1179,7 @@ const smallArcLayoutsClassic = computed(() => {
11791179
layouts[index] = {
11801180
side: "right",
11811181
labelX: bandMarkerX + markerTextGap,
1182-
labelY,
1182+
labelY: labelY + labels_inline_fontSize.value / 3,
11831183
textAnchor: "start",
11841184
markerX: bandMarkerX,
11851185
markerY: bandMarkerY,
@@ -1188,7 +1188,7 @@ const smallArcLayoutsClassic = computed(() => {
11881188
});
11891189
}
11901190
1191-
return layouts;
1191+
return layouts
11921192
});
11931193
11941194
@@ -1381,7 +1381,7 @@ function buildClassicInlineLabel(arc, index, isSmall) {
13811381
if (lineIndex === 0) {
13821382
nameTspans += `
13831383
<tspan
1384-
class="vue-data-ui-datalabel-name"
1384+
class="${isSmall ? 'vue-data-ui-datalabel-inline' : 'vue-data-ui-datalabel-name'}"
13851385
fill="${FINAL_CONFIG.value.style.chart.layout.labels.name.color}"
13861386
font-size="${isSmall ? labels_inline_fontSize.value : labels_name_fontSize.value}px"
13871387
style="font-weight:${FINAL_CONFIG.value.style.chart.layout.labels.name.bold ? 'bold' : ''}"
@@ -1390,7 +1390,7 @@ function buildClassicInlineLabel(arc, index, isSmall) {
13901390
} else {
13911391
nameTspans += `
13921392
<tspan
1393-
class="vue-data-ui-datalabel-name"
1393+
class="${isSmall ? 'vue-data-ui-datalabel-inline' : 'vue-data-ui-datalabel-name'}"
13941394
x="${x}"
13951395
dy="${(isSmall ? labels_inline_fontSize.value : labels_name_fontSize.value) * 1.2}"
13961396
fill="${FINAL_CONFIG.value.style.chart.layout.labels.name.color}"

0 commit comments

Comments
 (0)