diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base-convert.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base-convert.ts index e83fcbe9..48381706 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base-convert.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base-convert.ts @@ -67,6 +67,7 @@ export abstract class CertApplyBaseConvertPlugin extends AbstractTaskPlugin { @TaskOutput({ title: "域名证书", + type: "cert", }) cert?: CertInfo; diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/custom/index.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/custom/index.ts index 223467eb..3f147332 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/custom/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/custom/index.ts @@ -87,6 +87,7 @@ export class CertApplyUploadPlugin extends CertApplyBaseConvertPlugin { @TaskOutput({ title: "证书MD5", + type: "certMd5", }) certMd5?: string; diff --git a/packages/plugins/plugin-cert/src/plugin/index.ts b/packages/plugins/plugin-cert/src/plugin/index.ts index f563084c..bcc89825 100644 --- a/packages/plugins/plugin-cert/src/plugin/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/index.ts @@ -3,4 +3,4 @@ export { EVENT_CERT_APPLY_SUCCESS } from "./cert-plugin/base-convert.js"; export * from "./cert-plugin/index.js"; export * from "./cert-plugin/lego/index.js"; export * from "./cert-plugin/custom/index.js"; -export const CertApplyPluginNames = ["CertApply", "CertApplyLego", "CertApplyUpload"]; +export const CertApplyPluginNames = [":cert:"]; diff --git a/packages/ui/certd-client/src/components/plugins/common/cert-domains-getter.vue b/packages/ui/certd-client/src/components/plugins/common/cert-domains-getter.vue index cdf8500d..0f78c50b 100644 --- a/packages/ui/certd-client/src/components/plugins/common/cert-domains-getter.vue +++ b/packages/ui/certd-client/src/components/plugins/common/cert-domains-getter.vue @@ -54,8 +54,9 @@ function getDomainFromPipeline(inputKey: string) { return; } - if (!CertApplyPluginNames.includes(certStep.type)) { - targetStepId = getStepIdFromInputKey(certStep.input?.cert); + const firstLevelValue = certStep.input.cert; + if (firstLevelValue && typeof firstLevelValue === "string" && firstLevelValue.indexOf(".") > 0) { + targetStepId = getStepIdFromInputKey(firstLevelValue); certStep = findStepFromPipeline(targetStepId); if (!certStep) { errorRef.value = "找不到目标步骤,请先选择域名证书"; diff --git a/packages/ui/certd-client/src/components/plugins/common/output-selector/index.vue b/packages/ui/certd-client/src/components/plugins/common/output-selector/index.vue index 654e75a4..7f6c95d4 100644 --- a/packages/ui/certd-client/src/components/plugins/common/output-selector/index.vue +++ b/packages/ui/certd-client/src/components/plugins/common/output-selector/index.vue @@ -4,6 +4,7 @@