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
This commit is contained in:
katherinehhh 2023-06-01 11:30:54 +08:00 committed by GitHub
parent e139646d65
commit a69e1acbf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -130,7 +130,7 @@ FormItem.Designer = function Designer() {
? getCollectionFields(collectionField?.target) ? getCollectionFields(collectionField?.target)
: getCollectionFields(collectionField?.targetCollection) ?? []; : getCollectionFields(collectionField?.targetCollection) ?? [];
const fieldModeOptions = useFieldModeOptions(); 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 isTableField = fieldSchema['x-component'] === 'TableField';
const isFileField = isFileCollection(targetCollection); const isFileField = isFileCollection(targetCollection);
const initialValue = { const initialValue = {
@ -160,7 +160,7 @@ FormItem.Designer = function Designer() {
const sortFields = useSortFields(collectionField?.target); const sortFields = useSortFields(collectionField?.target);
const defaultSort = field.componentProps?.service?.params?.sort || []; const defaultSort = field.componentProps?.service?.params?.sort || [];
const fieldMode = field?.componentProps?.['mode'] || (isFileField ? 'FileManager' : 'Select'); const fieldMode = field?.componentProps?.['mode'] || (isFileField ? 'FileManager' : 'Select');
const isSelectFieldMode = fieldMode === 'Select'; const isSelectFieldMode = isAssociationField && fieldMode === 'Select';
const sort = defaultSort?.map((item: string) => { const sort = defaultSort?.map((item: string) => {
return item?.startsWith('-') return item?.startsWith('-')
? { ? {
@ -179,7 +179,6 @@ FormItem.Designer = function Designer() {
const isPickerMode = fieldSchema['x-component-props']?.mode === 'Picker'; const isPickerMode = fieldSchema['x-component-props']?.mode === 'Picker';
const showFieldMode = isAssociationField && fieldModeOptions && !isTableField; const showFieldMode = isAssociationField && fieldModeOptions && !isTableField;
const showModeSelect = showFieldMode && isPickerMode; const showModeSelect = showFieldMode && isPickerMode;
return ( return (
<GeneralSchemaDesigner> <GeneralSchemaDesigner>
<GeneralSchemaItems /> <GeneralSchemaItems />
@ -663,7 +662,7 @@ FormItem.Designer = function Designer() {
}} }}
/> />
)} )}
{IsShowMultipleSwitch() ? ( {isAssociationField && IsShowMultipleSwitch() ? (
<SchemaSettings.SwitchItem <SchemaSettings.SwitchItem
key="multiple" key="multiple"
title={t('Allow multiple')} title={t('Allow multiple')}