Browse Source

Merge pull request #4790 from ChantsovaEkaterina/bug/incorrect-timewindow-displaying

UI: fix incorrect timewindow displaying
pull/4851/head
Igor Kulikov 5 years ago
committed by GitHub
parent
commit
6c0c4bbf0f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      ui-ngx/src/app/shared/components/time/timewindow-panel.component.html
  2. 2
      ui-ngx/src/app/shared/components/time/timewindow.component.ts

2
ui-ngx/src/app/shared/components/time/timewindow-panel.component.html

@ -17,7 +17,7 @@
-->
<form [formGroup]="timewindowForm" (ngSubmit)="update()">
<fieldset [disabled]="(isLoading$ | async)">
<div class="mat-content" style="height: 100%;" fxLayout="column">
<div class="mat-content" fxLayout="column">
<mat-tab-group dynamicHeight [ngClass]="{'tb-headless': historyOnly}"
(selectedIndexChange)="timewindowForm.markAsDirty()" [(selectedIndex)]="timewindow.selectedTab">
<mat-tab label="{{ 'timewindow.realtime' | translate }}">

2
ui-ngx/src/app/shared/components/time/timewindow.component.ts

@ -185,7 +185,7 @@ export class TimewindowComponent implements OnInit, OnDestroy, ControlValueAcces
});
if (isGtXs) {
config.minWidth = '417px';
config.maxHeight = '500px';
config.maxHeight = '550px';
const panelHeight = 375;
const panelWidth = 417;
const el = this.timewindowPanelOrigin.elementRef.nativeElement;

Loading…
Cancel
Save