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

UI: Fix alarm table cell content for non alarm fields

Browse Source
This commit is contained in:
Igor Kulikov 2020-07-16 20:00:33 +03:00
parent a7e1e63b9e
commit c406c7b485
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts
View File

@ -182,7 +182,10 @@ export function getEntityValue(entity: any, key: DataKey): any {
} }
export function getAlarmValue(alarm: AlarmDataInfo, key: EntityColumn) { 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) { if (alarmField) {
return getDescendantProp(alarm, alarmField.value); return getDescendantProp(alarm, alarmField.value);
} else { } else {