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

UI: set value of not option to false if relation type cleared

Browse Source
This commit is contained in:
rusikv 2024-06-10 17:25:09 +03:00
parent 0968de8881
commit f77ad0d3ad
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/modules/home/components/relation/relation-filters.component.html
View File

@ -27,10 +27,7 @@
<div class="tb-form-table-row align-start" <div class="tb-form-table-row align-start"
*ngFor="let relationFilterControl of relationFiltersFormArray.controls; let $index = index"> *ngFor="let relationFilterControl of relationFiltersFormArray.controls; let $index = index">
<mat-chip-listbox *ngIf="enableNotOption" class="flex-18 center-stretch" [formControl]="relationFilterControl.get('negate')"> <mat-chip-listbox *ngIf="enableNotOption" class="flex-18 center-stretch" [formControl]="relationFilterControl.get('negate')">
<mat-chip-option color="primary" [value]="true" <mat-chip-option color="primary" [value]="true">{{ 'relation.not' | translate }}</mat-chip-option>
[disabled]="!relationFilterControl.get('relationType').value">
{{ 'relation.not' | translate}}
</mat-chip-option>
</mat-chip-listbox> </mat-chip-listbox>
<tb-relation-type-autocomplete subscriptSizing="dynamic" <tb-relation-type-autocomplete subscriptSizing="dynamic"
class="flex-50" showLabel="false" class="flex-50" showLabel="false"

12
ui-ngx/src/app/modules/home/components/relation/relation-filters.component.ts
View File

@ -128,7 +128,17 @@ export class RelationFiltersComponent extends PageComponent implements ControlVa
entityTypes: [filter ? filter.entityTypes : []] entityTypes: [filter ? filter.entityTypes : []]
}); });
if (this.enableNotOption) { if (this.enableNotOption) {
formGroup.addControl('negate', this.fb.control(filter ? filter.negate : false)); formGroup.addControl('negate', this.fb.control({value: filter ? filter.negate : false, disabled: true}));
formGroup.get('relationType').valueChanges.pipe(
takeUntil(this.destroy$)
).subscribe(value => {
if (value) {
formGroup.get('negate').enable({emitEvent: false});
} else {
formGroup.get('negate').setValue(false, {emitEvent:false});
formGroup.get('negate').disable({emitEvent: false});
}
});
} }
return formGroup; return formGroup;
} }