From 609ac9c9a2dde605eb09834ae59693c1cb238765 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Mon, 14 Jul 2025 01:36:40 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E7=BA=BF=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E3=80=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E6=80=A7=E8=83=BD=EF=BC=8C=E7=B2=BE?=
 =?UTF-8?q?=E7=AE=80=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libs/lib-server/src/basic/base-service.ts |  6 ++-
 .../src/views/certd/pipeline/crud.tsx         |  4 +-
 .../component/history-timeline-item.vue       |  4 +-
 .../views/certd/pipeline/pipeline/index.vue   | 13 +++--
 .../views/framework/home/dashboard/index.vue  |  1 +
 .../home/dashboard/statistic-card.vue         |  2 +-
 .../user/pipeline/history-controller.ts       | 50 ++++++++++++++-----
 .../service/getter/task-service-getter.ts     | 45 ++++++++---------
 .../pipeline/service/pipeline-service.ts      | 18 ++++++-
 9 files changed, 93 insertions(+), 50 deletions(-)

diff --git a/packages/libs/lib-server/src/basic/base-service.ts b/packages/libs/lib-server/src/basic/base-service.ts
index 973ed5c2..c968796c 100644
--- a/packages/libs/lib-server/src/basic/base-service.ts
+++ b/packages/libs/lib-server/src/basic/base-service.ts
@@ -164,8 +164,11 @@ export abstract class BaseService<T> {
   }
 
   private buildListQuery(listReq: ListReq<T>) {
-    const { query, sort, buildQuery } = listReq;
+    const { query, sort, buildQuery,select } = listReq;
     const qb = this.getRepository().createQueryBuilder('main');
+    if (select) {
+      qb.setFindOptions({select});
+    }
     if (query) {
       const keys = Object.keys(query);
       for (const key of keys) {
@@ -191,6 +194,7 @@ export abstract class BaseService<T> {
     if (buildQuery) {
       buildQuery(qb);
     }
+
     return qb;
   }
 
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
index b2468ef0..6cf4e23c 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
@@ -335,7 +335,7 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
             }
           },
         },
