From 393ea27fa4510938a638642cabce558301aa542b Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 3 Dec 2024 00:55:37 +0800 Subject: [PATCH] chore: --- .../src/views/certd/pipeline/api.plugin.ts | 13 ++++++++++++- .../pipeline/pipeline/component/step-form/index.vue | 6 +++--- .../src/controller/pipeline/plugin-controller.ts | 6 ++++++ .../pipeline/service/builtin-plugin-service.ts | 4 ++++ .../src/modules/plugin/service/plugin-service.ts | 4 ++++ 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/packages/ui/certd-client/src/views/certd/pipeline/api.plugin.ts b/packages/ui/certd-client/src/views/certd/pipeline/api.plugin.ts index 74013136b..941273698 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/api.plugin.ts +++ b/packages/ui/certd-client/src/views/certd/pipeline/api.plugin.ts @@ -29,7 +29,6 @@ function initPlugins(plugins: any) { plugin.input[key] = field; } } - console.log("plugins", plugins); } export async function GetList(query: any) { @@ -56,6 +55,18 @@ export async function GetGroups(query: any) { return groups; } +export async function GetPluginDefine(type: string) { + const define = await request({ + url: apiPrefix + "/getDefineByType", + method: "post", + data: { + type + } + }); + initPlugins([define]); + return define; +} + export async function GetPluginConfig(req: { id?: number; name: string; type: string }): Promise { return await request({ url: apiPrefix + "/config", diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue index 0ab14bb10..3c07b1099 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue @@ -239,13 +239,13 @@ export default { const stepType = step.type; step.type = stepType; step._isAdd = false; - - let pluginDefine = pluginGroups.get(stepType); + const pluginDefine = await pluginApi.GetPluginDefine(stepType); + // let pluginDefine = pluginGroups.get(stepType); if (pluginDefine == null) { console.log("插件未找到", stepType); return; } - pluginDefine = _.cloneDeep(pluginDefine); + // pluginDefine = _.cloneDeep(pluginDefine); const columns = pluginDefine.input; for (let key in columns) { const column = columns[key]; diff --git a/packages/ui/certd-server/src/controller/pipeline/plugin-controller.ts b/packages/ui/certd-server/src/controller/pipeline/plugin-controller.ts index 0315d83aa..8703675df 100644 --- a/packages/ui/certd-server/src/controller/pipeline/plugin-controller.ts +++ b/packages/ui/certd-server/src/controller/pipeline/plugin-controller.ts @@ -29,6 +29,12 @@ export class PluginController extends BaseController { return this.ok(group); } + @Post('/getDefineByType', { summary: Constants.per.authOnly }) + async getDefineByType(@Body('type') type: string) { + const define = await this.service.getDefineByType(type); + return this.ok(define); + } + @Post('/config', { summary: Constants.per.authOnly }) async config(@Body(ALL) body: { id?: number; name?: string; type: string }) { const config = await this.pluginConfigService.getPluginConfig(body); diff --git a/packages/ui/certd-server/src/modules/pipeline/service/builtin-plugin-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/builtin-plugin-service.ts index 3e77b792f..c5b770020 100644 --- a/packages/ui/certd-server/src/modules/pipeline/service/builtin-plugin-service.ts +++ b/packages/ui/certd-server/src/modules/pipeline/service/builtin-plugin-service.ts @@ -21,4 +21,8 @@ export class BuiltInPluginService { getGroups() { return cloneDeep(pluginGroups); } + + getByType(type: string) { + return pluginRegistry.getDefine(type); + } } diff --git a/packages/ui/certd-server/src/modules/plugin/service/plugin-service.ts b/packages/ui/certd-server/src/modules/plugin/service/plugin-service.ts index 656225ae9..ec4094194 100644 --- a/packages/ui/certd-server/src/modules/plugin/service/plugin-service.ts +++ b/packages/ui/certd-server/src/modules/plugin/service/plugin-service.ts @@ -127,4 +127,8 @@ export class PluginService extends BaseService { } throw new Error('参数错误: id 和 name 必须有一个'); } + + async getDefineByType(type: string) { + return this.builtInPluginService.getByType(type); + } }