Skip to content

Commit a41dde1

Browse files
committed
VueUiTreemap new component
1 parent 66d625d commit a41dde1

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "vue-data-ui",
33
"private": false,
4-
"version": "2.0.67",
4+
"version": "2.0.68",
55
"type": "module",
66
"description": "A user-empowering data visualization Vue components library",
77
"keywords": [
@@ -84,7 +84,6 @@
8484
"sass": "^1.57.1",
8585
"vite": "^4.5.3",
8686
"vitest": "^0.34.1",
87-
"vue": "^3.3.4",
88-
"vue-data-ui": "file:../vue-data-ui"
87+
"vue": "^3.3.4"
8988
}
9089
}

src/components/vue-data-ui.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -848,8 +848,8 @@ defineExpose({
848848
<template #tooltip-after="{ datapoint, seriesIndex, dataset, config }">
849849
<slot name="tooltip-after" v-bind="{ datapoint, seriesIndex, dataset, config }"></slot>
850850
</template>
851-
<template #svg="{ svg }">
852-
<slot name="svg" :svg="svg"></slot>
851+
<template #svg="{ svg, isZoom, rect, config }">
852+
<slot name="svg" v-bind="{ svg, isZoom, rect, config }"></slot>
853853
</template>
854854
<template #legend="{ legend }">
855855
<slot name="legend" v-bind:legend="legend"></slot>

src/components/vue-ui-treemap.vue

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,8 @@ const dataTable = computed(() => {
359359
return [
360360
{
361361
color: h.color,
362-
name: h.name
362+
name: h.name,
363+
shape: 'square'
363364
},
364365
label,
365366
isNaN(table.value.body[i] / total.value) ? "-" : (table.value.body[i] / total.value * 100).toFixed(treemapConfig.value.table.td.roundingPercentage) + '%'
@@ -377,7 +378,7 @@ const dataTable = computed(() => {
377378
color:treemapConfig.value.table.td.color,
378379
outline:treemapConfig.value.table.td.outline
379380
},
380-
breakpoint:treemapConfig.value.table.responsiveBreakpoint
381+
breakpoint:treemapConfig.value.table.responsiveBreakpoint,
381382
}
382383
383384
const colNames = [
@@ -502,7 +503,7 @@ defineExpose({
502503
<div style="width: 100%; height: 100%" class="vue-ui-treemap-cell">
503504
<div
504505
class="vue-ui-treemap-cell-default"
505-
v-if="treemapConfig.style.chart.layout.labels.showDefaultLabels && (rect.proportion > treemapConfig.style.chart.layout.labels.hideUnderProportion || isZoom)" :style="`width:calc(100% - ${calcFontSize(rect) / 1.5}px);text-align:left;line-height:${calcFontSize(rect)}px;padding:${calcFontSize(rect) / 3}px; color:${adaptColorToBackground(rect.color)}`"
506+
v-if="treemapConfig.style.chart.layout.labels.showDefaultLabels && (rect.proportion > treemapConfig.style.chart.layout.labels.hideUnderProportion || isZoom)" :style="`width:calc(100% - ${calcFontSize(rect) / 1.5}px);text-align:left;line-height:${calcFontSize(rect) < 14 ? 14 : calcFontSize(rect)}px;padding:${calcFontSize(rect) / 3}px; color:${adaptColorToBackground(rect.color)}`"
506507
>
507508
<span :style="`width:100%;font-size:${calcFontSize(rect)}px;`">
508509
{{ rect.name }}
@@ -552,7 +553,7 @@ defineExpose({
552553
<div style="width: 100%; height: 100%" class="vue-ui-treemap-cell">
553554
<div
554555
class="vue-ui-treemap-cell-default"
555-
v-if="treemapConfig.style.chart.layout.labels.showDefaultLabels" :style="`width:calc(100% - ${treemapConfig.style.chart.layout.labels.fontSize/ 1.5}px);text-align:left;line-height:${treemapConfig.style.chart.layout.labels.fontSize}px;padding:${treemapConfig.style.chart.layout.labels.fontSize / 3}px; color:${adaptColorToBackground(selectedRect.color)}`"
556+
v-if="treemapConfig.style.chart.layout.labels.showDefaultLabels" :style="`width:calc(100% - ${treemapConfig.style.chart.layout.labels.fontSize/ 1.5}px);text-align:left;padding:${treemapConfig.style.chart.layout.labels.fontSize / 3}px; color:${adaptColorToBackground(selectedRect.color)}`"
556557
>
557558
<span :style="`width:100%;`">
558559
{{ selectedRect.name }}
@@ -578,7 +579,7 @@ defineExpose({
578579
</div>
579580
</foreignObject>
580581
</g>
581-
<slot name="svg" :svg="svg"/>
582+
<slot name="svg" v-bind="{ svg, isZoom, rect: selectedRect, config: treemapConfig }"/>
582583
</svg>
583584

584585
<Skeleton

0 commit comments

Comments
 (0)