center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #9177 from dataease/pr@dev-v2_bug_fix

Browse Source 
fix(仪表板): 修复文本搜索的精确匹配无效的问题
This commit is contained in:
dataeaseShu 2024-04-18 10:14:57 +08:00 committed by GitHub
commit 811dfa4e21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/core-frontend/src/custom-component/v-query/Component.vue
View File

@ -293,12 +293,11 @@ const delQueryConfig = index => {
const resetData = () => { const resetData = () => {
;(list.value || []).reduce((pre, next) => { ;(list.value || []).reduce((pre, next) => {
if (next.defaultConditionValueF?.length) {
next.conditionValueF = next.defaultConditionValueF next.conditionValueF = next.defaultConditionValueF
} next.conditionValueOperatorF = next.defaultConditionValueOperatorF
if (next.defaultConditionValueS?.length) {
next.conditionValueS = next.defaultConditionValueS next.conditionValueS = next.defaultConditionValueS
} next.conditionValueOperatorS = next.defaultConditionValueOperatorS
if (!next.defaultValueCheck) { if (!next.defaultValueCheck) {
next.defaultValue = next.multiple || +next.displayType === 7 ? [] : undefined next.defaultValue = next.multiple || +next.displayType === 7 ? [] : undefined
} }

2
core/core-frontend/src/hooks/web/useFilter.ts
View File

@ -154,7 +154,7 @@ const getOperator = (
const operatorS = firstLoad ? defaultConditionValueOperatorS : conditionValueOperatorS const operatorS = firstLoad ? defaultConditionValueOperatorS : conditionValueOperatorS
if (displayType === '8') { if (displayType === '8') {
if (conditionType === 0) { if (conditionType === 0) {
return defaultConditionValueOperatorF return operatorF
} }
const operatorArr = [valueF === '' ? '' : operatorF, valueS === '' ? '' : operatorS].filter( const operatorArr = [valueF === '' ? '' : operatorF, valueS === '' ? '' : operatorS].filter(
ele => ele !== '' ele => ele !== ''