upstream changes

This commit is contained in:
Ricardo Espinoza 2019-11-05 18:30:12 -05:00
commit c8b6217903

View file

@ -61,8 +61,21 @@
</el-option>
</el-select>
<el-select multiple v-else-if="parameter.type === 'multiOptions'" ref="inputField" size="small" :value="displayValue" filterable :disabled="isReadOnly" @change="valueChanged" @keydown.stop @focus="setFocus" :title="displayTitle" >
<el-option v-for="option in parameter.options" :value="option.value" :key="option.value" :label="option.name" >
<el-select
v-else-if="parameter.type === 'multiOptions'"
ref="inputField"
size="small"
filterable
multiple
:value="displayValue"
:loading="remoteParameterOptionsLoading"
:disabled="isReadOnly || remoteParameterOptionsLoading"
@change="valueChanged"
@keydown.stop
@focus="setFocus"
:title="displayTitle"
>
<el-option v-for="option in parameterOptions" :value="option.value" :key="option.value" :label="option.name" >
<div class="option-headline">{{ option.name }}</div>
<div v-if="option.description" class="option-description" v-html="option.description"></div>
</el-option>
@ -306,7 +319,7 @@ export default mixins(
const issues = NodeHelpers.getParameterIssues(this.parameter, this.node.parameters, newPath.join('.'));
if (this.parameter.type === 'options' && this.remoteParameterOptionsLoading === false && this.remoteParameterOptionsLoadingIssues === null) {
if (['options', 'multiOptions'].includes(this.parameter.type) && this.remoteParameterOptionsLoading === false && this.remoteParameterOptionsLoadingIssues === null) {
// Check if the value resolves to a valid option
// Currently it only displays an error in the node itself in
// case the value is not valid. The workflow can still be executed