Browse Source

Merge pull request #2902 from break60/dev-1.3.0

Fixed selection of tenant value and defalut changed to lower case
pull/3/MERGE
xingchun-chen 4 years ago committed by GitHub
parent
commit
dd7513d3d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
  2. 2
      dolphinscheduler-ui/src/js/conf/home/store/security/actions.js

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

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

2
dolphinscheduler-ui/src/js/conf/home/store/security/actions.js

@ -282,7 +282,7 @@ export default {
const list = res.data const list = res.data
list.unshift({ list.unshift({
id: -1, id: -1,
tenantName: 'Default' tenantName: 'default'
}) })
state.tenantAllList = list state.tenantAllList = list
resolve(list) resolve(list)

Loading…
Cancel
Save