Skip to content

Inverse Search in Filter-Control #7937

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

Open
0x164C9DFC wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Inverse Search in Filter-Control #7937

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f13370c
Adds inverse search functionality with AND logic
Aug 18, 2025
70bb53d
Fix AND logic which was not working as expected when combining severa…
Aug 28, 2025
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
112 changes: 81 additions & 31 deletions src/extensions/filter-control/bootstrap-table-filter-control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,24 +226,32 @@ $.BootstrapTable = class extends $.BootstrapTable {
}

let filterValues = [filterValue]
let excludeValues = []

if (
this.options.filterControlMultipleSearch
) {
filterValues = filterValue.split(this.options.filterControlMultipleSearchDelimiter)
// Separate include and exclude values
excludeValues = filterValues.filter(fv => fv.startsWith('[!]')).map(fv => fv.slice(3).trim())
filterValues = filterValues.filter(fv => !fv.startsWith('[!]')).map(fv => fv.trim())
// Filter out empty values after trimming
excludeValues = excludeValues.filter(ev => ev !== '')
filterValues = filterValues.filter(fv => fv !== '')
} else if (filterValue.startsWith('[!]')) {
excludeValues = [filterValue.slice(3).trim()]
filterValues = []
// Filter out empty
excludeValues = excludeValues.filter(ev => ev !== '')
}

filterValues.forEach(filterValue => {
if (tmpItemIsExpected === true) {
return
}
// Handle exclusion first: if any exclude term matches, item is not expected
let isExcluded = false

filterValue = filterValue.trim()
if (excludeValues.length > 0) {
isExcluded = excludeValues.some(excludeValue => {
// Removed: if (excludeValue === '') return false (handled by filter above)

if (filterValue === '') {
tmpItemIsExpected = true
} else {
// Fix #142: search use formatted data
if (thisColumn) {
if (thisColumn.searchFormatter || thisColumn._forceFormatter) {
value = $.fn.bootstrapTable.utils.calculateObjectValue(
Expand All @@ -257,31 +265,73 @@ $.BootstrapTable = class extends $.BootstrapTable {

if ($.inArray(key, that.header.fields) !== -1) {
if (value === undefined || value === null) {
tmpItemIsExpected = false
} else if (typeof value === 'object' && thisColumn.filterCustomSearch) {
itemIsExpected.push(that.isValueExpected(rawFilterValue, value, thisColumn, key))
} else if (typeof value === 'object' && Array.isArray(value)) {
value.forEach(objectValue => {
if (tmpItemIsExpected) {
return
}

tmpItemIsExpected = that.isValueExpected(filterValue, objectValue, thisColumn, key)
})
} else if (typeof value === 'object' && !Array.isArray(value)) {
Object.values(value).forEach(objectValue => {
if (tmpItemIsExpected) {
return
}

tmpItemIsExpected = that.isValueExpected(filterValue, objectValue, thisColumn, key)
})
} else if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
tmpItemIsExpected = that.isValueExpected(filterValue, value, thisColumn, key)
return false
}
if (typeof value === 'object' && thisColumn.filterCustomSearch) {
return that.isValueExpected(excludeValue, value, thisColumn, key)
}
if (typeof value === 'object' && Array.isArray(value)) {
return value.some(objectValue => that.isValueExpected(excludeValue, objectValue, thisColumn, key))
}
if (typeof value === 'object' && !Array.isArray(value)) {
return Object.values(value).some(objectValue => that.isValueExpected(excludeValue, objectValue, thisColumn, key))
}
if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
return that.isValueExpected(excludeValue, value, thisColumn, key)
}
}
return false
})
}

if (isExcluded) {
tmpItemIsExpected = false
} else {
// Proceed with inclusion logic (fixed to AND)
tmpItemIsExpected = filterValues.length === 0
if (filterValues.length > 0) {
tmpItemIsExpected = filterValues.every(filterValue => {
value = Utils.unescapeHTML(Utils.getItemField(item, key, false))

if (thisColumn) {
if (thisColumn.searchFormatter || thisColumn._forceFormatter) {
value = $.fn.bootstrapTable.utils.calculateObjectValue(
thisColumn,
that.header.formatters[$.inArray(key, that.header.fields)],
[value, item, i],
value
)
}
}

if ($.inArray(key, that.header.fields) === -1) {
return false
}

if (value === undefined || value === null) {
return false
}

if (typeof value === 'object' && thisColumn.filterCustomSearch) {
return that.isValueExpected(filterValue, value, thisColumn, key)
}

if (typeof value === 'object' && Array.isArray(value)) {
return value.some(objectValue => that.isValueExpected(filterValue, objectValue, thisColumn, key))
}

if (typeof value === 'object' && !Array.isArray(value)) {
return Object.values(value).some(objectValue => that.isValueExpected(filterValue, objectValue, thisColumn, key))
}

if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
return that.isValueExpected(filterValue, value, thisColumn, key)
}

return false // Default for unexpected types
})
}
})
}

itemIsExpected.push(tmpItemIsExpected)
})
Expand Down