diff --git a/index.html b/index.html index f24438e9..0db8a935 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - + laoding... diff --git a/public/loading.js b/public/loading.js index 8677b501..436afdbd 100644 --- a/public/loading.js +++ b/public/loading.js @@ -155,22 +155,30 @@ } `; + // 根据浏览器选择语言 + const lang = localStorage.getItem('cache:local:i18n'); + if (!lang) { + let preferredLanguage = navigator.language; + if (preferredLanguage.indexOf('-')) { + preferredLanguage = preferredLanguage.replace('-', '_'); + } + localStorage.setItem('cache:local:i18n', preferredLanguage); + } + let loadInfo = { title: '正在加载资源', titleSub: '初次加载资源可能需要较多时间', msg: '请耐心等待', }; - document.title = "AGrandEMS"; + // document.title = "AGrandEMS"; - // 判断选择语言 - const lang = localStorage.getItem('cache:local:i18n') || 'zh_CN'; if (lang === 'en_US') { loadInfo = { title: 'Loading Resources', titleSub: 'Loading resources for the first time may take a lot of time', msg: 'Please be patient', }; - document.title = "AGrandEMS"; + // document.title = "AGrandEMS"; } const divStr = ` diff --git a/src/constants/result-constants.ts b/src/constants/result-constants.ts index f0458353..e2bccbd6 100644 --- a/src/constants/result-constants.ts +++ b/src/constants/result-constants.ts @@ -2,25 +2,46 @@ export const RESULT_CODE_SUCCESS = 1; /**响应-msg正常成功 */ -export const RESULT_MSG_SUCCESS = 'success'; +export const RESULT_MSG_SUCCESS: Record = { + zh_CN: '成功!', + en_US: 'Success!', +}; /**响应-code错误失败 */ export const RESULT_CODE_ERROR = 0; /**响应-msg错误失败 */ -export const RESULT_MSG_ERROR = 'error'; +export const RESULT_MSG_ERROR: Record = { + zh_CN: '错误!', + en_US: 'Error!', +}; /**响应-网络连接超时 */ -export const RESULT_MSG_TIMEOUT = 'Network connection timeout!'; +export const RESULT_MSG_TIMEOUT: Record = { + zh_CN: '网络连接超时!', + en_US: 'Network Connection Timeout!', +}; /**响应-未知响应数据类型 */ -export const RESULT_MSG_NOT_TYPE = 'Unknown response data type!'; +export const RESULT_MSG_NOT_TYPE: Record = { + zh_CN: '未知响应数据类型!', + en_US: 'Unknown Response Data Type!', +}; /**响应-服务器连接出错 */ -export const RESULT_MSG_SERVER_ERROR = 'Server connection error!'; +export const RESULT_MSG_SERVER_ERROR: Record = { + zh_CN: '服务器连接出错!', + en_US: 'Server Connection Error!', +}; /**响应-请求地址未找到 */ -export const RESULT_MSG_URL_NOTFOUND = 'Request address not found!'; +export const RESULT_MSG_URL_NOTFOUND: Record = { + zh_CN: '请求地址未找到!', + en_US: 'Request Address Not Found!', +}; /**响应-数据正在处理，请勿重复提交 */ -export const RESULT_MSG_URL_RESUBMIT = 'Data is being processed, please do not resubmit!'; +export const RESULT_MSG_URL_RESUBMIT: Record = { + zh_CN: '数据正在处理，请勿重复提交!', + en_US: 'Data are being processed, please do not resubmit', +}; diff --git a/src/i18n/index.ts b/src/i18n/index.ts index aa344943..f7acccc8 100644 --- a/src/i18n/index.ts +++ b/src/i18n/index.ts @@ -6,7 +6,7 @@ import enUS from './locales/en-US'; const i18n = createI18n({ legacy: false, // 使用 Composition API 的方式创建 i18n 实例 - locale: localGet(CACHE_LOCAL_I18N) || 'zh_CN', // 默认显示语言 + locale: localGet(CACHE_LOCAL_I18N) || 'en_US', // 默认显示语言 messages: { zh_CN: zhCN, en_US: enUS, diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts index ac4a9171..fbfc7272 100644 --- a/src/i18n/locales/en-US.ts +++ b/src/i18n/locales/en-US.ts @@ -124,6 +124,10 @@ export default { // 静态路由 router: { index: "Home", + login: "Sign In", + register: 'Registrations', + page403: 'No Access', + page404: 'Match Page Not Found', account: { index: "Personal Center", profile: "Personal Info", diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts index efa548f6..9f139e68 100644 --- a/src/i18n/locales/zh-CN.ts +++ b/src/i18n/locales/zh-CN.ts @@ -124,6 +124,10 @@ export default { // 静态路由 router: { index: "主页", + login: "登录", + register: '注册', + page403: '没有访问权限', + page404: '找不到匹配页面', account: { index: "个人中心", profile: "个人信息", diff --git a/src/plugins/http-fetch.ts b/src/plugins/http-fetch.ts index 56379005..50798349 100644 --- a/src/plugins/http-fetch.ts +++ b/src/plugins/http-fetch.ts @@ -82,6 +82,9 @@ type OptionsType = { signal?: AbortSignal; }; +// 多语言处理 +const language = localGet(CACHE_LOCAL_I18N) || 'en_US'; + // 兼容旧前端可改配置文件 const baseUrl = import.meta.env.PROD ? sessionGet('baseUrl') || import.meta.env.VITE_API_BASE_URL @@ -121,11 +124,7 @@ function beforeRequest(options: OptionsType): OptionsType | Promise { } // 客户端接受语言 - Reflect.set( - options.headers, - 'Accept-Language', - `${localGet(CACHE_LOCAL_I18N) || 'en_US'};q=0.9` - ); + Reflect.set(options.headers, 'Accept-Language', `${language};q=0.9`); // 是否需要设置 token const token = getToken(); @@ -153,7 +152,7 @@ function beforeRequest(options: OptionsType): OptionsType | Promise { requestObj.data === data && requestObj.time - time < interval ) { - const message = RESULT_MSG_URL_RESUBMIT; + const message = RESULT_MSG_URL_RESUBMIT[language]; return Promise.resolve({ code: RESULT_CODE_ERROR, msg: message, @@ -204,14 +203,14 @@ function interceptorResponse(res: ResultType): ResultType | Promise { if (!Reflect.has(res, 'code')) { return Promise.resolve({ code: RESULT_CODE_SUCCESS, - msg: RESULT_MSG_SUCCESS, + msg: RESULT_MSG_SUCCESS[language], data: res, }); } if (Reflect.has(res, 'error')) { return Promise.resolve({ code: RESULT_CODE_ERROR, - msg: RESULT_MSG_ERROR, + msg: RESULT_MSG_ERROR[language], data: res.error, }); } @@ -291,7 +290,7 @@ export async function request(options: OptionsType): Promise { : await res.arrayBuffer(); return { code: RESULT_CODE_SUCCESS, - msg: RESULT_MSG_SUCCESS, + msg: RESULT_MSG_SUCCESS[language], data: data, status: res.status, headers: res.headers, @@ -299,7 +298,7 @@ export async function request(options: OptionsType): Promise { default: return { code: RESULT_CODE_ERROR, - msg: RESULT_MSG_NOT_TYPE, + msg: RESULT_MSG_NOT_TYPE[language], }; } } catch (error: any) { @@ -307,7 +306,7 @@ export async function request(options: OptionsType): Promise { if (error.name === 'AbortError') { return { code: RESULT_CODE_ERROR, - msg: RESULT_MSG_TIMEOUT, + msg: RESULT_MSG_TIMEOUT[language], }; } throw error; @@ -326,21 +325,21 @@ function stateCode(res: Response) { if (res.status === 500) { return { code: RESULT_CODE_ERROR, - msg: RESULT_MSG_SERVER_ERROR, + msg: RESULT_MSG_SERVER_ERROR[language], }; } // 上传文件成功无内容返回 if (res.status === 204 && res.statusText === 'No Content') { return { code: RESULT_CODE_SUCCESS, - msg: RESULT_MSG_SUCCESS, + msg: RESULT_MSG_SUCCESS[language], }; } // 地址找不到 if (res.status === 404 || res.status === 405) { return { code: RESULT_CODE_ERROR, - msg: RESULT_MSG_URL_NOTFOUND, + msg: RESULT_MSG_URL_NOTFOUND[language], }; } // 身份授权 diff --git a/src/router/index.ts b/src/router/index.ts index 23e9b84c..c8de03bd 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -66,16 +66,19 @@ const constantRoutes: RouteRecordRaw[] = [ { path: '/login', name: 'Login', + meta: { title: 'router.login' }, component: () => import('@/views/login.vue'), }, { path: '/register', name: 'Register', + meta: { title: 'router.register' }, component: () => import('@/views/register.vue'), }, { path: '/403', name: 'NotPermission', + meta: { title: 'router.page403' }, component: () => import('@/views/error/403.vue'), }, { @@ -91,6 +94,7 @@ const constantRoutes: RouteRecordRaw[] = [ }, { path: '/:pathMatch(.*)*', + meta: { title: 'router.page404' }, component: () => import('@/views/error/404.vue'), }, ]; diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index bc6d9df4..aafed4b9 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -47,7 +47,7 @@ const useAppStore = defineStore('app', { */ getLOGOIcon(state) { const path = state.filePathIcon; - if (!path) { + if (!path || path === '#') { return defaultLOGOIcon; } if (validHttp(path)) { @@ -66,7 +66,7 @@ const useAppStore = defineStore('app', { */ getLOGOBrand(state) { const path = state.filePathBrand; - if (!path) { + if (!path || path === '#') { return defaultLOGOBrand; } if (validHttp(path)) { diff --git a/src/views/error/403.vue b/src/views/error/403.vue index b7578e2d..7bf27946 100644 --- a/src/views/error/403.vue +++ b/src/views/error/403.vue @@ -1,8 +1,27 @@