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

fix(查询组件): 查询组件配置 “选择数据集” 且配置参数时,筛选查询后,选项值会被两个单引号包围
This commit is contained in:
dataeaseShu 2024-05-20 16:38:21 +08:00 committed by GitHub
commit 9b8975f886
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -150,8 +150,7 @@ const getOperator = (
conditionValueF,
conditionValueOperatorS,
conditionValueS,
firstLoad,
optionValueSource
firstLoad
) => {
const valueF = firstLoad ? defaultConditionValueF : conditionValueF
const valueS = firstLoad ? defaultConditionValueS : conditionValueS
@ -170,11 +169,7 @@ const getOperator = (
return valueF === '' ? operatorS : operatorF
}
return [1, 7].includes(+displayType)
? 'between'
: multiple || optionValueSource === 1
? 'in'
: 'eq'
return [1, 7].includes(+displayType) ? 'between' : multiple ? 'in' : 'eq'
}
export const searchQuery = (queryComponentList, filter, curComponentId, firstLoad) => {
@ -304,8 +299,7 @@ export const searchQuery = (queryComponentList, filter, curComponentId, firstLoa
conditionValueF,
conditionValueOperatorS,
conditionValueS,
firstLoad,
optionValueSource
firstLoad
)
if (result?.length) {
filter.push({