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 { } private buildListQuery(listReq: ListReq) { - 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 { 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 @@

- + {{ status.label }} @@ -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 @@