dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14012 from mtsymbarov-del/fix/liquid-widgets

Browse Source 
Fixed decimals support in Liquid level widget
This commit is contained in:
Igor Kulikov 2025-09-25 16:50:07 +03:00 committed by GitHub
commit afbcb2abb0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui-ngx/src/app/modules/home/components/widget/lib/indicator/liquid-level-widget.component.ts
View File

@ -510,11 +510,9 @@ export class LiquidLevelWidgetComponent implements OnInit {
let content: string; let content: string;
let container: JQuery<HTMLElement>; let container: JQuery<HTMLElement>;
const jQueryContainerElement = $(this.liquidLevelContent.nativeElement); const jQueryContainerElement = $(this.liquidLevelContent.nativeElement);
let value = 'N/A'; let value: number | string = 'N/A';
if (isNumeric(data)) { if (isNumeric(data)) {
value = this.widgetUnitsConvertor(convertLiters(this.convertOutputData(percentage), this.widgetUnits as CapacityUnits, ConversionType.from)) value = +this.widgetUnitsConvertor(convertLiters(this.convertOutputData(percentage), this.widgetUnits as CapacityUnits, ConversionType.from)).toFixed(this.ctx.widgetConfig.decimals || 0);
.toFixed(this.settings.decimals || 0);
} }
this.valueColor.update(value); this.valueColor.update(value);
const valueTextStyle = cssTextFromInlineStyle({...inlineTextStyle(this.settings.valueFont), const valueTextStyle = cssTextFromInlineStyle({...inlineTextStyle(this.settings.valueFont),
@ -528,10 +526,9 @@ export class LiquidLevelWidgetComponent implements OnInit {
let volume: number | string; let volume: number | string;
if (this.widgetUnits !== CapacityUnits.percent) { if (this.widgetUnits !== CapacityUnits.percent) {
const volumeInLiters: number = convertLiters(this.volume, this.volumeUnits as CapacityUnits, ConversionType.to); const volumeInLiters: number = convertLiters(this.volume, this.volumeUnits as CapacityUnits, ConversionType.to);
volume = this.widgetUnitsConvertor(convertLiters(volumeInLiters, this.widgetUnits as CapacityUnits, ConversionType.from)) volume = +this.widgetUnitsConvertor(convertLiters(volumeInLiters, this.widgetUnits as CapacityUnits, ConversionType.from)).toFixed(this.ctx.widgetConfig.decimals || 0);
.toFixed(this.settings.decimals || 0);
} else { } else {
volume = this.widgetUnitsConvertor(this.volume).toFixed(this.settings.decimals || 0); volume = +this.widgetUnitsConvertor(this.volume).toFixed(this.ctx.widgetConfig.decimals || 0);
} }
const volumeTextStyle = cssTextFromInlineStyle({...inlineTextStyle(this.settings.volumeFont), const volumeTextStyle = cssTextFromInlineStyle({...inlineTextStyle(this.settings.volumeFont),