Browse Source

Merge pull request #2558 from samz406/dev

fix The create user is always loading when the queue does not select any value
pull/2/head
xingchun-chen 4 years ago committed by GitHub
parent
commit
697ea0f656
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  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
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
@ -194,7 +194,7 @@
_getQueueList () {
return new Promise((resolve, reject) => {
this.store.dispatch('security/getQueueList').then(res => {
this.queueList = _.map(res, v => {
return {
id: v.id,
@ -229,12 +229,18 @@
},
_submit () {
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 = {
userName: this.userName,
userPassword: this.userPassword,
tenantId: this.tenantId,
email: this.email,
queue: this.queueList.length>0? _.find(this.queueList, ['id', this.queueName]).code : '',
queue: queueCode,
phone: this.phone
}

Loading…
Cancel
Save