@record-evolution/widget-linechart 1.6.4 → 1.6.6

package/package.json

@@ -3,7 +3,7 @@
     "description": "Webcomponent widget-linechart following open-wc recommendations",
     "license": "MIT",
     "author": "widget-linechart",
-    "version": "1.6.4",
+    "version": "1.6.6",
     "type": "module",
     "main": "dist/widget-linechart.js",
     "types": "dist/src/widget-linechart.d.ts",
@@ -19,9 +19,7 @@
         "build": "rollup -c rollup.config.js",
         "watch": "rollup -w -c rollup.config.js",
         "types": "cat src/definition-schema.json | json2ts --style.tabWidth=4 > src/definition-schema.d.ts",
-        "patch": "npm version patch --tag-version-prefix=''",
-        "minor": "npm version minor --tag-version-prefix=''",
-        "release": "npm run build && npm run types && git push && git push --tag"
+        "release": "npm run build && npm run types && npm version patch --tag-version-prefix='' && git push && git push --tag"
     },
     "dependencies": {
         "echarts": "5.6.0",

package/src/definition-schema.d.ts

@@ -52,7 +52,7 @@ export type ChartName = string;
  * If timeseries is checked in the settings, then this should be an ISO String date like 2023-11-04T22:47:52.351152+00:00. But this works with many other formats as well.
  */
 export type XValue = string;
-export type YValue = number;
+export type YValue = string;
 /**
  * Controls the symbol size for line and scatter charts.
  */

package/src/definition-schema.json

@@ -179,7 +179,7 @@
                                 },
                                 "y": {
                                     "title": "Y-Value",
-                                    "type": "number",
+                                    "type": "string",
                                     "order": 2,
                                     "required": true
                                 },

package/src/widget-linechart.ts

@@ -33,16 +33,17 @@ import { InputData } from './definition-schema'
 import { EChartsOption, ScatterSeriesOption, SeriesOption } from 'echarts'
 import { TitleOption } from 'echarts/types/dist/shared'
 
+type Theme = {
+    theme_name: string
+    theme_object: any
+}
 @customElement('widget-linechart-versionplaceholder')
 export class WidgetLinechart extends LitElement {
     @property({ type: Object })
     inputData?: InputData
 
     @property({ type: Object })
-    themeObject?: any
-
-    @property({ type: String })
-    themeName?: string
+    theme?: Theme
 
     @state()
     private canvasList: Map<
@@ -172,12 +173,8 @@ export class WidgetLinechart extends LitElement {
             this.applyData()
         }
 
-        if (changedProperties.has('themeObject')) {
-            this.registerTheme(this.themeName, this.themeObject)
-        }
-
-        if (changedProperties.has('themeName')) {
-            this.registerTheme(this.themeName, this.themeObject)
+        if (changedProperties.has('theme')) {
+            this.registerTheme(this.theme)
             this.deleteCharts()
             this.transformData()
             this.applyData()
@@ -200,10 +197,11 @@ export class WidgetLinechart extends LitElement {
         }
     }
 
-    registerTheme(themeName?: string, themeObject?: any) {
-        if (!themeObject || !themeName) return
+    registerTheme(theme?: Theme) {
+        if (!theme || !theme.theme_object || !theme.theme_name) return
 
-        echarts.registerTheme(themeName, this.themeObject)
+        console.log('Registering theme', theme)
+        echarts.registerTheme(theme.theme_name, theme.theme_object)
     }
 
     transformData() {
@@ -270,9 +268,7 @@ export class WidgetLinechart extends LitElement {
                     data: data2 ?? []
                 }
                 let chartName = ds.advanced?.chartName ?? ''
-                if (chartName.includes('#split#')) {
-                    chartName = prefix + '-' + chartName
-                }
+                chartName = chartName.replace('#split#', prefix)
 
                 const chart = this.setupChart(chartName)
                 chart?.series.push(pds)
@@ -298,6 +294,12 @@ export class WidgetLinechart extends LitElement {
         return 'category'
     }
 
+    yAxisType(): 'value' | 'log' | 'category' | undefined {
+        const onePoint = this.inputData?.dataseries?.[0]?.data?.[0]
+        if (!isNaN(Number(onePoint?.y))) return 'value'
+        return 'category'
+    }
+
     applyData() {
         const modifier = 1
 
@@ -317,6 +319,7 @@ export class WidgetLinechart extends LitElement {
             // option.xAxis.axisLine.lineStyle.width = 2 * modifier
             // option.xAxis.axisLabel.fontSize = 20 * modifier
             option.xAxis.type = this.xAxisType()
+            option.yAxis.type = this.yAxisType()
 
             option.yAxis.name = this.inputData?.axis?.yAxisLabel ?? ''
             // option.yAxis.axisLine.lineStyle.width = 2 * modifier
@@ -324,7 +327,7 @@ export class WidgetLinechart extends LitElement {
             option.yAxis.scale = this.inputData?.axis?.yAxisScaling ?? false
 
             option.series = chart.series
-
+            // console.log('Applying data to chart', label, option)
             if (chart.series.length <= 1) option.legend.show = false
             const oldOption: any = chart.echart?.getOption() ?? {}
             const notMerge = oldOption.series?.length !== chart.series.length
@@ -358,7 +361,7 @@ export class WidgetLinechart extends LitElement {
         newContainer.setAttribute('class', 'sizer')
         this.chartContainer.appendChild(newContainer)
 
-        const newChart = echarts.init(newContainer, this.themeName)
+        const newChart = echarts.init(newContainer, this.theme?.theme_name)
         const chart = { echart: newChart, series: [] as SeriesOption[], element: newContainer }
         this.canvasList.set(label, chart)
         //@ts-ignore