diff --git a/src/assets/styles/app/_demo.scss b/src/assets/styles/app/_demo.scss index 53596da43..862dd52fa 100644 --- a/src/assets/styles/app/_demo.scss +++ b/src/assets/styles/app/_demo.scss @@ -117,10 +117,6 @@ } } -.p-column-filter { - width: 100%; -} - .country-item { display: flex; align-items: center; diff --git a/src/components/api/Api.js b/src/components/api/Api.js index ec70b298a..cedfb0ea2 100644 --- a/src/components/api/Api.js +++ b/src/components/api/Api.js @@ -1,3 +1,4 @@ import FilterMatchMode from './FilterMatchMode'; +import FilterOperator from './FilterOperator'; -export {FilterMatchMode}; \ No newline at end of file +export {FilterMatchMode,FilterOperator}; \ No newline at end of file diff --git a/src/components/column/Column.vue b/src/components/column/Column.vue index c6d69ea95..f3945a872 100755 --- a/src/components/column/Column.vue +++ b/src/components/column/Column.vue @@ -62,10 +62,6 @@ export default { type: Boolean, default: true }, - filterOperator: { - type: String, - default: 'and' - }, showFilterOperator: { type: Boolean, default: true diff --git a/src/components/datatable/ColumnFilter.vue b/src/components/datatable/ColumnFilter.vue index ac12ecdb2..844e6141a 100644 --- a/src/components/datatable/ColumnFilter.vue +++ b/src/components/datatable/ColumnFilter.vue @@ -17,8 +17,25 @@
  • {{noFilterLabel}}
  • - @@ -21,11 +26,11 @@ diff --git a/src/components/utils/FilterUtils.js b/src/components/utils/FilterUtils.js index 514de4fee..1d05c7d20 100755 --- a/src/components/utils/FilterUtils.js +++ b/src/components/utils/FilterUtils.js @@ -182,7 +182,18 @@ export default class FilterUtils { } static is(value, filter, filterLocale) { - return this.filters.equals(value, filter, filterLocale); + if (filter === undefined || filter === null || (typeof filter === 'string' && filter.trim() === '')) { + return true; + } + + if (value === undefined || value === null) { + return false; + } + + if (value.getTime && filter.getTime) + return value.getTime() === filter.getTime(); + else + return ObjectUtils.removeAccents(value.toString()).toLocaleLowerCase(filterLocale) == ObjectUtils.removeAccents(filter.toString()).toLocaleLowerCase(filterLocale); } static isNot(value, filter, filterLocale) { diff --git a/src/views/datatable/DataTableFilterDemo.vue b/src/views/datatable/DataTableFilterDemo.vue index 973cf915c..6958bd4a2 100755 --- a/src/views/datatable/DataTableFilterDemo.vue +++ b/src/views/datatable/DataTableFilterDemo.vue @@ -2,22 +2,22 @@
    -

    DataTable - Filter

    -

    Filtering is enabled by defining a filter template per column to populate the filters property of the DataTable.

    +

    DataTable Filter

    +

    Filtering feature provides advanced and flexible options to query the data.

    -
    Filter Row
    -

    Filters are displayed inline within a separate row.

    - +
    Filter Menu
    +

    Filters are displayed in an overlay..

    + @@ -33,27 +33,28 @@ {{slotProps.data.name}} - + - +