lkddi/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2026-04-15 13:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: 流水线支持名称模糊查询

Browse Source
This commit is contained in:
xiaojunnuo
2024-08-04 02:35:45 +08:00
parent a9717b9a0d
commit 59897c4cea
14 changed files with 157 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/ui/certd-client/src/plugin/fast-crud/index.tsx
View File

@@ -61,7 +61,7 @@ function install(app: App, options: any = {}) {
},
size: "small",
pagination: false,
onResizeColumn: (w: number, col: any) => {
onResizeColumn: (w: number | string, col: any) => {
if (crudBinding.value?.table?.columnsMap && crudBinding.value?.table?.columnsMap[col.key]) {
crudBinding.value.table.columnsMap[col.key].width = w;
}
@@ -347,6 +347,8 @@ function install(app: App, options: any = {}) {
columnProps.column.resizable = true;
if (!columnProps.column.width) {
columnProps.column.width = 100;
} else if (typeof columnProps.column?.width === "string" && columnProps.column.width.indexOf("px") > -1) {
columnProps.column.width = parseInt(columnProps.column.width.replace("px", ""));
}
return columnProps;
}

57
packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
View File

@@ -8,6 +8,7 @@ import { nanoid } from "nanoid";
import { message, Modal } from "ant-design-vue";
import { env } from "/@/utils/util.env";
import { useUserStore } from "/@/store/modules/user";
import dayjs from "dayjs";
export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
const router = useRouter();
@@ -125,6 +126,8 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
}
},
rowHandle: {
minWidth: 200,
fixed: "right",
buttons: {
view: {
click({ row }) {
@@ -200,6 +203,7 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
},
column: {
width: 300,
sorter: true,
component: {
on: {
// 注意：必须要on前缀
@@ -210,11 +214,35 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
}
}
},
lastVars: {
title: "到期剩余",
type: "number",
form: {
show: false
},
column: {
cellRender({ row }) {
if (!row.lastVars?.certExpiresTime) {
return "-";
}
const leftDays = dayjs(row.lastVars.certExpiresTime).diff(dayjs(), "day");
const color = leftDays < 20 ? "red" : "#389e0d";
const percent = (leftDays / 90) * 100;
return <a-progress percent={percent} strokeColor={color} format={(percent: number) => `${leftDays} 天`} />;
},
width: 110
}
},
lastHistoryTime: {
title: "最后运行",
type: "datetime",
form: {
show: false
},
column: {
sorter: true,
width: 120,
align: "center"
}
},
status: {
@@ -225,6 +253,11 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
}),
form: {
show: false
},
column: {
sorter: true,
width: 80,
align: "center"
}
},
@@ -242,6 +275,9 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
show: false
},
column: {
sorter: true,
width: 80,
align: "center",
component: {
name: "fs-dict-switch",
vModel: "checked"
@@ -254,12 +290,25 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
}
}
},
keepHistoryCount: {
title: "历史记录保持数",
type: "number",
form: {
value: 30,
helper: "历史记录保持条数，多余的会被删除"
},
column: {
show: false
}
},
order: {
title: "排序号",
type: "number",
column: {
sorter: true,
align: "center",
width: 80
}
},
createTime: {
@@ -267,6 +316,11 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
type: "datetime",
form: {
show: false
},
column: {
sorter: true,
width: 125,
align: "center"
}
},
updateTime: {
@@ -274,6 +328,9 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp
type: "datetime",
form: {
show: false
},
column: {
show: false
}
}
}

4
packages/ui/certd-server/db/migration-pg/v10006__pipeline_title.sql
View File

@@ -1 +1,5 @@
alter table pi_pipeline alter column title type varchar(100) using title::varchar(100);
alter table pi_pipeline alter column content type text using content::text;
alter table pi_storage alter column value type text using value::text;
alter table pi_pipeline add "order" integer default 0;

3
packages/ui/certd-server/db/migration/v10006__pipeline_title.sql
View File

@@ -0,0 +1,3 @@
alter table pi_pipeline add COLUMN "order" integer default 0;

5
packages/ui/certd-server/src/basic/base-service.ts
View File

