From 88fb1d0692afe15473bd456f175a9773eb3d7f5b Mon Sep 17 00:00:00 2001 From: nestorrente Date: Tue, 8 Dec 2020 12:20:31 +0100 Subject: [PATCH] Fixed sortField prop type. --- src/components/column/Column.d.ts | 4 ++-- src/components/column/Column.vue | 4 ++-- src/components/datatable/DataTable.d.ts | 4 ++-- src/components/datatable/DataTable.vue | 2 +- src/components/datatable/TableHeader.vue | 2 +- src/components/dataview/DataView.d.ts | 4 ++-- src/components/dataview/DataView.vue | 4 ++-- src/components/treetable/TreeTable.d.ts | 4 ++-- src/components/treetable/TreeTable.vue | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/components/column/Column.d.ts b/src/components/column/Column.d.ts index 70eb201c15..02d85a1d64 100755 --- a/src/components/column/Column.d.ts +++ b/src/components/column/Column.d.ts @@ -3,7 +3,7 @@ import Vue from 'vue'; declare class Column extends Vue { columnKey?: any; field?: string; - sortField?: string; + sortField?: string | ((item: any) => any); filterField?: string; sortable?: boolean; header?: any; @@ -30,4 +30,4 @@ declare class Column extends Vue { frozen?: boolean; } -export default Column; \ No newline at end of file +export default Column; diff --git a/src/components/column/Column.vue b/src/components/column/Column.vue index d92907587f..cc9ce9840d 100755 --- a/src/components/column/Column.vue +++ b/src/components/column/Column.vue @@ -11,7 +11,7 @@ export default { default: null }, sortField: { - type: String, + type: [String, Function], default: null }, filterField: { @@ -115,4 +115,4 @@ export default { return null; } } - \ No newline at end of file + diff --git a/src/components/datatable/DataTable.d.ts b/src/components/datatable/DataTable.d.ts index 464f2c9e25..6ad2dda1bd 100755 --- a/src/components/datatable/DataTable.d.ts +++ b/src/components/datatable/DataTable.d.ts @@ -16,7 +16,7 @@ declare class DataTable extends Vue { lazy?: boolean; loading?: boolean; loadingIcon?: string; - sortField?: string; + sortField?: string | ((item: any) => any); sortOrder?: number; defaultSortOrder?: number; multiSortMeta?: any[]; @@ -87,4 +87,4 @@ declare class DataTable extends Vue { } } -export default DataTable; \ No newline at end of file +export default DataTable; diff --git a/src/components/datatable/DataTable.vue b/src/components/datatable/DataTable.vue index 26f4dc08e2..957095c1a2 100755 --- a/src/components/datatable/DataTable.vue +++ b/src/components/datatable/DataTable.vue @@ -202,7 +202,7 @@ export default { default: 'pi pi-spinner' }, sortField: { - type: String, + type: [String, Function], default: null }, sortOrder: { diff --git a/src/components/datatable/TableHeader.vue b/src/components/datatable/TableHeader.vue index 85126c38f2..67b6b2882a 100755 --- a/src/components/datatable/TableHeader.vue +++ b/src/components/datatable/TableHeader.vue @@ -84,7 +84,7 @@ export default { default: 'single' }, sortField: { - type: String, + type: [String, Function], default: null }, sortOrder: { diff --git a/src/components/dataview/DataView.d.ts b/src/components/dataview/DataView.d.ts index 36b6751057..107c2f98e5 100755 --- a/src/components/dataview/DataView.d.ts +++ b/src/components/dataview/DataView.d.ts @@ -13,7 +13,7 @@ declare class DataView extends Vue { pageLinkSize?: number; rowsPerPageOptions?: number[]; currentPageReportTemplate?: string; - sortField?: string; + sortField?: string | ((item: any) => any); sortOrder?: number; lazy?: boolean; $emit(eventName: 'page', event: Event): this; @@ -27,4 +27,4 @@ declare class DataView extends Vue { } } -export default DataView; \ No newline at end of file +export default DataView; diff --git a/src/components/dataview/DataView.vue b/src/components/dataview/DataView.vue index 243172e5d3..a0536cbb8e 100755 --- a/src/components/dataview/DataView.vue +++ b/src/components/dataview/DataView.vue @@ -94,7 +94,7 @@ export default { default: '({currentPage} of {totalPages})' }, sortField: { - type: String, + type: [String, Function], default: null }, sortOrder: { @@ -218,4 +218,4 @@ export default { 'DVPaginator': Paginator } } - \ No newline at end of file + diff --git a/src/components/treetable/TreeTable.d.ts b/src/components/treetable/TreeTable.d.ts index 441fe1110e..59ed33a5f0 100755 --- a/src/components/treetable/TreeTable.d.ts +++ b/src/components/treetable/TreeTable.d.ts @@ -21,7 +21,7 @@ declare class TreeTable extends Vue { loadingIcon?: string; rowHover?: boolean; autoLayout?: boolean; - sortField?: string; + sortField?: string | ((item: any) => any); sortOrder?: number; defaultSortOrder?: number; multiSortMeta?: any[]; @@ -52,4 +52,4 @@ declare class TreeTable extends Vue { } } -export default TreeTable; \ No newline at end of file +export default TreeTable; diff --git a/src/components/treetable/TreeTable.vue b/src/components/treetable/TreeTable.vue index db3331f1d5..46a5edf9bf 100755 --- a/src/components/treetable/TreeTable.vue +++ b/src/components/treetable/TreeTable.vue @@ -168,7 +168,7 @@ export default { default: false }, sortField: { - type: String, + type: [String, Function], default: null }, sortOrder: {