Browse Source

Merge pull request #4041 from vvlladd28/bug/safary/action-dialog

UI: Fixed show widget action dialog in Safari browser
pull/4062/head
Igor Kulikov 6 years ago
committed by GitHub
parent
commit
09edf8502c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 42
      ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html

42
ui-ngx/src/app/modules/home/components/widget/action/widget-action-dialog.component.html

@ -67,15 +67,13 @@
</mat-form-field> </mat-form-field>
<section fxLayout="column" [formGroup]="actionTypeFormGroup" [ngSwitch]="widgetActionFormGroup.get('type').value"> <section fxLayout="column" [formGroup]="actionTypeFormGroup" [ngSwitch]="widgetActionFormGroup.get('type').value">
<ng-template [ngSwitchCase]="widgetActionType.openDashboard"> <ng-template [ngSwitchCase]="widgetActionType.openDashboard">
<div fxLayout="column"> <div class="mat-caption tb-required"
<div class="mat-caption tb-required" style="padding-left: 3px; padding-bottom: 10px; color: rgba(0,0,0,0.57);" translate>widget-action.target-dashboard</div>
style="padding-left: 3px; padding-bottom: 10px; color: rgba(0,0,0,0.57);" translate>widget-action.target-dashboard</div> <tb-dashboard-autocomplete
<tb-dashboard-autocomplete formControlName="targetDashboardId"
formControlName="targetDashboardId" required
required [selectFirstDashboard]="true"
[selectFirstDashboard]="true" ></tb-dashboard-autocomplete>
></tb-dashboard-autocomplete>
</div>
</ng-template> </ng-template>
<ng-template [ngSwitchCase]="widgetActionFormGroup.get('type').value === widgetActionType.openDashboardState || <ng-template [ngSwitchCase]="widgetActionFormGroup.get('type').value === widgetActionType.openDashboardState ||
widgetActionFormGroup.get('type').value === widgetActionType.updateDashboardState || widgetActionFormGroup.get('type').value === widgetActionType.updateDashboardState ||
@ -122,26 +120,24 @@
widgetActionFormGroup.get('type').value === widgetActionType.updateDashboardState || widgetActionFormGroup.get('type').value === widgetActionType.updateDashboardState ||
widgetActionFormGroup.get('type').value === widgetActionType.openDashboard ? widgetActionFormGroup.get('type').value === widgetActionType.openDashboard ?
widgetActionFormGroup.get('type').value : ''"> widgetActionFormGroup.get('type').value : ''">
<div fxFlex fxLayout="column"> <mat-checkbox formControlName="setEntityId">
<mat-checkbox formControlName="setEntityId"> {{ 'widget-action.set-entity-from-widget' | translate }}
{{ 'widget-action.set-entity-from-widget' | translate }} </mat-checkbox>
</mat-checkbox> <mat-form-field *ngIf="actionTypeFormGroup.get('setEntityId').value"
<mat-form-field *ngIf="actionTypeFormGroup.get('setEntityId').value" floatLabel="always"
floatLabel="always" class="mat-block">
class="mat-block"> <mat-label translate>alias.state-entity-parameter-name</mat-label>
<mat-label translate>alias.state-entity-parameter-name</mat-label> <input matInput
<input matInput placeholder="{{ 'alias.default-entity-parameter-name' | translate }}"
placeholder="{{ 'alias.default-entity-parameter-name' | translate }}" formControlName="stateEntityParamName">
formControlName="stateEntityParamName"> </mat-form-field>
</mat-form-field>
</div>
</ng-template> </ng-template>
<ng-template [ngSwitchCase]="widgetActionFormGroup.get('type').value === widgetActionType.openDashboardState ? <ng-template [ngSwitchCase]="widgetActionFormGroup.get('type').value === widgetActionType.openDashboardState ?
widgetActionFormGroup.get('type').value : ''"> widgetActionFormGroup.get('type').value : ''">
<mat-checkbox formControlName="openInSeparateDialog"> <mat-checkbox formControlName="openInSeparateDialog">
{{ 'widget-action.open-in-separate-dialog' | translate }} {{ 'widget-action.open-in-separate-dialog' | translate }}
</mat-checkbox> </mat-checkbox>
<section fxLayout="column" *ngIf="actionTypeFormGroup.get('openInSeparateDialog').value"> <section *ngIf="actionTypeFormGroup.get('openInSeparateDialog').value">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>widget-action.dialog-title</mat-label> <mat-label translate>widget-action.dialog-title</mat-label>
<input matInput formControlName="dialogTitle"> <input matInput formControlName="dialogTitle">

Loading…
Cancel
Save