fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-09 07:29:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: associationSelect

Browse Source
This commit is contained in:
katherinehhh 2023-05-11 15:48:06 +08:00
parent d6d2a81523
commit 9864292029
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx
View File

@ -3,7 +3,7 @@ import { RecursionField, connect, mapProps, observer, useField, useFieldSchema }
import { Button, Input } from 'antd'; import { Button, Input } from 'antd';
import React, { useCallback, useEffect, useMemo, useState } from 'react'; import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { CollectionProvider, useCollection } from '../../../collection-manager'; import { CollectionProvider, useCollection, useCollectionManager } from '../../../collection-manager';
import { useFieldTitle } from '../../hooks'; import { useFieldTitle } from '../../hooks';
import { ActionContext } from '../action'; import { ActionContext } from '../action';
import { RemoteSelect, RemoteSelectProps } from '../remote-select'; import { RemoteSelect, RemoteSelectProps } from '../remote-select';
@ -18,11 +18,12 @@ export type AssociationSelectProps<P = any> = RemoteSelectProps<P> & {
const InternalAssociationSelect = observer((props: AssociationSelectProps) => { const InternalAssociationSelect = observer((props: AssociationSelectProps) => {
const { fieldNames, objectValue = true } = props; const { fieldNames, objectValue = true } = props;
const field: any = useField(); const field: any = useField();
const fieldSchema = useFieldSchema();
const [visibleAddNewer, setVisibleAddNewer] = useState(false); const [visibleAddNewer, setVisibleAddNewer] = useState(false);
const { getField } = useCollection(); const { getField } = useCollection();
const collectionField = getField(field.props.name); const { getCollectionJoinField } = useCollectionManager();
const collectionField = getField(field.props.name) || getCollectionJoinField(fieldSchema?.['x-collection-field']);
const service = useServiceOptions(props); const service = useServiceOptions(props);
const fieldSchema = useFieldSchema();
const isFilterForm = fieldSchema['x-designer'] === 'FormItem.FilterFormDesigner'; const isFilterForm = fieldSchema['x-designer'] === 'FormItem.FilterFormDesigner';
const isAllowAddNew = fieldSchema['x-add-new']; const isAllowAddNew = fieldSchema['x-add-new'];
const insertAddNewer = useInsertSchema('AddNewer'); const insertAddNewer = useInsertSchema('AddNewer');
@ -74,7 +75,7 @@ const InternalAssociationSelect = observer((props: AssociationSelectProps) => {
</Input.Group> </Input.Group>
<ActionContext.Provider value={{ openMode: 'drawer', visible: visibleAddNewer, setVisible: setVisibleAddNewer }}> <ActionContext.Provider value={{ openMode: 'drawer', visible: visibleAddNewer, setVisible: setVisibleAddNewer }}>
<CollectionProvider name={collectionField?.target}> <CollectionProvider name={collectionField.target}>
<RecursionField <RecursionField
onlyRenderProperties onlyRenderProperties
basePath={field.address} basePath={field.address}