Bug: 流水线实例复制功能没有复制相应实例的参数值 issue TencentBlueKing#10580

lockiechen · Aug 5, 2024 · 6d22fad · 6d22fad
1 parent feceed5
commit 6d22fad
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/src/frontend/devops-pipeline/src/components/PipelineHeader/MoreActions.vue b/src/frontend/devops-pipeline/src/components/PipelineHeader/MoreActions.vue
@@ -293,8 +293,8 @@
             },
             copyAsTemplateInstance (pipeline) {
                 const pipelineName = (pipeline.pipelineName + '_copy').substring(0, 128)
-                const { templateId, projectId, templateVersion } = pipeline
-                window.top.location.href = `${location.origin}/console/pipeline/${projectId}/template/${templateId}/createInstance/${templateVersion}/${pipelineName}`
+                const { templateId, pipelineId, projectId, templateVersion } = pipeline
+                window.top.location.href = `${location.origin}/console/pipeline/${projectId}/template/${templateId}/createInstance/${templateVersion}/${pipelineName}?pipelineId=${pipelineId}`
             },
             afterRemovePipeline () {
                 this.$router.push({

diff --git a/src/frontend/devops-pipeline/src/mixins/pipeline-action-mixin.js b/src/frontend/devops-pipeline/src/mixins/pipeline-action-mixin.js
@@ -492,8 +492,8 @@ export default {
         },
         copyAsTemplateInstance (pipeline) {
             const pipelineName = (pipeline.pipelineName + '_copy').substring(0, 128)
-            const { templateId, projectId, version } = pipeline
-            window.top.location.href = `${location.origin}/console/pipeline/${projectId}/template/${templateId}/createInstance/${version}/${pipelineName}`
+            const { templateId, pipelineId, projectId, version } = pipeline
+            window.top.location.href = `${location.origin}/console/pipeline/${projectId}/template/${templateId}/createInstance/${version}/${pipelineName}?pipelineId=${pipelineId}`
         }
     }
 }
diff --git a/src/frontend/devops-pipeline/src/views/template/instance.vue b/src/frontend/devops-pipeline/src/views/template/instance.vue
@@ -517,10 +517,11 @@
                 const route = {
                     name: 'createInstance',
                     params: {
-                        projectId: this.projectId,
-                        pipelineId: this.pipelineId,
                         curVersionId: this.currentVersionId,
                         pipelineName: (row.pipelineName + '_copy').substring(0, 128)
+                    },
+                    query: {
+                        pipelineId: row.pipelineId
                     }
                 }
                 this.$router.push(route)

diff --git a/src/frontend/devops-pipeline/src/views/template/instance_create.vue b/src/frontend/devops-pipeline/src/views/template/instance_create.vue
@@ -258,6 +258,8 @@
                     const hashVal = this.$route.hash.substr(1, this.$route.hash.length)
                     const pipeline = hashVal.split('&')
                     return pipeline
+                } else if (this.$route.query.pipelineId) {
+                    return [this.$route.query.pipelineId]
                 }
                 return ''
             }
@@ -309,13 +311,6 @@
             },
             async requestPipelineParams (pipeline, versionId) {
                 const { $store, loading } = this
-                const params = []
-
-                pipeline.forEach(item => {
-                    params.push({
-                        id: item
-                    })
-                })
 
                 loading.isLoading = true
 
@@ -324,7 +319,9 @@
                         projectId: this.projectId,
                         templateId: this.templateId,
                         versionId: versionId,
-                        params
+                        params: pipeline.map(id => ({
+                            id
+                        }))
                     })
                     this.handlePipelineParams(res)
                 } catch (err) {