From 83abdc52c8a1e1628630043fa23462832b30107a Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Mon, 26 Aug 2024 16:19:41 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E6=9F=A5=E7=9C=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E5=9C=A8=E6=9E=84=E5=BB=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=82=B9=E5=87=BB=E6=8F=92=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=BF=9B=E5=85=A5=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=20=E6=97=A5=E5=BF=97=20or=20=E9=85=8D=E7=BD=AE=20Tab=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=82=20#10808=20#=20Reviewed,=20transaction=20id:?=
 =?UTF-8?q?=2016458?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ExecDetail/plugin.vue      | 27 +++++++++++++++++--
 .../src/views/subpages/ExecDetail.vue         |  1 +
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue b/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
index dcfaaa57af9..364e4d941bb 100644
--- a/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
+++ b/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
@@ -65,6 +65,10 @@
             editingElementPos: {
                 type: Object,
                 required: true
+            },
+            properties: {
+                type: Array,
+                default: () => ['LOG', 'ARTIFACT', 'CONFIG']
             }
         },
         data () {
@@ -150,7 +154,12 @@
             },
 
             showTab () {
-                return this.tabList[1].completeLoading && this.tabList[2].completeLoading
+                const artifactoryTab = this.tabList.find(tab => tab.name === 'artifactory')
+                const reportTab = this.tabList.find(tab => tab.name === 'report')
+                if (artifactoryTab && reportTab) {
+                    return artifactoryTab.completeLoading && reportTab.completeLoading
+                }
+                return false
             }
         },
 
@@ -167,10 +176,24 @@
                 handler (val) {
                     const tab = val.find(tab => tab.name === this.currentTab)
                     if (!tab.show) {
-                        this.currentTab = 'log'
+                        this.currentTab = val[0].name
                     }
                 },
                 deep: true
+            },
+            properties: {
+                handler (newValue) {
+                    if (JSON.stringify(newValue) === JSON.stringify(['CONFIG', 'LOG', 'ARTIFACT'])) {
+                        this.tabList = [
+                            { name: 'setting', show: true },
+                            { name: 'log', show: true },
+                            { name: 'artifactory', show: false, completeLoading: false },
+                            { name: 'report', show: false, completeLoading: false }
+                        ]
+                        this.currentTab = 'setting'
+                    }
+                },
+                immediate: true
             }
         },
 
diff --git a/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue b/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
index 84709f287a0..e46f8026066 100755
--- a/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
+++ b/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
@@ -110,6 +110,7 @@
                 <plugin
                     :exec-detail="execDetail"
                     :editing-element-pos="editingElementPos"
+                    :properties="curProject.properties.pluginDetailsDisplayOrder"
                     @close="hideSidePanel"
                 />
             </template>

From e6961e707d4b735dbe1a99125d61a6bed6977e5c Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Wed, 28 Aug 2024 14:28:23 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E6=9F=A5=E7=9C=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E5=9C=A8=E6=9E=84=E5=BB=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=82=B9=E5=87=BB=E6=8F=92=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=BF=9B=E5=85=A5=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=20=E6=97=A5=E5=BF=97=20or=20=E9=85=8D=E7=BD=AE=20Tab=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=82=20#10808=20#=20Reviewed,=20transaction=20id:?=
 =?UTF-8?q?=2018494?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/devops-atomstore/src/views/release_progress.vue   | 3 +++
 .../src/components/StageReviewPanel/components/describe.vue    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/frontend/devops-atomstore/src/views/release_progress.vue b/src/frontend/devops-atomstore/src/views/release_progress.vue
