github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #10314 from dataease/pr@dev-v2_st

Browse Source 
fix(仪表板): 修复数据大屏过滤组件确定按钮保存失败的问题 #10291
This commit is contained in:
dataeaseShu 2024-06-17 10:55:21 +08:00 committed by GitHub
commit de0a552c13
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
View File

@ -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()
}

2
de-xpack

@ -1 +1 @@
Subproject commit 4bbe092537c4e9e793a5941b9fdee3bdaecbf42d
Subproject commit 6dee3e0526a186626dfc42e6a4d11120e17c1eaa