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

[AAE-1564][DW-1654] improved datatable schema (#5408)

Browse Source 
* improved datatable schema

* collect all runtime columns
This commit is contained in:
Denys Vuika
2020-01-28 14:08:18 +00:00
committed by GitHub
parent 1754baa111
commit d09373501f
3 changed files with 110 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/core/datatable/components/datatable/datatable.component.ts
View File

@@ -356,7 +356,9 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
}
private initTable() {
this.data = new ObjectDataTableAdapter(this.rows, this.columns);
const runtimeColumns = this.getRuntimeColumns();
this.data = new ObjectDataTableAdapter(this.rows, runtimeColumns);
this.setTableSorting(this.sorting);
this.resetSelection();
this.rowMenuCache = {};
@@ -373,18 +375,18 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck,
}
}
private getRuntimeColumns(): any[] {
return [
...(this.columns || []),
...this.getSchemaFromHtml()
];
}
private setTableSchema() {
let schema = [];
if (!this.columns || this.columns.length === 0) {
schema = this.getSchemaFromHtml();
} else {
schema = this.columns.concat(this.getSchemaFromHtml());
}
const columns = this.getRuntimeColumns();
this.columns = schema;
if (this.data && this.columns && this.columns.length > 0) {
this.data.setColumns(this.columns);
if (this.data && columns.length > 0) {
this.data.setColumns(columns);
}
}