MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use normal combobox for filtering array columns

This commit is contained in:
Peter Clement 2021-08-25 17:00:42 +01:00
parent 5b23ea1dc9
commit 3ce5b96b0c
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/src/components/design/PropertiesPanel/PropertyControls/FilterEditor/FilterDrawer.svelte
View File

@ -136,7 +136,7 @@
/> />
{:else if ["string", "longform", "number"].includes(filter.type)} {:else if ["string", "longform", "number"].includes(filter.type)}
<Input disabled={filter.noValue} bind:value={filter.value} /> <Input disabled={filter.noValue} bind:value={filter.value} />
{:else if filter.type === "options"} {:else if filter.type === "options" || filter.type === "array"}
<Combobox <Combobox
disabled={filter.noValue} disabled={filter.noValue}
options={getFieldOptions(filter.field)} options={getFieldOptions(filter.field)}

18
packages/server/src/api/controllers/row/internalSearch.js
View File

@ -229,14 +229,7 @@ class QueryBuilder {
if (!value) { if (!value) {
return null return null
} }
let opts = [] return `${key}.${value}:${builder.preprocess(value, allPreProcessingOpts)}`
value.forEach(val =>
opts.push(
`${key}.${val}:${builder.preprocess(val, allPreProcessingOpts)}`
)
)
const joined = opts.join(" AND ")
return joined
}) })
} }
@ -245,14 +238,7 @@ class QueryBuilder {
if (!value) { if (!value) {
return null return null
} }
let opts = [] return `!${key}.${value}:${builder.preprocess(value, allPreProcessingOpts)}`
value.forEach(val =>
opts.push(
`!${key}.${val}:${builder.preprocess(val, allPreProcessingOpts)}`
)
)
const joined = opts.join(" AND ")
return joined
}) })
} }