index 73c74c49701..a3af7eb8919 100755
--- a/src/frontend/devops-atomstore/src/views/release_progress.vue
+++ b/src/frontend/devops-atomstore/src/views/release_progress.vue
@@ -603,6 +603,9 @@
             }
             .card-item {
                 text-align: center;
+                word-wrap: break-word;
+                word-break: break-all;
+                padding: 5px;
                 i {
                     font-size: 12px;
                     font-weight: bold;
diff --git a/src/frontend/devops-stream/src/components/StageReviewPanel/components/describe.vue b/src/frontend/devops-stream/src/components/StageReviewPanel/components/describe.vue
index bed83e4904f..f116c130c8f 100644
--- a/src/frontend/devops-stream/src/components/StageReviewPanel/components/describe.vue
+++ b/src/frontend/devops-stream/src/components/StageReviewPanel/components/describe.vue
@@ -67,6 +67,7 @@
         word-break: break-all;
         font-size: 12px;
         color: #666770;
+        white-space: pre;
         &.show-more {
             display: block;
         }

From abdfd7336972ea80bea3fc2fb77b09b55eeb2588 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Sat, 14 Sep 2024 11:37:19 +0800
Subject: [PATCH 03/12] Merge branch 'master' of
 https://github.com/TencentBlueKing/bk-ci into issue_10808 # Reviewed,
 transaction id: 18496


From adb00b0b2d48fbe6d452f3080c1bd47db8145ccd Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Sat, 14 Sep 2024 14:52:15 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E6=9F=A5=E7=9C=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E5=9C=A8=E6=9E=84=E5=BB=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=82=B9=E5=87=BB=E6=8F=92=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=BF=9B=E5=85=A5=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=20=E6=97=A5=E5=BF=97=20or=20=E9=85=8D=E7=BD=AE=20Tab=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=82=20#10808=20#=20Reviewed,=20transaction=20id:?=
 =?UTF-8?q?=2018511?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ExecDetail/plugin.vue           | 14 +++-----------
 .../src/views/subpages/ExecDetail.vue              |  2 +-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue b/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
index 1932681f65a..24d40050ff4 100644
--- a/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
+++ b/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
@@ -43,7 +43,7 @@
                 v-if="currentTab === 'log'"
             />
             <component
-                v-if="currentTab === key"
+                v-show="currentTab === key"
                 :is="value.component"
                 v-bind="value.bindData"
                 v-for="(value, key) in componentList"
@@ -95,7 +95,8 @@
                     { name: 'artifactory', show: false, completeLoading: false },
                     { name: 'report', show: false, completeLoading: false },
                     { name: 'setting', show: true }
-                ]
+                ],
+                isShowArtifact: false
             }
         },
 
@@ -167,15 +168,6 @@
                 // } catch (error) {
                 //     return null
                 // }
-            },
-
-            showTab () {
-                const artifactoryTab = this.tabList.find(tab => tab.name === 'artifactory')
-                const reportTab = this.tabList.find(tab => tab.name === 'report')
-                if (artifactoryTab && reportTab) {
-                    return artifactoryTab.completeLoading && reportTab.completeLoading
-                }
-                return false
             }
         },
 
diff --git a/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue b/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
index 0a5e653d952..4d411aa301e 100755
--- a/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
+++ b/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
@@ -132,7 +132,7 @@
                 <plugin
                     :exec-detail="execDetail"
                     :editing-element-pos="editingElementPos"
-                    :properties="curProject.properties.pluginDetailsDisplayOrder"
+                    :properties="['CONFIG', 'LOG', 'ARTIFACT']"
                     @close="hideSidePanel"
                 />
             </template>

From 84c2653061f904319e85212c61ee525fd1ace879 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Wed, 18 Sep 2024 14:41:20 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E6=9F=A5=E7=9C=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E5=9C=A8=E6=9E=84=E5=BB=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=82=B9=E5=87=BB=E6=8F=92=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=BF=9B=E5=85=A5=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=20=E6=97=A5=E5=BF=97=20or=20=E9=85=8D=E7=BD=AE=20Tab=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=82=20#10808=20#=20Reviewed,=20transaction=20id:?=
 =?UTF-8?q?=2018660?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue b/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
index 4d411aa301e..0a5e653d952 100755
--- a/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
+++ b/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
@@ -132,7 +132,7 @@
                 <plugin
                     :exec-detail="execDetail"
                     :editing-element-pos="editingElementPos"
-                    :properties="['CONFIG', 'LOG', 'ARTIFACT']"
+                    :properties="curProject.properties.pluginDetailsDisplayOrder"
                     @close="hideSidePanel"
                 />
             </template>

