From 3ceb47532759182390ef4bab3c512a2c367b1fcc Mon Sep 17 00:00:00 2001 From: chengshiwen Date: Thu, 28 Jan 2021 22:19:13 +0800 Subject: [PATCH] [1.3.5-prepare][cherry-pick]#4110 --- .../src/js/conf/home/pages/dag/_source/formModel/log.vue | 2 +- .../home/pages/resource/pages/file/pages/details/index.vue | 2 +- .../pages/resource/pages/file/pages/list/_source/list.vue | 2 +- .../resource/pages/file/pages/subdirectory/_source/list.vue | 2 +- .../pages/resource/pages/udf/pages/resource/_source/list.vue | 2 +- .../resource/pages/udf/pages/subUdfDirectory/_source/list.vue | 2 +- dolphinscheduler-ui/src/js/module/download/index.js | 4 +++- dolphinscheduler-ui/src/js/module/permissions/index.js | 1 + 8 files changed, 10 insertions(+), 7 deletions(-) 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 838f429bd..96e560a61 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 06626b6dc..85cd53d97 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 ce4d2b7da..5d50987ad 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 0c22b429f..34e7657f5 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 f2244b634..5bbca7992 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 f41dcc47c..28016cf4b 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 552df62e9..6f51a3b01 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 21278851e..6a693516a 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) } } -- GitLab