Browse Source

Merge pull request #4649 from chengshiwen/fix-create-user

[Fix-4648][UI] Fix TypeError: Cannot read property 'id' of undefined in createUser
pull/3/MERGE
xingchun-chen 4 years ago committed by GitHub
parent
commit
8419ad798c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

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

@ -239,7 +239,9 @@
} }
}) })
this.$nextTick(() => { this.$nextTick(() => {
if (this.tenantList.length) {
this.tenantId = this.tenantList[0].id this.tenantId = this.tenantList[0].id
}
}) })
resolve() resolve()
}) })
@ -291,9 +293,14 @@
this.email = this.item.email this.email = this.item.email
this.phone = this.item.phone this.phone = this.item.phone
this.userState = this.item.state + '' || '1' this.userState = this.item.state + '' || '1'
if (this.item.tenantName) {
this.tenantId = this.item.tenantId this.tenantId = this.item.tenantId
}
this.$nextTick(() => { this.$nextTick(() => {
this.queueName = _.find(this.queueList, ['code', this.item.queue]).id || '' let queue = _.find(this.queueList, ['code', this.item.queue])
if (queue) {
this.queueName = queue.id || ''
}
}) })
} }
}) })
@ -304,9 +311,14 @@
this.email = this.item.email this.email = this.item.email
this.phone = this.item.phone this.phone = this.item.phone
this.userState = this.state + '' || '1' this.userState = this.state + '' || '1'
if (this.item.tenantName) {
this.tenantId = this.item.tenantId this.tenantId = this.item.tenantId
}
if (this.queueList.length > 0) { if (this.queueList.length > 0) {
this.queueName = _.find(this.queueList, ['code', this.item.queue]).id let queue = _.find(this.queueList, ['code', this.item.queue])
if (queue) {
this.queueName = queue.id || ''
}
} else { } else {
this.queueName = '' this.queueName = ''
} }

Loading…
Cancel
Save