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

6 years ago · 330e0a3b27
2 changed files with 2 additions and 2 deletions
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
@ -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', {
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
@ -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', {