diff --git a/packages/ui/certd-client/src/views/certd/pipeline/detail.vue b/packages/ui/certd-client/src/views/certd/pipeline/detail.vue index 79013c39..a27ed3ab 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/detail.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/detail.vue @@ -56,7 +56,7 @@ const pipelineOptions: PipelineOptions = { }, async doSave(pipelineConfig: any) { - await api.Save({ + return await api.Save({ id: pipelineConfig.id, content: JSON.stringify(pipelineConfig), }); diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue index dce5a8db..ee92ae5f 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue @@ -739,6 +739,10 @@ export default defineComponent({ async onOk() { //@ts-ignore await changeCurrentHistory(null); + if (histories.value.length > 0) { + pipeline.value = histories.value[0].pipeline; + } + await props.options.doTrigger({ pipelineId: pipeline.value.id, stepId: stepId }); notification.success({ message: "管道已经开始运行" }); }, @@ -837,7 +841,11 @@ export default defineComponent({ return item.tasks.length === 0; }); - await props.options.doSave(pipeline.value); + const { version } = await props.options.doSave(pipeline.value); + if (version) { + pipeline.value.version = version; + currentPipeline.value.version = version; + } } if (offEdit) { toggleEditMode(false); diff --git a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts index 6ffb75b1..ca98051e 100644 --- a/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts +++ b/packages/ui/certd-server/src/controller/user/pipeline/pipeline-controller.ts @@ -91,7 +91,7 @@ export class PipelineController extends CrudController { delete bean.validTime } - await this.service.save(bean); + const {version} = await this.service.save(bean); //是否增加证书监控 if (bean.addToMonitorEnabled && bean.addToMonitorDomains) { const sysPublicSettings = await this.sysSettingsService.getPublicSettings(); @@ -103,7 +103,7 @@ export class PipelineController extends CrudController { }); } } - return this.ok(bean.id); + return this.ok({id:bean.id,version:version}); } @Post('/delete', { summary: Constants.per.authOnly }) diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts index ca8eb23d..381f5ac6 100644 --- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts +++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts @@ -241,7 +241,10 @@ export class PipelineService extends BaseService { fromType = "auto"; } await this.certInfoService.updateDomains(pipeline.id, pipeline.userId || bean.userId, domains, fromType); - return bean; + return { + ...bean, + version: pipeline.version, + }; } /**