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

Fixed assignee cell height not matching row height in alarm entity table

Browse Source
This commit is contained in:
rusikv 2023-04-20 18:09:06 +03:00
parent a0c370079e
commit 7549e25969
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui-ngx/src/app/modules/home/components/alarm/alarm-table-config.ts
View File

@ -120,18 +120,11 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink>
color: alarmSeverityColors.get(entity.severity)
})));
this.columns.push(
new EntityTableColumn<AlarmInfo>('assignee', 'alarm.assignee', '200px',
new EntityTableColumn<AlarmInfo>('assignee', 'alarm.assignee', '240px',
(entity) => {
return this.getAssigneeTemplate(entity)
},
(entity) => {
return {
display: 'flex',
justifyContent: 'start',
alignItems: 'center',
height: 'inherit'
}
},
() => ({}),
false,
() => ({}),
(entity) => undefined,
@ -203,8 +196,10 @@ export class AlarmTableConfig extends EntityTableConfig<AlarmInfo, TimePageLink>
<span class="user-display-name">${this.getUserDisplayName(entity)}</span>
</span>`
:
`<mat-icon class="material-icons unassigned-icon">account_circle</mat-icon>
<span>${this.translate.instant('alarm.unassigned')}</span>`
`<span class="unassigned-container">
<mat-icon class="material-icons unassigned-icon">account_circle</mat-icon>
<span>${this.translate.instant('alarm.unassigned')}</span>
</span>`
}
</span>`
}

25
ui-ngx/src/app/modules/home/components/alarm/alarm-table.component.scss
View File

@ -21,10 +21,10 @@
}
}
.assignee-cell {
display: flex;
justify-content: flex-start;
align-items: center;
line-height: normal;
.assigned-container {
display: inline-block;
vertical-align: baseline;
max-width: 180px;
overflow: hidden;
white-space: nowrap;
@ -44,14 +44,19 @@
font-weight: 700;
}
}
.material-icons.unassigned-icon {
width: 28px;
height: 28px;
font-size: 28px;
margin-right: 8px;
color: rgba(0, 0, 0, 0.38);
overflow: visible;
.unassigned-container {
display: inline-flex;
align-items: center;
.material-icons.unassigned-icon {
width: 28px;
height: 28px;
font-size: 28px;
margin-right: 8px;
color: rgba(0, 0, 0, 0.38);
overflow: visible;
}
}
}
}
}