Merge branch 'next' into develop

This commit is contained in:
nocobase[bot] 2025-02-26 09:04:08 +00:00
commit cb0f097c3c

View File

@ -16,6 +16,7 @@ import {
useBlockRequestContext, useBlockRequestContext,
useCollection, useCollection,
useCollection_deprecated, useCollection_deprecated,
useParsedFilter,
useApp, useApp,
} from '@nocobase/client'; } from '@nocobase/client';
import { Spin } from 'antd'; import { Spin } from 'antd';
@ -67,14 +68,17 @@ const InternalKanbanBlockProvider = (props) => {
}; };
export const KanbanBlockProvider = (props) => { export const KanbanBlockProvider = (props) => {
const params = { ...props.params }; const { filter: parsedFilter } = useParsedFilter({
filterOption: props.params?.filter,
});
const params = { ...props.params, filter: parsedFilter };
return ( return (
<BlockProvider name="kanban" {...props} params={params}> <BlockProvider name="kanban" {...props} params={params}>
<InternalKanbanBlockProvider {...props} params={params} /> <InternalKanbanBlockProvider {...props} params={params} />
</BlockProvider> </BlockProvider>
); );
}; };
export const useKanbanBlockContext = () => { export const useKanbanBlockContext = () => {
return useContext(KanbanBlockContext); return useContext(KanbanBlockContext);
}; };