@record-evolution/widget-gauge 1.7.18 → 1.7.19

package/package.json

@@ -3,7 +3,7 @@
     "description": "REWidget widget-gauge",
     "license": "MIT",
     "author": "widget-gauge",
-    "version": "1.7.18",
+    "version": "1.7.19",
     "type": "module",
     "main": "dist/widget-gauge.js",
     "types": "dist/src/widget-gauge.d.ts",
@@ -23,7 +23,7 @@
         "release": "npm run build && npm run types && npm version patch --tag-version-prefix='' && git push && git push --tag && npm run build"
     },
     "dependencies": {
-        "echarts": "5.6.0",
+        "echarts": "6.0.0",
         "lit": "^3.3.1"
     },
     "devDependencies": {
@@ -40,8 +40,8 @@
         "eslint": "^9.29.0",
         "eslint-config-prettier": "^10.1.5",
         "json-schema-to-typescript": "^15.0.4",
-        "prettier": "^3.5.3",
-        "rollup": "^4.43.0",
+        "prettier": "^3.6.2",
+        "rollup": "^4.52.4",
         "typescript": "5.8.3"
     },
     "repository": {

package/src/widget-gauge.ts

@@ -234,7 +234,8 @@ export class WidgetGauge extends LitElement {
 
         const maxSize = fits.reduce((p, c) => (c.size < p ? p : c.size), 0)
         const fit = fits.find((f) => f.size === maxSize)
-        const modifier = fit?.m ?? 0
+        if (!fit) return
+        const modifier = fit.m ?? 0
 
         // console.log(
         //     'FITS count',
@@ -250,6 +251,8 @@ export class WidgetGauge extends LitElement {
         // )
         this.boxes = Array.from(this.gaugeContainer?.querySelectorAll('.chart') as NodeListOf<HTMLDivElement>)
 
+        this.gaugeContainer.style.gridTemplateColumns = `repeat(${fit.c}, 1fr)`
+
         this.boxes?.forEach((box) =>
             box.setAttribute('style', `width:${modifier * chartW}px; height:${modifier * (chartH - 27)}px`)
         )
@@ -267,16 +270,18 @@ export class WidgetGauge extends LitElement {
         if (!this?.inputData) return
         this.inputData.dataseries
             ?.sort((a, b) => ((a.label ?? '') > (b.label ?? '') ? 1 : -1))
-            .forEach((ds) => {
+            .forEach((ds, idx) => {
                 // pivot data
                 const distincts = ds.multiChart
                     ? ([...new Set(ds.data?.map((d: Data) => d.pivot))].sort() as string[])
                     : ['']
                 distincts.forEach((piv) => {
                     const prefix = piv ?? ''
-                    const label = ds.label ?? ''
+                    let label = ds.label?.trim() ?? ''
+                    label = prefix + (!!prefix && !!label ? ' - ' : '') + label
+                    if (this.dataSets.some((ds) => ds.label === label)) label += ' ' + idx
                     const pds: any = {
-                        label: prefix + (!!prefix && !!label ? ' - ' : '') + label,
+                        label: label,
                         unit: ds.unit,
                         precision: ds.precision,
                         advanced: ds.advanced,
@@ -484,7 +489,7 @@ export class WidgetGauge extends LitElement {
             align-items: center;
         }
         .gauge-container {
-            display: flex;
+            display: grid;
             flex: 1;
             justify-content: center;
             align-items: center;