mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 08:21:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
GitHub Actions Bot 2024-08-12 02:16:33 +00:00
commit 7f258ac62b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/client/src/block-provider/hooks/index.ts
View File

@ -1277,7 +1277,9 @@ export const useAssociationFilterBlockProps = () => {
if (!isOptionalField(collectionField)) { if (!isOptionalField(collectionField)) {
run(); run();
} }
}, [collectionField, labelKey, run, valueKey]);
// do not format the dependencies
}, [collectionField, labelKey, run, valueKey, field.componentProps?.params, field.componentProps?.params?.sort]);
if (!collectionField) { if (!collectionField) {
return {}; return {};

2
packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.tsx
View File

@ -48,7 +48,7 @@ export const AssociationFilterItem = withDynamicSchemaProps(
const defaultActiveKeyCollapse = useMemo<React.Key[]>( const defaultActiveKeyCollapse = useMemo<React.Key[]>(
() => (defaultCollapse && collectionField?.name ? [collectionField.name] : []), () => (defaultCollapse && collectionField?.name ? [collectionField.name] : []),
[], [collectionField.name, defaultCollapse],
); );
const valueKey = _valueKey || collectionField?.targetKey || 'id'; const valueKey = _valueKey || collectionField?.targetKey || 'id';
const labelKey = _labelKey || fieldSchema['x-component-props']?.fieldNames?.label || valueKey; const labelKey = _labelKey || fieldSchema['x-component-props']?.fieldNames?.label || valueKey;