Browse Source

fix The create user is always loading when the queue does not select any value

pull/3/MERGE
samz406 5 years ago committed by gaojun2048
parent
commit
1b419f3829
  1. 12
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

12
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

@ -150,7 +150,7 @@
// Mobile phone number regular // Mobile phone number regular
let regPhone = /^1(3|4|5|6|7|8)\d{9}$/; // eslint-disable-line 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 regPassword = /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?![`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、]+$)[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、0-9A-Za-z]{6,22}$/;
// user name // user name
@ -194,7 +194,7 @@
_getQueueList () { _getQueueList () {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.store.dispatch('security/getQueueList').then(res => { this.store.dispatch('security/getQueueList').then(res => {
this.queueList = _.map(res, v => { this.queueList = _.map(res, v => {
return { return {
id: v.id, id: v.id,
@ -229,12 +229,18 @@
}, },
_submit () { _submit () {
this.$refs['popup'].spinnerLoading = true this.$refs['popup'].spinnerLoading = true
let queueCode = '';
//get queue code
if (this.queueName != ''){
queueCode = this.queueList.length > 0 ? _.find(this.queueList, ['id', this.queueName]).code : ''
}
let param = { let param = {
userName: this.userName, userName: this.userName,
userPassword: this.userPassword, userPassword: this.userPassword,
tenantId: this.tenantId, tenantId: this.tenantId,
email: this.email, email: this.email,
queue: this.queueList.length>0? _.find(this.queueList, ['id', this.queueName]).code : '', queue: queueCode,
phone: this.phone phone: this.phone
} }

Loading…
Cancel
Save