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

fix(查询组件): v2.8 文本搜索组件,设置默认值同时设置必填,不能识别默认值报错无选项值 #10853
This commit is contained in:
dataeaseShu 2024-07-16 10:52:39 +08:00 committed by GitHub
commit f166e16575
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -423,7 +423,17 @@ const queryData = () => {
requiredName = next.name
}
if (
if (next.displayType === '8') {
const { conditionValueF, conditionValueS, conditionType } = next
if (conditionType === 0) {
requiredName = conditionValueF === '' ? next.name : ''
} else {
requiredName = [conditionValueF || '', conditionValueS || ''].filter(ele => ele !== '')
.length
? next.name
: ''
}
} else if (
(Array.isArray(next.selectValue) && !next.selectValue.length) ||
(next.selectValue !== 0 && !next.selectValue)
) {