From c406c7b485a990a8573730d00d24df8bb0c8b232 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 16 Jul 2020 20:00:33 +0300 Subject: [PATCH] UI: Fix alarm table cell content for non alarm fields --- .../home/components/widget/lib/table-widget.models.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts index a6edfb86a5..1ab9ea6fc4 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts @@ -182,7 +182,10 @@ export function getEntityValue(entity: any, key: DataKey): any { } export function getAlarmValue(alarm: AlarmDataInfo, key: EntityColumn) { - const alarmField = alarmFields[key.name]; + let alarmField = null; + if (key.type === DataKeyType.alarm) { + alarmField = alarmFields[key.name]; + } if (alarmField) { return getDescendantProp(alarm, alarmField.value); } else {