Commit 3f8ef73de0d684e1b2a092c56736c79123d0d395
1 parent
84f2bdd2
Change position advanced settings and add lazy loadin for expansion panel
Showing
1 changed file
with
33 additions
and
29 deletions
... | ... | @@ -310,21 +310,6 @@ |
310 | 310 | <input matInput formControlName="titleTooltip"> |
311 | 311 | </mat-form-field> |
312 | 312 | </div> |
313 | - <mat-expansion-panel class="tb-settings"> | |
314 | - <mat-expansion-panel-header> | |
315 | - <mat-panel-description fxLayoutAlign="end" translate> | |
316 | - widget-config.advanced-settings | |
317 | - </mat-panel-description> | |
318 | - </mat-expansion-panel-header> | |
319 | - <div fxFlex> | |
320 | - <tb-json-object-edit | |
321 | - [editorStyle]="{minHeight: '100px'}" | |
322 | - required | |
323 | - label="{{ 'widget-config.title-style' | translate }}" | |
324 | - formControlName="titleStyle" | |
325 | - ></tb-json-object-edit> | |
326 | - </div> | |
327 | - </mat-expansion-panel> | |
328 | 313 | <fieldset class="fields-group" fxLayout="column" fxLayoutGap="8px"> |
329 | 314 | <legend class="group-title" translate>widget-config.title-icon</legend> |
330 | 315 | <mat-slide-toggle formControlName="showTitleIcon"> |
... | ... | @@ -347,6 +332,21 @@ |
347 | 332 | </mat-form-field> |
348 | 333 | </div> |
349 | 334 | </fieldset> |
335 | + <mat-expansion-panel class="tb-settings"> | |
336 | + <mat-expansion-panel-header> | |
337 | + <mat-panel-description fxLayoutAlign="end" translate> | |
338 | + widget-config.advanced-settings | |
339 | + </mat-panel-description> | |
340 | + </mat-expansion-panel-header> | |
341 | + <ng-template matExpansionPanelContent> | |
342 | + <tb-json-object-edit | |
343 | + [editorStyle]="{minHeight: '100px'}" | |
344 | + required | |
345 | + label="{{ 'widget-config.title-style' | translate }}" | |
346 | + formControlName="titleStyle" | |
347 | + ></tb-json-object-edit> | |
348 | + </ng-template> | |
349 | + </mat-expansion-panel> | |
350 | 350 | </fieldset> |
351 | 351 | <fieldset class="fields-group" fxLayout="column" fxLayoutGap="8px"> |
352 | 352 | <legend class="group-title" translate>widget-config.widget-style</legend> |
... | ... | @@ -391,14 +391,14 @@ |
391 | 391 | widget-config.advanced-settings |
392 | 392 | </mat-panel-description> |
393 | 393 | </mat-expansion-panel-header> |
394 | - <div fxFlex> | |
394 | + <ng-template matExpansionPanelContent> | |
395 | 395 | <tb-json-object-edit |
396 | 396 | [editorStyle]="{minHeight: '100px'}" |
397 | 397 | required |
398 | 398 | label="{{ 'widget-config.widget-style' | translate }}" |
399 | 399 | formControlName="widgetStyle" |
400 | 400 | ></tb-json-object-edit> |
401 | - </div> | |
401 | + </ng-template> | |
402 | 402 | </mat-expansion-panel> |
403 | 403 | </fieldset> |
404 | 404 | <fieldset class="fields-group fields-group-slider" fxLayout="column" fxLayoutGap="8px"> |
... | ... | @@ -414,7 +414,9 @@ |
414 | 414 | widget-config.advanced-settings |
415 | 415 | </mat-panel-description> |
416 | 416 | </mat-expansion-panel-header> |
417 | - <tb-legend-config formControlName="legendConfig"></tb-legend-config> | |
417 | + <ng-template matExpansionPanelContent> | |
418 | + <tb-legend-config formControlName="legendConfig"></tb-legend-config> | |
419 | + </ng-template> | |
418 | 420 | </mat-expansion-panel> |
419 | 421 | </fieldset> |
420 | 422 | <fieldset [formGroup]="layoutSettings" class="fields-group fields-group-slider" fxLayout="column" fxLayoutGap="8px"> |
... | ... | @@ -430,17 +432,19 @@ |
430 | 432 | widget-config.advanced-settings |
431 | 433 | </mat-panel-description> |
432 | 434 | </mat-expansion-panel-header> |
433 | - <div fxLayout.xs="column" fxLayoutAlign.xs="center" fxLayout="row" fxLayoutAlign="start center" | |
434 | - fxLayoutGap="8px"> | |
435 | - <mat-form-field fxFlex> | |
436 | - <mat-label translate>widget-config.order</mat-label> | |
437 | - <input matInput formControlName="mobileOrder" type="number" step="1"> | |
438 | - </mat-form-field> | |
439 | - <mat-form-field fxFlex> | |
440 | - <mat-label translate>widget-config.height</mat-label> | |
441 | - <input matInput formControlName="mobileHeight" type="number" min="1" max="10" step="1"> | |
442 | - </mat-form-field> | |
443 | - </div> | |
435 | + <ng-template matExpansionPanelContent> | |
436 | + <div fxLayout.xs="column" fxLayoutAlign.xs="center" fxLayout="row" fxLayoutAlign="start center" | |
437 | + fxLayoutGap="8px"> | |
438 | + <mat-form-field fxFlex> | |
439 | + <mat-label translate>widget-config.order</mat-label> | |
440 | + <input matInput formControlName="mobileOrder" type="number" step="1"> | |
441 | + </mat-form-field> | |
442 | + <mat-form-field fxFlex> | |
443 | + <mat-label translate>widget-config.height</mat-label> | |
444 | + <input matInput formControlName="mobileHeight" type="number" min="1" max="10" step="1"> | |
445 | + </mat-form-field> | |
446 | + </div> | |
447 | + </ng-template> | |
444 | 448 | </mat-expansion-panel> |
445 | 449 | </fieldset> |
446 | 450 | <div fxLayout.xs="column" fxLayoutAlign.xs="center" fxLayout="row" fxLayoutAlign="start center" | ... | ... |