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

fix(过滤器): 英文逗号引起查询错误

Browse Source
This commit is contained in:
fit2cloud-chenyw 2023-03-23 18:24:19 +08:00
parent 29f4b0d815
commit 3b0a9e44ac
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/src/components/widget/deWidget/DeSelect.vue
View File

@ -84,7 +84,8 @@ export default {
value: null,
data: [],
onFocus: false,
keyWord: ''
keyWord: '',
separator: ','
}
},
computed: {
@ -149,7 +150,7 @@ export default {
if (!token && linkToken) {
method = linkMultFieldValues
}
const param = { fieldIds: this.element.options.attrs.fieldId.split(','), sort: this.element.options.attrs.sort }
const param = { fieldIds: this.element.options.attrs.fieldId.split(this.separator), sort: this.element.options.attrs.sort }
if (this.panelInfo.proxy) {
param.userId = this.panelInfo.proxy
}
@ -188,7 +189,7 @@ export default {
if (!token && linkToken) {
method = linkMultFieldValues
}
const param = { fieldIds: this.element.options.attrs.fieldId.split(','), sort: this.element.options.attrs.sort }
const param = { fieldIds: this.element.options.attrs.fieldId.split(this.separator), sort: this.element.options.attrs.sort }
if (this.panelInfo.proxy) {
param.userId = this.panelInfo.proxy
}
@ -245,8 +246,8 @@ export default {
this.element.options.value = ''
return
}
const tempValueArray = JSON.parse(JSON.stringify(this.element.options.value.split(',')))
this.element.options.value = tempValueArray.filter(item => optionList.some(option => option === item)).join(',')
const tempValueArray = JSON.parse(JSON.stringify(this.element.options.value.split(this.separator)))
this.element.options.value = tempValueArray.filter(item => optionList.some(option => option === item)).join(this.separator)
}
}
},
@ -297,7 +298,7 @@ export default {
method = linkMultFieldValues
}
method({
fieldIds: this.element.options.attrs.fieldId.split(','),
fieldIds: this.element.options.attrs.fieldId.split(this.separator),
sort: this.element.options.attrs.sort
}).then(res => {
this.data = this.optionData(res.data)
@ -321,7 +322,7 @@ export default {
if (value === null) {
this.element.options.value = ''
} else {
this.element.options.value = Array.isArray(value) ? value.join() : value
this.element.options.value = Array.isArray(value) ? value.join(this.separator) : value
}
this.element.options.manualModify = false
} else {
@ -364,16 +365,19 @@ export default {
formatFilterValue() {
if (this.value === null) return []
if (Array.isArray(this.value)) return this.value
if (!this.element.options.attrs.multiple) {
return [this.value]
}
return this.value.split(',')
},
fillValueDerfault() {
const defaultV = this.element.options.value === null ? '' : this.element.options.value.toString()
if (this.element.options.attrs.multiple) {
if (defaultV === null || typeof defaultV === 'undefined' || defaultV === '' || defaultV === '[object Object]') return []
return defaultV.split(',')
return defaultV.split(this.separator)
} else {
if (defaultV === null || typeof defaultV === 'undefined' || defaultV === '' || defaultV === '[object Object]') return null
return defaultV.split(',')[0]
return defaultV.split(this.separator)[0]
}
},
optionData(data) {