fix: fix multi-select field not show 'Allow multiple' switch (#1857)

* fix: fix multi-select field not show 'Allow multiple' switch

* fix: use uiSchema

packages/core/client/src/schema-component/antd/association-select/AssociationSelect.tsx

@@ -15,6 +15,7 @@ import {
 } from '../../../collection-manager';
 import { isTitleField } from '../../../collection-manager/Configuration/CollectionFields';
 import { GeneralSchemaDesigner, SchemaSettings, isPatternDisabled, isShowDefaultValue } from '../../../schema-settings';
+import { useIsShowMultipleSwitch } from '../../../schema-settings/hooks/useIsShowMultipleSwitch';
 import { useCompile, useDesignable, useFieldComponentOptions, useFieldTitle } from '../../hooks';
 import { removeNullCondition } from '../filter';
 import { RemoteSelect, RemoteSelectProps } from '../remote-select';
@@ -102,6 +103,8 @@ AssociationSelect.Designer = function Designer() {
   const tk = useFilterByTk();
   const { dn, refresh, insertAdjacent } = useDesignable();
   const compile = useCompile();
+  const IsShowMultipleSwitch = useIsShowMultipleSwitch();
+
   const collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
   const fieldComponentOptions = useFieldComponentOptions();
   const isSubFormAssociationField = field.address.segments.includes('__form_grid');
@@ -495,17 +498,12 @@ AssociationSelect.Designer = function Designer() {
           }}
         />
       )}
-      {form &&
+      {IsShowMultipleSwitch() ? (
-        !form?.readPretty &&
-        ['o2m', 'm2m'].includes(collectionField.interface) &&
-        fieldSchema['x-component'] !== 'TableField' && (
         <SchemaSettings.SwitchItem
           key="multiple"
           title={t('Allow multiple')}
           checked={
-              fieldSchema['x-component-props']?.multiple === undefined
+            fieldSchema['x-component-props']?.multiple === undefined ? true : fieldSchema['x-component-props'].multiple
-                ? true
-                : fieldSchema['x-component-props'].multiple
           }
           onChange={(value) => {
             const schema = {
@@ -524,7 +522,7 @@ AssociationSelect.Designer = function Designer() {
             refresh();
           }}
         />
-        )}
+      ) : null}
       <SchemaSettings.ModalItem
         title={t('Set the data scope')}
         schema={

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

@@ -8,7 +8,7 @@ import moment from 'moment';
 import React, { useContext, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ACLCollectionFieldProvider } from '../../../acl/ACLProvider';
-import { BlockRequestContext, useFilterByTk, useFormBlockContext } from '../../../block-provider';
+import { BlockRequestContext, useFormBlockContext } from '../../../block-provider';
 import {
   Collection,
   CollectionFieldOptions,
@@ -20,6 +20,7 @@ import {
 import { isTitleField } from '../../../collection-manager/Configuration/CollectionFields';
 import { GeneralSchemaDesigner, SchemaSettings, isPatternDisabled, isShowDefaultValue } from '../../../schema-settings';
 import { VariableInput } from '../../../schema-settings/VariableInput/VariableInput';
+import { useIsShowMultipleSwitch } from '../../../schema-settings/hooks/useIsShowMultipleSwitch';
 import { isVariable, parseVariables, useVariablesCtx } from '../../common/utils/uitls';
 import { SchemaComponent } from '../../core';
 import { useCompile, useDesignable, useFieldModeOptions } from '../../hooks';
@@ -99,14 +100,15 @@ export const FormItem: any = observer((props: any) => {
 FormItem.Designer = function Designer() {
   const { getCollectionFields, getInterface, getCollectionJoinField, getCollection } = useCollectionManager();
   const { getField } = useCollection();
-  const tk = useFilterByTk();
   const { form } = useFormBlockContext();
   const field = useField<Field>();
   const fieldSchema = useFieldSchema();
   const { t } = useTranslation();
-  const { dn, refresh, insertAdjacent } = useDesignable();
+  const { dn, refresh } = useDesignable();
   const compile = useCompile();
   const variablesCtx = useVariablesCtx();
+  const IsShowMultipleSwitch = useIsShowMultipleSwitch();
+
   const collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
   const targetCollection = getCollection(collectionField?.target);
   const interfaceConfig = getInterface(collectionField?.interface);
@@ -705,17 +707,12 @@ FormItem.Designer = function Designer() {
           }}
         />
       )}
-      {form &&
+      {IsShowMultipleSwitch() ? (
-        !form?.readPretty &&
-        ['o2m', 'm2m'].includes(collectionField?.interface) &&
-        fieldSchema['x-component'] !== 'TableField' && (
         <SchemaSettings.SwitchItem
           key="multiple"
           title={t('Allow multiple')}
           checked={
-              fieldSchema['x-component-props']?.multiple === undefined
+            fieldSchema['x-component-props']?.multiple === undefined ? true : fieldSchema['x-component-props'].multiple
-                ? true
-                : fieldSchema['x-component-props'].multiple
           }
           onChange={(value) => {
             const schema = {
@@ -734,7 +731,7 @@ FormItem.Designer = function Designer() {
             refresh();
           }}
         />
-        )}
+      ) : null}
       {field.readPretty && options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && !isFileField && (
         <SchemaSettings.SwitchItem
           title={t('Enable link')}

packages/core/client/src/schema-settings/hooks/useIsShowMultipleSwitch.ts

@@ -0,0 +1,19 @@
+import { useField, useFieldSchema } from '@formily/react';
+import { useCollectionManager } from '../../collection-manager';
+
+/**
+ * 是否显示 `允许多选` 开关
+ */
+export function useIsShowMultipleSwitch() {
+  const field = useField();
+  const fieldSchema = useFieldSchema();
+  const { getCollectionField } = useCollectionManager();
+
+  const collectionField = getCollectionField(fieldSchema['x-collection-field']);
+  const uiSchema = collectionField?.uiSchema || fieldSchema;
+  const hasMultiple = uiSchema['x-component-props']?.multiple === true;
+
+  return function IsShowMultipleSwitch() {
+    return !field.readPretty && fieldSchema['x-component'] !== 'TableField' && hasMultiple;
+  };
+}