From 1fa3e2157755aaa09efaf3044a046d3eae9f32e7 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Mon, 1 Jul 2024 17:53:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat=EF=BC=9A=E5=88=B6=E5=93=81=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=97=A0=E5=8F=8D=E5=BA=94=E9=97=AE=E9=A2=98=20#10555?=
 =?UTF-8?q?=20#=20Reviewed,=20transaction=20id:=2010972?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ArtifactDownloadButton.vue    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/frontend/devops-pipeline/src/components/ArtifactDownloadButton.vue b/src/frontend/devops-pipeline/src/components/ArtifactDownloadButton.vue
index 293a1339d0f..c6e49b7eff4 100644
--- a/src/frontend/devops-pipeline/src/components/ArtifactDownloadButton.vue
+++ b/src/frontend/devops-pipeline/src/components/ArtifactDownloadButton.vue
@@ -1,10 +1,11 @@
 <template>
     <div v-if="artifactoryType !== 'IMAGE'">
         <bk-popover
-            :disabled="!hasPermission || !disabled"
+            :disabled="!btnDisabled"
         >
+            <i v-if="isLoading" class="devops-icon icon-circle-2-1 spin-icon" />
             <i
-                v-if="downloadIcon"
+                v-else-if="downloadIcon && !isLoading"
                 :class="['devops-icon icon-download', {
                     'artifactory-download-icon-disabled': btnDisabled
                 }]"
@@ -19,7 +20,7 @@
                 {{ $t("download") }}
             </bk-button>
             <template slot="content">
-                <template v-if="disabled">
+                <template>
                     <p>{{ disabled ? $t('downloadDisabledTips') : $t('details.noDownloadPermTips') }}</p>
                 </template>
             </template>
@@ -72,7 +73,8 @@
         data () {
             return {
                 visible: false,
-                signingMap: new Map()
+                signingMap: new Map(),
+                isLoading: false
             }
         },
         computed: {
@@ -85,7 +87,7 @@
                 return false
             },
             btnDisabled () {
-                return !this.hasPermission || this.disabled
+                return !this.hasPermission || this.disabled || this.isLoading
             }
         },
         beforeDestroy () {
@@ -98,11 +100,13 @@
             },
             async downLoadFile () {
                 try {
+                    if (this.btnDisabled) return
                     if (this.signingMap.get(this.path)) {
                         // this.apkSigningDialogVisible = true
                         this.setVisible(true)
                         return
                     }
+                    this.isLoading = true
                     const { url2 } = await this.$store
                         .dispatch('common/requestDownloadUrl', {
                             projectId: this.$route.params.projectId,
@@ -131,6 +135,8 @@
                     }
                 } catch (err) {
                     this.$bkMessage({ theme: 'error', message: err.message || err })
+                } finally {
+                    this.isLoading = false
                 }
             },
             pollingCheckSignedApk (url) {

From 91c7c416d906aa267041d00d14c1145d5878fbab Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Tue, 2 Jul 2024 11:29:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat=EF=BC=9A=E5=88=B6=E5=93=81=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=97=A0=E5=8F=8D=E5=BA=94=E9=97=AE=E9=A2=98=20#10555?=
 =?UTF-8?q?=20#=20Reviewed,=20transaction=20id:=2011029?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ArtifactDownloadButton.vue               | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/frontend/devops-pipeline/src/components/ArtifactDownloadButton.vue b/src/frontend/devops-pipeline/src/components/ArtifactDownloadButton.vue
index c6e49b7eff4..23f5b1b06e0 100644
--- a/src/frontend/devops-pipeline/src/components/ArtifactDownloadButton.vue
+++ b/src/frontend/devops-pipeline/src/components/ArtifactDownloadButton.vue
@@ -5,7 +5,7 @@
         >
             <i v-if="isLoading" class="devops-icon icon-circle-2-1 spin-icon" />
             <i
-                v-else-if="downloadIcon && !isLoading"
+                v-else-if="downloadIcon"
                 :class="['devops-icon icon-download', {
                     'artifactory-download-icon-disabled': btnDisabled
                 }]"
@@ -20,9 +20,7 @@
                 {{ $t("download") }}
             </bk-button>
             <template slot="content">
-                <template>
-                    <p>{{ disabled ? $t('downloadDisabledTips') : $t('details.noDownloadPermTips') }}</p>
-                </template>
+                <p>{{ disabled ? $t('downloadDisabledTips') : $t('details.noDownloadPermTips') }}</p>
             </template>
         </bk-popover>
         <bk-dialog

From 3d6b2cce23a65afad2a7bccb111661b08dfa3d8c Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Tue, 2 Jul 2024 17:54:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat=EF=BC=9A=E5=88=B6=E5=93=81=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=97=A0=E5=8F=8D=E5=BA=94=E9=97=AE=E9=A2=98=20#10555?=
 =?UTF-8?q?=20#=20Reviewed,=20transaction=20id:=2011095?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ArtifactDownloadButton.vue             | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/frontend/devops-pipeline/src/components/ArtifactDownloadButton.vue b/src/frontend/devops-pipeline/src/components/ArtifactDownloadButton.vue
index 23f5b1b06e0..34d3bf43aa5 100644
--- a/src/frontend/devops-pipeline/src/components/ArtifactDownloadButton.vue
+++ b/src/frontend/devops-pipeline/src/components/ArtifactDownloadButton.vue
@@ -1,9 +1,13 @@
 <template>
     <div v-if="artifactoryType !== 'IMAGE'">
         <bk-popover
-            :disabled="!btnDisabled"
+            :disabled="!btnDisabled || isLoading"
         >
-            <i v-if="isLoading" class="devops-icon icon-circle-2-1 spin-icon" />
+            <i
+                v-if="isLoading"
+                class="devops-icon icon-circle-2-1 spin-icon"
+                @click.stop=""
+            />
             <i
                 v-else-if="downloadIcon"
                 :class="['devops-icon icon-download', {