Merge pull request #10854 from lockiechen/issue_8125_hotfix

feat：流水线模板导出后再导入新建失败 issue #10752
TencentBlueKing · Aug 26, 2024 · 5153153 · 5153153
2 parents 8f4866e + 3f5bca3
commit 5153153
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/frontend/devops-pipeline/src/components/PipelineHeader/DetailHeader.vue b/src/frontend/devops-pipeline/src/components/PipelineHeader/DetailHeader.vue
@@ -1,6 +1,6 @@
 <template>
     <div v-if="execDetail" class="pipeline-detail-header">
-        <pipeline-bread-crumb :show-record-entry="isDebugExec" :pipeline-name="pipelineInfo?.pipelineName" />
+        <pipeline-bread-crumb :show-record-entry="isDebugExec" show-build-num-switch :pipeline-name="pipelineInfo?.pipelineName" />
         <aside :class="['pipeline-detail-right-aside', {
             'is-debug-exec-detail': isDebugExec
         }]">

diff --git a/src/frontend/devops-pipeline/src/components/PipelineHeader/PipelineBreadCrumb.vue b/src/frontend/devops-pipeline/src/components/PipelineHeader/PipelineBreadCrumb.vue
@@ -29,6 +29,7 @@
         },
         props: {
             showRecordEntry: Boolean,
+            showBuildNumSwitch: Boolean,
             pipelineName: String,
             isLoading: Boolean,
             showPacTag: {
@@ -90,7 +91,7 @@
                                 : []
                         ),
                         ...(
-                            this.$route.name === 'pipelinesDetail'
+                            this.showBuildNumSwitch
                                 ? [{
                                     slot: BuildNumSwitcher,
                                     slotProps: {

diff --git a/src/frontend/devops-pipeline/src/components/pipelineList/ImportPipelinePopup/index.vue b/src/frontend/devops-pipeline/src/components/pipelineList/ImportPipelinePopup/index.vue
@@ -124,9 +124,9 @@
                 })
             },
             async updatePipeline (result, newPipelineName) {
+                const { templateId, instanceFromTemplate, ...restModel } = result.model
                 const pipeline = {
-                    ...result.model,
-                    instanceFromTemplate: false,
+                    ...restModel,
                     name: newPipelineName
                 }
                 try {