From b0fd387f0ff5091a664ed7ded3df1d2a14014370 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Mon, 1 Jun 2020 10:41:07 +0800 Subject: [PATCH 1/6] mr resource display and create user username length cannot be less than 3 --- .../js/conf/home/pages/dag/_source/formModel/tasks/mr.vue | 2 +- .../home/pages/security/pages/users/_source/createUser.vue | 7 ++++++- dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js | 3 ++- dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue index 8fb2ebadfe..d05c6983d6 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue @@ -78,7 +78,7 @@
{{$t('Resources')}}
- +
{{ node.raw.fullName }}
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 866fb4e0e7..5f2a040e7b 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 @@ -152,8 +152,13 @@ let regPhone = /^1(3|4|5|6|7|8)\d{9}$/; // eslint-disable-line let regPassword = /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?![`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]+$)[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、0-9A-Za-z]{6,22}$/; - + + let userNameLength = this.userName.length // user name + if (userNameLength<3) { + this.$message.warning(`${i18n.$t('Username length cannot be less than 3')}`) + return false + } if (!this.userName.replace(/\s*/g,"")) { this.$message.warning(`${i18n.$t('Please enter user name')}`) return false 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 aeba322855..69f64006f7 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -594,5 +594,6 @@ export default { 'Unauthorized or deleted resources': 'Unauthorized or deleted resources', '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' + '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' } 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 6567d38429..ef842137b2 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -594,5 +594,6 @@ export default { 'Unauthorized or deleted resources': '未授权或已删除资源', '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': '下载前请确定工作流是否已保存' + 'Please confirm whether the workflow has been saved before downloading': '下载前请确定工作流是否已保存', + 'Username length cannot be less than 3': '用户名长度不能小于3' } 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 2/6] 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之间' } From 2183e7e06213c548694c446e3a781a1f775ea31e Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Mon, 1 Jun 2020 11:06:10 +0800 Subject: [PATCH 3/6] fix --- .../pages/instance/pages/list/_source/list.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue index 612c1ce46c..005858da18 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue @@ -53,11 +53,11 @@ {{$t('fault-tolerant sign')}} - {{$t('host')}} + {{$t('Executor')}} - -
- {{$t('Executor')}} + +
+ {{$t('host')}}
@@ -92,11 +92,11 @@ {{item.runTimes}} {{item.recovery}} - {{item.host}} + {{item.executorName}} - - {{item.executorName}} + {{item.host}} - From 098db69f6961979ae955e60629d48144a91b1cbb Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Mon, 1 Jun 2020 11:09:54 +0800 Subject: [PATCH 4/6] 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 e5c428f635..337767f08b 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 && userNameLength>60) { - this.$message.warning(`${i18n.$t('User name length is between 3 and 60')}`) + if (userNameLength<3 && userNameLength>39) { + this.$message.warning(`${i18n.$t('User name length is between 3 and 39')}`) 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 84a34daf62..def4c1adcc 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', - 'User name length is between 3 and 60': 'User name length is between 3 and 60' + 'User name length is between 3 and 39': 'User name length is between 3 and 39' } 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 a5b84a39fe..add8601384 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': '下载前请确定工作流是否已保存', - 'User name length is between 3 and 60': '用户名长度在3～60之间' + 'User name length is between 3 and 39': '用户名长度在3～39之间' } From ecb4df40516f61622a7b97cebeee96779fccec57 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Mon, 1 Jun 2020 11:14:46 +0800 Subject: [PATCH 5/6] fix --- .../home/pages/security/pages/users/_source/createUser.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 337767f08b..655b6cb9ec 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 @@ -154,8 +154,9 @@ let regPassword = /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?![`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]+$)[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、0-9A-Za-z]{6,22}$/; let userNameLength = this.userName.length + console.log(userNameLength) // user name - if (userNameLength<3 && userNameLength>39) { + if (userNameLength<3 || userNameLength>39) { this.$message.warning(`${i18n.$t('User name length is between 3 and 39')}`) return false } From 5922bcfaa19d0e8996f5e9f19b4fa7d84f096ae8 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Mon, 1 Jun 2020 11:15:07 +0800 Subject: [PATCH 6/6] fix --- .../conf/home/pages/security/pages/users/_source/createUser.vue | 1 - 1 file changed, 1 deletion(-) 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 655b6cb9ec..3850f6ea81 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 @@ -154,7 +154,6 @@ let regPassword = /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?![`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]+$)[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、0-9A-Za-z]{6,22}$/; let userNameLength = this.userName.length - console.log(userNameLength) // user name if (userNameLength<3 || userNameLength>39) { this.$message.warning(`${i18n.$t('User name length is between 3 and 39')}`)