{{ item.label }} @@ -110,8 +110,15 @@ + + + item.name.toLowerCase().indexOf(this.searchName.toLowerCase()) > -1) ?? [] } + }, + isConstrainMode () { + return this.templateType === templateTypeEnum.CONSTRAIN } }, watch: { @@ -397,23 +416,26 @@ } return acc }, []) - console.log(this.applySettings) } }, searchName (val) { if (this.activePanel === 'store') { this.requestMarkTemplates(true) } + }, + defaultPipelineDialect (val) { + this.pipelineDialect = val } }, - created () { + async created () { + await this.$store.dispatch('requestProjectDetail', { + projectId: this.$route.params.projectId + }) this.requestPipelineTemplate({ projectId: this.$route.params.projectId }) - this.requestPipelineDialect() }, mounted () { - console.log(this.$refs.pipelineName) this.$nextTick(() => { this.$refs.pipelineName.focus() }) @@ -426,7 +448,7 @@ ...mapActions('pipelines', [ 'installPipelineTemplate', 'createPipelineWithTemplate', - 'getPipelineDialect' + 'requestTemplateSetting' ]), goList () { this.$router.push(this.pipelineListRoute) @@ -497,9 +519,17 @@ this.isLoading = false } }, - selectTemp (index) { - console.log(index) + async selectTemp (index) { const target = this.tempList.length && this.tempList[index] + if (target?.templateType !== 'PUBLIC') { + await this.requestTemplateSetting({ + projectId: this.$route.params.projectId, + templateId: target.templateId + }) + this.labelValues = this.templateSetting.labels + } else { + this.labelValues = [] + } if (index !== this.activeTempIndex && target.installed) { this.activeTempIndex = index } @@ -517,7 +547,6 @@ this.previewSettingType = '' }, previewSetting (setting) { - console.log(setting) this.isShowPreview = true this.previewSettingType = setting }, @@ -545,7 +574,8 @@ }, {}), instanceType: this.templateType, inheritedDialect: this.inheritedDialect, - pipelineDialect: this.pipelineDialect + pipelineDialect: this.pipelineDialect, + labels: this.labelValues } if (this.templateType === templateTypeEnum.CONSTRAIN) { @@ -555,6 +585,10 @@ templateId: this.activeTemp.templateId, curVersionId: this.activeTemp.version, pipelineName: this.newPipelineName + + }, + query: { + useTemplateSettings: true } }) return @@ -589,19 +623,10 @@ this.isDisabled = false } }, - async requestPipelineDialect () { - try { - const projectId = this.$route.params.projectId - await this.getPipelineDialect(projectId) - this.pipelineDialect = this.currentPipelineDialect - } catch (err) { - console.log(err) - } - }, inheritedChange (value) { this.inheritedDialect = value if (value) { - this.pipelineDialect = this.currentPipelineDialect + this.pipelineDialect = this.defaultPipelineDialect } }, pipelineDialectChange (value) { diff --git a/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue b/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue index 23d92c12e864..42664c2294d2 100755 --- a/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue +++ b/src/frontend/devops-pipeline/src/views/subpages/ExecDetail.vue @@ -61,10 +61,10 @@ name="default-user" size="24" /> - + {{ $t("details.executorInfo", [ - execDetail.triggerUser, + startUser, execDetail.trigger, execFormatStartTime ]) @@ -394,6 +394,21 @@ }, pipelineModel () { return this.execDetail?.model || {} + }, + executeCount () { + return this.execDetail?.executeCount ?? 1 + }, + recordList () { + const list = [...this.execDetail?.recordList] + return ( + list.reverse().map((record, index) => ({ + id: index + 1, + user: record.startUser + })) ?? [] + ) + }, + startUser () { + return this.recordList.find(i => i.id === this.executeCount)?.user || '' } }, diff --git a/src/frontend/devops-pipeline/src/views/template/instance_create.vue b/src/frontend/devops-pipeline/src/views/template/instance_create.vue index 598166cf17ac..9d32ae55b177 100755 --- a/src/frontend/devops-pipeline/src/views/template/instance_create.vue +++ b/src/frontend/devops-pipeline/src/views/template/instance_create.vue @@ -350,7 +350,7 @@ }, async mounted () { this.requestTemplateDatail(this.curVersionId) - if (this.$route.query.useTemplateSettings === 'true') { + if (this.$route.query.useTemplateSettings) { this.isTemplateSetting = true } if (this.curVersionId) { diff --git a/src/frontend/locale/pipeline/en-US.json b/src/frontend/locale/pipeline/en-US.json index bd31044d2ae2..82fb623c0bc6 100644 --- a/src/frontend/locale/pipeline/en-US.json +++ b/src/frontend/locale/pipeline/en-US.json @@ -1663,5 +1663,6 @@ "deleteDraft": "Delete Draft", "sureDeleteDraft": "Are you sure you want to delete this draft?", "deleteDraftPipeline": "The current pipeline has not been published yet. Deleting the draft is equivalent to deleting the pipeline. Are you sure you want to proceed?", - "noDraft": "No drafts available for deletion" + "noDraft": "No drafts available for deletion", + "addLabels": "Add Label" } \ No newline at end of file diff --git a/src/frontend/locale/pipeline/zh-CN.json b/src/frontend/locale/pipeline/zh-CN.json index fbf69f43401e..f1433017811b 100644 --- a/src/frontend/locale/pipeline/zh-CN.json +++ b/src/frontend/locale/pipeline/zh-CN.json @@ -1665,5 +1665,6 @@ "deleteDraft": "删除草稿", "sureDeleteDraft": "确认删除该草稿？", "deleteDraftPipeline": "当前流水线尚未发布，删除草稿等同于删除流水线，确认删除吗？", - "noDraft": "暂无可删除的草稿" + "noDraft": "暂无可删除的草稿", + "addLabels": "添加标签" } \ No newline at end of file