Unverified Commit dd7513d3 authored by xingchun-chen's avatar xingchun-chen Committed by GitHub
Browse files

Merge pull request #2902 from break60/dev-1.3.0

Fixed selection of tenant value and defalut changed to lower case
parents b5eb9fe4 e8d9f5c2
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -205,12 +205,13 @@
      this.syncDefine = dag.syncDefine
      this.timeout = dag.timeout || 0
      this.checkedTimeout = this.timeout !== 0

      this.$nextTick(() => {
        if (dag.tenantId === -1) {
          this.tenantId = this.store.state.user.userInfo.tenantId
        } else {
          this.tenantId = dag.tenantId
        }
      })

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