test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-01 03:37:46 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shiwen Cheng 2021-02-14 21:28:02 +08:00 committed by GitHub
parent cbada7c16d
commit 60016fbd66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
View File

@ -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) {