diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue index b5f4372e8d..edf5679ada 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -656,11 +656,27 @@ const cancelValueSource = () => { } const confirmValueSource = () => { - if (valueSource.value.some(ele => !ele.trim())) { + if ( + valueSource.value.some(ele => { + if (typeof ele === 'string') { + return !ele.trim() + } + return false + }) + ) { ElMessage.error('手工输入-选项值不能为空') return } - curComponent.value.valueSource = cloneDeep(valueSource.value.filter(ele => ele.trim())) + console.log(cloneDeep(valueSource.value), 'valueSource') + + curComponent.value.valueSource = cloneDeep( + valueSource.value.filter(ele => { + if (typeof ele === 'string') { + return ele.trim() + } + return true + }) + ) handleValueSourceChange() cancelValueSource() } diff --git a/de-xpack b/de-xpack index 4bbe092537..6dee3e0526 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 4bbe092537c4e9e793a5941b9fdee3bdaecbf42d +Subproject commit 6dee3e0526a186626dfc42e6a4d11120e17c1eaa