Browse Source
Merge pull request #13892 from vvlladd28/improvement/table-widgets/blink-action-buttons
Fix action buttons blinking in table widgets during API requests
pull/13894/head
Igor Kulikov
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
6 additions and
8 deletions
-
ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.html
-
ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.html
|
|
|
@ -45,14 +45,14 @@ |
|
|
|
</span> |
|
|
|
<span class="flex-1"></span> |
|
|
|
<button *ngIf="allowAcknowledgment" |
|
|
|
mat-icon-button [disabled]="isLoading$ | async" |
|
|
|
mat-icon-button |
|
|
|
matTooltip="{{ 'alarm.acknowledge' | translate }}" |
|
|
|
matTooltipPosition="above" |
|
|
|
(click)="ackAlarms($event)"> |
|
|
|
<mat-icon>done</mat-icon> |
|
|
|
</button> |
|
|
|
<button *ngIf="ctx.settings.allowClear" mat-icon-button |
|
|
|
[disabled]="isLoading$ | async" |
|
|
|
<button *ngIf="ctx.settings.allowClear" |
|
|
|
mat-icon-button |
|
|
|
matTooltip="{{ 'alarm.clear' | translate }}" |
|
|
|
matTooltipPosition="above" |
|
|
|
(click)="clearAlarms($event)"> |
|
|
|
@ -107,7 +107,7 @@ |
|
|
|
</span> |
|
|
|
</ng-template> |
|
|
|
<button *ngIf="allowAssign" |
|
|
|
mat-icon-button [disabled]="isLoading$ | async" |
|
|
|
mat-icon-button |
|
|
|
matTooltip="{{ 'alarm.assign' | translate }}" |
|
|
|
matTooltipPosition="above" |
|
|
|
(click)="openAlarmAssigneePanel($event, alarm)"> |
|
|
|
|
|
|
|
@ -65,7 +65,7 @@ |
|
|
|
[style.min-width]="(entityDatasource.countCellButtonAction * 48) + 'px'"> |
|
|
|
<ng-container *ngFor="let actionDescriptor of entity.actionCellButtons; trackBy: trackByActionCellDescriptionId"> |
|
|
|
<span *ngIf="!actionDescriptor.icon" style="width: 48px;"></span> |
|
|
|
<button mat-icon-button [disabled]="isLoading$ | async" |
|
|
|
<button mat-icon-button |
|
|
|
*ngIf="actionDescriptor.icon" |
|
|
|
matTooltip="{{ actionDescriptor.displayName }}" |
|
|
|
matTooltipPosition="above" |
|
|
|
@ -83,7 +83,6 @@ |
|
|
|
<mat-menu #cellActionsMenu="matMenu" xPosition="before"> |
|
|
|
<ng-container *ngFor="let actionDescriptor of entity.actionCellButtons; trackBy: trackByActionCellDescriptionId"> |
|
|
|
<button mat-menu-item *ngIf="actionDescriptor.icon" |
|
|
|
[disabled]="isLoading$ | async" |
|
|
|
(click)="onActionButtonClick($event, entity, actionDescriptor)"> |
|
|
|
<tb-icon matMenuItemIcon>{{actionDescriptor.icon}}</tb-icon> |
|
|
|
<span>{{ actionDescriptor.displayName }}</span> |
|
|
|
|
|
|
|
@ -78,7 +78,7 @@ |
|
|
|
<span *ngIf="!actionDescriptor.icon" style="width: 40px;"></span> |
|
|
|
<button *ngIf="actionDescriptor.icon" |
|
|
|
class="tb-mat-40" |
|
|
|
mat-icon-button [disabled]="isLoading$ | async" |
|
|
|
mat-icon-button |
|
|
|
matTooltip="{{ actionDescriptor.displayName }}" |
|
|
|
matTooltipPosition="above" |
|
|
|
(click)="onActionButtonClick($event, row, actionDescriptor)"> |
|
|
|
@ -96,7 +96,6 @@ |
|
|
|
<mat-menu #cellActionsMenu="matMenu" xPosition="before"> |
|
|
|
<ng-container *ngFor="let actionDescriptor of row.actionCellButtons; trackBy: trackByActionCellDescriptionId"> |
|
|
|
<button mat-menu-item *ngIf="actionDescriptor.icon" |
|
|
|
[disabled]="isLoading$ | async" |
|
|
|
(click)="onActionButtonClick($event, row, actionDescriptor)"> |
|
|
|
<tb-icon matMenuItemIcon>{{actionDescriptor.icon}}</tb-icon> |
|
|
|
<span>{{ actionDescriptor.displayName }}</span> |
|
|
|
|
