From 6d3c7e037f0419f9ccd5c6d4fc0218be10ea6890 Mon Sep 17 00:00:00 2001 From: Zeke Zhang <958414905@qq.com> Date: Wed, 18 Dec 2024 11:16:11 +0800 Subject: [PATCH] feat: add ellipsis configuration support for more components (#5888) * feat: add ellipsis configuration support for more components * chore: fix unit tests --- .../form/__tests__/fieldSettingsFormItem.test.tsx | 8 ++++++++ .../CascadeSelect/cascadeSelectComponentFieldSettings.tsx | 5 +++-- .../DatePicker/datePickerComponentFieldSettings.tsx | 5 ++++- .../component/Select/selectComponentFieldSettings.tsx | 5 +++-- .../fields/component/Tag/tagComponentFieldSettings.tsx | 6 ++++-- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/__tests__/fieldSettingsFormItem.test.tsx b/packages/core/client/src/modules/blocks/data-blocks/form/__tests__/fieldSettingsFormItem.test.tsx index db40bac647..952d927c8b 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/form/__tests__/fieldSettingsFormItem.test.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/form/__tests__/fieldSettingsFormItem.test.tsx @@ -198,6 +198,10 @@ describe('FieldSettingsFormItem', () => { title: 'Allow multiple', type: 'switch', }, + { + title: 'Ellipsis overflow content', + type: 'switch', + }, { title: 'Title field', type: 'select', @@ -304,6 +308,10 @@ describe('FieldSettingsFormItem', () => { title: 'Enable link', type: 'switch', }, + { + title: 'Ellipsis overflow content', + type: 'switch', + }, { title: 'Delete', type: 'delete', diff --git a/packages/core/client/src/modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.tsx index a1f4bb48c8..8730b493fa 100644 --- a/packages/core/client/src/modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.tsx @@ -12,10 +12,11 @@ import { useField, useFieldSchema } from '@formily/react'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useFieldComponentName } from '../../../../common/useFieldComponentName'; +import { useCollectionField } from '../../../../data-source'; 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 '../../../../data-source'; +import { ellipsisSettingsItem } from '../Input/inputComponentSettings'; const fieldComponent: any = { name: 'fieldComponent', @@ -99,5 +100,5 @@ const titleField: any = { export const cascadeSelectComponentFieldSettings = new SchemaSettings({ name: 'fieldSettings:component:CascadeSelect', - items: [fieldComponent, titleField], + items: [fieldComponent, titleField, ellipsisSettingsItem], }); diff --git a/packages/core/client/src/modules/fields/component/DatePicker/datePickerComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/DatePicker/datePickerComponentFieldSettings.tsx index 905b26ac7f..ca1ca42633 100644 --- a/packages/core/client/src/modules/fields/component/DatePicker/datePickerComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/DatePicker/datePickerComponentFieldSettings.tsx @@ -9,8 +9,9 @@ import { useFieldSchema } from '@formily/react'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; -import { SchemaSettingsDateFormat } from '../../../../schema-settings/SchemaSettingsDateFormat'; import { useColumnSchema } from '../../../../schema-component/antd/table-v2/Table.Column.Decorator'; +import { SchemaSettingsDateFormat } from '../../../../schema-settings/SchemaSettingsDateFormat'; +import { ellipsisSettingsItem } from '../Input/inputComponentSettings'; export const datePickerComponentFieldSettings = new SchemaSettings({ name: 'fieldSettings:component:DatePicker', @@ -27,6 +28,7 @@ export const datePickerComponentFieldSettings = new SchemaSettings({ }; }, }, + ellipsisSettingsItem, ], }); @@ -45,5 +47,6 @@ export const rangePickerPickerComponentFieldSettings = new SchemaSettings({ }; }, }, + ellipsisSettingsItem, ], }); diff --git a/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx index 52fcb1189f..4204ffad10 100644 --- a/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx @@ -16,7 +16,7 @@ import { SchemaSettings } from '../../../../application/schema-settings/SchemaSe import { useFormBlockContext } from '../../../../block-provider/FormBlockProvider'; import { useCollectionManager_deprecated, useCollection_deprecated } from '../../../../collection-manager'; import { useFieldComponentName } from '../../../../common/useFieldComponentName'; -import { useCollectionField } from '../../../../data-source'; +import { useCollectionField, useDataBlockProps } from '../../../../data-source'; import { useRecord } from '../../../../record-provider'; import { removeNullCondition, useDesignable, useFieldModeOptions, useIsAddNewForm } from '../../../../schema-component'; import { isSubMode } from '../../../../schema-component/antd/association-field/util'; @@ -34,7 +34,7 @@ import { SchemaSettingsSortingRule } from '../../../../schema-settings/SchemaSet import { useIsShowMultipleSwitch } from '../../../../schema-settings/hooks/useIsShowMultipleSwitch'; import { useLocalVariables, useVariables } from '../../../../variables'; import { useOpenModeContext } from '../../../popup/OpenModeProvider'; -import { useDataBlockProps } from '../../../../data-source'; +import { ellipsisSettingsItem } from '../Input/inputComponentSettings'; const enableLink = { name: 'enableLink', @@ -382,6 +382,7 @@ export const selectComponentFieldSettings = new SchemaSettings({ return useIsAssociationField() && readPretty; }, }, + ellipsisSettingsItem, ], }); diff --git a/packages/core/client/src/modules/fields/component/Tag/tagComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/Tag/tagComponentFieldSettings.tsx index 75a6c55d47..3982699c3e 100644 --- a/packages/core/client/src/modules/fields/component/Tag/tagComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/Tag/tagComponentFieldSettings.tsx @@ -12,12 +12,13 @@ import { useField, useFieldSchema } from '@formily/react'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useFieldComponentName } from '../../../../common/useFieldComponentName'; +import { useCollectionField } from '../../../../data-source'; 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 { useColorFields } from '../../../../schema-component/antd/table-v2/Table.Column.Designer'; import { useColumnSchema } from '../../../../schema-component/antd/table-v2/Table.Column.Decorator'; -import { useCollectionField } from '../../../../data-source'; +import { useColorFields } from '../../../../schema-component/antd/table-v2/Table.Column.Designer'; +import { ellipsisSettingsItem } from '../Input/inputComponentSettings'; const enableLink = { name: 'enableLink', @@ -177,5 +178,6 @@ export const tagComponentFieldSettings = new SchemaSettings({ }, titleField, enableLink, + ellipsisSettingsItem, ], });