This is an automated email from the ASF dual-hosted git repository.
chenxingchun pushed a commit to branch 1.3.5-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.5-prepare by this push:
new 3ceb475 [1.3.5-prepare][cherry-pick]#4110
new 3b41aa5 Merge pull request #4613 from chengshiwen/1.3.5-#4110
3ceb475 is described below
commit 3ceb47532759182390ef4bab3c512a2c367b1fcc
Author: chengshiwen <[email protected]>
AuthorDate: Thu Jan 28 22:19:13 2021 +0800
[1.3.5-prepare][cherry-pick]#4110
---
.../src/js/conf/home/pages/dag/_source/formModel/log.vue | 2 +-
.../js/conf/home/pages/resource/pages/file/pages/details/index.vue | 2 +-
.../conf/home/pages/resource/pages/file/pages/list/_source/list.vue | 2 +-
.../pages/resource/pages/file/pages/subdirectory/_source/list.vue | 2 +-
.../home/pages/resource/pages/udf/pages/resource/_source/list.vue | 2 +-
.../pages/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 838f429..96e560a 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 06626b6..85cd53d 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 ce4d2b7..5d50987 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 0c22b42..34e7657 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 f2244b6..5bbca79 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 f41dcc4..28016cf 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 552df62..6f51a3b 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 2127885..6a69351 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)
}
}