From d37508b14ae851eedf081ec149f4866fe160918e Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Wed, 18 Sep 2024 14:43:27 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E6=9F=A5=E7=9C=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E5=9C=A8=E6=9E=84=E5=BB=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=82=B9=E5=87=BB=E6=8F=92=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=BF=9B=E5=85=A5=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=20=E6=97=A5=E5=BF=97=20or=20=E9=85=8D=E7=BD=AE=20Tab=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=82=20#10808=20#=20Reviewed,=20transaction=20id:?=
 =?UTF-8?q?=2018662?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devops-pipeline/src/components/ExecDetail/plugin.vue       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue b/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
index 24d40050ff4..1a92b306337 100644
--- a/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
+++ b/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
@@ -95,8 +95,7 @@
                     { name: 'artifactory', show: false, completeLoading: false },
                     { name: 'report', show: false, completeLoading: false },
                     { name: 'setting', show: true }
-                ],
-                isShowArtifact: false
+                ]
             }
         },
 

From c1678f9528a12970a2b29cc9939909317ac2ffa7 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Fri, 20 Sep 2024 11:02:53 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E6=9F=A5=E7=9C=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E5=9C=A8=E6=9E=84=E5=BB=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=82=B9=E5=87=BB=E6=8F=92=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=BF=9B=E5=85=A5=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=20=E6=97=A5=E5=BF=97=20or=20=E9=85=8D=E7=BD=AE=20Tab=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=82=20#10808=20#=20Reviewed,=20transaction=20id:?=
 =?UTF-8?q?=2018879?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devops-pipeline/src/components/ExecDetail/plugin.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue b/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
