From dfa58024dced182619f028268a7b1b2e6e85de4f Mon Sep 17 00:00:00 2001
From: Katherine <katherine_15995@163.com>
Date: Wed, 12 Feb 2025 21:36:52 +0800
Subject: [PATCH] fix: missing drag setting in quick-create operation modal
 (#6201)

* fix: missing drag setting in quick-create operation modal

* fix: test
---
 .../antd/association-field/AssociationSelect.tsx      | 11 +++++++++++
 .../__tests__/AssociationFieldModeProvider.test.tsx   |  1 +
 .../schema-component/antd/association-field/index.ts  |  3 ++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx b/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx
index 4e3c52018e..76520c7ee5 100644
--- a/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx
@@ -24,12 +24,22 @@ import {
   useCollectionRecordData,
   SchemaComponentContext,
 } from '../../../';
+import { Action } from '../action';
 import { isVariable } from '../../../variables/utils/isVariable';
 import { getInnermostKeyAndValue } from '../../common/utils/uitls';
 import { RemoteSelect, RemoteSelectProps } from '../remote-select';
 import useServiceOptions, { useAssociationFieldContext } from './hooks';
 import { VariablePopupRecordProvider } from '../../../modules/variable/variablesProvider/VariablePopupRecordProvider';
 
+export const AssociationFieldAddNewer = (props) => {
+  const schemaComponentCtxValue = useContext(SchemaComponentContext);
+  return (
+    <SchemaComponentContext.Provider value={{ ...schemaComponentCtxValue, draggable: true }}>
+      <Action.Container {...props} />
+    </SchemaComponentContext.Provider>
+  );
+};
+
 export type AssociationSelectProps<P = any> = RemoteSelectProps<P> & {
   addMode?: 'quickAdd' | 'modalAdd';
   action?: string;
@@ -141,6 +151,7 @@ const InternalAssociationSelect = observer(
         </div>
       );
     };
+    console.log(fieldSchema);
     return (
       <div key={fieldSchema.name}>
         <Space.Compact style={{ display: 'flex' }}>
diff --git a/packages/core/client/src/schema-component/antd/association-field/__tests__/AssociationFieldModeProvider.test.tsx b/packages/core/client/src/schema-component/antd/association-field/__tests__/AssociationFieldModeProvider.test.tsx
index 1a46e0bcbc..6b1bd1ab3b 100644
--- a/packages/core/client/src/schema-component/antd/association-field/__tests__/AssociationFieldModeProvider.test.tsx
+++ b/packages/core/client/src/schema-component/antd/association-field/__tests__/AssociationFieldModeProvider.test.tsx
@@ -18,6 +18,7 @@ import {
 
 vi.mock('../AssociationSelect', () => ({
   AssociationSelect: () => <div>Association Select</div>,
+  AssociationFieldAddNewer: vi.fn(() => <div> AssociationFieldAddNewer</div>),
 }));
 
 vi.mock('../InternalPicker', () => ({
diff --git a/packages/core/client/src/schema-component/antd/association-field/index.ts b/packages/core/client/src/schema-component/antd/association-field/index.ts
index 61ba03f687..343b00c867 100644
--- a/packages/core/client/src/schema-component/antd/association-field/index.ts
+++ b/packages/core/client/src/schema-component/antd/association-field/index.ts
@@ -15,6 +15,7 @@ import { InternalPicker } from './InternalPicker';
 import { Nester } from './Nester';
 import { ReadPretty } from './ReadPretty';
 import { SubTable } from './SubTable';
+import { AssociationFieldAddNewer } from './AssociationSelect';
 
 export {
   AssociationFieldMode,
@@ -26,7 +27,7 @@ export const AssociationField: any = connect(Editable, mapReadPretty(ReadPretty)
 
 AssociationField.SubTable = SubTable;
 AssociationField.Nester = Nester;
-AssociationField.AddNewer = Action.Container;
+AssociationField.AddNewer = AssociationFieldAddNewer;
 AssociationField.Selector = Action.Container;
 AssociationField.Viewer = Action.Container;
 AssociationField.InternalSelect = InternalPicker;