diff --git a/core/core-frontend/src/api/dataset.ts b/core/core-frontend/src/api/dataset.ts index 3232268a1a..d0e07760c7 100644 --- a/core/core-frontend/src/api/dataset.ts +++ b/core/core-frontend/src/api/dataset.ts @@ -17,6 +17,7 @@ export interface EnumValue { sortId?: string sort?: string searchText: string + filter?: Array<{}> } interface Fields { @@ -286,3 +287,9 @@ export const exportDeletePost = async (data): Promise => { return res?.data }) } + +export const listByDsIds = async (data): Promise => { + return request.post({ url: 'datasetField/listByDsIds', data }).then(res => { + return res?.data + }) +} diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue index 752f4c532c..eeeee78f7b 100644 --- a/core/core-frontend/src/custom-component/v-query/Component.vue +++ b/core/core-frontend/src/custom-component/v-query/Component.vue @@ -253,10 +253,15 @@ const queryDataForId = id => { const getQueryConditionWidth = () => { return customStyle.queryConditionWidth } + +const getCascadeList = () => { + return props.element.cascade +} provide('unmount-select', unMountSelect) provide('release-unmount-select', releaseSelect) provide('query-data-for-id', queryDataForId) provide('com-width', getQueryConditionWidth) +provide('cascade-list', getCascadeList) onBeforeUnmount(() => { emitter.off(`addQueryCriteria${element.value.id}`) diff --git a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue new file mode 100644 index 0000000000..55fcf777f0 --- /dev/null +++ b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue @@ -0,0 +1,358 @@ + + + + + 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 49c8794564..8074a95152 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -1,6 +1,16 @@ getLastStart