From 8f258370e0c66767c069a6851bb89b706d49e597 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Mon, 1 Jun 2020 10:54:38 +0800 Subject: [PATCH] fix --- .../home/pages/security/pages/users/_source/createUser.vue | 4 ++-- dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js | 2 +- dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue index 5f2a040e7b..e5c428f635 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue @@ -155,8 +155,8 @@ let userNameLength = this.userName.length // user name - if (userNameLength<3) { - this.$message.warning(`${i18n.$t('Username length cannot be less than 3')}`) + if (userNameLength<3 && userNameLength>60) { + this.$message.warning(`${i18n.$t('User name length is between 3 and 60')}`) return false } if (!this.userName.replace(/\s*/g,"")) { diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js index 69f64006f7..84a34daf62 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -595,5 +595,5 @@ export default { 'Please delete all non-existent resources': 'Please delete all non-existent resources', 'The Worker group no longer exists, please select the correct Worker group!': 'The Worker group no longer exists, please select the correct Worker group!', 'Please confirm whether the workflow has been saved before downloading': 'Please confirm whether the workflow has been saved before downloading', - 'Username length cannot be less than 3': 'Username length cannot be less than 3' + 'User name length is between 3 and 60': 'User name length is between 3 and 60' } diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js index ef842137b2..a5b84a39fe 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -595,5 +595,5 @@ export default { 'Please delete all non-existent resources': '请删除所有未授权或已删除资源', 'The Worker group no longer exists, please select the correct Worker group!': '该Worker分组已经不存在,请选择正确的Worker分组!', 'Please confirm whether the workflow has been saved before downloading': '下载前请确定工作流是否已保存', - 'Username length cannot be less than 3': '用户名长度不能小于3' + 'User name length is between 3 and 60': '用户名长度在3~60之间' }