From 687bb8a2376d0de7b72739a174e4a9560581f866 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Wed, 26 Mar 2025 21:54:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dlego=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=88=9B=E5=BB=BA=E6=B5=81=E6=B0=B4=E7=BA=BF?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin-cert/src/plugin/cert-plugin/lego/index.ts | 6 +----- .../src/views/certd/pipeline/certd-form/crud.tsx | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/index.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/index.ts index 187cc0bd9..dc274e2da 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/lego/index.ts @@ -179,11 +179,7 @@ export class CertApplyLegoPlugin extends CertApplyBasePlugin { if (this.acmeServer) { serverArgs = ` --server ${this.acmeServer}`; } - const cmds = [ - `${legoPath} -a --email "${this.email}" --dns ${this.dnsType} ${keyType} ${domainArgs} ${serverArgs} ${eabArgs} ${savePathArgs} ${ - this.customArgs || "" - } run`, - ]; + const cmds = [`${legoPath} -a --email "${this.email}" --dns ${this.dnsType} ${keyType} ${domainArgs} ${serverArgs} ${eabArgs} ${savePathArgs} ${this.customArgs || ""} run`]; await this.ctx.utils.sp.spawn({ cmd: cmds, diff --git a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx index e088bdd5e..f7efe0100 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx @@ -14,7 +14,8 @@ export default function (certPlugins: any[], formWrapperRef: any): CreateCrudOpt for (const plugin of certPlugins) { for (const inputKey in plugin.input) { if (inputs[inputKey]) { - // inputs[inputKey].form.show = true; + //如果两个插件有的字段,直接显示 + inputs[inputKey].form.show = true; continue; } const inputDefine = _.cloneDeep(plugin.input[inputKey]);