VueUiWaffle fixes

graphieros · Mar 28, 2024 · 3ab5e1a · 3ab5e1a
1 parent ef628ae
commit 3ab5e1a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue-data-ui",
   "private": false,
-  "version": "2.0.43",
+  "version": "2.0.44",
   "type": "module",
   "description": "A user-empowering data visualization Vue components library",
   "keywords": [

diff --git a/src/App.vue b/src/App.vue
@@ -374,7 +374,7 @@ const waffleDataset = [
   {
     name: "serie 2",
     color: "",
-    values: [2],
+    values: [2.2],
     shape: "diamond"
   },
   {

diff --git a/src/components/vue-ui-waffle.vue b/src/components/vue-ui-waffle.vue
@@ -340,7 +340,9 @@ function segregate(uid) {
     if(segregated.value.includes(uid)) {
         segregated.value = segregated.value.filter(s => s !== uid);
     }else {
-        segregated.value.push(uid);
+        if(segregated.value.length < legendSet.value.length - 1 && legendSet.value.length > 1) {
+            segregated.value.push(uid);
+        }
     }
     emit('selectLegend', waffleSet.value.map(w => {
         return {
@@ -593,7 +595,7 @@ defineExpose({
             />
             <template v-for="(position, i) in positions">
                 <foreignObject
-                    v-if="!waffleConfig.style.chart.layout.grid.vertical && waffleConfig.style.chart.layout.labels.captions.show && ((rects[i].isFirst && position.position < waffleConfig.style.chart.layout.grid.size - 3) || (rects[i].isAbsoluteFirst && i % waffleConfig.style.chart.layout.grid.size === 0 && rects[i].absoluteStartIndex))"
+                    v-if="!waffleConfig.style.chart.layout.grid.vertical && waffleConfig.style.chart.layout.labels.captions.show && ((rects[i].isFirst && position.position < waffleConfig.style.chart.layout.grid.size - 2) || (rects[i].isAbsoluteFirst && i % waffleConfig.style.chart.layout.grid.size === 0 && rects[i].absoluteStartIndex))"
                     :x="position.x + waffleConfig.style.chart.layout.labels.captions.offsetX"
                     :y="position.y + waffleConfig.style.chart.layout.labels.captions.offsetY"
                     :height="absoluteRectDimension"