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

#967 rework container model structure

Browse Source 
- now FormFieldModel provides information about columns and child fields
- greatly simplified models
- visibility engine fixes
This commit is contained in:
Denys Vuika
2016-11-15 15:13:05 +00:00
committed by Mario Romano
parent e114534bc5
commit ee56a1faa6
17 changed files with 97 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ng2-components/ng2-activiti-form/src/components/form-field/form-field.component.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { Component, OnInit, ViewChild, ViewContainerRef, Input, ComponentRef, ComponentFactoryResolver, Output, EventEmitter/*, Injector*/ } from '@angular/core';
import { Component, OnInit, ViewChild, ViewContainerRef, Input, ComponentRef, ComponentFactoryResolver/*,Output, EventEmitter, Injector*/ } from '@angular/core';
import { WidgetVisibilityService } from './../../services/widget-visibility.service';
import { FormRenderingService } from './../../services/form-rendering.service';
import { WidgetComponent } from './../widgets/widget.component';
@@ -23,7 +23,11 @@ import { FormFieldModel/*, FormWidgetModel*/ } from './../widgets/core/index';
@Component({
selector: 'form-field',
template: `<div #container></div>`
template: `
<div [hidden]="!field.isVisible">
<div #container></div>
</div>
`
})
export class FormFieldComponent implements OnInit {
@@ -33,10 +37,6 @@ export class FormFieldComponent implements OnInit {
@Input()
field: FormFieldModel = null;
/** @deprecated component handles visibilty itself */
@Output()
fieldChanged: EventEmitter<FormFieldModel> = new EventEmitter<FormFieldModel>();
private componentRef: ComponentRef<{}>;
constructor(
@@ -54,12 +54,10 @@ export class FormFieldComponent implements OnInit {
this.componentRef = this.container.createComponent(factory/*, 0, this.injector*/);
let instance = <WidgetComponent>this.componentRef.instance;
instance.field = this.field;
instance.fieldChanged.subscribe(args => {
if (this.field && this.field.form) {
this.visibilityService.refreshVisibility(this.field.form);
instance.fieldChanged.subscribe(field => {
if (field && field.form) {
this.visibilityService.refreshVisibility(field.form);
}
/** @deprecated */
this.fieldChanged.emit(args);
});
}
}