From 89b96a367eeae6cbb2c29843927dfb4451171ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Sat, 14 May 2022 12:21:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BF=BB=E8=AF=91=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/index.js | 10 +- src/i18n/lang/en.js | 9 +- src/i18n/lang/zh-cn.js | 13 ++- src/i18n/lang/zh-tw.js | 9 +- src/i18n/pages/langSet/en.js | 6 + src/i18n/pages/langSet/zh-cn.js | 6 + src/i18n/pages/langSet/zh-tw.js | 6 + src/utils/ruoyi.js | 28 ++++- src/views/system/commonLang/index.vue | 162 +++++++++++++------------- 9 files changed, 156 insertions(+), 93 deletions(-) create mode 100644 src/i18n/pages/langSet/en.js create mode 100644 src/i18n/pages/langSet/zh-cn.js create mode 100644 src/i18n/pages/langSet/zh-tw.js diff --git a/src/i18n/index.js b/src/i18n/index.js index 3732983..4bd4a4c 100644 --- a/src/i18n/index.js +++ b/src/i18n/index.js @@ -9,6 +9,10 @@ import pageLoginCn from './pages/login/zh-cn' import pageLoginEn from './pages/login/en' import pageLoginTw from './pages/login/zh-tw' +import pageLangSetCn from './pages/langSet/zh-cn' +import pageLangSetEn from './pages/langSet/en' +import pageLangSetTw from './pages/langSet/zh-tw' + const i18n = createI18n({ // 全局注入 $t 函数 globalInjection: true, @@ -16,9 +20,9 @@ const i18n = createI18n({ locale: store.getters.language, //默认选择的语言 legacy: false, // 使用 Composition API 模式，则需要将其设置为false messages: { - 'zh-cn': { ...zhCn, ...pageLoginCn }, - 'zh-tw': { ...zhTw, ...pageLoginTw }, - 'en': { ...en, ...pageLoginEn } + 'zh-cn': { ...zhCn, ...pageLoginCn, ...pageLangSetCn }, + 'zh-tw': { ...zhTw, ...pageLoginTw, ...pageLangSetTw }, + 'en': { ...en, ...pageLoginEn, ...pageLangSetEn } } }) console.log('lang=' + store.getters.language) diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js index 1cfa85e..605334f 100644 --- a/src/i18n/lang/en.js +++ b/src/i18n/lang/en.js @@ -76,7 +76,13 @@ export default { common: { ok: 'Ok', cancel: 'Cancel', - tips: 'tips' + tips: 'tips', + english: 'English', + chinese: 'Chinese', + traditionalChinese: 'TraditionalChinese', + name: 'Name', + content: 'Content', + addTime: 'AddTime' }, btn: { add: 'Add', @@ -107,5 +113,6 @@ export default { upload: 'Upload', view: 'To view', copy: 'Copy', + operate: 'Operate' } }; \ No newline at end of file diff --git a/src/i18n/lang/zh-cn.js b/src/i18n/lang/zh-cn.js index 51d1f8f..ed8ca58 100644 --- a/src/i18n/lang/zh-cn.js +++ b/src/i18n/lang/zh-cn.js @@ -76,7 +76,13 @@ export default { common: { ok: '确定', cancel: '取消', - tips: '提示' + tips: '提示', + english: '英文', + chinese: '中文', + traditionalChinese: '繁体', + name: '名称', + content: '内容', + addTime: '添加时间' }, btn: { add: '新增', @@ -90,8 +96,8 @@ export default { synchronize: '同步', generateCode: '生成代码', start: '启动', - stop: '停止', - run: '运行', + stop: '停止', + run: '运行', runOnce: '运行一次', log: '日志', expand: '展开', @@ -107,5 +113,6 @@ export default { upload: '上传', view: '查看', copy: '複製', + operate: '操作' } }; \ No newline at end of file diff --git a/src/i18n/lang/zh-tw.js b/src/i18n/lang/zh-tw.js index 8577183..3da47e8 100644 --- a/src/i18n/lang/zh-tw.js +++ b/src/i18n/lang/zh-tw.js @@ -76,7 +76,13 @@ export default { common: { ok: '確定', cancel: '取消', - tips: '提示' + tips: '提示', + english: '英文', + chinese: '中文簡體', + traditionalChinese: '繁體', + name: '名稱', + content: '內容', + addTime: '添加時間' }, btn: { add: '新增', @@ -104,5 +110,6 @@ export default { upload: '上傳', view: '查看', copy: '复制', + operate: '操作' } }; \ No newline at end of file diff --git a/src/i18n/pages/langSet/en.js b/src/i18n/pages/langSet/en.js new file mode 100644 index 0000000..cb147ff --- /dev/null +++ b/src/i18n/pages/langSet/en.js @@ -0,0 +1,6 @@ +export default { + language: 'Language', + languageKey: 'LanguageKey', + showWay: 'Show Way', + table: 'Table', +} \ No newline at end of file diff --git a/src/i18n/pages/langSet/zh-cn.js b/src/i18n/pages/langSet/zh-cn.js new file mode 100644 index 0000000..d996b6c --- /dev/null +++ b/src/i18n/pages/langSet/zh-cn.js @@ -0,0 +1,6 @@ +export default { + language: '语言', + languageKey: '语言key', + showWay: '显示方式', + table: '表格', +} \ No newline at end of file diff --git a/src/i18n/pages/langSet/zh-tw.js b/src/i18n/pages/langSet/zh-tw.js new file mode 100644 index 0000000..df2f026 --- /dev/null +++ b/src/i18n/pages/langSet/zh-tw.js @@ -0,0 +1,6 @@ +export default { + language: '语言', + languageKey: '语言key', + showWay: '显示方式', + table: '表格', +} \ No newline at end of file diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js index 32b1e95..48b7038 100644 --- a/src/utils/ruoyi.js +++ b/src/utils/ruoyi.js @@ -1,4 +1,5 @@ -const baseURL = import.meta.env.VITE_APP_BASE_API +const baseURL = + import.meta.env.VITE_APP_BASE_API /** * 通用js方法封装处理 * Copyright (c) 2019 ruoyi @@ -94,7 +95,7 @@ export function selectDictLabel(datas, value) { // 回显数据字典（字符串数组） export function selectDictLabels(datas, value, separator) { - if(value === undefined) { + if (value === undefined) { return ""; } var actions = []; @@ -118,7 +119,9 @@ export function download(fileName) { // 字符串格式化(%s ) export function sprintf(str) { - var args = arguments, flag = true, i = 1; + var args = arguments, + flag = true, + i = 1; str = str.replace(/%s/g, function () { var arg = args[i++]; if (typeof arg === 'undefined') { @@ -206,9 +209,9 @@ export function handleTree(data, id, parentId, children) { } /** -* 参数处理 -* @param {*} params 参数 -*/ + * 参数处理 + * @param {*} params 参数 + */ export function tansParams(params) { let result = '' for (const propName of Object.keys(params)) { @@ -268,4 +271,17 @@ export function praseStrZero(str) { return 0; } return str; +} + +/** + * 字符串是否为空 + * @param {*} obj + * @returns + */ +export function isEmpty(obj) { + if (typeof obj == "undefined" || obj == null || obj === "") { + return true; + } else { + return false; + } } \ No newline at end of file diff --git a/src/views/system/commonLang/index.vue b/src/views/system/commonLang/index.vue index e7c0bd8..48d97a5 100644 --- a/src/views/system/commonLang/index.vue +++ b/src/views/system/commonLang/index.vue @@ -10,21 +10,21 @@
- + - + - + 表格 行列 - + {{ $t('btn.add') }} - {{ - $t('btn.edit') - }} + + {{ $t('btn.edit') }} + - {{ - $t('btn.delete') - }} + + {{ $t('btn.delete') }} + {{ $t('btn.export') }} @@ -77,16 +77,16 @@ - + - - - + + + - +