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

added test dialog required expression

Browse Source
This commit is contained in:
mpetrov 2025-02-19 15:59:16 +02:00
parent 373cca1e19
commit 0d3f364bed
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.html
View File

@ -38,6 +38,7 @@
functionName="calculate" functionName="calculate"
class="expression-edit" class="expression-edit"
[functionArgs]="functionArgs" [functionArgs]="functionArgs"
[required]="true"
[disableUndefinedCheck]="true" [disableUndefinedCheck]="true"
[fillHeight]="true" [fillHeight]="true"
[highlightRules]="data.argumentsHighlightRules" [highlightRules]="data.argumentsHighlightRules"

4
ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.ts
View File

@ -26,7 +26,7 @@ import {
import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog'; import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state'; import { AppState } from '@core/core.state';
import { FormBuilder } from '@angular/forms'; import { FormBuilder, Validators } from '@angular/forms';
import { NEVER, Observable, of, switchMap } from 'rxjs'; import { NEVER, Observable, of, switchMap } from 'rxjs';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { DialogComponent } from '@shared/components/dialog.component'; import { DialogComponent } from '@shared/components/dialog.component';
@ -62,7 +62,7 @@ export class CalculatedFieldScriptTestDialogComponent extends DialogComponent<Ca
@ViewChild('expressionContent', {static: true}) expressionContent: JsonContentComponent; @ViewChild('expressionContent', {static: true}) expressionContent: JsonContentComponent;
calculatedFieldScriptTestFormGroup = this.fb.group({ calculatedFieldScriptTestFormGroup = this.fb.group({
expression: [], expression: ['', Validators.required],
arguments: [], arguments: [],
output: [] output: []
}); });