Browse Source

[Improvement-4740][UI] Set the default Tenant as default or the first exist tenant in save process (#4742)

pull/3/MERGE
Shiwen Cheng 4 years ago committed by GitHub
parent
commit
60016fbd66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
  2. 4
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue

6
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue

@ -213,10 +213,10 @@
this.timeout = dag.timeout || 0 this.timeout = dag.timeout || 0
this.checkedTimeout = this.timeout !== 0 this.checkedTimeout = this.timeout !== 0
this.$nextTick(() => { this.$nextTick(() => {
if (dag.tenantId === -1) { if (dag.tenantId > -1) {
this.tenantId = this.store.state.user.userInfo.tenantId
} else {
this.tenantId = dag.tenantId this.tenantId = dag.tenantId
} else if (this.store.state.user.userInfo.tenantId) {
this.tenantId = this.store.state.user.userInfo.tenantId
} }
}) })
}, },

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

@ -293,7 +293,7 @@
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) { if (this.item.tenantId) {
this.tenantId = this.item.tenantId this.tenantId = this.item.tenantId
} }
this.$nextTick(() => { this.$nextTick(() => {
@ -311,7 +311,7 @@
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) { if (this.item.tenantId) {
this.tenantId = this.item.tenantId this.tenantId = this.item.tenantId
} }
if (this.queueList.length > 0) { if (this.queueList.length > 0) {

Loading…
Cancel
Save