tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Change position advanced settings and add lazy loadin for expansion panel

pull/5452/head
ArtemDzhereleiko 5 years ago
parent
84f2bdd2de
commit
3f8ef73de0
1 changed files with 33 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 62
      ui-ngx/src/app/modules/home/components/widget/widget-config.component.html

62
ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
View File

@ -310,21 +310,6 @@
<input matInput formControlName="titleTooltip"> <input matInput formControlName="titleTooltip">
</mat-form-field> </mat-form-field>
</div> </div>
<mat-expansion-panel class="tb-settings">
<mat-expansion-panel-header>
<mat-panel-description fxLayoutAlign="end" translate>
widget-config.advanced-settings
</mat-panel-description>
</mat-expansion-panel-header>
<div fxFlex>
<tb-json-object-edit
[editorStyle]="{minHeight: '100px'}"
required
label="{{ 'widget-config.title-style' | translate }}"
formControlName="titleStyle"
></tb-json-object-edit>
</div>
</mat-expansion-panel>
<fieldset class="fields-group" fxLayout="column" fxLayoutGap="8px"> <fieldset class="fields-group" fxLayout="column" fxLayoutGap="8px">
<legend class="group-title" translate>widget-config.title-icon</legend> <legend class="group-title" translate>widget-config.title-icon</legend>
<mat-slide-toggle formControlName="showTitleIcon"> <mat-slide-toggle formControlName="showTitleIcon">
@ -347,6 +332,21 @@
</mat-form-field> </mat-form-field>
</div> </div>
</fieldset> </fieldset>
<mat-expansion-panel class="tb-settings">
<mat-expansion-panel-header>
<mat-panel-description fxLayoutAlign="end" translate>
widget-config.advanced-settings
</mat-panel-description>
</mat-expansion-panel-header>
<ng-template matExpansionPanelContent>
<tb-json-object-edit
[editorStyle]="{minHeight: '100px'}"
required
label="{{ 'widget-config.title-style' | translate }}"
formControlName="titleStyle"
></tb-json-object-edit>
</ng-template>
</mat-expansion-panel>
</fieldset> </fieldset>
<fieldset class="fields-group" fxLayout="column" fxLayoutGap="8px"> <fieldset class="fields-group" fxLayout="column" fxLayoutGap="8px">
<legend class="group-title" translate>widget-config.widget-style</legend> <legend class="group-title" translate>widget-config.widget-style</legend>
@ -391,14 +391,14 @@
widget-config.advanced-settings widget-config.advanced-settings
</mat-panel-description> </mat-panel-description>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<div fxFlex> <ng-template matExpansionPanelContent>
<tb-json-object-edit <tb-json-object-edit
[editorStyle]="{minHeight: '100px'}" [editorStyle]="{minHeight: '100px'}"
required required
label="{{ 'widget-config.widget-style' | translate }}" label="{{ 'widget-config.widget-style' | translate }}"
formControlName="widgetStyle" formControlName="widgetStyle"
></tb-json-object-edit> ></tb-json-object-edit>
</div> </ng-template>
</mat-expansion-panel> </mat-expansion-panel>
</fieldset> </fieldset>
<fieldset class="fields-group fields-group-slider" fxLayout="column" fxLayoutGap="8px"> <fieldset class="fields-group fields-group-slider" fxLayout="column" fxLayoutGap="8px">
@ -414,7 +414,9 @@
widget-config.advanced-settings widget-config.advanced-settings
</mat-panel-description> </mat-panel-description>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<tb-legend-config formControlName="legendConfig"></tb-legend-config> <ng-template matExpansionPanelContent>
<tb-legend-config formControlName="legendConfig"></tb-legend-config>
</ng-template>
</mat-expansion-panel> </mat-expansion-panel>
</fieldset> </fieldset>
<fieldset [formGroup]="layoutSettings" class="fields-group fields-group-slider" fxLayout="column" fxLayoutGap="8px"> <fieldset [formGroup]="layoutSettings" class="fields-group fields-group-slider" fxLayout="column" fxLayoutGap="8px">
@ -430,17 +432,19 @@
widget-config.advanced-settings widget-config.advanced-settings
</mat-panel-description> </mat-panel-description>
</mat-expansion-panel-header> </mat-expansion-panel-header>
<div fxLayout.xs="column" fxLayoutAlign.xs="center" fxLayout="row" fxLayoutAlign="start center" <ng-template matExpansionPanelContent>
fxLayoutGap="8px"> <div fxLayout.xs="column" fxLayoutAlign.xs="center" fxLayout="row" fxLayoutAlign="start center"
<mat-form-field fxFlex> fxLayoutGap="8px">
<mat-label translate>widget-config.order</mat-label> <mat-form-field fxFlex>
<input matInput formControlName="mobileOrder" type="number" step="1"> <mat-label translate>widget-config.order</mat-label>
</mat-form-field> <input matInput formControlName="mobileOrder" type="number" step="1">
<mat-form-field fxFlex> </mat-form-field>
<mat-label translate>widget-config.height</mat-label> <mat-form-field fxFlex>
<input matInput formControlName="mobileHeight" type="number" min="1" max="10" step="1"> <mat-label translate>widget-config.height</mat-label>
</mat-form-field> <input matInput formControlName="mobileHeight" type="number" min="1" max="10" step="1">
</div> </mat-form-field>
</div>
</ng-template>
</mat-expansion-panel> </mat-expansion-panel>
</fieldset> </fieldset>
<div fxLayout.xs="column" fxLayoutAlign.xs="center" fxLayout="row" fxLayoutAlign="start center" <div fxLayout.xs="column" fxLayoutAlign.xs="center" fxLayout="row" fxLayoutAlign="start center"

Write Preview
Loading…
Cancel
Save