fix(Collapse): issue with data scope being cleared (#6782)

2025-05-05 05:29:26 +08:00 · 2025-04-28 14:25:15 +08:00 · 2025-04-28 14:25:15 +08:00 · 4547b7dd96
commit 4547b7dd96
parent 6808620a3d
2 changed files with 3 additions and 1 deletions
--- a/packages/core/client/src/block-provider/hooks/index.ts
+++ b/packages/core/client/src/block-provider/hooks/index.ts
@ -1451,6 +1451,7 @@ export const useAssociationFilterBlockProps = () => {
    run,
    valueKey,
    labelKey,
+    dataScopeFilter: filter,
  };
 };
 async function doReset({
--- a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.tsx
+++ b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.tsx
@ -41,6 +41,7 @@ export const AssociationFilterItem = withDynamicSchemaProps(
      handleSearchInput: _handleSearchInput,
      params,
      run,
+      dataScopeFilter,
      valueKey: _valueKey,
      labelKey: _labelKey,
      defaultCollapse,
@ -94,7 +95,7 @@ export const AssociationFilterItem = withDynamicSchemaProps(
      if (searchVisible || filter) {
        run({
          ...params?.[0],
-          filter: undefined,
+          filter: dataScopeFilter,
        });
      }
      setSearchVisible(!searchVisible);