dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
fix(查询组件): 查询组件报错
This commit is contained in:
Junjun 2024-11-14 09:49:07 +08:00 committed by GitHub
commit ec96115a44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,12 +266,12 @@ const showTypeError = computed(() => {
ele => checkId === ele.id
)
if (!field) return false
if (displayTypeField === null && Array.isArray(field.type)) {
if (displayTypeField === null) {
displayTypeField = field
return false
}
if (displayTypeField?.deType === field?.deType && displayTypeField?.deType === 1) {
if (!Array.isArray(field.type)) {
if (!Array.isArray(field.type) || !Array.isArray(displayTypeField.type)) {
return false
}
if (!displayTypeField.type?.length && !field.type?.length) {
@ -1246,12 +1246,12 @@ const validate = () => {
itx => checkId === itx.id
)
if (!field) return false
if (displayTypeField === null && Array.isArray(field.type)) {
if (displayTypeField === null) {
displayTypeField = field
return false
}
if (displayTypeField?.deType === field?.deType && displayTypeField?.deType === 1) {
if (!Array.isArray(field.type)) {
if (!Array.isArray(field.type) || !Array.isArray(displayTypeField.type)) {
return false
}
if (!displayTypeField.type?.length && !field.type?.length) {