diff --git a/packages/core/client/src/schema-component/antd/association-field/hooks.ts b/packages/core/client/src/schema-component/antd/association-field/hooks.ts index c6b9ed15f..f2f0778bd 100644 --- a/packages/core/client/src/schema-component/antd/association-field/hooks.ts +++ b/packages/core/client/src/schema-component/antd/association-field/hooks.ts @@ -67,7 +67,7 @@ export default function useServiceOptions(props) { const _run = async () => { const result = await parseFilter(mergeFilter([filterFromSchema || service?.params?.filter])); - setFieldServiceFilter(removeNullCondition(result)); + setFieldServiceFilter(result); }; const run = _.debounce(_run, DEBOUNCE_WAIT); diff --git a/packages/core/client/src/schema-settings/hooks/useParseDataScopeFilter.ts b/packages/core/client/src/schema-settings/hooks/useParseDataScopeFilter.ts index 6b0ee75b2..c09bb3cfc 100644 --- a/packages/core/client/src/schema-settings/hooks/useParseDataScopeFilter.ts +++ b/packages/core/client/src/schema-settings/hooks/useParseDataScopeFilter.ts @@ -36,17 +36,15 @@ const useParseDataScopeFilter = ({ exclude }: Props = { exclude: defaultExclude return result; }, }); - await Promise.all( Object.keys(flat).map(async (key) => { flat[key] = await flat[key]; if (flat[key] === undefined) { - delete flat[key]; + flat[key] = null; } return flat[key]; }), ); - const result = unflatten(flat); return result; },