Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve datatable performance #4008

Merged
merged 4 commits into from
Aug 18, 2023
Merged

Improve datatable performance #4008

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9289997
Improve sort and filter performance
andrewguy May 30, 2023
3d98b01
Merge branch 'primefaces:master' into improve-datatable-performance
andrewguy May 31, 2023
7073144
Fix issue with no $emit when no filters active
andrewguy Jun 22, 2023
5815f36
Use Map.get to retrieve data
andrewguy Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 39 additions & 10 deletions components/lib/datatable/DataTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,9 +768,15 @@ export default {

let data = [...value];

let lookupMap = new Map();

for (let item of data) {
lookupMap.set(item, ObjectUtils.resolveFieldData(item, this.d_sortField));
}

data.sort((data1, data2) => {
let value1 = ObjectUtils.resolveFieldData(data1, this.d_sortField);
let value2 = ObjectUtils.resolveFieldData(data2, this.d_sortField);
let value1 = lookupMap.get(data1);
let value2 = lookupMap.get(data2);

let result = null;

Expand Down Expand Up @@ -837,16 +843,39 @@ export default {

this.d_multiSortMeta = [...this.d_multiSortMeta];
},
getActiveFilters(filters) {
const removeEmptyFilters = ([key, value]) => {
if (value.constraints) {
const filteredConstraints = value.constraints.filter((constraint) => constraint.value !== null);

if (filteredConstraints.length > 0) {
return [key, { ...value, constraints: filteredConstraints }];
}
} else if (value.value !== null) {
return [key, value];
}

return undefined;
};

const filterValidEntries = (entry) => entry !== undefined;

const entries = Object.entries(filters).map(removeEmptyFilters).filter(filterValidEntries);

return Object.fromEntries(entries);
},
filter(data) {
if (!data) {
return;
}

let activeFilters = this.getActiveFilters(this.filters);

this.clearEditingMetaData();

let globalFilterFieldsArray;

if (this.filters['global']) {
if (activeFilters['global']) {
globalFilterFieldsArray = this.globalFilterFields || this.columns.map((col) => this.columnProp(col, 'filterField') || this.columnProp(col, 'field'));
}

Expand All @@ -857,11 +886,11 @@ export default {
let globalMatch = false;
let localFiltered = false;

for (let prop in this.filters) {
if (Object.prototype.hasOwnProperty.call(this.filters, prop) && prop !== 'global') {
for (let prop in activeFilters) {
if (Object.prototype.hasOwnProperty.call(activeFilters, prop) && prop !== 'global') {
localFiltered = true;
let filterField = prop;
let filterMeta = this.filters[filterField];
let filterMeta = activeFilters[filterField];

if (filterMeta.operator) {
for (let filterConstraint of filterMeta.constraints) {
Expand All @@ -881,11 +910,11 @@ export default {
}
}

if (this.filters['global'] && !globalMatch && globalFilterFieldsArray) {
if (localMatch && activeFilters['global'] && !globalMatch && globalFilterFieldsArray) {
for (let j = 0; j < globalFilterFieldsArray.length; j++) {
let globalFilterField = globalFilterFieldsArray[j];

globalMatch = FilterService.filters[this.filters['global'].matchMode || FilterMatchMode.CONTAINS](ObjectUtils.resolveFieldData(data[i], globalFilterField), this.filters['global'].value, this.filterLocale);
globalMatch = FilterService.filters[activeFilters['global'].matchMode || FilterMatchMode.CONTAINS](ObjectUtils.resolveFieldData(data[i], globalFilterField), activeFilters['global'].value, this.filterLocale);

if (globalMatch) {
break;
Expand All @@ -895,7 +924,7 @@ export default {

let matches;

if (this.filters['global']) {
if (activeFilters['global']) {
matches = localFiltered ? localFiltered && localMatch && globalMatch : globalMatch;
} else {
matches = localFiltered && localMatch;
Expand All @@ -906,7 +935,7 @@ export default {
}
}

if (filteredValue.length === this.value.length) {
if (filteredValue.length === this.value.length || Object.keys(activeFilters).length == 0) {
filteredValue = data;
}

Expand Down
Loading