Browse Source

[1.3.5-prepare][cherry-pick]#4110

chengshiwen 4 years ago
parent
commit
3ceb475327
  1. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
  2. 2
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
  3. 2
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
  4. 2
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
  5. 2
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
  6. 2
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue
  7. 4
      dolphinscheduler-ui/src/js/module/download/index.js
  8. 1
      dolphinscheduler-ui/src/js/module/permissions/index.js

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue

@ -169,7 +169,7 @@
* Download log * Download log
*/ */
_downloadLog () { _downloadLog () {
downloadFile('/dolphinscheduler/log/download-log', { downloadFile('log/download-log', {
taskInstanceId: this.stateId || this.logId taskInstanceId: this.stateId || this.logId
}) })
}, },

2
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue

@ -81,7 +81,7 @@
this.$router.push({ name: 'file' }) this.$router.push({ name: 'file' })
}, },
_downloadFile () { _downloadFile () {
downloadFile('/dolphinscheduler/resources/download', { downloadFile('resources/download', {
id: this.$route.params.id id: this.$route.params.id
}) })
}, },

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

@ -179,7 +179,7 @@
findComponentDownward(this.$root, 'roof-nav')._fileReUpload('FILE',item) findComponentDownward(this.$root, 'roof-nav')._fileReUpload('FILE',item)
}, },
_downloadFile (item) { _downloadFile (item) {
downloadFile('/dolphinscheduler/resources/download', { downloadFile('resources/download', {
id: item.id id: item.id
}) })
}, },

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

@ -180,7 +180,7 @@
findComponentDownward(this.$root, 'roof-nav')._fileChildReUpload('FILE',item,this.$route.params.id) findComponentDownward(this.$root, 'roof-nav')._fileChildReUpload('FILE',item,this.$route.params.id)
}, },
_downloadFile (item) { _downloadFile (item) {
downloadFile('/dolphinscheduler/resources/download', { downloadFile('resources/download', {
id: item.id id: item.id
}) })
}, },

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

@ -155,7 +155,7 @@
methods: { methods: {
...mapActions('resource', ['deleteResource']), ...mapActions('resource', ['deleteResource']),
_downloadFile (item) { _downloadFile (item) {
downloadFile('/dolphinscheduler/resources/download', { downloadFile('resources/download', {
id: item.id id: item.id
}) })
}, },

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

@ -156,7 +156,7 @@
methods: { methods: {
...mapActions('resource', ['deleteResource']), ...mapActions('resource', ['deleteResource']),
_downloadFile (item) { _downloadFile (item) {
downloadFile('/dolphinscheduler/resources/download', { downloadFile('resources/download', {
id: item.id id: item.id
}) })
}, },

4
dolphinscheduler-ui/src/js/module/download/index.js

@ -16,12 +16,14 @@
*/ */
import i18n from '@/module/i18n' import i18n from '@/module/i18n'
import { resolveURL } from '@/module/io'
/** /**
* download file * download file
*/ */
const downloadFile = ($url, $obj) => { const downloadFile = ($url, $obj) => {
const param = { const param = {
url: $url, url: resolveURL($url),
obj: $obj obj: $obj
} }

1
dolphinscheduler-ui/src/js/module/permissions/index.js

@ -44,6 +44,7 @@ Permissions.prototype = {
if ($(el).prop('tagName') === 'BUTTON') { if ($(el).prop('tagName') === 'BUTTON') {
$(el).attr('disabled', true) $(el).attr('disabled', true)
} else { } else {
$(el).css('display', 'none')
setTimeout(function () { el.parentNode.removeChild(el) }, 100) setTimeout(function () { el.parentNode.removeChild(el) }, 100)
} }
} }

Loading…
Cancel
Save