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 d9a920071..2a790f0d8 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 @@ -163,7 +163,7 @@ export default function useServiceOptions(props) { ); }, [ collectionField?.interface, - collectionField.foreignKey, + collectionField?.foreignKey, fieldSchema, fieldServiceFilter, sourceValue, diff --git a/packages/core/client/src/schema-component/antd/form-v2/utils.tsx b/packages/core/client/src/schema-component/antd/form-v2/utils.tsx index 588ae4fee..2ac53d1eb 100644 --- a/packages/core/client/src/schema-component/antd/form-v2/utils.tsx +++ b/packages/core/client/src/schema-component/antd/form-v2/utils.tsx @@ -51,8 +51,6 @@ export const linkageMergeAction = async ({ if (await conditionAnalyses({ rules: condition, formValues: values, variables, localVariables })) { field._display = '_display' in field ? field._display : field.display; field.display = operator; - } else { - field.display = field._display; } break; case ActionType.Editable: