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

fix: foreignKey undefined in association field (#2903)

Browse Source
This commit is contained in:
katherinehhh 2023-10-24 16:43:21 +08:00 committed by GitHub
parent 266a4ccb08
commit 6b46b166cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/client/src/schema-component/antd/association-field/hooks.ts
View File

@ -149,7 +149,7 @@ export default function useServiceOptions(props) {
],
'$or',
);
}, [collectionField?.interface, collectionField.foreignKey, fieldSchema, fieldServiceFilter, sourceValue]);
}, [collectionField?.interface, collectionField?.foreignKey, fieldSchema, fieldServiceFilter, sourceValue]);
return useMemo(() => {
return {

14
packages/core/client/src/schema-component/antd/form-v2/Form.tsx
View File

@ -119,14 +119,12 @@ const WithForm = (props: WithFormProps) => {
if (h.targetFields?.length) {
const fields = h.targetFields.join(',');
onFieldInit(`*(${fields})`, (field: any, form) => {
setTimeout(() => {
field['initProperty'] = field?.['initProperty'] ?? {
display: field.display,
required: field.required,
pattern: field.pattern,
value: field.value || field.initialValue,
};
});
field['initProperty'] = field?.['initProperty'] ?? {
display: field.display,
required: field.required,
pattern: field.pattern,
value: field.value || field.initialValue,
};
});
onFieldChange(`*(${fields})`, ['value', 'required', 'pattern', 'display'], (field: any) => {
field.linkageProperty = {