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

Resolve conflict

Browse Source
This commit is contained in:
Ekaterina Chantsova 2024-11-28 12:22:21 +02:00
parent d763b811aa
commit 4fa5c9dbd5
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,7 +370,6 @@ export class TimewindowConfigDialogComponent extends PageComponent implements On
update() {
const timewindowFormValue = this.timewindowForm.getRawValue();
this.timewindow = mergeDeep(this.timewindow, timewindowFormValue);
<<<<<<< HEAD
if (timewindowFormValue.realtime.advancedParams.allowedLastIntervals?.length) {
this.timewindow.realtime.advancedParams.allowedLastIntervals = timewindowFormValue.realtime.advancedParams.allowedLastIntervals;
@ -407,7 +406,6 @@ export class TimewindowConfigDialogComponent extends PageComponent implements On
delete this.timewindow.allowedAggTypes;
}
=======
if (!this.timewindow.realtime.disableCustomInterval) {
delete this.timewindow.realtime.disableCustomInterval;
}
@ -420,7 +418,7 @@ export class TimewindowConfigDialogComponent extends PageComponent implements On
if (!this.timewindow.history.disableCustomGroupInterval) {
delete this.timewindow.history.disableCustomGroupInterval;
}
>>>>>>> upstream/master
if (!this.aggregation) {
delete this.timewindow.aggregation;
}