Browse Source

Merge pull request #9121 from rusikv/bug/action-reserved-space

Increased reserved space for hidden action cell buttons
pull/8767/head
Igor Kulikov 3 years ago
committed by GitHub
parent
commit
3834086c18
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.html
  2. 2
      ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.html
  3. 2
      ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.html

2
ui-ngx/src/app/modules/home/components/widget/lib/alarms-table-widget.component.html

@ -127,7 +127,7 @@
width: (alarmsDatasource.countCellButtonAction * 48) + 'px' }">
<div [fxHide]="showCellActionsMenu" fxShow.gt-md fxFlex fxLayout="row" fxLayoutAlign="end">
<ng-container *ngFor="let actionDescriptor of alarm.actionCellButtons; trackBy: trackByActionCellDescriptionId">
<span *ngIf="!actionDescriptor.icon" style="width: 40px;"></span>
<span *ngIf="!actionDescriptor.icon" style="width: 48px;"></span>
<button mat-icon-button [disabled]="(isLoading$ | async) || !actionEnabled(alarm, actionDescriptor)"
*ngIf="actionDescriptor.icon"
matTooltip="{{ actionDescriptor.displayName }}"

2
ui-ngx/src/app/modules/home/components/widget/lib/entities-table-widget.component.html

@ -57,7 +57,7 @@
width: (entityDatasource.countCellButtonAction * 48) + 'px' }">
<div [fxHide]="showCellActionsMenu && entityDatasource.countCellButtonAction !== 1" fxShow.gt-md fxFlex fxLayout="row" fxLayoutAlign="end">
<ng-container *ngFor="let actionDescriptor of entity.actionCellButtons; trackBy: trackByActionCellDescriptionId">
<span *ngIf="!actionDescriptor.icon" style="width: 40px;"></span>
<span *ngIf="!actionDescriptor.icon" style="width: 48px;"></span>
<button mat-icon-button [disabled]="isLoading$ | async"
*ngIf="actionDescriptor.icon"
matTooltip="{{ actionDescriptor.displayName }}"

2
ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.html

@ -69,7 +69,7 @@
width: (source.timeseriesDatasource.countCellButtonAction * 48) + 'px' }">
<div [fxHide]="showCellActionsMenu && source.timeseriesDatasource.countCellButtonAction !== 1" fxShow.gt-md fxFlex fxLayout="row" fxLayoutAlign="end">
<ng-container *ngFor="let actionDescriptor of row.actionCellButtons; trackBy: trackByActionCellDescriptionId">
<span *ngIf="!actionDescriptor.icon" style="width: 40px;"></span>
<span *ngIf="!actionDescriptor.icon" style="width: 48px;"></span>
<button *ngIf="actionDescriptor.icon"
mat-icon-button [disabled]="isLoading$ | async"
matTooltip="{{ actionDescriptor.displayName }}"

Loading…
Cancel
Save