From ebbd788fbb2c0b45d4473798efc57eec8ba74a25 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 18 六月 2024 14:51:16 +0800
Subject: [PATCH] 版本更新至2.11.5
---
src/locales/lang/zh_CN.ts | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/locales/lang/zh_CN.ts b/src/locales/lang/zh_CN.ts
index 146343b..e7621ec 100644
--- a/src/locales/lang/zh_CN.ts
+++ b/src/locales/lang/zh_CN.ts
@@ -1,17 +1,33 @@
+/*
+ * @Description: file content
+ * @Author: your name
+ * @version:
+ * @Date: 2024-06-17 14:51:26
+ * @LastEditors: your name
+ * @LastEditTime: 2024-06-17 19:51:29
+ */
import { genMessage } from '../helper';
import antdLocale from 'ant-design-vue/es/locale/zh_CN';
+import { deepMerge } from '@/utils';
import { defHttp } from '/@/utils/http/axios';
import { Api } from '../../api/sys/language';
-const modules = import.meta.globEager('./zh-CN/**/*.ts');
+const modules = import.meta.glob('./zh-CN/**/*.{json,ts,js}', { eager: true });
+
export default {
message: {
- ...genMessage(modules, 'zh-CN'),
- antdLocale,
+ ...genMessage(modules as Recordable<Recordable>, 'zh-CN'),
+ antdLocale: {
+ ...antdLocale,
+ DatePicker: deepMerge(
+ antdLocale.DatePicker,
+ genMessage(modules as Recordable<Recordable>, 'zh-CN').antdLocale.DatePicker,
+ ),
+ },
},
apiMessage: {
...(await defHttp.get(
- { url: `${Api.GetLanguage}?locale=zh-CN` },
+ { url: `${Api.GetLanguage}?locale=zh-cn` },
{ isTransformResponse: false },
)),
antdLocale,
--
Gitblit v1.9.3