public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 05:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(查询组件): 数字下拉组件显示字段支持选择文本类型字段 #14731

Browse Source
This commit is contained in:
dataeaseShu
2025-02-11 14:09:44 +08:00
committed by xuwei-fit2cloud
parent d89433cc56
commit e47d5afb18
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1540,6 +1540,16 @@ const confirmClick = () => {
})
}
const fieldsComputed = computed(() => {
return curComponent.value.dataset.fields.filter(ele => {
return (
ele.deType === +curComponent.value.displayType ||
([0, 2, 3, 4].includes(ele.deType) && [0, 2].includes(+curComponent.value.displayType)) ||
(ele.deType === 7 && +curComponent.value.displayType === 0)
)
})
})
const cancelValueSource = () => {
valueSource.value = cloneDeep(curComponent.value.valueSource)
if (!valueSource.value.length) {
@@ -2966,12 +2976,7 @@ defineExpose({
</el-icon>
</template>
<el-option
v-for="ele in curComponent.dataset.fields.filter(
ele =>
ele.deType === +curComponent.displayType ||
([3, 4].includes(ele.deType) && +curComponent.displayType === 2) ||
(ele.deType === 7 && +curComponent.displayType === 0)
)"
v-for="ele in fieldsComputed"
:key="ele.id"
:label="ele.name"
:value="ele.id"