Unverified Commit 324a3c1d authored by hymzcn's avatar hymzcn Committed by GitHub
Browse files

Merge pull request #538 from hymzcn/dev-1.1.0 

remove default tenant
parents a0824991 9d1cc24e

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

+4 −1
Original line number Diff line number Diff line
@@ -184,7 +184,10 @@ 
      _getTenantList () {

        return new Promise((resolve, reject) => {

          this.store.dispatch('security/getTenantList').then(res => {

            this.tenantList = _.map(res, v => {

            let arr = _.filter(res, (o) => {

              return o.id !== -1

            })

            this.tenantList = _.map(arr, v => {

              return {

                id: v.id,

                code: v.tenantName

escheduler-ui/src/js/conf/home/store/security/actions.js

+4 −4
Original line number Diff line number Diff line
@@ -241,10 +241,10 @@ export default { 
    return new Promise((resolve, reject) => {

      io.get(`tenant/list`, payload, res => {

        let list=res.data

        // list.unshift({

        //   id: -1,

        //   tenantName: 'Default'

        // })

        list.unshift({

          id: -1,

          tenantName: 'Default'

        })

        state.tenantAllList = list

        resolve(list)

      }).catch(e => {