inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-10-01 14:41:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

added visibility model to container

Browse Source
This commit is contained in:
Vito Albano
2016-10-18 00:28:27 +01:00
parent f39f5c4567
commit 1b3b5ab94a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ng2-components/ng2-activiti-form/src/components/widgets/core/container.model.ts
View File

@@ -21,6 +21,7 @@ import { ContainerColumnModel } from './container-column.model';
import { FormFieldTypes } from './form-field-types';
import { FormModel } from './form.model';
import { FormFieldModel } from './form-field.model';
import { WidgetVisibilityModel } from '../../../models/widget-visibility.model';
// TODO: inherit FormFieldModel
export class ContainerModel extends FormWidgetModel {
@@ -32,6 +33,7 @@ export class ContainerModel extends FormWidgetModel {
tab: string;
numberOfColumns: number = 1;
params: FormFieldMetadata = {};
visibilityCondition: WidgetVisibilityModel = null;
columns: ContainerColumnModel[] = [];
isExpanded: boolean = true;
@@ -71,6 +73,7 @@ export class ContainerModel extends FormWidgetModel {
this.tab = json.tab;
this.numberOfColumns = <number> json.numberOfColumns;
this.params = <FormFieldMetadata> json.params || {};
this.visibilityCondition = <WidgetVisibilityModel> json.visibilityCondition;
let columnSize: number = 12;
if (this.numberOfColumns > 1) {

6
ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts
View File

@@ -81,8 +81,10 @@ export class WidgetVisibilityService {
}
getLeftValue(form: FormModel, visibilityObj: WidgetVisibilityModel) {
return this.getVariableValue(form, visibilityObj.leftRestResponseId, this.processVarList) ||
this.getFormValue(form, visibilityObj.leftFormFieldId);
if (visibilityObj.leftRestResponseId) {
return this.getVariableValue(form, visibilityObj.leftRestResponseId, this.processVarList);
}
return this.getFormValue(form, visibilityObj.leftFormFieldId);
}
getRightValue(form: FormModel, visibilityObj: WidgetVisibilityModel) {