Commit abb3c472396b5e1d4387384033ea4b9c76361ba0
1 parent
d0c39416
UI: Fixed didn't show alarm detail key
Showing
1 changed file
with
5 additions
and
2 deletions
| @@ -184,10 +184,13 @@ export function getEntityValue(entity: any, key: DataKey): any { | @@ -184,10 +184,13 @@ export function getEntityValue(entity: any, key: DataKey): any { | ||
| 184 | export function getAlarmValue(alarm: AlarmDataInfo, key: EntityColumn) { | 184 | export function getAlarmValue(alarm: AlarmDataInfo, key: EntityColumn) { |
| 185 | let alarmField = null; | 185 | let alarmField = null; |
| 186 | if (key.type === DataKeyType.alarm) { | 186 | if (key.type === DataKeyType.alarm) { |
| 187 | - alarmField = alarmFields[key.name]; | 187 | + alarmField = alarmFields[key.name]?.value; |
| 188 | + if (!alarmField && key.name.startsWith('details.')) { | ||
| 189 | + alarmField = key.name; | ||
| 190 | + } | ||
| 188 | } | 191 | } |
| 189 | if (alarmField) { | 192 | if (alarmField) { |
| 190 | - return getDescendantProp(alarm, alarmField.value); | 193 | + return getDescendantProp(alarm, alarmField); |
| 191 | } else { | 194 | } else { |
| 192 | return getDescendantProp(alarm, key.label); | 195 | return getDescendantProp(alarm, key.label); |
| 193 | } | 196 | } |