dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'rc'

Browse Source
This commit is contained in:
Igor Kulikov 2024-10-08 16:12:39 +03:00
commit c88a05ef5c
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui-ngx/src/app/shared/components/time/timewindow-config-dialog.component.html
View File

@ -63,7 +63,7 @@
subscriptSizing="dynamic" subscriptSizing="dynamic"
appearance="outline" appearance="outline"
[disabledAdvanced]="timewindowForm.get('realtime.disableCustomInterval').value" [disabledAdvanced]="timewindowForm.get('realtime.disableCustomInterval').value"
[required]="timewindow.selectedTab === timewindowTypes.REALTIME && [required]="timewindowForm.get('selectedTab').value === timewindowTypes.REALTIME &&
timewindowForm.get('realtime.realtimeType').value === realtimeTypes.LAST_INTERVAL"> timewindowForm.get('realtime.realtimeType').value === realtimeTypes.LAST_INTERVAL">
</tb-timeinterval> </tb-timeinterval>
</div> </div>
@ -83,7 +83,7 @@
onlyCurrentInterval="true" onlyCurrentInterval="true"
subscriptSizing="dynamic" subscriptSizing="dynamic"
appearance="outline" appearance="outline"
[required]="timewindow.selectedTab === timewindowTypes.REALTIME && [required]="timewindowForm.get('selectedTab').value === timewindowTypes.REALTIME &&
timewindowForm.get('realtime.realtimeType').value === realtimeTypes.INTERVAL"> timewindowForm.get('realtime.realtimeType').value === realtimeTypes.INTERVAL">
</tb-quick-time-interval> </tb-quick-time-interval>
</div> </div>
@ -118,7 +118,7 @@
subscriptSizing="dynamic" subscriptSizing="dynamic"
appearance="outline" appearance="outline"
[disabledAdvanced]="timewindowForm.get('history.disableCustomInterval').value" [disabledAdvanced]="timewindowForm.get('history.disableCustomInterval').value"
[required]="timewindow.selectedTab === timewindowTypes.HISTORY && [required]="timewindowForm.get('selectedTab').value === timewindowTypes.HISTORY &&
timewindowForm.get('history.historyType').value === historyTypes.LAST_INTERVAL"> timewindowForm.get('history.historyType').value === historyTypes.LAST_INTERVAL">
</tb-timeinterval> </tb-timeinterval>
</div> </div>
@ -135,7 +135,7 @@
subscriptSizing="dynamic" subscriptSizing="dynamic"
appearance="outline" appearance="outline"
class="history-time-input" class="history-time-input"
[required]="timewindow.selectedTab === timewindowTypes.HISTORY && [required]="timewindowForm.get('selectedTab').value === timewindowTypes.HISTORY &&
timewindowForm.get('history.historyType').value === historyTypes.FIXED"> timewindowForm.get('history.historyType').value === historyTypes.FIXED">
</tb-datetime-period> </tb-datetime-period>
</div> </div>
@ -151,7 +151,7 @@
formControlName="quickInterval" formControlName="quickInterval"
subscriptSizing="dynamic" subscriptSizing="dynamic"
appearance="outline" appearance="outline"
[required]="timewindow.selectedTab === timewindowTypes.HISTORY && [required]="timewindowForm.get('selectedTab').value === timewindowTypes.HISTORY &&
timewindowForm.get('history.historyType').value === historyTypes.INTERVAL"> timewindowForm.get('history.historyType').value === historyTypes.INTERVAL">
</tb-quick-time-interval> </tb-quick-time-interval>
</div> </div>
@ -198,7 +198,7 @@
<section class="tb-form-panel" [fxShow]="timewindowForm.get('aggregation.type').value !== aggregationTypes.NONE"> <section class="tb-form-panel" [fxShow]="timewindowForm.get('aggregation.type').value !== aggregationTypes.NONE">
<div class="tb-form-panel-title">{{ 'aggregation.group-interval' | translate }}</div> <div class="tb-form-panel-title">{{ 'aggregation.group-interval' | translate }}</div>
<ng-container *ngIf="timewindow.selectedTab === timewindowTypes.REALTIME"> <ng-container *ngIf="timewindowForm.get('selectedTab').value === timewindowTypes.REALTIME">
<div class="tb-form-row" formGroupName="realtime"> <div class="tb-form-row" formGroupName="realtime">
<mat-slide-toggle class="mat-slide fixed-title-width" formControlName="disableCustomGroupInterval"> <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="disableCustomGroupInterval">
{{ 'timewindow.disable-custom-interval' | translate }} {{ 'timewindow.disable-custom-interval' | translate }}
@ -219,7 +219,7 @@
</ng-container> </ng-container>
</div> </div>
</ng-container> </ng-container>
<ng-container *ngIf="timewindow.selectedTab === timewindowTypes.HISTORY"> <ng-container *ngIf="timewindowForm.get('selectedTab').value === timewindowTypes.HISTORY">
<div class="tb-form-row" formGroupName="history"> <div class="tb-form-row" formGroupName="history">
<mat-slide-toggle class="mat-slide fixed-title-width" formControlName="disableCustomGroupInterval"> <mat-slide-toggle class="mat-slide fixed-title-width" formControlName="disableCustomGroupInterval">
{{ 'timewindow.disable-custom-interval' | translate }} {{ 'timewindow.disable-custom-interval' | translate }}

4
ui-ngx/src/app/shared/components/time/timewindow-config-dialog.component.ts
View File

