diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue
index 928852d44f..3e56c344f7 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue
@@ -29,7 +29,7 @@
{{$index+1}} |
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 fb56c32683..926a29a7b2 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
@@ -150,6 +150,8 @@
// Mobile phone number regular
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}$/;
// user name
if (!this.userName.replace(/\s*/g,"")) {
@@ -157,10 +159,18 @@
return false
}
// password
- if (!this.userPassword && !this.item) {
- this.$message.warning(`${i18n.$t('Please enter your password')}`)
- return false
+ if (this.userPassword!='' && this.item) {
+ if(!regPassword.test(this.userPassword)) {
+ this.$message.warning(`${i18n.$t('Password consists of at least two combinations of numbers, letters, and characters, and the length is between 6-22')}`)
+ return false
+ }
+ } else if(!this.item){
+ if(!regPassword.test(this.userPassword)) {
+ this.$message.warning(`${i18n.$t('Password consists of at least two combinations of numbers, letters, and characters, and the length is between 6-22')}`)
+ return false
+ }
}
+
// email
if (!this.email) {
this.$message.warning(`${i18n.$t('Please enter email')}`)
@@ -184,6 +194,7 @@
_getQueueList () {
return new Promise((resolve, reject) => {
this.store.dispatch('security/getQueueList').then(res => {
+
this.queueList = _.map(res, v => {
return {
id: v.id,
@@ -223,7 +234,7 @@
userPassword: this.userPassword,
tenantId: this.tenantId,
email: this.email,
- queue: this.queueList[this.queueName].code,
+ queue: this.queueList.length>0? _.find(this.queueList, ['id', this.queueName]).code : '',
phone: this.phone
}
@@ -266,7 +277,11 @@
this.email = this.item.email
this.phone = this.item.phone
this.tenantId = this.item.tenantId
- this.queueName = _.find(this.queueList, ['code', this.item.queue]).id
+ if(this.queueList.length>0) {
+ this.queueName = _.find(this.queueList, ['code', this.item.queue]).id
+ } else {
+ this.queueName = ''
+ }
}
}
},
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue
index 391c982f7e..af296c9f28 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue
@@ -104,35 +104,15 @@
* verification
*/
_verification () {
- let regCn = new RegExp('[\\u4E00-\\u9FFF]+', 'g')
+ let regPassword = /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?![`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、]+$)[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、0-9A-Za-z]{6,22}$/;
// password
- if (regCn.test(this.userPassword)) {
- this.$message.warning(`${i18n.$t('Password cannot be in Chinese')}`)
- return false
- }
- if (!this.userPassword) {
- this.$message.warning(`${i18n.$t('Please enter a password (6-22) character password')}`)
- return false
- }
- if (this.userPassword.length < 6 || this.userPassword.length > 22) {
- this.$message.warning(`${i18n.$t('Please enter a password (6-22) character password')}`)
+ if (!regPassword.test(this.userPassword)) {
+ this.$message.warning(`${i18n.$t('Password consists of at least two combinations of numbers, letters, and characters, and the length is between 6-22')}`)
return false
}
// confirm password
- if (regCn.test(this.oldUserPassword)) {
- this.$message.warning(`${i18n.$t('Confirmation password cannot be in Chinese')}`)
- return false
- }
- if (!this.oldUserPassword) {
- this.$message.warning(`${i18n.$t('Please enter a confirmation password (6-22) character password')}`)
- return false
- }
- if (this.oldUserPassword.length < 6 || this.oldUserPassword.length > 22) {
- this.$message.warning(`${i18n.$t('Please enter a confirmation password (6-22) character password')}`)
- return false
- }
if (this.userPassword !== this.oldUserPassword) {
this.$message.warning(`${i18n.$t('The password is inconsistent with the confirmation password')}`)
return false
diff --git a/dolphinscheduler-ui/src/js/module/components/nav/nav.vue b/dolphinscheduler-ui/src/js/module/components/nav/nav.vue
index b29b172fea..2c4038ac73 100644
--- a/dolphinscheduler-ui/src/js/module/components/nav/nav.vue
+++ b/dolphinscheduler-ui/src/js/module/components/nav/nav.vue
@@ -72,7 +72,7 @@
style="width: 80px"
trigger="click">
{{activeLocale.name}}
diff --git a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue
index 8c09bfb326..9a491fc622 100644
--- a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue
+++ b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue
@@ -20,7 +20,7 @@
-
+
diff --git a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
index c9f85374ad..3e07a943d7 100644
--- a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
+++ b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
@@ -42,7 +42,7 @@
-->
- -
+
-
{{item.name}}
@@ -68,7 +68,7 @@
-->
- - {{item.name}}
+ - {{item.name}}
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 041704df9e..fb87146dff 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -20,6 +20,7 @@ export default {
'Please enter user name': 'Please enter user name',
'Password': 'Password',
'Please enter your password': 'Please enter your password',
+ 'Password consists of at least two combinations of numbers, letters, and characters, and the length is between 6-22': 'Password consists of at least two combinations of numbers, letters, and characters, and the length is between 6-22',
'Login': 'Login',
'Home': 'Home',
'Failed to create node to save': 'Failed to create node to save',
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 3e6d7e6dee..11fd0940bf 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -20,6 +20,7 @@ export default {
'Please enter user name': '请输入用户名',
'Password': '密码',
'Please enter your password': '请输入密码',
+ 'Password consists of at least two combinations of numbers, letters, and characters, and the length is between 6-22': '密码至少包含数字,字母和字符的两种组合,长度在6-22之间',
'Login': '登录',
'Home': '首页',
'Failed to create node to save': '未创建节点保存失败',
|