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

UI: Fixed format function when set only units

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2024-11-25 17:48:02 +02:00
parent 5eab539c33
commit e5b92dab40
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui-ngx/src/app/core/utils.ts
View File

@ -133,8 +133,8 @@ export function isLiteralObject(value: any) {
export const formatValue = (value: any, dec?: number, units?: string, showZeroDecimals?: boolean): string | undefined => { export const formatValue = (value: any, dec?: number, units?: string, showZeroDecimals?: boolean): string | undefined => {
if (isDefinedAndNotNull(value) && isNumeric(value) && if (isDefinedAndNotNull(value) && isNumeric(value) &&
(isDefinedAndNotNull(dec) || isDefinedAndNotNull(units) || Number(value).toString() === value)) { (isDefinedAndNotNull(dec) || isNotEmptyStr(units) || Number(value).toString() === value)) {
let formatted: string | number = Number(value); let formatted: string | number = isDefinedAndNotNull(dec) ? Number(value) : (value as number);
if (isDefinedAndNotNull(dec)) { if (isDefinedAndNotNull(dec)) {
formatted = formatted.toFixed(dec); formatted = formatted.toFixed(dec);
} }
@ -142,7 +142,7 @@ export const formatValue = (value: any, dec?: number, units?: string, showZeroDe
formatted = (Number(formatted)); formatted = (Number(formatted));
} }
formatted = formatted.toString(); formatted = formatted.toString();
if (isDefinedAndNotNull(units) && units.length > 0) { if (isNotEmptyStr(units)) {
formatted += ' ' + units; formatted += ' ' + units;
} }
return formatted; return formatted;