From 6650c30c27308e3d3a5447e400ad15021c602d7f Mon Sep 17 00:00:00 2001 From: yhliu Date: Wed, 9 Jul 2025 12:32:08 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=AF=81=E4=B9=A6=E7=94=B3=E8=AF=B7=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/plugins/common/cert-domains-getter.vue | 2 +- .../plugins/common/output-selector/index.vue | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) 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..674f3e28 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,7 +54,7 @@ function getDomainFromPipeline(inputKey: string) { return; } - if (!CertApplyPluginNames.includes(certStep.type)) { + if (certStep?.type?.indexOf?.("CertApply") === -1) { targetStepId = getStepIdFromInputKey(certStep.input?.cert); certStep = findStepFromPipeline(targetStepId); if (!certStep) { 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..69656df3 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 @@ -37,13 +37,9 @@ export default { currentStepIndex: currentStepIndex.value, currentTask: currentTask.value, }); - if (props.from) { - if (typeof props.from === "string") { - options.value = options.value.filter((item: any) => item.type === props.from); - } else { - options.value = options.value.filter((item: any) => props.from.includes(item.type)); - } - } + const _certApply = pluginGroups?.groups?.cert?.plugins?.map((item: any) => item.name) || []; + const _fromProps = props.from ? (typeof props.from === "string" ? [props.from] : props.from) : []; + options.value = options.value.filter((item: any) => _certApply?.includes?.(item.type) || _fromProps.includes(item.type)); if (props.modelValue != null) { const found = options.value.find((item: any) => item.value === props.modelValue);