diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue index 838f429bd320061027a0bce0cc36701c0b871400..96e560a6170a8d3ae8e3a429ce353fb4ebfbf2d5 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue @@ -169,7 +169,7 @@ * Download log */ _downloadLog () { - downloadFile('/dolphinscheduler/log/download-log', { + downloadFile('log/download-log', { taskInstanceId: this.stateId || this.logId }) }, diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue index 06626b6dcf003e114170545bc999816785ac533d..85cd53d97553bdfe078c5e2c8d3a0f87da3a0671 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue @@ -81,7 +81,7 @@ this.$router.push({ name: 'file' }) }, _downloadFile () { - downloadFile('/dolphinscheduler/resources/download', { + downloadFile('resources/download', { id: this.$route.params.id }) }, diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue index ce4d2b7dace27ce5f018db8715713c354e185fe5..5d50987ad58e91739e8aa4529a2890c0e1002762 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue +++ b/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) }, _downloadFile (item) { - downloadFile('/dolphinscheduler/resources/download', { + downloadFile('resources/download', { id: item.id }) }, diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue index 0c22b429f1743e495d53bb3e1b6d8b89e3801abb..34e7657f53554a16f1798d79d9485917f58b0540 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue +++ b/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) }, _downloadFile (item) { - downloadFile('/dolphinscheduler/resources/download', { + downloadFile('resources/download', { id: item.id }) }, diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue index f2244b634d1f92a73f163b52a956ae6b5c40ebff..5bbca79920f1cfb26d899c5f6c8613eff727a90c 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue @@ -155,7 +155,7 @@ methods: { ...mapActions('resource', ['deleteResource']), _downloadFile (item) { - downloadFile('/dolphinscheduler/resources/download', { + downloadFile('resources/download', { id: item.id }) }, diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue index f41dcc47ce5707e5fa0f75f61c5ab7506270c55f..28016cf4b822f020ccc16b4a8613b4ac8347a379 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/_source/list.vue @@ -156,7 +156,7 @@ methods: { ...mapActions('resource', ['deleteResource']), _downloadFile (item) { - downloadFile('/dolphinscheduler/resources/download', { + downloadFile('resources/download', { id: item.id }) }, diff --git a/dolphinscheduler-ui/src/js/module/download/index.js b/dolphinscheduler-ui/src/js/module/download/index.js index 552df62e9ef3dac4d90e1183e23f3fe87c00941a..6f51a3b01bc18cfd4be8ecc03a1aa04631be5432 100644 --- a/dolphinscheduler-ui/src/js/module/download/index.js +++ b/dolphinscheduler-ui/src/js/module/download/index.js @@ -16,12 +16,14 @@ */ import i18n from '@/module/i18n' +import { resolveURL } from '@/module/io' + /** * download file */ const downloadFile = ($url, $obj) => { const param = { - url: $url, + url: resolveURL($url), obj: $obj } diff --git a/dolphinscheduler-ui/src/js/module/permissions/index.js b/dolphinscheduler-ui/src/js/module/permissions/index.js index 21278851ef18ca3de7cad0f66a7dca5a8d30b08b..6a693516ae8c2302cd4573eb0b32bef316705513 100644 --- a/dolphinscheduler-ui/src/js/module/permissions/index.js +++ b/dolphinscheduler-ui/src/js/module/permissions/index.js @@ -44,6 +44,7 @@ Permissions.prototype = { if ($(el).prop('tagName') === 'BUTTON') { $(el).attr('disabled', true) } else { + $(el).css('display', 'none') setTimeout(function () { el.parentNode.removeChild(el) }, 100) } }