Browse Source

UI: Fix Json Form conditions.

pull/12214/head
Igor Kulikov 2 years ago
parent
commit
617381ffc7
  1. 6
      ui-ngx/src/app/shared/components/json-form/react/json-form-schema-form.tsx
  2. 1
      ui-ngx/src/app/shared/components/json-form/react/json-form.models.ts

6
ui-ngx/src/app/shared/components/json-form/react/json-form-schema-form.tsx

@ -131,10 +131,10 @@ class ThingsboardSchemaForm extends React.Component<JsonFormProps, any> {
}
if (form.condition) {
this.hasConditions = true;
if (!this.conditionFunction) {
this.conditionFunction = new Function('form', 'model', 'index', `return ${form.condition};`);
if (!form.conditionFunction) {
form.conditionFunction = new Function('form', 'model', 'index', `return ${form.condition};`);
}
if (this.conditionFunction(form, model, index) === false) {
if (form.conditionFunction(form, model, index) === false) {
return null;
}
}

1
ui-ngx/src/app/shared/components/json-form/react/json-form.models.ts

@ -87,6 +87,7 @@ export interface JsonFormData {
required: boolean;
default?: any;
condition?: string;
conditionFunction?: Function;
style?: any;
rows?: number;
rowsMax?: number;

Loading…
Cancel
Save