From d3c59a6fe3d493d21eaee35632e11805dc919add Mon Sep 17 00:00:00 2001 From: Jan Oberhauser Date: Fri, 28 May 2021 18:13:15 -0500 Subject: [PATCH] :zap: Fix issue with option parameters that are named the same #1808 --- .../src/components/CollectionParameter.vue | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/editor-ui/src/components/CollectionParameter.vue b/packages/editor-ui/src/components/CollectionParameter.vue index d18b8ae8e..ac299c130 100644 --- a/packages/editor-ui/src/components/CollectionParameter.vue +++ b/packages/editor-ui/src/components/CollectionParameter.vue @@ -68,7 +68,7 @@ export default mixins( for (const name of this.propertyNames) { tempProperties = this.getOptionProperties(name); if (tempProperties !== undefined) { - returnProperties.push(tempProperties); + returnProperties.push(...tempProperties); } } return returnProperties; @@ -104,14 +104,15 @@ export default mixins( return this.parameter.typeOptions[argumentName]; }, - getOptionProperties (optionName: string): INodeProperties | undefined { + getOptionProperties (optionName: string): INodeProperties[] { + const properties: INodeProperties[] = []; for (const option of this.parameter.options) { if (option.name === optionName) { - return option; + properties.push(option); } } - return undefined; + return properties; }, displayNodeParameter (parameter: INodeProperties) { if (parameter.displayOptions === undefined) { @@ -121,10 +122,12 @@ export default mixins( return this.displayParameter(this.nodeValues, parameter, this.path); }, optionSelected (optionName: string) { - const option = this.getOptionProperties(optionName); - if (option === undefined) { + const options = this.getOptionProperties(optionName); + if (options.length === 0) { return; } + + const option = options[0]; const name = `${this.path}.${option.name}`; let parameterData;