@ -56,8 +56,6 @@ export class TimewindowConfigDialogComponent extends PageComponent implements On
aggregation = false; aggregation = false;
timewindow: Timewindow;
timewindowForm: FormGroup; timewindowForm: FormGroup;
historyTypes = HistoryWindowType; historyTypes = HistoryWindowType;
@ -109,6 +107,8 @@ export class TimewindowConfigDialogComponent extends PageComponent implements On
realtimeTypeSelectionAvailable: boolean; realtimeTypeSelectionAvailable: boolean;
private timewindow: Timewindow;
private destroy$ = new Subject<void>(); private destroy$ = new Subject<void>();
constructor(@Inject(MAT_DIALOG_DATA) public data: TimewindowConfigDialogData, constructor(@Inject(MAT_DIALOG_DATA) public data: TimewindowConfigDialogData,

14
ui-ngx/src/app/shared/components/time/timewindow-panel.component.html
View File

@ -51,7 +51,7 @@
subscriptSizing="dynamic" subscriptSizing="dynamic"
appearance="outline" appearance="outline"
[disabledAdvanced]="timewindow.realtime.disableCustomInterval" [disabledAdvanced]="timewindow.realtime.disableCustomInterval"
[required]="timewindow.selectedTab === timewindowTypes.REALTIME && [required]="timewindowForm.get('selectedTab').value === timewindowTypes.REALTIME &&
timewindowForm.get('realtime.realtimeType').value === realtimeTypes.LAST_INTERVAL"> timewindowForm.get('realtime.realtimeType').value === realtimeTypes.LAST_INTERVAL">
</tb-timeinterval> </tb-timeinterval>
@ -62,7 +62,7 @@
onlyCurrentInterval="true" onlyCurrentInterval="true"
subscriptSizing="dynamic" subscriptSizing="dynamic"
appearance="outline" appearance="outline"
[required]="timewindow.selectedTab === timewindowTypes.REALTIME && [required]="timewindowForm.get('selectedTab').value === timewindowTypes.REALTIME &&
timewindowForm.get('realtime.realtimeType').value === realtimeTypes.INTERVAL"> timewindowForm.get('realtime.realtimeType').value === realtimeTypes.INTERVAL">
</tb-quick-time-interval> </tb-quick-time-interval>
</div> </div>
@ -94,7 +94,7 @@
subscriptSizing="dynamic" subscriptSizing="dynamic"
appearance="outline" appearance="outline"
[disabledAdvanced]="timewindow.history.disableCustomInterval" [disabledAdvanced]="timewindow.history.disableCustomInterval"
[required]="timewindow.selectedTab === timewindowTypes.HISTORY && [required]="timewindowForm.get('selectedTab').value === timewindowTypes.HISTORY &&
timewindowForm.get('history.historyType').value === historyTypes.LAST_INTERVAL"> timewindowForm.get('history.historyType').value === historyTypes.LAST_INTERVAL">
</tb-timeinterval> </tb-timeinterval>
@ -104,7 +104,7 @@
subscriptSizing="dynamic" subscriptSizing="dynamic"
appearance="outline" appearance="outline"
class="history-time-input" class="history-time-input"
[required]="timewindow.selectedTab === timewindowTypes.HISTORY && [required]="timewindowForm.get('selectedTab').value === timewindowTypes.HISTORY &&
timewindowForm.get('history.historyType').value === historyTypes.FIXED"> timewindowForm.get('history.historyType').value === historyTypes.FIXED">
</tb-datetime-period> </tb-datetime-period>
@ -114,7 +114,7 @@
formControlName="quickInterval" formControlName="quickInterval"
subscriptSizing="dynamic" subscriptSizing="dynamic"
appearance="outline" appearance="outline"
[required]="timewindow.selectedTab === timewindowTypes.HISTORY && [required]="timewindowForm.get('selectedTab').value === timewindowTypes.HISTORY &&
timewindowForm.get('history.historyType').value === historyTypes.INTERVAL"> timewindowForm.get('history.historyType').value === historyTypes.INTERVAL">
</tb-quick-time-interval> </tb-quick-time-interval>
</div> </div>
@ -145,7 +145,7 @@
<section class="tb-form-row column-xs same-padding" [fxShow]="(isEdit || !timewindow.hideAggInterval) <section class="tb-form-row column-xs same-padding" [fxShow]="(isEdit || !timewindow.hideAggInterval)
&& timewindowForm.get('aggregation.type').value !== aggregationTypes.NONE"> && timewindowForm.get('aggregation.type').value !== aggregationTypes.NONE">
<ng-container formGroupName="realtime" *ngIf="timewindow.selectedTab === timewindowTypes.REALTIME"> <ng-container formGroupName="realtime" *ngIf="timewindowForm.get('selectedTab').value === timewindowTypes.REALTIME">
<tb-timeinterval <tb-timeinterval
formControlName="interval" formControlName="interval"
[min]="minRealtimeAggInterval()" [max]="maxRealtimeAggInterval()" [min]="minRealtimeAggInterval()" [max]="maxRealtimeAggInterval()"
@ -156,7 +156,7 @@
<div class="fixed-title-width-180">{{ 'aggregation.group-interval' | translate }}</div> <div class="fixed-title-width-180">{{ 'aggregation.group-interval' | translate }}</div>
</tb-timeinterval> </tb-timeinterval>
</ng-container> </ng-container>
<ng-container formGroupName="history" *ngIf="timewindow.selectedTab === timewindowTypes.HISTORY"> <ng-container formGroupName="history" *ngIf="timewindowForm.get('selectedTab').value === timewindowTypes.HISTORY">
<tb-timeinterval <tb-timeinterval
formControlName="interval" formControlName="interval"
[min]="minHistoryAggInterval()" [max]="maxHistoryAggInterval()" [min]="minHistoryAggInterval()" [max]="maxHistoryAggInterval()"