fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 13:39:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(filter-provider): improve filter utility with dynamic value and field resolution (#6314)

Browse Source
This commit is contained in:
Zeke Zhang 2025-02-27 07:37:00 +08:00 committed by GitHub
parent 376cb21a71
commit 605eea4399
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/core/client/src/filter-provider/utils.ts
View File

@ -193,16 +193,19 @@ export const useFilterAPI = () => {
const doFilter = useCallback( const doFilter = useCallback(
( (
value, value: any | ((target: FilterTarget['targets'][0], block: DataBlock) => any),
field: string | ((target: FilterTarget['targets'][0]) => string) = 'id', field: string | ((target: FilterTarget['targets'][0], block: DataBlock) => string) = 'id',
operator: string | ((target: FilterTarget['targets'][0]) => string) = '$eq', operator: string | ((target: FilterTarget['targets'][0]) => string) = '$eq',
) => { ) => {
dataBlocks.forEach((block) => { dataBlocks.forEach((block) => {
const target = targets.find((target) => target.uid === block.uid); const target = targets.find((target) => target.uid === block.uid);
if (!target) return; if (!target) return;
if (_.isFunction(value)) {
value = value(target, block);
}
if (_.isFunction(field)) { if (_.isFunction(field)) {
field = field(target); field = field(target, block);
} }
if (_.isFunction(operator)) { if (_.isFunction(operator)) {
operator = operator(target); operator = operator(target);