Browse Source

Merge pull request #4798 from ChantsovaEkaterina/bug/static-widget-config-tabs-invisible

UI: Fix displaying static widget configuration tabs, when advanced settings configuration is empty
pull/4851/head
Igor Kulikov 5 years ago
committed by GitHub
parent
commit
7fc56dc439
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      ui-ngx/src/app/modules/home/components/widget/widget-config.component.html

6
ui-ngx/src/app/modules/home/components/widget/widget-config.component.html

@ -15,9 +15,8 @@
limitations under the License. limitations under the License.
--> -->
<mat-tab-group [ngClass]="{'tb-headless': (widgetType === widgetTypes.static && !displayAdvanced())}" <mat-tab-group class="tb-widget-config tb-absolute-fill" [(selectedIndex)]="selectedTab">
class="tb-widget-config tb-absolute-fill" [(selectedIndex)]="selectedTab"> <mat-tab label="{{ 'widget-config.data' | translate }}" *ngIf="widgetType !== widgetTypes.static">
<mat-tab label="{{ 'widget-config.data' | translate }}" [fxShow]="widgetType !== widgetTypes.static">
<div [formGroup]="dataSettings" class="mat-content mat-padding" fxLayout="column" fxLayoutGap="8px"> <div [formGroup]="dataSettings" class="mat-content mat-padding" fxLayout="column" fxLayoutGap="8px">
<div *ngIf="widgetType === widgetTypes.timeseries || widgetType === widgetTypes.alarm" fxFlex="100" <div *ngIf="widgetType === widgetTypes.timeseries || widgetType === widgetTypes.alarm" fxFlex="100"
fxLayout.xs="column" fxLayoutGap="8px" fxLayoutAlign.xs="center" fxLayout="row" fxLayoutAlign="start center"> fxLayout.xs="column" fxLayoutGap="8px" fxLayoutAlign.xs="center" fxLayout="row" fxLayoutAlign="start center">
@ -85,7 +84,6 @@
</div> </div>
<mat-expansion-panel class="tb-datasources" *ngIf="widgetType !== widgetTypes.rpc && <mat-expansion-panel class="tb-datasources" *ngIf="widgetType !== widgetTypes.rpc &&
widgetType !== widgetTypes.alarm && widgetType !== widgetTypes.alarm &&
widgetType !== widgetTypes.static &&
modelValue?.isDataEnabled" [expanded]="true"> modelValue?.isDataEnabled" [expanded]="true">
<mat-expansion-panel-header> <mat-expansion-panel-header>
<mat-panel-title fxLayout="column"> <mat-panel-title fxLayout="column">

Loading…
Cancel
Save