Browse Source

Check if subscription or formatValue not change view str value to number

pull/3169/head
Vladyslav_Prykhodko 6 years ago
parent
commit
060a54cd6d
  1. 2
      ui-ngx/src/app/core/api/entity-data-subscription.ts
  2. 3
      ui-ngx/src/app/core/utils.ts

2
ui-ngx/src/app/core/api/entity-data-subscription.ts

@ -624,7 +624,7 @@ export class EntityDataSubscription {
}
private convertValue(val: string): any {
if (val && this.isNumeric(val)) {
if (val && this.isNumeric(val) && Number(val).toString() === val) {
return Number(val);
} else {
return val;

3
ui-ngx/src/app/core/utils.ts

@ -115,8 +115,7 @@ export function isEmpty(obj: any): boolean {
}
export function formatValue(value: any, dec?: number, units?: string, showZeroDecimals?: boolean): string | undefined {
if (isDefined(value) &&
value !== null && isNumeric(value)) {
if (isDefinedAndNotNull(value) && isNumeric(value) && (isDefined(dec) || isDefined(units) || Number(value).toString() === value)) {
let formatted: string | number = Number(value);
if (isDefined(dec)) {
formatted = formatted.toFixed(dec);

Loading…
Cancel
Save