From 0035c9b742bb067bb20b70fb6446bfc14a66d321 Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Tue, 11 Oct 2016 15:14:23 +0100 Subject: [PATCH] changed to forEach for loop --- .../src/services/widget-visibility.service.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts index 56d7069a9d..8b3a632dab 100644 --- a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts @@ -124,16 +124,18 @@ export class WidgetVisibilityService { } searchForm(form: FormModel, name: string) { - for (let columns of form.json.fields) { + let res; + form.json.fields.forEach(columns => { for (let i in columns.fields) { if (columns.fields.hasOwnProperty(i)) { - let res = columns.fields[i].find(field => field.id === name); + res = columns.fields[i].find(field => field.id === name); if (res) { return res.value; } } } - } + }); + return res ? res.value : res; } getVariableValue(form: FormModel, name: string, processVarList: TaskProcessVariableModel[]) {