Unverified Commit e6f65a82 authored by millionfor's avatar millionfor Committed by GitHub
Browse files

Merge pull request #328 from millionfor/branch-1.0.2 

Branch 1.0.2
parents 7b163f8e 0f2b2a2c

escheduler-ui/.env

+1 −1
Original line number Diff line number Diff line 


# 后端接口地址

API_BASE = http://192.168.xx.xx:12345

API_BASE = http://192.168.221.188:12345



# 本地开发如需ip访问项目把"#"号去掉

#DEV_HOST = 192.168.xx.xx

escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue

+11 −4
Original line number Diff line number Diff line
@@ -49,10 +49,16 @@ 
    methods: {

      _ok (fn) {

        this._verification().then(res => {

          if (this.name === this.item.alias) {

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

              resolve()

            })

          }else{

            return this.store.dispatch('resource/resourceVerifyName', {

              name: this.name,

              type: 'FILE'

            })

          }

        }).then(res => {

          return this.store.dispatch('resource/resourceRename', {

            name: this.name,
@@ -78,6 +84,7 @@ 
          } else {

            resolve()

          }



        })

      }

    },

escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue

+10 −4
Original line number Diff line number Diff line
@@ -49,10 +49,16 @@ 
    methods: {

      _ok (fn) {

        this._verification().then(res => {

          if (this.name === this.item.alias) {

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

              resolve()

            })

          }else{

            return this.store.dispatch('resource/resourceVerifyName', {

              name: this.name,

              type: 'UDF'

            })

          }

        }).then(res => {

          return this.store.dispatch('resource/resourceRename', {

            name: this.name,