diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue index c66b6b0860..8afe679612 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -328,6 +328,9 @@ const setParameters = () => { } }) setType() + if (curComponent.value.displayType === '9') { + setTreeDefault() + } } const setType = () => { diff --git a/core/core-frontend/src/custom-component/v-query/Select.vue b/core/core-frontend/src/custom-component/v-query/Select.vue index c2ae81bac9..4ae900a494 100644 --- a/core/core-frontend/src/custom-component/v-query/Select.vue +++ b/core/core-frontend/src/custom-component/v-query/Select.vue @@ -110,7 +110,11 @@ const setCascadeValueBack = val => { cascade.value.forEach(ele => { ele.forEach(item => { if (item.datasetId.split('--')[1] === config.value.id) { - item.selectValue = Array.isArray(val) ? [...val] : val + if (props.isConfig) { + item.selectValue = Array.isArray(val) ? [...val] : val + } else { + item.currentSelectValue = Array.isArray(val) ? [...val] : val + } } }) }) @@ -158,11 +162,21 @@ const getCascadeFieldId = () => { } filter.push(condition) } else { - if (!!item.selectValue.length) { - condition = { - fieldId: fieldId, - operator: 'in', - value: [...item.selectValue] + if (props.isConfig) { + if (!!item.selectValue?.length) { + condition = { + fieldId: fieldId, + operator: 'in', + value: [...item.selectValue] + } + } + } else { + if (!!item.currentSelectValue?.length) { + condition = { + fieldId: fieldId, + operator: 'in', + value: [...item.currentSelectValue] + } } } } diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue index 9940efe9bf..975cd5058b 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -356,7 +356,7 @@ provide('quotaData', realQuota) const startToMove = (e: DragEvent, item) => { e.dataTransfer.setData( - 'fields', + 'dimension', JSON.stringify( item .filter(ele => ele.id)