@@ -118,10 +118,9 @@ export abstract class BaseService<T> {
}
const qb = this.getRepository().createQueryBuilder('main');
if (order && order.prop) {
qb.orderBy('main.' + order.prop, order.asc ? 'ASC' : 'DESC');
} else {
qb.orderBy('id', 'DESC');
qb.addOrderBy('main.' + order.prop, order.asc ? 'ASC' : 'DESC');
}
qb.addOrderBy('id', 'DESC');
qb.offset(page.offset).limit(page.limit);
//根据bean query
if (query) {

8
packages/ui/certd-server/src/basic/crud-controller.ts
View File

@@ -9,12 +9,7 @@ export abstract class CrudController<T> extends BaseController {
@Body(ALL)
body
) {
const pageRet = await this.getService().page(
body?.query,
body?.page,
body?.sort,
null
);
const pageRet = await this.getService().page(body?.query, body?.page, body?.sort, null);
return this.ok(pageRet);
}
@@ -54,6 +49,7 @@ export abstract class CrudController<T> extends BaseController {
await this.getService().update(bean);
return this.ok(null);
}
@Post('/delete')
async delete(
@Query('id')

13
packages/ui/certd-server/src/modules/pipeline/controller/pipeline-controller.ts
View File

@@ -23,9 +23,19 @@ export class PipelineController extends CrudController<PipelineService> {
@Post('/page', { summary: Constants.per.authOnly })
async page(@Body(ALL) body) {
body.query.userId = this.ctx.user.id;
const title = body.query.title;
delete body.query.title;
const buildQuery = qb => {
qb.where({});
if (title) {
qb.where('title like :title', { title: `%${title}%` });
}
};
if (!body.sort || !body.sort?.prop) {
body.sort = { prop: 'order', asc: false };
}
return super.page({ ...body, buildQuery });
}
@@ -48,7 +58,6 @@ export class PipelineController extends CrudController<PipelineService> {
await this.service.checkUserId(bean.id, this.ctx.user.id);
}
await this.service.save(bean);
await this.service.registerTriggerById(bean.id);
return this.ok(bean.id);
}

10
packages/ui/certd-server/src/modules/pipeline/entity/pipeline.ts
View File

@@ -37,6 +37,16 @@ export class PipelineEntity {
})
lastHistoryTime: number;
// 变量
lastVars: any;
@Column({
name: 'order',
comment: '排序',
nullable: true,
})
order: number;
@Column({
name: 'create_time',
comment: '创建时间',

2
packages/ui/certd-server/src/modules/pipeline/service/db-storage.ts
View File

@@ -12,7 +12,7 @@ export class DbStorage implements IStorage {
this.storageService = storageService;
}
remove(scope: string, namespace: string, version: string, key: string): Promise<void> {
async remove(scope: string, namespace: string, version: string, key: string): Promise<void> {
throw new Error('Method not implemented.');
}

42
packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
View File

@@ -47,8 +47,23 @@ export class PipelineService extends BaseService<PipelineEntity> {
return this.repository;
}
async update(entity) {
await super.update(entity);
async page(query: any, page: { offset: number; limit: number }, order: any, buildQuery: any) {
const result = await super.page(query, page, order, buildQuery);
const pipelineIds: number[] = [];
const recordMap = {};
for (const record of result.records) {
pipelineIds.push(record.id);
recordMap[record.id] = record;
}
const vars = await this.storageService.findPipelineVars(pipelineIds);
for (const varEntity of vars) {
const record = recordMap[varEntity.namespace];
if (record) {
const value = JSON.parse(varEntity.value);
record.lastVars = value.value;
}
}
return result;
}
public async registerTriggerById(pipelineId) {
@@ -71,10 +86,18 @@ export class PipelineService extends BaseService<PipelineEntity> {
return new PipelineDetail(pipeline);
}
async update(bean: PipelineEntity) {
await this.clearTriggers(bean.id);
await super.update(bean);
await this.registerTriggerById(bean.id);
}
async save(bean: PipelineEntity) {
await this.clearTriggers(bean.id);
const pipeline = JSON.parse(bean.content);
bean.title = pipeline.title;
await this.addOrUpdate(bean);
await this.registerTriggerById(bean.id);
}
/**
@@ -153,6 +176,14 @@ export class PipelineService extends BaseService<PipelineEntity> {
}
async delete(id: number) {
await this.clearTriggers(id);
//TODO 删除storage
// const storage = new DbStorage(pipeline.userId, this.storageService);
// await storage.remove(pipeline.id);
await super.delete([id]);
}
async clearTriggers(id: number) {
const pipeline = await this.info(id);
if (!pipeline) {
return;
@@ -163,7 +194,6 @@ export class PipelineService extends BaseService<PipelineEntity> {
this.removeCron(id, trigger);
}
}
await super.delete([id]);
}
removeCron(pipelineId, trigger) {
@@ -176,6 +206,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
if (cron == null) {
return;
}
cron = cron.trim();
if (cron.startsWith('*')) {
cron = '0' + cron.substring(1, cron.length);
}
@@ -183,7 +214,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
this.cron.remove(name);
this.cron.register({
name,
cron: cron,
cron,
job: async () => {
logger.info('定时任务触发：', pipelineId, trigger.id);
try {
@@ -198,6 +229,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
async run(id: number, triggerId: string) {
const entity: PipelineEntity = await this.info(id);
if (entity.disabled) {
return;
}
const pipeline = JSON.parse(entity.content);
if (!pipeline.stages || pipeline.stages.length === 0) {

12
packages/ui/certd-server/src/modules/pipeline/service/storage-service.ts
View File

@@ -1,6 +1,6 @@
import { Provide, Scope, ScopeEnum } from '@midwayjs/core';
import { InjectEntityModel } from '@midwayjs/typeorm';
import { Repository } from 'typeorm';
import { In, Repository } from 'typeorm';
import { BaseService } from '../../../basic/base-service.js';
import { StorageEntity } from '../entity/storage.js';
@@ -41,4 +41,14 @@ export class StorageService extends BaseService<StorageEntity> {
}
return;
}
async findPipelineVars(pipelineIds: number[]) {
return await this.repository.find({
where: {
scope: 'pipeline',
namespace: In(pipelineIds),
key: 'vars',
},
});
}
}