index 1a92b306337..182b5240cc9 100644
--- a/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
+++ b/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
@@ -190,7 +190,7 @@
             },
             properties: {
                 handler (newValue) {
-                    if (JSON.stringify(newValue) === JSON.stringify(['CONFIG', 'LOG', 'ARTIFACT'])) {
+                    if (newValue.join('') === ['CONFIG', 'LOG', 'ARTIFACT'].join('')) {
                         this.tabList = [
                             { name: 'setting', show: true },
                             { name: 'log', show: true },

From 4655f3a47d867fcbbb4fddc6bb4e20097e0181a4 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Wed, 23 Oct 2024 16:58:17 +0800
Subject: [PATCH 08/12] Merge branch 'master' of
 https://github.com/TencentBlueKing/bk-ci into issue_10808 # Reviewed,
 transaction id: 21647


From 660ae58809f1db91fc0ee9d567fb7a11d84458b0 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Thu, 24 Oct 2024 10:57:48 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E6=9F=A5=E7=9C=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E5=9C=A8=E6=9E=84=E5=BB=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=82=B9=E5=87=BB=E6=8F=92=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=BF=9B=E5=85=A5=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=20=E6=97=A5=E5=BF=97=20or=20=E9=85=8D=E7=BD=AE=20Tab=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=82=20#10808=20#=20Reviewed,=20transaction=20id:?=
 =?UTF-8?q?=2021709?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue b/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
index 0a5e653d952..d9fb0b481d1 100755
--- a/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
+++ b/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
@@ -132,7 +132,7 @@
                 <plugin
                     :exec-detail="execDetail"
                     :editing-element-pos="editingElementPos"
-                    :properties="curProject.properties.pluginDetailsDisplayOrder"
+                    :properties="curProject.properties?.pluginDetailsDisplayOrder"
                     @close="hideSidePanel"
                 />
             </template>
@@ -257,6 +257,7 @@
                 return ['RUNNING', 'QUEUE'].includes(this.execDetail?.status)
             },
             panels () {
+                console.log(this.execDetail, '------------------', this.curProject)
                 return [
                     {
                         name: 'executeDetail',

From b13fe4d1038aa636ad578500b8544a2b96cb908e Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Thu, 24 Oct 2024 16:15:07 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E6=9F=A5=E7=9C=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E5=9C=A8=E6=9E=84=E5=BB=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=82=B9=E5=87=BB=E6=8F=92=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=BF=9B=E5=85=A5=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=20=E6=97=A5=E5=BF=97=20or=20=E9=85=8D=E7=BD=AE=20Tab=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=82=20#10808=20#=20Reviewed,=20transaction=20id:?=
 =?UTF-8?q?=2021752?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ExecDetail/plugin.vue      | 57 +++++++++----------
 .../src/views/subpages/ExecDetail.vue         |  1 -
 2 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue b/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
index 182b5240cc9..6d4cc2c1072 100644
--- a/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
+++ b/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
@@ -10,7 +10,7 @@
             class="head-tab"
             slot="tab"
         >
-            <template v-for="tab in tabList">
+            <template v-for="tab in sortedTabList">
                 <span
                     v-if="tab.show"
                     :key="tab.name"
@@ -93,8 +93,8 @@
                 tabList: [
                     { name: 'log', show: true },
                     { name: 'artifactory', show: false, completeLoading: false },
-                    { name: 'report', show: false, completeLoading: false },
-                    { name: 'setting', show: true }
+                    { name: 'setting', show: true },
+                    { name: 'report', show: false, completeLoading: false }
                 ]
             }
         },
@@ -167,6 +167,26 @@
                 // } catch (error) {
                 //     return null
                 // }
+            },
+            sortedTabList () {
+                const mapping = {
+                    LOG: 'log',
+                    ARTIFACT: 'artifactory',
+                    CONFIG: 'setting'
+                }
+
+                const orderedTabs = this.properties.map(prop => {
+                    const tabName = mapping[prop]
+                    return this.tabList.find(tab => tab.name === tabName)
+                }).filter(Boolean)
+
+                const reportTab = this.tabList.find(tab => tab.name === 'report')
+                if (reportTab) {
+                    orderedTabs.push(reportTab)
+                }
+                
+                this.currentTab = orderedTabs.find(tab => tab.show)?.name
+                return orderedTabs
             }
         },
 
@@ -175,43 +195,20 @@
                 this.tabList = [
                     { name: 'log', show: true },
                     { name: 'artifactory', show: true, completeLoading: false },
-                    { name: 'report', show: false, completeLoading: false },
-                    { name: 'setting', show: true }
+                    { name: 'setting', show: true },
+                    { name: 'report', show: false, completeLoading: false }
                 ]
-            },
-            tabList: {
-                handler (val) {
-                    const tab = val.find(tab => tab.name === this.currentTab)
-                    if (!tab.show) {
-                        this.currentTab = val[0].name
-                    }
-                },
-                deep: true
-            },
-            properties: {
-                handler (newValue) {
-                    if (newValue.join('') === ['CONFIG', 'LOG', 'ARTIFACT'].join('')) {
-                        this.tabList = [
-                            { name: 'setting', show: true },
-                            { name: 'log', show: true },
-                            { name: 'artifactory', show: false, completeLoading: false },
-                            { name: 'report', show: false, completeLoading: false }
-                        ]
-                        this.currentTab = 'setting'
-                    }
-                },
-                immediate: true
             }
         },
 
         methods: {
             toggleTab (key, show = false) {
-                const tab = this.tabList.find(tab => tab.name === key)
+                const tab = this.sortedTabList.find(tab => tab.name === key)
                 tab.show = show
             },
 
             completeLoading (key) {
-                const tab = this.tabList.find(tab => tab.name === key)
+                const tab = this.sortedTabList.find(tab => tab.name === key)
                 tab.completeLoading = true
             }
         }
diff --git a/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue b/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
index d9fb0b481d1..23d92c12e86 100755
--- a/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
+++ b/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue
@@ -257,7 +257,6 @@
                 return ['RUNNING', 'QUEUE'].includes(this.execDetail?.status)
             },
             panels () {
-                console.log(this.execDetail, '------------------', this.curProject)
                 return [
                     {
                         name: 'executeDetail',

From 40106f3d97f5efa43bfe3753e04fafe483dd9ca5 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Fri, 25 Oct 2024 10:40:17 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E6=9F=A5=E7=9C=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E5=9C=A8=E6=9E=84=E5=BB=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=82=B9=E5=87=BB=E6=8F=92=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=BF=9B=E5=85=A5=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=20=E6=97=A5=E5=BF=97=20or=20=E9=85=8D=E7=BD=AE=20Tab=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=82=20#10808=20#=20Reviewed,=20transaction=20id:?=
 =?UTF-8?q?=2021851?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ExecDetail/Artifactory.vue               | 5 +++++
 .../devops-pipeline/src/components/ExecDetail/plugin.vue    | 4 +++-
 .../devops-pipeline/src/store/modules/atom/constants.js     | 2 ++
 .../devops-pipeline/src/store/modules/atom/index.js         | 3 ++-
 .../devops-pipeline/src/store/modules/atom/mutations.js     | 6 ++++++
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/frontend/devops-pipeline/src/components/ExecDetail/Artifactory.vue b/src/frontend/devops-pipeline/src/components/ExecDetail/Artifactory.vue
index f518fd72baf..6233e0fd107 100644
--- a/src/frontend/devops-pipeline/src/components/ExecDetail/Artifactory.vue
+++ b/src/frontend/devops-pipeline/src/components/ExecDetail/Artifactory.vue
@@ -77,6 +77,7 @@
     import Logo from '@/components/Logo'
     import { extForFile } from '@/utils/pipelineConst'
     import { convertFileSize } from '@/utils/util'
+    import { SET_PLUGIN_HEAD_TAB } from '@/store/modules/atom/constants'
 
     export default {
         components: {
@@ -107,6 +108,7 @@
 
         created () {
             this.initData()
+            this.$store.commit(`atom/${SET_PLUGIN_HEAD_TAB}`, { isGetPluginHeadTab: false })
         },
 
         methods: {
@@ -140,6 +142,9 @@
                                 size: item.folder ? this.sizeFormatter(this.getFolderSize(item)) : this.sizeFormatter(item.size)
                             })) || []
                         this.hasPermission = permission
+                        if (res) {
+                            this.$store.commit(`atom/${SET_PLUGIN_HEAD_TAB}`, { isGetPluginHeadTab: true })
+                        }
                         if (this.artifactories.length > 0) {
                             this.$emit('toggle', true)
                         }
diff --git a/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue b/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
index 6d4cc2c1072..814d43bfa7c 100644
--- a/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
+++ b/src/frontend/devops-pipeline/src/components/ExecDetail/plugin.vue
@@ -9,6 +9,7 @@
         <span
             class="head-tab"
             slot="tab"
+            v-if="isGetPluginHeadTab"
         >
             <template v-for="tab in sortedTabList">
                 <span
@@ -101,7 +102,8 @@
 
         computed: {
             ...mapState('atom', [
-                'globalEnvs'
+                'globalEnvs',
+                'isGetPluginHeadTab'
             ]),
 
             stages () {
diff --git a/src/frontend/devops-pipeline/src/store/modules/atom/constants.js b/src/frontend/devops-pipeline/src/store/modules/atom/constants.js
index b7053c97b55..7c226379ebd 100755
--- a/src/frontend/devops-pipeline/src/store/modules/atom/constants.js
+++ b/src/frontend/devops-pipeline/src/store/modules/atom/constants.js
@@ -102,6 +102,8 @@ export const SET_COMMEND_ATOM_PAGE_OVER = 'SET_COMMEND_ATOM_PAGE_OVER'
 export const SET_PIPELINE_INFO = 'SET_PIPELINE_INFO'
 export const UPDATE_PIPELINE_INFO = 'UPDATE_PIPELINE_INFO'
 
+export const SET_PLUGIN_HEAD_TAB = 'SET_PLUGIN_HEAD_TAB'
+
 export const buildNoRules = [
     {
         value: 'CONSISTENT',
diff --git a/src/frontend/devops-pipeline/src/store/modules/atom/index.js b/src/frontend/devops-pipeline/src/store/modules/atom/index.js
index a6c6ea8cf66..006a3ae2da8 100755
--- a/src/frontend/devops-pipeline/src/store/modules/atom/index.js
+++ b/src/frontend/devops-pipeline/src/store/modules/atom/index.js
@@ -87,7 +87,8 @@ export default {
         activePipelineVersion: null,
         yamlHighlightBlockMap: {},
         switchingVersion: false,
-        isElementModified: false
+        isElementModified: false,
+        isGetPluginHeadTab: false
     },
     mutations,
     actions,
diff --git a/src/frontend/devops-pipeline/src/store/modules/atom/mutations.js b/src/frontend/devops-pipeline/src/store/modules/atom/mutations.js
index ac39e5241ef..26665345716 100755
--- a/src/frontend/devops-pipeline/src/store/modules/atom/mutations.js
+++ b/src/frontend/devops-pipeline/src/store/modules/atom/mutations.js
@@ -76,6 +76,7 @@ import {
     SET_STORE_LOADING,
     SET_STORE_SEARCH,
     SET_TEMPLATE,
+    SET_PLUGIN_HEAD_TAB,
     SWITCHING_PIPELINE_VERSION,
     TOGGLE_ATOM_SELECTOR_POPUP,
     TOGGLE_STAGE_REVIEW_PANEL,
@@ -504,5 +505,10 @@ export default {
 
         })
         return state
+    },
+    [SET_PLUGIN_HEAD_TAB]: (state, { isGetPluginHeadTab }) => {
+        return Object.assign(state, {
+            isGetPluginHeadTab
+        })
     }
 }

From 9c239fb50267b4d287c79119281d59bb872138d6 Mon Sep 17 00:00:00 2001
From: v_yjjiaoyu <1981190393@qq.com>
Date: Fri, 25 Oct 2024 15:07:43 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E6=9F=A5=E7=9C=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E5=9C=A8=E6=9E=84=E5=BB=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=82=B9=E5=87=BB=E6=8F=92=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=BF=9B=E5=85=A5=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=20=E6=97=A5=E5=BF=97=20or=20=E9=85=8D=E7=BD=AE=20Tab=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=82=20#10808=20#=20Reviewed,=20transaction=20id:?=
 =?UTF-8?q?=2021886?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CopyPipelineDialog.vue                    | 53 ++++++++++---------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/frontend/devops-pipeline/src/components/PipelineActionDialog/CopyPipelineDialog.vue b/src/frontend/devops-pipeline/src/components/PipelineActionDialog/CopyPipelineDialog.vue
index 0d8a74bcf80..998f8cb30b9 100644
--- a/src/frontend/devops-pipeline/src/components/PipelineActionDialog/CopyPipelineDialog.vue
+++ b/src/frontend/devops-pipeline/src/components/PipelineActionDialog/CopyPipelineDialog.vue
@@ -13,33 +13,34 @@
         @confirm="submit"
         @cancel="cancel"
     >
-        <bk-form
-            :model="model"
-            form-type="vertical"
-            v-bkloading="{ isLoading: isSubmiting }"
-            ref="copyForm"
-        >
-            <bk-form-item
-                v-for="item in formModel"
-                :key="item.name"
-                :label="$t(item.name)"
-                :rules="item.rules"
-                :property="item.name"
+        <div v-bkloading="{ isLoading: isSubmiting }">
+            <bk-form
+                :model="model"
+                form-type="vertical"
+                ref="copyForm"
             >
-                <bk-input
-                    :placeholder="$t(item.placeholder)"
-                    :value="item.value"
-                    @input="item.handleInput"
-                />
-            </bk-form-item>
-        </bk-form>
-        <PipelineGroupSelector
-            class="pipeline-group-selector-form"
-            ref="pipelineGroupSelector"
-            v-model="groupValue"
-            :has-manage-permission="isManage"
-            :pipeline-name="model.name"
-        />
+                <bk-form-item
+                    v-for="item in formModel"
+                    :key="item.name"
+                    :label="$t(item.name)"
+                    :rules="item.rules"
+                    :property="item.name"
+                >
+                    <bk-input
+                        :placeholder="$t(item.placeholder)"
+                        :value="item.value"
+                        @input="item.handleInput"
+                    />
+                </bk-form-item>
+            </bk-form>
+            <PipelineGroupSelector
+                class="pipeline-group-selector-form"
+                ref="pipelineGroupSelector"
+                v-model="groupValue"
+                :has-manage-permission="isManage"
+                :pipeline-name="model.name"
+            />
+        </div>
     </bk-dialog>
 </template>