From bdb266092ae5a977213eb153a3a66e788ef056c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tu=C4=9F=C3=A7e=20K=C3=BC=C3=A7=C3=BCko=C4=9Flu?= Date: Wed, 9 Aug 2023 16:51:31 +0300 Subject: [PATCH] Fixed #4229 - Datatable: Filtering with grouping not working --- components/lib/datatable/BaseDataTable.vue | 2 +- doc/card/BasicDoc.vue | 127 +++++++++++---------- 2 files changed, 68 insertions(+), 61 deletions(-) diff --git a/components/lib/datatable/BaseDataTable.vue b/components/lib/datatable/BaseDataTable.vue index d37b0ac5c..736e41078 100644 --- a/components/lib/datatable/BaseDataTable.vue +++ b/components/lib/datatable/BaseDataTable.vue @@ -281,7 +281,7 @@ const classes = { thead: 'p-datatable-thead', // headercell headerCell: ({ instance, props, column }) => - column && !instance.columnProp(column, 'hidden') && (props.rowGroupMode !== 'subheader' || props.groupRowsBy !== columnProp(column, 'field')) + column && !instance.columnProp(column, 'hidden') && (props.rowGroupMode !== 'subheader' || props.groupRowsBy !== instance.columnProp(column, 'field')) ? [ 'p-filter-column', { diff --git a/doc/card/BasicDoc.vue b/doc/card/BasicDoc.vue index a47632890..0124b3de4 100644 --- a/doc/card/BasicDoc.vue +++ b/doc/card/BasicDoc.vue @@ -1,72 +1,79 @@ - - -