-        _triggerCount: {
+        triggerCount: {
           title: t("certd.fields.scheduledTaskCount"),
           type: "number",
           column: {
@@ -346,7 +346,7 @@ export default function ({ crudExpose, context: { groupDictRef, selectedRowKeys
             show: false,
           },
         },
-        _stepCount: {
+        stepCount: {
           title: t("certd.fields.deployTaskCount"),
           type: "number",
           form: { show: false },
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/history-timeline-item.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/history-timeline-item.vue
index fdb1cb27..b45baf3f 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/history-timeline-item.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/history-timeline-item.vue
@@ -4,7 +4,7 @@
       <fs-icon v-bind="status" :color="status.iconColor || status.color" />
     </template>
     <p>
-      <fs-date-format :model-value="runnable.status?.startTime"></fs-date-format>
+      <fs-date-format :model-value="runnable.createTime"></fs-date-format>
       <a-tag class="ml-5" :color="status.color" :closable="status.value === 'start'" @close="cancelTask">
         {{ status.label }}
       </a-tag>
@@ -46,7 +46,7 @@ export default defineComponent({
   emits: ["view", "cancel"],
   setup(props: any, ctx: any) {
     const status = computed(() => {
-      return statusUtil.get(props.runnable?.status?.result);
+      return statusUtil.get(props.runnable?.status);
     });
 
     function view() {
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 ec0e4e95..abebba12 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
@@ -258,7 +258,7 @@
           <a-timeline class="mt-10">
             <template v-for="item of histories" :key="item.id">
               <pi-history-timeline-item
-                :runnable="item.pipeline"
+                :runnable="item"
                 :history-id="item.id"
                 :is-current="currentHistory?.id === item.id"
                 :edit-mode="editMode"
@@ -371,7 +371,7 @@ export default defineComponent({
     const loadCurrentHistoryDetail = async () => {
       const detail: RunHistory = await props.options?.getHistoryDetail({ historyId: currentHistory.value.id });
       currentHistory.value.logs = detail.logs;
-      merge(currentHistory.value.pipeline, detail.pipeline);
+      currentHistory.value.pipeline = detail.pipeline;
     };
     const changeCurrentHistory = async (history?: RunHistory) => {
       if (!history) {
@@ -382,7 +382,8 @@ export default defineComponent({
       }
       currentHistory.value = history;
       await loadCurrentHistoryDetail();
-      pipeline.value = history.pipeline;
+      pipeline.value = currentHistory.value.pipeline;
+      currentPipeline.value = cloneDeep(pipeline.value);
     };
 
     async function loadHistoryList(reload = false) {
@@ -413,7 +414,8 @@ export default defineComponent({
             return true;
           }
         }
-        if (historyList[0].pipeline?.version === pipeline.value.version) {
+        //@ts-ignore
+        if (historyList[0]?.version === pipeline.value.version) {
           await changeCurrentHistory(historyList[0]);
         }
       }
@@ -486,7 +488,6 @@ export default defineComponent({
           },
           detail.pipeline
         );
-        debugger;
         pipeline.value = currentPipeline.value;
         await loadHistoryList(true);
       },
@@ -707,7 +708,6 @@ export default defineComponent({
           title: "确认",
           content: `确定要手动触发运行吗？`,
           async onOk() {
-            debugger;
             //@ts-ignore
             await changeCurrentHistory(null);
             await props.options.doTrigger({ pipelineId: pipeline.value.id, stepId: stepId });
@@ -787,7 +787,6 @@ export default defineComponent({
               pipeline.value.version = 0;
             }
             pipeline.value.version++;
-            debugger;
             currentPipeline.value = pipeline.value;
 
             //移除空阶段
diff --git a/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue b/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue
index 763dc1dc..a955014b 100644
--- a/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue
+++ b/packages/ui/certd-client/src/views/framework/home/dashboard/index.vue
@@ -214,6 +214,7 @@ function transformStatusCount() {
     { name: "error", label: "失败" },
     { name: "canceled", label: "已取消" },
     { name: null, label: "未执行" },
+    { name: "skip", label: "跳过" },
   ];
   const result = [];
   for (const item of sorted) {
diff --git a/packages/ui/certd-client/src/views/framework/home/dashboard/statistic-card.vue b/packages/ui/certd-client/src/views/framework/home/dashboard/statistic-card.vue
index 630b8976..ad8608b9 100644
--- a/packages/ui/certd-client/src/views/framework/home/dashboard/statistic-card.vue
+++ b/packages/ui/certd-client/src/views/framework/home/dashboard/statistic-card.vue
@@ -43,7 +43,7 @@ const slots = defineSlots();
   .data-item {
     display: flex;
     flex-direction: column;
-    height: 180px;
+    height: 188px;
     .header {
       display: flex;
       justify-content: space-between;
diff --git a/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
index 545a7556..f453b542 100644
--- a/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/pipeline/history-controller.ts
@@ -1,16 +1,15 @@
-import { ALL, Body, Controller, Get, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { CommonException, Constants, CrudController, PermissionException } from '@certd/lib-server';
-import { PipelineEntity } from '../../../modules/pipeline/entity/pipeline.js';
-import { HistoryService } from '../../../modules/pipeline/service/history-service.js';
-import { HistoryLogService } from '../../../modules/pipeline/service/history-log-service.js';
-import { HistoryEntity } from '../../../modules/pipeline/entity/history.js';
-import { HistoryLogEntity } from '../../../modules/pipeline/entity/history-log.js';
-import { PipelineService } from '../../../modules/pipeline/service/pipeline-service.js';
-import * as fs from 'fs';
-import { logger } from '@certd/basic';
-import { AuthService } from '../../../modules/sys/authority/service/auth-service.js';
-import { SysSettingsService } from '@certd/lib-server';
-import { In } from 'typeorm';
+import { ALL, Body, Controller, Get, Inject, Post, Provide, Query } from "@midwayjs/core";
+import { CommonException, Constants, CrudController, PermissionException, SysSettingsService } from "@certd/lib-server";
+import { PipelineEntity } from "../../../modules/pipeline/entity/pipeline.js";
+import { HistoryService } from "../../../modules/pipeline/service/history-service.js";
+import { HistoryLogService } from "../../../modules/pipeline/service/history-log-service.js";
+import { HistoryEntity } from "../../../modules/pipeline/entity/history.js";
+import { HistoryLogEntity } from "../../../modules/pipeline/entity/history-log.js";
+import { PipelineService } from "../../../modules/pipeline/service/pipeline-service.js";
+import * as fs from "fs";
+import { logger } from "@certd/basic";
+import { AuthService } from "../../../modules/sys/authority/service/auth-service.js";
+import { In } from "typeorm";
 
 /**
  * 证书
@@ -88,11 +87,30 @@ export class HistoryController extends CrudController<HistoryService> {
     const buildQuery = qb => {
       qb.limit(20);
     };
+    const withDetail = body.withDetail;
+    delete body.withDetail;
+    let select:any = null
+    if (!withDetail) {
+      select = {
+        pipeline: true, // 后面这里改成false
+        id: true,
+        userId: true,
+        pipelineId: true,
+        status: true,
+        // startTime: true,
+        triggerType: true,
+        endTime: true,
+        createTime: true,
+        updateTime: true
+      };
+    }
     const listRet = await this.getService().list({
       query: body,
       sort: { prop: 'id', asc: false },
       buildQuery,
+      select
     });
+
     for (const item of listRet) {
       if (!item.pipeline) {
         continue;
@@ -100,7 +118,13 @@ export class HistoryController extends CrudController<HistoryService> {
       const json = JSON.parse(item.pipeline);
       delete json.stages;
       item.pipeline = json;
+
+      //@ts-ignore
+      item.version = json.version;
+      item.status = json.status.result
+      delete item.pipeline;
     }
+
     return this.ok(listRet);
   }
 
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts b/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts
index 8943e45d..a1f4901b 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/getter/task-service-getter.ts
@@ -1,22 +1,21 @@
-import {IServiceGetter} from "@certd/pipeline";
-import {Inject, Provide, Scope, ScopeEnum} from "@midwayjs/core";
-import {AccessGetter, AccessService} from "@certd/lib-server";
-import {CnameProxyService} from "./cname-proxy-service.js";
-import {NotificationGetter} from "./notification-getter.js";
-import {NotificationService} from "../notification-service.js";
-import {CnameRecordService} from "../../../cname/service/cname-record-service.js";
-import {SubDomainsGetter} from './sub-domain-getter.js'
-import {DomainVerifierGetter} from "./domain-verifier-getter.js";
-import {Context} from "@midwayjs/koa";
-import {DomainService} from "../../../cert/service/domain-service.js";
-import {SubDomainService} from "../sub-domain-service.js";
+import { IServiceGetter } from "@certd/pipeline";
+import { ApplicationContext, IMidwayContainer, Provide, Scope, ScopeEnum } from "@midwayjs/core";
+import { AccessGetter, AccessService } from "@certd/lib-server";
+import { CnameProxyService } from "./cname-proxy-service.js";
+import { NotificationGetter } from "./notification-getter.js";
+import { NotificationService } from "../notification-service.js";
+import { CnameRecordService } from "../../../cname/service/cname-record-service.js";
+import { SubDomainsGetter } from "./sub-domain-getter.js";
+import { DomainVerifierGetter } from "./domain-verifier-getter.js";
+import { DomainService } from "../../../cert/service/domain-service.js";
+import { SubDomainService } from "../sub-domain-service.js";
 
 export class TaskServiceGetter implements IServiceGetter{
   private userId: number;
-  private ctx : Context;
-  constructor(userId:number,ctx:Context) {
+  private appCtx : IMidwayContainer;
+  constructor(userId:number,appCtx:IMidwayContainer) {
     this.userId = userId;
-    this.ctx = ctx
+    this.appCtx = appCtx
   }
   async get<T>(serviceName: string): Promise<T> {
 
@@ -36,27 +35,27 @@ export class TaskServiceGetter implements IServiceGetter{
   }
 
   async getSubDomainsGetter(): Promise<SubDomainsGetter> {
-    const subDomainsService:SubDomainService = await  this.ctx.requestContext.getAsync("subDomainService")
+    const subDomainsService:SubDomainService = await  this.appCtx.getAsync("subDomainService")
     return new SubDomainsGetter(this.userId, subDomainsService)
   }
 
   async getAccessService(): Promise<AccessGetter> {
-    const accessService:AccessService = await  this.ctx.requestContext.getAsync("accessService")
+    const accessService:AccessService = await  this.appCtx.getAsync("accessService")
     return new AccessGetter(this.userId, accessService.getById.bind(accessService));
   }
 
   async getCnameProxyService(): Promise<CnameProxyService> {
-    const cnameRecordService:CnameRecordService = await  this.ctx.requestContext.getAsync("cnameRecordService")
+    const cnameRecordService:CnameRecordService = await  this.appCtx.getAsync("cnameRecordService")
     return new CnameProxyService(this.userId, cnameRecordService.getWithAccessByDomain.bind(cnameRecordService));
   }
 
   async getNotificationService(): Promise<NotificationGetter> {
-    const notificationService:NotificationService = await  this.ctx.requestContext.getAsync("notificationService")
+    const notificationService:NotificationService = await  this.appCtx.getAsync("notificationService")
     return new NotificationGetter(this.userId, notificationService);
   }
 
   async getDomainVerifierGetter(): Promise<DomainVerifierGetter> {
-    const domainService:DomainService = await  this.ctx.requestContext.getAsync("domainService")
+    const domainService:DomainService = await  this.appCtx.getAsync("domainService")
     return new DomainVerifierGetter(this.userId, domainService);
   }
 }
@@ -67,12 +66,12 @@ export type TaskServiceCreateReq = {
 @Provide()
 @Scope(ScopeEnum.Request, { allowDowngrade: true })
 export class TaskServiceBuilder  {
-  @Inject()
-  ctx: Context;
+  @ApplicationContext()
+  appCtx: IMidwayContainer;
 
   create(req:TaskServiceCreateReq){
     const userId = req.userId;
-    return new TaskServiceGetter(userId,this.ctx)
+    return new TaskServiceGetter(userId,this.appCtx)
   }
 }
 
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 f9cc2b51..b52c6151 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
@@ -123,6 +123,22 @@ export class PipelineService extends BaseService<PipelineEntity> {
     const result = await super.page(pageReq);
     await this.fillLastVars(result.records);
 
+    for (const item of result.records) {
+      if (!item.content){
+        continue
+      }
+      const pipeline = JSON.parse(item.content);
+      let stepCount = 0
+      RunnableCollection.each(pipeline.stages, (runnable: any) => {
+        stepCount++
+      })
+      // @ts-ignore
+      item.stepCount = stepCount
+      // @ts-ignore
+      item.triggerCount = pipeline.triggers.length
+      delete item.content
+    }
+
     return result;
   }
 
@@ -637,7 +653,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     //修改pipeline状态
     const pipelineEntity = new PipelineEntity();
     pipelineEntity.id = parseInt(history.pipeline.id);
-    pipelineEntity.status = history.pipeline.status.status + '';
+    pipelineEntity.status = history.pipeline.status.result + '';
     pipelineEntity.lastHistoryTime = history.pipeline.status.startTime;
     await this.update(pipelineEntity);