From a69e1acbf4acbc74efd1baad6adbc2d211fc1e7b Mon Sep 17 00:00:00 2001 From: katherinehhh Date: Thu, 1 Jun 2023 11:30:54 +0800 Subject: [PATCH] fix(form-item): data scope and sorting rule config should only display in association field (#1964) * fix: data scope and sorting rule config should not display in normal field * fix: data scope and sorting rule config should not display in normal field * fix: allowMultiple should display in association field --- .../src/schema-component/antd/form-item/FormItem.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx index d3061818b..3e4f61958 100644 --- a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx +++ b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx @@ -130,7 +130,7 @@ FormItem.Designer = function Designer() { ? getCollectionFields(collectionField?.target) : getCollectionFields(collectionField?.targetCollection) ?? []; const fieldModeOptions = useFieldModeOptions(); - const isAssociationField = ['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(collectionField?.type); + const isAssociationField = ['obo', 'oho', 'o2o', 'o2m', 'm2m', 'm2o'].includes(collectionField?.interface); const isTableField = fieldSchema['x-component'] === 'TableField'; const isFileField = isFileCollection(targetCollection); const initialValue = { @@ -160,7 +160,7 @@ FormItem.Designer = function Designer() { const sortFields = useSortFields(collectionField?.target); const defaultSort = field.componentProps?.service?.params?.sort || []; const fieldMode = field?.componentProps?.['mode'] || (isFileField ? 'FileManager' : 'Select'); - const isSelectFieldMode = fieldMode === 'Select'; + const isSelectFieldMode = isAssociationField && fieldMode === 'Select'; const sort = defaultSort?.map((item: string) => { return item?.startsWith('-') ? { @@ -179,7 +179,6 @@ FormItem.Designer = function Designer() { const isPickerMode = fieldSchema['x-component-props']?.mode === 'Picker'; const showFieldMode = isAssociationField && fieldModeOptions && !isTableField; const showModeSelect = showFieldMode && isPickerMode; - return ( @@ -663,7 +662,7 @@ FormItem.Designer = function Designer() { }} /> )} - {IsShowMultipleSwitch() ? ( + {isAssociationField && IsShowMultipleSwitch() ? (