Merge pull request #328 from millionfor/branch-1.0.2

Branch 1.0.2

escheduler-ui/.env

@@ -1,6 +1,6 @@
 
 # 后端接口地址
-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

@@ -49,10 +49,16 @@
     methods: {
       _ok (fn) {
         this._verification().then(res => {
-          return this.store.dispatch('resource/resourceVerifyName', {
-            name: this.name,
-            type: 'FILE'
-          })
+          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

@@ -49,10 +49,16 @@
     methods: {
       _ok (fn) {
         this._verification().then(res => {
-          return this.store.dispatch('resource/resourceVerifyName', {
-            name: this.name,
-            type: 'UDF'
-          })
+          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,