From 6d047fb53fb113a4c6fc5c46c5b4195e50744eb0 Mon Sep 17 00:00:00 2001
From: zhang <zwtvip@qq.com>
Date: Mon, 13 Nov 2023 13:14:59 +0800
Subject: [PATCH] fix(DatePicker): zh-CN is not work in DatePicker (#3273)

* fix(DatePicker): zh-CN is not work in DatePicker

* fix(DatePicker): locale zh-CN is not work in DatePicker
---
 src/locales/lang/zh_CN.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/locales/lang/zh_CN.ts b/src/locales/lang/zh_CN.ts
index 9d2b01b9..0d12074e 100644
--- a/src/locales/lang/zh_CN.ts
+++ b/src/locales/lang/zh_CN.ts
@@ -1,10 +1,18 @@
 import { genMessage } from '../helper';
 import antdLocale from 'ant-design-vue/es/locale/zh_CN';
+import { deepMerge } from '/@/utils';
 
 const modules = import.meta.glob('./zh-CN/**/*.json', { eager: true });
+
 export default {
   message: {
     ...genMessage(modules as Recordable<Recordable>, 'zh-CN'),
-    antdLocale,
+    antdLocale: {
+      ...antdLocale,
+      DatePicker: deepMerge(
+        antdLocale.DatePicker,
+        genMessage(modules as Recordable<Recordable>, 'zh-CN').antdLocale.DatePicker,
+      ),
+    },
   },
 };