From 65e53092e8d677eb34b7d04d68c6f738165f5de2 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 7 Nov 2025 01:15:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E7=BC=96=E8=BE=91=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E7=BA=BF=EF=BC=8C=E6=B2=A1=E6=9C=89=E7=AB=8B=E5=8D=B3=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=8F=98=E6=9B=B4=E6=95=88=E6=9E=9C=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certd-client/src/views/certd/pipeline/detail.vue   |  2 +-
 .../src/views/certd/pipeline/pipeline/index.vue        | 10 +++++++++-
 .../controller/user/pipeline/pipeline-controller.ts    |  4 ++--
 .../src/modules/pipeline/service/pipeline-service.ts   |  5 ++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

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<PipelineService> {
       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<PipelineService> {
         });
       }
     }
-    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<PipelineEntity> {
       fromType = "auto";
     }
     await this.certInfoService.updateDomains(pipeline.id, pipeline.userId || bean.userId, domains, fromType);
-    return bean;
+    return {
+      ...bean,
+      version: pipeline.version,
+    };
   }
 
   /**