fix: table settings get collectionField (#3837)

* fix: table settings get collectionField

* fix: remove duplicate useCollectionField

* fix: bug

* refactor: tagComponentFieldSettings

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>

packages/core/client/src/common/useFieldComponentName.tsx

@@ -2,19 +2,7 @@ import { Field } from '@formily/core';
 import { useField, useFieldSchema } from '@formily/react';
 import { useIsFileField } from '../schema-component/antd/form-item/FormItem.Settings';
 import { useColumnSchema } from '../schema-component/antd/table-v2/Table.Column.Decorator';
-import { useCollectionManager_deprecated, useCollection_deprecated } from '../collection-manager';
+import { useCollectionField } from '../data-source';
-
-/**
- * 获取字段相关的配置信息
- * @returns
- */
-function useCollectionField() {
-  const { getCollectionJoinField } = useCollectionManager_deprecated();
-  const { getField } = useCollection_deprecated();
-  const fieldSchema = useFieldSchema();
-  const collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
-  return collectionField;
-}
 
 export function useFieldComponentName(): string {
   const { fieldSchema: tableColumnSchema, collectionField: tableColumnField } = useColumnSchema();

packages/core/client/src/data-source/collection-field/CollectionFieldProvider.tsx

@@ -22,7 +22,7 @@ export const CollectionFieldProvider: FC<CollectionFieldProviderProps> = (props)
   const collectionManager = useCollectionManager();
 
   const value = useMemo(() => {
-    if (!collection || allowNull) return null;
+    if (!collection) return null;
     const field = fieldSchema?.['x-component-props']?.['field'];
     return (
       collectionManager.getCollectionField(fieldSchema?.['x-collection-field']) ||
@@ -31,7 +31,7 @@ export const CollectionFieldProvider: FC<CollectionFieldProviderProps> = (props)
     );
   }, [collection, fieldSchema, name, collectionManager]);
 
-  if (!collection || allowNull) {
+  if (!value && allowNull) {
     return <>{children}</>;
   }
 

packages/core/client/src/modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.tsx

@@ -6,7 +6,7 @@ import { useFieldComponentName } from '../../../../common/useFieldComponentName'
 import { useDesignable, useFieldModeOptions, useIsAddNewForm } from '../../../../schema-component';
 import { isSubMode } from '../../../../schema-component/antd/association-field/util';
 import { useTitleFieldOptions } from '../../../../schema-component/antd/form-item/FormItem.Settings';
-import { useCollectionField } from '../utils';
+import { useCollectionField } from '../../../../data-source';
 
 const fieldComponent: any = {
   name: 'fieldComponent',

packages/core/client/src/modules/fields/component/Nester/subformComponentFieldSettings.tsx

@@ -9,7 +9,7 @@ import {
   useIsFieldReadPretty,
   useIsFormReadPretty,
 } from '../../../../schema-component/antd/form-item/FormItem.Settings';
-import { useCollectionField } from '../utils';
+import { useCollectionField } from '../../../../data-source';
 import { useFormBlockType } from '../../../../block-provider';
 
 const allowMultiple: any = {

packages/core/client/src/modules/fields/component/Picker/recordPickerComponentFieldSettings.tsx

@@ -10,7 +10,7 @@ import {
   useTitleFieldOptions,
 } from '../../../../schema-component/antd/form-item/FormItem.Settings';
 import { useColumnSchema } from '../../../../schema-component/antd/table-v2/Table.Column.Decorator';
-import { useCollectionField } from '../utils';
+import { useCollectionField } from '../../../../data-source';
 
 export const titleField: any = {
   name: 'titleField',

packages/core/client/src/modules/fields/component/PopoverNester/subformPopoverComponentFieldSettings.tsx

@@ -6,7 +6,7 @@ import { useFieldComponentName } from '../../../../common/useFieldComponentName'
 import { useDesignable, useFieldModeOptions, useIsAddNewForm } from '../../../../schema-component';
 import { isSubMode } from '../../../../schema-component/antd/association-field/util';
 import { useIsFieldReadPretty } from '../../../../schema-component/antd/form-item/FormItem.Settings';
-import { useCollectionField } from '../utils';
+import { useCollectionField } from '../../../../data-source';
 import { useColumnSchema } from '../../../../schema-component/antd/table-v2/Table.Column.Decorator';
 import { titleField } from '../Picker/recordPickerComponentFieldSettings';
 

packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx

@@ -23,7 +23,7 @@ import { SchemaSettingsDataScope } from '../../../../schema-settings/SchemaSetti
 import { SchemaSettingsSortingRule } from '../../../../schema-settings/SchemaSettingsSortingRule';
 import { useIsShowMultipleSwitch } from '../../../../schema-settings/hooks/useIsShowMultipleSwitch';
 import { useLocalVariables, useVariables } from '../../../../variables';
-import { useCollectionField } from '../utils';
+import { useCollectionField } from '../../../../data-source';
 
 const enableLink = {
   name: 'enableLink',

packages/core/client/src/modules/fields/component/Tag/tagComponentFieldSettings.tsx

@@ -8,7 +8,7 @@ import { isSubMode } from '../../../../schema-component/antd/association-field/u
 import { useTitleFieldOptions } from '../../../../schema-component/antd/form-item/FormItem.Settings';
 import { useColorFields } from '../../../../schema-component/antd/table-v2/Table.Column.Designer';
 import { useColumnSchema } from '../../../../schema-component/antd/table-v2/Table.Column.Decorator';
-import { useCollectionField } from '../utils';
+import { useCollectionField } from '../../../../data-source';
 
 const enableLink = {
   name: 'enableLink',
@@ -140,9 +140,12 @@ export const tagComponentFieldSettings = new SchemaSettings({
       useComponentProps() {
         const { t } = useTranslation();
         const field = useField<Field>();
-        const fieldSchema = useFieldSchema();
+        const schema = useFieldSchema();
+        const targetCollectionField = useCollectionField();
+        const { fieldSchema: tableColumnSchema, collectionField: tableColumnField } = useColumnSchema();
+        const fieldSchema = tableColumnSchema || schema;
+        const collectionField = tableColumnField || targetCollectionField;
         const { dn } = useDesignable();
-        const collectionField = useCollectionField();
         const colorFieldOptions = useColorFields(collectionField?.target ?? collectionField?.targetCollection);
         return {
           title: t('Tag color field'),

packages/core/client/src/modules/fields/component/utils.tsx

@@ -1,14 +0,0 @@
-import { useFieldSchema } from '@formily/react';
-import { useCollection_deprecated, useCollectionManager_deprecated } from '../../../collection-manager';
-
-/**
- * 获取字段相关的配置信息
- * @returns
- */
-export function useCollectionField() {
-  const { getCollectionJoinField } = useCollectionManager_deprecated();
-  const { getField } = useCollection_deprecated();
-  const fieldSchema = useFieldSchema();
-  const collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
-  return collectionField;
-}

packages/core/client/src/schema-component/antd/form-item/FormItem.tsx

@@ -67,16 +67,15 @@ export const FormItem: any = observer(
         },
       );
     }, [showTitle]);
-    const fieldSchema = useFieldSchema();
 
     return (
-      <BlockItem className={'nb-form-item'}>
+      <CollectionFieldProvider allowNull={true}>
-        <CollectionFieldProvider name={fieldSchema.name} allowNull={!fieldSchema['x-collection-field']}>
+        <BlockItem className={'nb-form-item'}>
           <ACLCollectionFieldProvider>
             <Item className={className} {...props} extra={extra} />
           </ACLCollectionFieldProvider>
-        </CollectionFieldProvider>
+        </BlockItem>
-      </BlockItem>
+      </CollectionFieldProvider>
     );
   },
   { displayName: 'FormItem' },