CN-1258 fix: 修复实体搜索框多个条件与has函数并列时,has函数前缺少and操作符的问题
This commit is contained in:
@@ -857,7 +857,11 @@ export function handleMetaListToStr (metaList) {
|
||||
for (const i in lastObj) {
|
||||
str += lastObj[i] + ' AND '
|
||||
}
|
||||
str = str.slice(0, -5) + ' ' + hasStr.slice(0, -5)
|
||||
if (hasStr !== '') {
|
||||
str = str + hasStr.slice(0, -5)
|
||||
} else {
|
||||
str = str.slice(0, -5)
|
||||
}
|
||||
|
||||
return str
|
||||
}
|
||||
|
||||
@@ -1586,9 +1586,12 @@ const handleStrToUniteStr = (str) => {
|
||||
for (const i in lastObj) {
|
||||
lastStr += lastObj[i] + ' AND '
|
||||
}
|
||||
lastStr = lastStr.slice(0, -5)
|
||||
const hasStr = hasArr.join(' AND ')
|
||||
lastStr = lastStr + ' ' + hasStr
|
||||
if (hasStr !== '') {
|
||||
lastStr = lastStr + hasStr
|
||||
} else {
|
||||
lastStr = lastStr.slice(0, -5)
|
||||
}
|
||||
|
||||
return lastStr
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user