Browse Source
Merge pull request #12031 from maxunbearable/fix/4871-flex-layout-migration-fixes
Flex Layout migration fixes
pull/12056/head
Andrew Shvayka
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
3 additions and
3 deletions
-
ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.html
-
ui-ngx/src/app/modules/home/components/filter/filter-predicate-value.component.html
-
ui-ngx/src/app/modules/home/pages/customer/customer.component.html
|
|
|
@ -73,7 +73,7 @@ |
|
|
|
</mat-chip-listbox> |
|
|
|
</div> |
|
|
|
<div class="tb-form-row column-xs"> |
|
|
|
<div class="fixed-title-width" ranslate>alarm.alarm-type-list</div> |
|
|
|
<div class="fixed-title-width" translate>alarm.alarm-type-list</div> |
|
|
|
<tb-entity-subtype-list subscriptSizing="dynamic" |
|
|
|
formControlName="typeList" |
|
|
|
appearance="outline" |
|
|
|
|
|
|
|
@ -43,7 +43,7 @@ |
|
|
|
</div> |
|
|
|
<div class="tb-hint">{{ hintText | translate }}</div> |
|
|
|
</div> |
|
|
|
<div class="flex flex-col" [class.!hidden]="!dynamicMode && !onlyUserDynamicSource"> |
|
|
|
<div class="flex flex-col flex-1" [class.!hidden]="!dynamicMode && !onlyUserDynamicSource"> |
|
|
|
<div formGroupName="dynamicValue" class="flex flex-row items-center justify-start gap-2"> |
|
|
|
<div class="flex max-w-35% flex-full flex-col"> |
|
|
|
<mat-form-field hideRequiredMarker class="mat-block"> |
|
|
|
|
|
|
|
@ -49,7 +49,7 @@ |
|
|
|
<button mat-raised-button color="primary" |
|
|
|
[disabled]="(isLoading$ | async)" |
|
|
|
(click)="onEntityAction($event, 'manageEdges')" |
|
|
|
[class.!hidden]="isEdit"> |
|
|
|
[class.!hidden]="isEdit" |
|
|
|
*ngIf="edgesSupportEnabled()"> |
|
|
|
{{'customer.manage-edges' | translate }} |
|
|
|
</button> |
|
|
|
|