From efbd7c7020c0e2c720fbfea63fa92c2d31b40108 Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Fri, 26 May 2023 11:38:03 +0800
Subject: [PATCH] fix(association-field): allow multiple (#1938)

---
 packages/core/client/src/locale/zh_CN.ts                   | 2 +-
 .../antd/association-field/AssociationFieldProvider.tsx    | 3 ++-
 .../src/schema-component/antd/association-field/Nester.tsx | 4 ++--
 .../src/schema-component/antd/association-field/context.ts | 3 ++-
 .../src/schema-component/antd/association-field/hooks.ts   | 7 ++++++-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/core/client/src/locale/zh_CN.ts b/packages/core/client/src/locale/zh_CN.ts
index 3744380e0..ec0d0f67a 100644
--- a/packages/core/client/src/locale/zh_CN.ts
+++ b/packages/core/client/src/locale/zh_CN.ts
@@ -312,7 +312,7 @@ export default {
   "Display association fields": "显示关联表的字段",
   "Display field title": "显示字段标题",
   "Field component": "字段组件",
-  "Allow multiple": "允许多选",
+  "Allow multiple": "允许添加/关联多条",
   "Quick upload": "快速上传",
   "Select file": "选择文件",
   "Subtable": "子表格",
diff --git a/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx b/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx
index 33fdbecc9..ef9ddcde6 100644
--- a/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx
@@ -8,6 +8,7 @@ export const AssociationFieldProvider = observer((props) => {
   const field = useField<Field>();
   const { getCollectionJoinField, getCollection } = useCollectionManager();
   const fieldSchema = useFieldSchema();
+  const allowMultiple = fieldSchema['x-component-props']?.multiple !== false;
 
   const collectionField = useMemo(
     () => getCollectionJoinField(fieldSchema['x-collection-field']),
@@ -23,7 +24,7 @@ export const AssociationFieldProvider = observer((props) => {
   );
 
   return collectionField ? (
-    <AssociationFieldContext.Provider value={{ options: collectionField, field, currentMode }}>
+    <AssociationFieldContext.Provider value={{ options: collectionField, field, allowMultiple, currentMode }}>
       {props.children}
     </AssociationFieldContext.Provider>
   ) : null;
diff --git a/packages/core/client/src/schema-component/antd/association-field/Nester.tsx b/packages/core/client/src/schema-component/antd/association-field/Nester.tsx
index 4ad58961e..5d8fe4d52 100644
--- a/packages/core/client/src/schema-component/antd/association-field/Nester.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/Nester.tsx
@@ -24,7 +24,7 @@ const ToOneNester = (props) => {
 
 const ToManyNester = observer((props) => {
   const fieldSchema = useFieldSchema();
-  const { field } = useAssociationFieldContext<ArrayField>();
+  const { field, allowMultiple } = useAssociationFieldContext<ArrayField>();
   const { t } = useTranslation();
   return (
     <Card bordered={true} style={{ position: 'relative' }}>
@@ -48,7 +48,7 @@ const ToManyNester = observer((props) => {
           </>
         );
       })}
-      {field.editable && (
+      {field.editable && allowMultiple && (
         <Button
           type={'dashed'}
           block
diff --git a/packages/core/client/src/schema-component/antd/association-field/context.ts b/packages/core/client/src/schema-component/antd/association-field/context.ts
index 7aa04d823..bd49c5ecc 100644
--- a/packages/core/client/src/schema-component/antd/association-field/context.ts
+++ b/packages/core/client/src/schema-component/antd/association-field/context.ts
@@ -4,7 +4,8 @@ import { createContext } from 'react';
 export interface AssociationFieldContextProps {
   options?: any;
   field?: GeneralField;
-  currentMode?:string;
+  currentMode?: string;
+  allowMultiple?: boolean;
 }
 
 export const AssociationFieldContext = createContext<AssociationFieldContextProps>({});
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 0ac0da19b..e5e47b9a8 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
@@ -30,7 +30,12 @@ export const useInsertSchema = (component) => {
 };
 
 export function useAssociationFieldContext<F extends GeneralField>() {
-  return useContext(AssociationFieldContext) as { options: any; field: F; currentMode: string };
+  return useContext(AssociationFieldContext) as {
+    options: any;
+    field: F;
+    currentMode: string;
+    allowMultiple?: boolean;
+  };
 }
 
 export default function useServiceOptions(props) {