Skip to content

Commit 698f6aa

Browse files
NachmanBerkowitzNachman Berkowitz
andauthored
Fix the mismatch in the click def in MetaData (#58)
Co-authored-by: Nachman Berkowitz <[email protected]>
1 parent 4f1e9ee commit 698f6aa

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

projects/table-builder/src/lib/components/column-builder/column-builder.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ng-container [matColumnDef]="metaData.key">
22

33
<ng-template #body let-element='element' >
4-
<mat-cell [styler]='metaData?.additional?.styles' (click)='cellClicked(metaData.key, element)' >
4+
<mat-cell [styler]='metaData?.additional?.styles' (click)='cellClicked(element, metaData.key)' >
55
<ng-container [ngSwitch]="metaData.fieldType">
66
<span *ngSwitchCase="FieldType.Boolean">
77
<mat-icon *ngIf="element[metaData.key]">check</mat-icon>
@@ -31,7 +31,7 @@
3131
</ng-template>
3232

3333
<ng-template #customCellWrapper let-element='element' >
34-
<mat-cell [styler]='metaData?.additional?.styles' (click)='cellClicked(metaData.key, element)' >
34+
<mat-cell [styler]='metaData?.additional?.styles' (click)='cellClicked(element, metaData.key)' >
3535
<ng-container *ngTemplateOutlet="customCell.TemplateRef ;context: {metaData: metaData, element: element }">
3636
</ng-container>
3737
</mat-cell>

projects/table-builder/src/lib/interfaces/report-def.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ export interface MetaData<T = any> {
3838
width?: string;
3939
noExport?: boolean;
4040
noFilter?: boolean;
41-
transform?: ( (o: any, ...args: any[])=> any ) | PipeTransform;
42-
click?: (element: any, key: string ) => void;
41+
transform?: ( (o: T, ...args: any[])=> any ) | PipeTransform;
42+
click?: (element: T, key: string ) => void;
4343
}
4444

4545
export interface ReportDef<DataType = any> {

src/app/table-builder-example/table-builder-example.component.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ const META_DATA: MetaData[] = [
4747
{key: 'date', fieldType: FieldType.Date , displayName: 'The Date',
4848
preSort: {direction: SortDirection.asc, precedence: 1},
4949
additional: {dateFormat: 'shortDate'},
50-
click: (element, key) => console.log(key,element)
50+
click: (element, key) => console.log(element,key)
5151
},
52-
{key: 'name', fieldType: FieldType.String, additional: {
52+
{key: 'name', fieldType: FieldType.String,
53+
additional: {
5354
export: { prepend: "'" },
5455
FilterOptions: { FilterableValues : ['Oxygen', 'Nitrogen','Neon']},
5556
styles: { color: 'yellow' },
@@ -67,7 +68,7 @@ const META_DATA: MetaData[] = [
6768
additional: {
6869
styles: {color: 'green', flex: '0 0 200px'}
6970
},
70-
click: (element, key) => console.log(key,element)
71+
click: (element, key) => console.log(element,key)
7172
}
7273
];
7374

0 commit comments

Comments
 (0)