From 133b9d8431fd296ff1f264926e7881499ec34d5e Mon Sep 17 00:00:00 2001
From: chengshiwen <chengshiwen0103@gmail.com>
Date: Thu, 26 Nov 2020 17:24:29 +0800
Subject: [PATCH 1/2] fix: security page disappear delay problem when force
 refresh under GENERAL_USER

---
 .../pages/resource/pages/udf/pages/function/_source/list.vue    | 2 +-
 dolphinscheduler-ui/src/js/module/permissions/index.js          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
index 8320a17516..7d3ef41dc6 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-v-ps<template>
+<template>
   <div class="list-model">
     <div class="table-box">
       <table class="fixed">
diff --git a/dolphinscheduler-ui/src/js/module/permissions/index.js b/dolphinscheduler-ui/src/js/module/permissions/index.js
index 21278851ef..6a693516ae 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)
           }
         }

From 959286c358fa8f34cc2b7eb37084c9d9f4179ebb Mon Sep 17 00:00:00 2001
From: chengshiwen <chengshiwen0103@gmail.com>
Date: Thu, 26 Nov 2020 17:30:34 +0800
Subject: [PATCH 2/2] improvement: resovle download url with resolveURL to
 prevent change of apiPrefix

---
 .../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 +++-
 7 files changed, 9 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 838f429bd3..96e560a617 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 18bfcbf32a..d1a3ff16db 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
@@ -87,7 +87,7 @@
         this.$router.go(-1)
       },
       _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 4ccfa2eff3..d3e061b467 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
@@ -162,7 +162,7 @@
         }
       },
       _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 f5e801a205..6db3be96b3 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
@@ -163,7 +163,7 @@
         }
       },
       _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 362a3f6727..3e7cc60a8c 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
@@ -143,7 +143,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 ddb097ee0f..6f5ea0914a 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
@@ -144,7 +144,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 552df62e9e..6f51a3b01b 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
   }