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

Merge pull request #8311 from vvlladd28/bug/timeinterval/disable

Browse Source 
Fix disable time interval in timewindow panel
This commit is contained in:
Igor Kulikov 2023-04-13 17:58:10 +03:00 committed by GitHub
commit 3ffe9dd762
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/shared/components/time/timeinterval.component.ts
View File

@ -64,8 +64,6 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
@coerceBoolean()
isEdit = false;
hideFlagValue = false;
@Input()
@coerceBoolean()
hideFlag = false;
@ -208,7 +206,7 @@ export class TimeintervalComponent implements OnInit, ControlValueAccessor {
}
onHideFlagChange() {
this.hideFlagChange.emit(this.hideFlagValue);
this.hideFlagChange.emit(this.hideFlag);
}
onTimeInputChange(type: string) {

9
ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts
View File

@ -157,9 +157,9 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit {
disabled: hideTimezone
}]
});
this.updateValidators();
this.timewindowForm.get('aggregation.type').valueChanges.subscribe(() => {
this.updateValidators();
this.updateValidators(this.timewindowForm.get('aggregation.type').value);
this.timewindowForm.get('aggregation.type').valueChanges.subscribe((aggregationType: AggregationType) => {
this.updateValidators(aggregationType);
});
}
@ -172,8 +172,7 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit {
return limit;
}
private updateValidators() {
const aggType = this.timewindowForm.get('aggregation.type').value;
private updateValidators(aggType: AggregationType) {
if (aggType !== AggregationType.NONE) {
this.timewindowForm.get('aggregation.limit').clearValidators();
} else {