Browse Source

[Fix-5055][UI] Fix can not upload file to correct dir (#5056)

* fix udf resource can not upload to the correct dir,and when delete udf resource can not refresh page

Co-authored-by: 李巨丰 <lijf@2345.com>
pull/3/MERGE
JuFeng Li 4 years ago committed by GitHub
parent
commit
e8c9c33d7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
  2. 1
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
  3. 2
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue
  4. 1
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
  5. 2
      dolphinscheduler-ui/src/js/module/components/fileUpdate/fileChildUpdate.vue
  6. 2
      dolphinscheduler-ui/src/js/module/components/fileUpdate/resourceChildUpdate.vue

1
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue

@ -115,6 +115,7 @@
_go (item) { _go (item) {
localStore.setItem('file', `${item.alias}|${item.size}`) localStore.setItem('file', `${item.alias}|${item.size}`)
if (item.directory) { if (item.directory) {
localStore.setItem('pid', `${item.id}`)
localStore.setItem('currentDir', `${item.fullName}`) localStore.setItem('currentDir', `${item.fullName}`)
this.$router.push({ path: `/resource/file/subdirectory/${item.id}` }) this.$router.push({ path: `/resource/file/subdirectory/${item.id}` })
} else { } else {

1
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue

@ -116,6 +116,7 @@
_go (item) { _go (item) {
localStore.setItem('file', `${item.alias}|${item.size}`) localStore.setItem('file', `${item.alias}|${item.size}`)
if (item.directory) { if (item.directory) {
localStore.setItem('pid', `${item.id}`)
localStore.setItem('currentDir', `${item.fullName}`) localStore.setItem('currentDir', `${item.fullName}`)
this.$router.push({ path: `/resource/udf/subUdfDirectory/${item.id}` }) this.$router.push({ path: `/resource/udf/subUdfDirectory/${item.id}` })
} }

2
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue

@ -127,11 +127,9 @@
this.deleteResource({ this.deleteResource({
id: item.id id: item.id
}).then(res => { }).then(res => {
this.$refs[`poptip-${i}`][0].doClose()
this.$emit('on-update') this.$emit('on-update')
this.$message.success(res.msg) this.$message.success(res.msg)
}).catch(e => { }).catch(e => {
this.$refs[`poptip-${i}`][0].doClose()
this.$message.error(e.msg || '') this.$message.error(e.msg || '')
}) })
}, },

1
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue

@ -121,6 +121,7 @@
this.isLeft = true this.isLeft = true
} }
this.isLoading = !flag this.isLoading = !flag
this.searchParams.id = this.$route.params.id
this.getResourcesListP(this.searchParams).then(res => { this.getResourcesListP(this.searchParams).then(res => {
if (this.searchParams.pageNo > 1 && res.totalList.length === 0) { if (this.searchParams.pageNo > 1 && res.totalList.length === 0) {
this.searchParams.pageNo = this.searchParams.pageNo - 1 this.searchParams.pageNo = this.searchParams.pageNo - 1

2
dolphinscheduler-ui/src/js/module/components/fileUpdate/fileChildUpdate.vue

@ -174,7 +174,7 @@
formData.append('file', this.file) formData.append('file', this.file)
formData.append('type', this.type) formData.append('type', this.type)
formData.append('name', this.name) formData.append('name', this.name)
formData.append('pid', this.pid) formData.append('pid', this.id)
formData.append('currentDir', this.currentDir) formData.append('currentDir', this.currentDir)
formData.append('description', this.description) formData.append('description', this.description)
io.post('resources/create', res => { io.post('resources/create', res => {

2
dolphinscheduler-ui/src/js/module/components/fileUpdate/resourceChildUpdate.vue

@ -174,7 +174,7 @@
formData.append('file', this.file) formData.append('file', this.file)
formData.append('type', this.type) formData.append('type', this.type)
formData.append('name', this.name) formData.append('name', this.name)
formData.append('pid', this.pid) formData.append('pid', this.id)
formData.append('currentDir', this.currentDir) formData.append('currentDir', this.currentDir)
formData.append('description', this.description) formData.append('description', this.description)
io.post('resources/create', res => { io.post('resources/create', res => {

Loading…
Cancel
Save