From 1af19f0ac053fe109782882964533636b5969d6b Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 6 Aug 2024 11:32:25 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pipeline/pipeline/component/step-form/index.vue | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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 64688b3c..b4c82a9b 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 @@ -148,15 +148,8 @@ export default { // 给step的input设置默认值 changeCurrentPlugin(currentStep.value); - //赋初始值 + //合并默认值 _.merge(currentStep.value, { input: {}, strategy: { runStrategy: 0 } }, currentPlugin.value.default, currentStep.value); - - for (const key in currentPlugin.value.input) { - const input = currentPlugin.value.input[key]; - if (input.default != null) { - currentStep.value.input[key] = input.default ?? input.value; - } - } }; const stepDrawerShow = () => { @@ -229,7 +222,7 @@ export default { } } //设置初始值 - if (input.default != null && currentStep.value.input[key] == null) { + if ((input.default != null || input.value != null) && currentStep.value.input[key] == null) { currentStep.value.input[key] = input.default ?? input.value; } }