From 440dd28fbb5f7b5554c9c0044ed887f75abb1ef2 Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 28 May 2021 17:48:05 +0800 Subject: [PATCH] =?UTF-8?q?feat(frontend):1.=E8=A7=92=E8=89=B2=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E7=9B=B8=E5=85=B3bug=E4=BF=AE=E5=A4=8D=EF=BC=9B2.?= =?UTF-8?q?=E5=86=85=E7=BD=AE=E8=A7=92=E8=89=B2=E7=A6=81=E6=AD=A2=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=92=8C=E5=88=A0=E9=99=A4=EF=BC=9B3.=E5=8F=B3?= =?UTF-8?q?=E4=B8=8A=E8=A7=92=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95=E6=96=87?= =?UTF-8?q?=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 5 +++-- frontend/src/lang/tw.js | 5 +++-- frontend/src/lang/zh.js | 5 +++-- frontend/src/layout/components/Topbar.vue | 2 +- frontend/src/views/system/role/form.vue | 2 +- frontend/src/views/system/role/index.vue | 10 +++++++--- frontend/src/views/system/user/personPwd.vue | 2 +- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index a687fc8d5a..44634f221f 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -278,7 +278,7 @@ export default { default_module: 'Default Module' }, datasource: 'Datasource', - char_can_not_more_50: 'Name can not more 50 char', + char_can_not_more_50: 'Can not more 50 char', share_success: 'Share Success' }, documentation: { @@ -435,7 +435,8 @@ export default { current_user: 'Current User', origin_passwd: 'Origin Password', new_passwd: 'New Password', - confirm_passwd: 'Confirm Password' + confirm_passwd: 'Confirm Password', + change_password: 'Change Password' }, role: { menu_authorization: 'Menu Authorization', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index a8b24afed5..8330f734c8 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -278,7 +278,7 @@ export default { default_module: '默认模块' }, datasource: '數據源', - char_can_not_more_50: '名稱不能超過50字符', + char_can_not_more_50: '不能超過50字符', share_success: '分享成功' }, documentation: { @@ -435,7 +435,8 @@ export default { current_user: '當前用戶', origin_passwd: '原始密碼', new_passwd: '新密碼', - confirm_passwd: '確認密碼' + confirm_passwd: '確認密碼', + change_password: '修改密碼' }, role: { menu_authorization: '菜單授權', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index e0246ec79d..2feb5ef0f3 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -278,7 +278,7 @@ export default { default_module: '默认模块' }, datasource: '数据源', - char_can_not_more_50: '名称不能超过50字符', + char_can_not_more_50: '不能超过50字符', share_success: '分享成功' }, documentation: { @@ -435,7 +435,8 @@ export default { current_user: '当前用户', origin_passwd: '原始密码', new_passwd: '新密码', - confirm_passwd: '确认密码' + confirm_passwd: '确认密码', + change_password: '修改密码' }, role: { menu_authorization: '菜单授权', diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue index 0f73ef356d..4f5bccaedb 100644 --- a/frontend/src/layout/components/Topbar.vue +++ b/frontend/src/layout/components/Topbar.vue @@ -47,7 +47,7 @@ {{ $t('commons.personal_info') }} - {{ $t('user.reset_password') }} + {{ $t('user.change_password') }} {{ $t('commons.help_documentation') }} diff --git a/frontend/src/views/system/role/form.vue b/frontend/src/views/system/role/form.vue index fd7619736d..7a9930f673 100644 --- a/frontend/src/views/system/role/form.vue +++ b/frontend/src/views/system/role/form.vue @@ -30,7 +30,7 @@ export default { name: [ { required: true, trigger: 'blur', validator: this.roleValidator } ], - code: [{ required: true, message: '请输入代码', trigger: 'blur' }] + description: [{ max: 50, message: this.$t('commons.char_can_not_more_50'), trigger: 'blur' }] }, roles: [], originName: null diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue index e04aae98c6..2045fee5a2 100644 --- a/frontend/src/views/system/role/index.vue +++ b/frontend/src/views/system/role/index.vue @@ -18,6 +18,7 @@ +