Merge branch 'master' of github.com:thingsboard/thingsboard
This commit is contained in:
commit
436aedef4d
@ -220,7 +220,8 @@
|
|||||||
</mat-cell>
|
</mat-cell>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<mat-header-row [ngClass]="{'mat-row-select': selectionEnabled}" *matHeaderRowDef="displayedColumns; sticky: true"></mat-header-row>
|
<mat-header-row [ngClass]="{'mat-row-select': selectionEnabled}" *matHeaderRowDef="displayedColumns; sticky: true"></mat-header-row>
|
||||||
<mat-row [ngClass]="{'mat-row-select': selectionEnabled,
|
<mat-row [fxShow]="!dataSource.dataLoading"
|
||||||
|
[ngClass]="{'mat-row-select': selectionEnabled,
|
||||||
'mat-selected': dataSource.selection.isSelected(entity),
|
'mat-selected': dataSource.selection.isSelected(entity),
|
||||||
'tb-current-entity': dataSource.isCurrentEntity(entity)}"
|
'tb-current-entity': dataSource.isCurrentEntity(entity)}"
|
||||||
*matRowDef="let entity; columns: displayedColumns;" (click)="onRowClick($event, entity)"></mat-row>
|
*matRowDef="let entity; columns: displayedColumns;" (click)="onRowClick($event, entity)"></mat-row>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user