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

[ADF-773] Fix datatable custom template render (#1947)

Browse Source
This commit is contained in:
Maurizio Vitale
2017-06-08 18:38:01 +01:00
committed by Eugenio Romano
parent ae683ad708
commit cfb3c9b8ba
3 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts
View File

@@ -101,18 +101,36 @@ export class DataTableComponent implements AfterContentInit, OnChanges {
}
ngAfterContentInit() {
this.loadTable();
this.setTableSchema();
this.setupMaterialComponents();
}
ngAfterViewInit() {
this.setupMaterialComponents();
}
private setupMaterialComponents(): boolean {
// workaround for MDL issues with dynamic components
if (componentHandler) {
componentHandler.upgradeAllRegistered();
return true;
}
return false;
}
ngOnChanges(changes: SimpleChanges) {
if (this.isPropertyChanged(changes['data'])) {
this.loadTable();
if (this.isTableEmpty()) {
this.initTable();
}
return;
}
if (this.isPropertyChanged(changes['rows'])) {
if (this.data) {
this.data.setRows(this.convertToRowsData(changes['rows'].currentValue));
if (this.isTableEmpty()) {
this.initTable();
} else {
this.setTableRows(changes['rows'].currentValue);
}
return;
}
@@ -130,27 +148,28 @@ export class DataTableComponent implements AfterContentInit, OnChanges {
return rows.map(row => new ObjectDataRow(row));
}
loadTable() {
private initTable() {
this.data = new ObjectDataTableAdapter(this.rows, []);
}
isTableEmpty() {
return this.data === undefined || this.data === null;
}
private setTableRows(rows) {
if (this.data) {
this.data.setRows(this.convertToRowsData(rows));
}
}
private setTableSchema() {
let schema: DataColumn[] = [];
if (this.columnList && this.columnList.columns) {
schema = this.columnList.columns.map(c => <DataColumn> c);
}
if (!this.data) {
this.data = new ObjectDataTableAdapter(this.rows, schema);
} else {
this.setHtmlColumnConfigurationOnObjectAdapter(schema);
}
// workaround for MDL issues with dynamic components
if (componentHandler) {
componentHandler.upgradeAllRegistered();
}
}
private setHtmlColumnConfigurationOnObjectAdapter(schema: DataColumn[]) {
if (schema && schema.length > 0) {
if (this.data && schema && schema.length > 0) {
this.data.setColumns(schema);
}
}