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

UI: Hidden dynamic value in alarm rules

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2020-09-30 12:30:01 +03:00
parent 1d61b4f439
commit 51a6278d44
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui-ngx/src/app/modules/home/components/filter/filter-predicate-value.component.html
View File

@ -76,6 +76,7 @@
type="button" type="button"
matTooltip="{{ (dynamicMode ? 'filter.switch-to-default-value' : 'filter.switch-to-dynamic-value') | translate }}" matTooltip="{{ (dynamicMode ? 'filter.switch-to-default-value' : 'filter.switch-to-dynamic-value') | translate }}"
matTooltipPosition="above" matTooltipPosition="above"
*ngIf="allow"
(click)="dynamicMode = !dynamicMode"> (click)="dynamicMode = !dynamicMode">
<mat-icon class="tb-mat-20" [svgIcon]="dynamicMode ? 'mdi:numeric' : 'mdi:variable'"></mat-icon> <mat-icon class="tb-mat-20" [svgIcon]="dynamicMode ? 'mdi:numeric' : 'mdi:variable'"></mat-icon>
</button> </button>

3
ui-ngx/src/app/modules/home/components/filter/filter-predicate-value.component.ts
View File

@ -50,6 +50,7 @@ export class FilterPredicateValueComponent implements ControlValueAccessor, OnIn
set allowUserDynamicSource(allow: boolean) { set allowUserDynamicSource(allow: boolean) {
this.dynamicValueSourceTypes = [DynamicValueSourceType.CURRENT_TENANT, this.dynamicValueSourceTypes = [DynamicValueSourceType.CURRENT_TENANT,
DynamicValueSourceType.CURRENT_CUSTOMER]; DynamicValueSourceType.CURRENT_CUSTOMER];
this.allow = allow;
if (allow) { if (allow) {
this.dynamicValueSourceTypes.push(DynamicValueSourceType.CURRENT_USER); this.dynamicValueSourceTypes.push(DynamicValueSourceType.CURRENT_USER);
} else { } else {
@ -71,6 +72,8 @@ export class FilterPredicateValueComponent implements ControlValueAccessor, OnIn
dynamicMode = false; dynamicMode = false;
allow = true;
private propagateChange = null; private propagateChange = null;
constructor(private fb: FormBuilder) { constructor(private fb: FormBuilder) {