From 929d52ecad83fded41c5f54502ab7129445dc4db Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 24 Nov 2023 14:21:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20menu=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-ui/src/i18n/langs/chinese.js | 4 +- lms/nladmin-ui/src/i18n/langs/en.js | 2 + lms/nladmin-ui/src/i18n/langs/english.js | 4 +- lms/nladmin-ui/src/i18n/langs/in.js | 2 + lms/nladmin-ui/src/i18n/langs/indonesian.js | 4 +- lms/nladmin-ui/src/i18n/langs/menu/en.js | 6 +++ lms/nladmin-ui/src/i18n/langs/menu/in.js | 6 +++ lms/nladmin-ui/src/i18n/langs/menu/zh.js | 6 +++ lms/nladmin-ui/src/i18n/langs/zh-CN.js | 2 + .../src/layout/components/Navbar.vue | 8 ++-- lms/nladmin-ui/src/main.js | 1 - .../src/views/system/menu/index.vue | 43 ++++++++++++++++--- 12 files changed, 75 insertions(+), 13 deletions(-) create mode 100644 lms/nladmin-ui/src/i18n/langs/menu/en.js create mode 100644 lms/nladmin-ui/src/i18n/langs/menu/in.js create mode 100644 lms/nladmin-ui/src/i18n/langs/menu/zh.js diff --git a/lms/nladmin-ui/src/i18n/langs/chinese.js b/lms/nladmin-ui/src/i18n/langs/chinese.js index baa9849..f344de3 100644 --- a/lms/nladmin-ui/src/i18n/langs/chinese.js +++ b/lms/nladmin-ui/src/i18n/langs/chinese.js @@ -1,7 +1,9 @@ import zhLocale from 'element-ui/lib/locale/lang/zh-CN' import zh from './zh-CN' +import menu from './menu/zh' export default { ...zhLocale, - ...zh + ...zh, + ...menu } diff --git a/lms/nladmin-ui/src/i18n/langs/en.js b/lms/nladmin-ui/src/i18n/langs/en.js index e72480c..10bf340 100644 --- a/lms/nladmin-ui/src/i18n/langs/en.js +++ b/lms/nladmin-ui/src/i18n/langs/en.js @@ -76,6 +76,8 @@ export default { 'Tip10': 'Please enter your old password', 'Tip11': 'Please enter your new password', 'Tip12': '6 to 20 characters in length', + 'Tip13': 'Are you sure to log out and exit the system?', + 'Tip14': 'WebSocket connection error', 'loading': 'loading...' }, // 菜单 diff --git a/lms/nladmin-ui/src/i18n/langs/english.js b/lms/nladmin-ui/src/i18n/langs/english.js index 203b44c..32fe505 100644 --- a/lms/nladmin-ui/src/i18n/langs/english.js +++ b/lms/nladmin-ui/src/i18n/langs/english.js @@ -1,7 +1,9 @@ import enLocale from 'element-ui/lib/locale/lang/en' import en from './en' +import menu from './menu/en' export default { ...enLocale, - ...en + ...en, + ...menu } diff --git a/lms/nladmin-ui/src/i18n/langs/in.js b/lms/nladmin-ui/src/i18n/langs/in.js index 8c8ede7..798c0f6 100644 --- a/lms/nladmin-ui/src/i18n/langs/in.js +++ b/lms/nladmin-ui/src/i18n/langs/in.js @@ -76,6 +76,8 @@ export default { 'Tip10': 'Silakan masukkan kata sandi lama Anda', 'Tip11': 'Silakan masukkan sandi baru', 'Tip12': 'Antara 6 dan 20 karakter dalam panjang', + 'Tip13': 'Apakah Anda yakin untuk log keluar dan keluar dari sistem?', + 'Tip14': 'Koneksi WebSocket error', 'loading': 'Memuatkan Data...' }, // 菜单 diff --git a/lms/nladmin-ui/src/i18n/langs/indonesian.js b/lms/nladmin-ui/src/i18n/langs/indonesian.js index b5d3e4d..998fe75 100644 --- a/lms/nladmin-ui/src/i18n/langs/indonesian.js +++ b/lms/nladmin-ui/src/i18n/langs/indonesian.js @@ -1,7 +1,9 @@ import idLocale from 'element-ui/lib/locale/lang/id' import id from './in' +import menu from './menu/in' export default { ...idLocale, - ...id + ...id, + ...menu } diff --git a/lms/nladmin-ui/src/i18n/langs/menu/en.js b/lms/nladmin-ui/src/i18n/langs/menu/en.js new file mode 100644 index 0000000..d90ff2a --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/menu/en.js @@ -0,0 +1,6 @@ +export default { + 'placeholder': { + 'fuzzy_search': 'fuzzy search', + 'owning_system': 'system' + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/menu/in.js b/lms/nladmin-ui/src/i18n/langs/menu/in.js new file mode 100644 index 0000000..eba10a5 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/menu/in.js @@ -0,0 +1,6 @@ +export default { + 'placeholder': { + 'fuzzy_search': 'pencarian kabur', + 'owning_system': 'sistem terkait' + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/menu/zh.js b/lms/nladmin-ui/src/i18n/langs/menu/zh.js new file mode 100644 index 0000000..a2ce5a3 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/menu/zh.js @@ -0,0 +1,6 @@ +export default { + 'placeholder': { + 'fuzzy_search': '模糊搜索', + 'owning_system': '所属系统' + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/zh-CN.js b/lms/nladmin-ui/src/i18n/langs/zh-CN.js index 64e411c..05c7c5c 100644 --- a/lms/nladmin-ui/src/i18n/langs/zh-CN.js +++ b/lms/nladmin-ui/src/i18n/langs/zh-CN.js @@ -76,6 +76,8 @@ export default { 'Tip10': '请输入旧密码', 'Tip11': '请输入新密码', 'Tip12': '长度在 6 到 20 个字符', + 'Tip13': '确定注销并退出系统吗？', + 'Tip14': 'WebSocket连接发生错误', 'loading': '数据加载中...' }, // 菜单 diff --git a/lms/nladmin-ui/src/layout/components/Navbar.vue b/lms/nladmin-ui/src/layout/components/Navbar.vue index d1ba136..fa087ec 100644 --- a/lms/nladmin-ui/src/layout/components/Navbar.vue +++ b/lms/nladmin-ui/src/layout/components/Navbar.vue @@ -142,9 +142,9 @@ export default { this.$store.dispatch('app/toggleSideBar') }, open() { - this.$confirm('确定注销并退出系统吗？', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', + this.$confirm(this.$t('common.Tip13'), this.$t('common.Tips'), { + confirmButtonText: this.$t('common.Confirm'), + cancelButtonText: this.$t('common.Cancel'), type: 'warning' }).then(() => { this.logout() @@ -164,7 +164,7 @@ export default { }, webSocketOnError(e) { this.$notify({ - title: 'WebSocket连接发生错误', + title: this.$t('common.Tip14'), type: 'error', duration: 0 }) diff --git a/lms/nladmin-ui/src/main.js b/lms/nladmin-ui/src/main.js index 32ba6a6..e4e0e81 100644 --- a/lms/nladmin-ui/src/main.js +++ b/lms/nladmin-ui/src/main.js @@ -81,7 +81,6 @@ Vue.use(Element, { Vue.prototype.$langPre = { computedProp(suffix) { - console.log(suffix) return localStorage.getItem('lang') + '_' + suffix } } diff --git a/lms/nladmin-ui/src/views/system/menu/index.vue b/lms/nladmin-ui/src/views/system/menu/index.vue index c7b5c58..5ac780c 100644 --- a/lms/nladmin-ui/src/views/system/menu/index.vue +++ b/lms/nladmin-ui/src/views/system/menu/index.vue @@ -8,7 +8,7 @@ v-model="query.blurry" clearable size="mini" - placeholder="模糊搜索" + :placeholder="$t('placeholder.fuzzy_search')" style="width: 200px;margin-bottom: 10px" class="filter-item" @keyup.enter.native="queryBlurry" @@ -16,7 +16,7 @@ 否 - + + + + + + + + + + @@ -222,6 +243,9 @@ import Dict from '../../../components/Dict/Dict' const defaultForm = { menu_id: null, title: null, + en_title: null, + in_title: null, + zh_title: null, menu_sort: 999, path: null, system_type: null, @@ -234,7 +258,7 @@ const defaultForm = { icon: null, cache: false, hidden: false, - type: 0, + type: 2, permission: null } export default { @@ -259,6 +283,15 @@ export default { title: [ { required: true, message: '请输入标题', trigger: 'blur' } ], + zh_title: [ + { required: true, message: '请输入标题', trigger: 'blur' } + ], + en_title: [ + { required: true, message: '请输入标题', trigger: 'blur' } + ], + in_title: [ + { required: true, message: '请输入标题', trigger: 'blur' } + ], path: [ { required: true, message: '请输入地址', trigger: 'blur' } ]