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

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

Browse Source 
fix(查询组件): 级联配置不生效
This commit is contained in:
dataeaseShu 2024-06-27 18:30:31 +08:00 committed by GitHub
commit 39f879b177
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/core-frontend/src/custom-component/v-query/QueryCascade.vue
View File

@ -60,7 +60,8 @@ const setCascadeArrBack = () => {
}
}
const init = (cascadeMap: cascadeMap) => {
const init = (cascadeMap: cascadeMap, arr) => {
cascadeList.value = cloneDeep(arr)
datasetMap.value = Object.values(cascadeMap).map(ele => ({
label: ele.name,
deType: ele.deType,

2
core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
View File

@ -497,7 +497,7 @@ const openCascadeDialog = () => {
}
return pre
}, {})
cascadeDialog.value.init(cascadeMap)
cascadeDialog.value.init(cascadeMap, cascadeArr)
}
const indexCascade = ' 一二三四五'

6
core/core-frontend/src/custom-component/v-query/Select.vue
View File

@ -83,7 +83,7 @@ const cascade = computed(() => {
const setDefaultMapValue = arr => {
const { displayId, field } = config.value
if (!displayId) {
if (config.value.optionValueSource !== 1) {
return []
}
let defaultMapValue = {}
@ -92,8 +92,8 @@ const setDefaultMapValue = arr => {
defaultMapValue[ele] = []
})
enumValueArr.forEach(ele => {
if (defaultMapValue[ele[displayId]]) {
defaultMapValue[ele[displayId]].push(ele[field?.id])
if (defaultMapValue[ele[displayId || field?.id]]) {
defaultMapValue[ele[displayId || field?.id]].push(ele[field?.id])
}
})
Object.values(defaultMapValue).forEach(ele => {