Commit 330e0a3b authored by ligang's avatar ligang
Browse files

Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2

parents 4f1c41c0 70a44bd0

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
        this._verification().then(res => {

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

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

              resolve()

              this.desc === this.item.desc ? reject({msg:'内容未修改'}) : resolve()

            })

          }else{

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

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
        this._verification().then(res => {

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

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

              resolve()

              this.desc === this.item.desc ? reject({msg:'内容未修改'}) : resolve()

            })

          }else{

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