From 2dbefc2949ab87aa6dcd6e8f2f9553bc7c763a71 Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Tue, 22 Apr 2025 14:26:37 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E7=BA=BF-=E5=B7=A5=E5=85=B7=E5=8F=82=E6=95=B0=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E9=A2=84=E7=BD=AE=E5=8F=82=E6=95=B0=E9=9B=86=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E9=A2=84=E7=BD=AE=E5=8F=82=E6=95=B0=E9=87=8D?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=90=8E=EF=BC=8C=E5=B7=A5=E5=85=B7=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=BC=95=E7=94=A8=E5=80=BC=E6=B2=A1=E6=9C=89=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1236953981222912?=
 =?UTF-8?q?]=E6=B5=81=E6=B0=B4=E7=BA=BF-=E5=B7=A5=E5=85=B7=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=BC=95=E7=94=A8=E9=A2=84=E7=BD=AE=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=9B=86=E5=8F=82=E6=95=B0=EF=BC=8C=E9=A2=84=E7=BD=AE=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=87=8D=E5=AE=9A=E4=B9=89=E5=90=8E=EF=BC=8C=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E5=8F=82=E6=95=B0=E5=BC=95=E7=94=A8=E5=80=BC=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=9B=B4=E6=96=B0=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/bug-detail/939050947543040/939050947543057/1236953981222?=
 =?UTF-8?q?912?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deploy/job/publishing/phase-list.vue      | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/views/pages/deploy/job/publishing/phase-list.vue b/src/views/pages/deploy/job/publishing/phase-list.vue
index 7808b4e8a..6c05b1baa 100644
--- a/src/views/pages/deploy/job/publishing/phase-list.vue
+++ b/src/views/pages/deploy/job/publishing/phase-list.vue
@@ -73,6 +73,11 @@ export default {
     StepConfig: () => import('@/views/pages/autoexec/detail/actionDetail/step/step-config.vue'),
     StepGroup: () => import('@/views/pages/deploy/application-config/pipeline/step-group')
   },
+  provide() {
+    return {
+      getCombopConfig: this.combopConfig //流水线详情（阶段）
+    };
+  },
   props: {
     appSystemId: Number,
     envId: Number,
@@ -91,7 +96,11 @@ export default {
       currentGroupConfig: null,
       selectStepList: [],
       paramsTypeList: [],
-      loadingShow: true
+      loadingShow: true,
+      combopConfig: {
+        phaseList: [], //阶段
+        overrideProfileList: []
+      }
     };
   },
   beforeCreate() {},
@@ -122,9 +131,13 @@ export default {
       this.$api.deploy.apppipeline.getAppPipeline(data).then(res => {
         if (res && res.Status == 'OK') {
           let data = res.Return || {};
-          this.combopPhaseList = data.config.combopPhaseList || [];
-          this.combopGroupList = data.config.combopGroupList || [];
-          this.runtimeParamList = data.config.runtimeParamList || [];
+          const {config = {}} = data || {};
+          const {combopPhaseList = [], combopGroupList = [], runtimeParamList = [], overrideProfileList = []} = config || {};
+          this.combopPhaseList = combopPhaseList || [];
+          this.combopGroupList = combopGroupList || [];
+          this.runtimeParamList = runtimeParamList || [];
+          this.$set(this.combopConfig, 'overrideProfileList', overrideProfileList);
+          this.$set(this.combopConfig, 'phaseList', combopPhaseList);
           this.getSelectStepList();
         }
       }).finally(() => {
-- 
Gitee