diff --git a/package.json b/package.json index acabbec9f3..b888de0996 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "antd-mobile-v5-count": "^1.0.1", "classnames": "^2.3.2", "dayjs": "^1.11.7", + "deepmerge": "^4.3.1", "lodash": "^4.17.21", "nano-memoize": "^3.0.16", "rc-field-form": "~1.27.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bdee5a6d2b..f7bd23fe20 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,6 +36,9 @@ dependencies: dayjs: specifier: ^1.11.7 version: 1.11.9 + deepmerge: + specifier: ^4.3.1 + version: 4.3.1 lodash: specifier: ^4.17.21 version: 4.17.21 @@ -7295,7 +7298,6 @@ packages: /deepmerge@4.3.1: resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} - dev: true /default-compare@1.0.0: resolution: {integrity: sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==} diff --git a/src/components/form/form.tsx b/src/components/form/form.tsx index a92bf6b8c3..454eb20bbc 100644 --- a/src/components/form/form.tsx +++ b/src/components/form/form.tsx @@ -12,7 +12,7 @@ import { defaultFormContext, FormContext, FormContextType } from './context' import { mergeProps } from '../../utils/with-default-props' import { Header } from './header' import { useConfig } from '../config-provider' -import merge from 'lodash/merge' +import merge from 'deepmerge' import { FormArray } from './form-array' import { traverseReactNode } from '../../utils/traverse-react-node' @@ -78,9 +78,8 @@ export const Form = forwardRef((p, ref) => { const validateMessages = useMemo( () => merge( - {}, locale.Form.defaultValidateMessages, - formProps.validateMessages + formProps.validateMessages || {} ), [locale.Form.defaultValidateMessages, formProps.validateMessages] )