From cd3c93a11d6d5f183978eaf63ad916b359346d8e Mon Sep 17 00:00:00 2001 From: katherinehhh Date: Fri, 4 Aug 2023 16:29:13 +0800 Subject: [PATCH] refactor:the default value of the built-in field should not be required (#2115) * fix: the default value of the built-in field in users collection should not be required * refactor: code improve * fix: the default value of the built-in field in users collection should not be required * refactor: code improve --- .../src/collection-manager/Configuration/AddFieldAction.tsx | 3 ++- .../src/collection-manager/Configuration/EditFieldAction.tsx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx b/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx index 8e196380d..03f3a55ba 100644 --- a/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx +++ b/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx @@ -9,11 +9,11 @@ import { useTranslation } from 'react-i18next'; import { useRequest } from '../../api-client'; import { RecordProvider, useRecord } from '../../record-provider'; import { ActionContextProvider, SchemaComponent, useActionContext, useCompile } from '../../schema-component'; -import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider'; import { useCancelAction } from '../action-hooks'; import { useCollectionManager } from '../hooks'; import useDialect from '../hooks/useDialect'; import { IField } from '../interfaces/types'; +import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider'; import * as components from './components'; import { getOptions } from './interfaces'; @@ -26,6 +26,7 @@ const getSchema = (schema: IField, record: any, compile) => { if (schema.hasDefaultValue === true) { properties['defaultValue'] = cloneDeep(schema?.default?.uiSchema); + properties.defaultValue.required = false; properties['defaultValue']['title'] = compile('{{ t("Default value") }}'); properties['defaultValue']['x-decorator'] = 'FormItem'; properties['defaultValue']['x-reactions'] = { diff --git a/packages/core/client/src/collection-manager/Configuration/EditFieldAction.tsx b/packages/core/client/src/collection-manager/Configuration/EditFieldAction.tsx index de91df8d7..92b1dae27 100644 --- a/packages/core/client/src/collection-manager/Configuration/EditFieldAction.tsx +++ b/packages/core/client/src/collection-manager/Configuration/EditFieldAction.tsx @@ -8,11 +8,11 @@ import { useTranslation } from 'react-i18next'; import { useAPIClient, useRequest } from '../../api-client'; import { RecordProvider, useRecord } from '../../record-provider'; import { ActionContextProvider, SchemaComponent, useActionContext, useCompile } from '../../schema-component'; -import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider'; import { useCancelAction, useUpdateAction } from '../action-hooks'; import { useCollectionManager } from '../hooks'; import useDialect from '../hooks/useDialect'; import { IField } from '../interfaces/types'; +import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider'; import * as components from './components'; const getSchema = (schema: IField, record: any, compile, getContainer): ISchema => { @@ -26,6 +26,7 @@ const getSchema = (schema: IField, record: any, compile, getContainer): ISchema if (schema.hasDefaultValue === true) { properties['defaultValue'] = cloneDeep(schema.default.uiSchema) || {}; + properties.defaultValue.required = false; properties['defaultValue']['title'] = compile('{{ t("Default value") }}'); properties['defaultValue']['x-decorator'] = 'FormItem'; properties['defaultValue']['x-reactions'] = {