|
|
|
@ -184,10 +184,13 @@ export function getEntityValue(entity: any, key: DataKey): any { |
|
|
|
export function getAlarmValue(alarm: AlarmDataInfo, key: EntityColumn) { |
|
|
|
let alarmField = null; |
|
|
|
if (key.type === DataKeyType.alarm) { |
|
|
|
alarmField = alarmFields[key.name]; |
|
|
|
alarmField = alarmFields[key.name]?.value; |
|
|
|
if (!alarmField && key.name.startsWith('details.')) { |
|
|
|
alarmField = key.name; |
|
|
|
} |
|
|
|
} |
|
|
|
if (alarmField) { |
|
|
|
return getDescendantProp(alarm, alarmField.value); |
|
|
|
return getDescendantProp(alarm, alarmField); |
|
|
|
} else { |
|
|
|
return getDescendantProp(alarm, key.label); |
|
|
|
} |
|
|
|
|