inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-4524] Checkbox widget is not displayed on a form on APS1 when having some visibility conditions on it (#4838)

Browse Source 
* fix visibbility conditions form

* fix visibbility conditions form
This commit is contained in:
Eugenio Romano
2019-06-11 19:44:29 +01:00
committed by GitHub
parent 1c412ab15f
commit 9838d1e5d8
6 changed files with 831 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/core/form/services/widget-visibility.service.ts
View File

@@ -52,7 +52,7 @@ export class WidgetVisibilityService {
}
evaluateVisibility(form: FormModel, visibilityObj: WidgetVisibilityModel): boolean {
const isLeftFieldPresent = visibilityObj && ( visibilityObj.leftFormFieldId || visibilityObj.leftRestResponseId );
const isLeftFieldPresent = visibilityObj && (visibilityObj.leftFormFieldId || visibilityObj.leftRestResponseId);
if (!isLeftFieldPresent || isLeftFieldPresent === 'null') {
return true;
} else {
@@ -60,19 +60,28 @@ export class WidgetVisibilityService {
}
}
isFieldVisible(form: FormModel, visibilityObj: WidgetVisibilityModel): boolean {
isFieldVisible(form: FormModel, visibilityObj: WidgetVisibilityModel, accumulator: any[] = [], result: boolean = false): boolean {
const leftValue = this.getLeftValue(form, visibilityObj);
const rightValue = this.getRightValue(form, visibilityObj);
const actualResult = this.evaluateCondition(leftValue, rightValue, visibilityObj.operator);
accumulator.push({ value: actualResult, operator: visibilityObj.nextConditionOperator });
if (visibilityObj.nextCondition) {
return this.evaluateLogicalOperation(
visibilityObj.nextConditionOperator,
actualResult,
this.isFieldVisible(form, visibilityObj.nextCondition)
);
result = this.isFieldVisible(form, visibilityObj.nextCondition, accumulator);
} else {
return actualResult;
result = accumulator[0].value;
for (let i = 1; i < accumulator.length; i++) {
result = this.evaluateLogicalOperation(
accumulator[i - 1].operator,
result,
accumulator[i].value
);
}
}
return result;
}
getLeftValue(form: FormModel, visibilityObj: WidgetVisibilityModel): string {