fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-02 03:02:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: filter button nonfilterable field settings affecting other table block with the same collection (#6121)

Browse Source
This commit is contained in:
Katherine 2025-01-23 11:48:46 +08:00 committed by GitHub
parent c14530b9f5
commit 0b6ed37fa4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts
View File

@ -150,7 +150,7 @@ const field2option = (field, depth, nonfilterable, dataSourceManager, collection
return option; return option;
}; };
const getOptions = _.memoize((fields, depth, nonfilterable, dataSourceManager, collectionManager) => { const getOptions = (fields, depth, nonfilterable, dataSourceManager, collectionManager) => {
const options = []; const options = [];
fields.forEach((field) => { fields.forEach((field) => {
const option = field2option(field, depth, nonfilterable, dataSourceManager, collectionManager); const option = field2option(field, depth, nonfilterable, dataSourceManager, collectionManager);
@ -159,7 +159,7 @@ const getOptions = _.memoize((fields, depth, nonfilterable, dataSourceManager, c
} }
}); });
return options; return options;
}); };
export const useFilterFieldOptions = (fields) => { export const useFilterFieldOptions = (fields) => {
const fieldSchema = useFieldSchema(); const fieldSchema = useFieldSchema();
@ -192,6 +192,7 @@ export const removeNullCondition = (filter, customFlat = flat) => {
export const useFilterActionProps = () => { export const useFilterActionProps = () => {
const collection = useCollection(); const collection = useCollection();
const options = useFilterOptions(collection?.name); const options = useFilterOptions(collection?.name);
console.log(options);
const props = useDataBlockProps(); const props = useDataBlockProps();
return useFilterFieldProps({ options, params: props?.params }); return useFilterFieldProps({ options, params: props?.params });
}; };