natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #328 from millionfor/branch-1.0.2 

Branch 1.0.2
This commit is contained in:
millionfor 2019-05-22 17:25:56 +08:00 committed by GitHub
parent 7b163f8e16 0f2b2a2ce2
commit e6f65a8284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
escheduler-ui/.env
View File

@ -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

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

@ -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()
}
})
}
},

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

@ -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,