From bc169bc375cae1de1e6f357bac7d5467385ee6b8 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 21 Mar 2025 16:18:05 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E5=8D=A1=E6=94=AF=E6=8C=81=E8=81=94=E5=8A=A8=E5=B9=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=9C=A8=E5=B5=8C=E5=85=A5=E6=97=B6=E5=B0=86=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=8F=82=E6=95=B0=E5=90=91=E5=A4=96=E4=BC=A0=E9=80=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/manage/ChartDataManage.java | 15 ++- .../indicator/DeIndicator.vue | 32 +++++-- .../modules/data-visualization/dvMain.ts | 96 ++++++++++++------- .../view/dto/ChartExtFilterDTO.java | 5 +- 4 files changed, 102 insertions(+), 46 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java index b72e22a208..dd422cb0de 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java @@ -44,6 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.*; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; /** @@ -223,11 +224,17 @@ public class ChartDataManage { } List filters = new ArrayList<>(); + FilterTreeObj customLinkageFilter = null; // 联动条件 if (ObjectUtils.isNotEmpty(chartExtRequest.getLinkageFilters())) { - filters.addAll(chartExtRequest.getLinkageFilters()); + for(ChartExtFilterDTO linkageFilter: chartExtRequest.getLinkageFilters()) { + if (3 == linkageFilter.getFilterType()) { + customLinkageFilter = linkageFilter.getCustomFilter(); + } else { + filters.add(linkageFilter); + } + } } - // 外部参数条件 if (ObjectUtils.isNotEmpty(chartExtRequest.getOuterParamsFilters())) { filters.addAll(chartExtRequest.getOuterParamsFilters()); @@ -355,6 +362,10 @@ public class ChartDataManage { } // 字段过滤器 FilterTreeObj fieldCustomFilter = view.getCustomFilter(); + // 指标表联动时 使用的CustomFilter + if (customLinkageFilter != null) { + fieldCustomFilter = customLinkageFilter; + } chartFilterTreeService.searchFieldAndSet(fieldCustomFilter); fieldCustomFilter = chartFilterTreeService.charReplace(fieldCustomFilter); // 获取dsMap,union sql diff --git a/core/core-frontend/src/custom-component/indicator/DeIndicator.vue b/core/core-frontend/src/custom-component/indicator/DeIndicator.vue index f03c1d6b30..8afd5f59df 100644 --- a/core/core-frontend/src/custom-component/indicator/DeIndicator.vue +++ b/core/core-frontend/src/custom-component/indicator/DeIndicator.vue @@ -392,18 +392,21 @@ const calcData = (view, callback) => { const trackClick = trackAction => { const param = state.pointParam - if (!param?.data?.dimensionList) { + if (!param?.data?.dimensionList && !param?.data?.quotaList) { return } const linkageParam = { option: 'linkage', + innerType: 'indicator', name: state.pointParam.data.name, viewId: view.value.id, dimensionList: state.pointParam.data.dimensionList, - quotaList: state.pointParam.data.quotaList + quotaList: state.pointParam.data.quotaList, + customFilter: state.pointParam.data.customFilter } const jumpParam = { option: 'jump', + innerType: 'indicator', name: state.pointParam.data.name, viewId: view.value.id, dimensionList: state.pointParam.data.dimensionList, @@ -413,10 +416,12 @@ const trackClick = trackAction => { const clickParams = { option: 'pointClick', + innerType: 'indicator', name: state.pointParam.data.name, viewId: view.value.id, dimensionList: state.pointParam.data.dimensionList, - quotaList: state.pointParam.data.quotaList + quotaList: state.pointParam.data.quotaList, + customFilter: state.pointParam.data.customFilter } switch (trackAction) { @@ -477,6 +482,10 @@ const trackMenu = computed(() => { return trackMenuInfo }) +const showCursor = computed(() => { + return trackMenu.value.length || embeddedCallBack.value === 'yes' +}) + const pointClickTrans = () => { if (embeddedCallBack.value === 'yes') { trackClick('pointClick') @@ -516,11 +525,10 @@ const onPointClick = () => { // 模拟点击 const params = { data: { - data: { - name: axis.name, - dimensionList: [], - quotaList: view.value.yAxis - } + name: axis.name, + dimensionList: view.value.xAxis, + quotaList: view.value.yAxis, + customFilter: view.value.customFilter } } action(params) @@ -534,7 +542,7 @@ defineExpose({ - + diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts index f9bd0dbd5b..aba757a683 100644 --- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts +++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts @@ -1005,11 +1005,19 @@ export const dvMainStore = defineStore('dataVisualization', { } const preActiveComponentIds = [] const checkQDList = [...data.dimensionList, ...data.quotaList] + const customFilterInfo = data.customFilter for (let indexOuter = 0; indexOuter < this.componentData.length; indexOuter++) { const element = this.componentData[indexOuter] if (element.id !== viewId) { if (['UserView', 'VQuery'].includes(element.component)) { - this.trackFilterCursor(element, checkQDList, trackInfo, preActiveComponentIds, viewId) + this.trackFilterCursor( + element, + checkQDList, + trackInfo, + preActiveComponentIds, + viewId, + customFilterInfo + ) this.componentData[indexOuter] = element } else if (element.component === 'Group') { element.propValue?.forEach((groupItem, index) => { @@ -1018,7 +1026,8 @@ export const dvMainStore = defineStore('dataVisualization', { checkQDList, trackInfo, preActiveComponentIds, - viewId + viewId, + customFilterInfo ) element.propValue[index] = groupItem }) @@ -1030,7 +1039,8 @@ export const dvMainStore = defineStore('dataVisualization', { checkQDList, trackInfo, preActiveComponentIds, - viewId + viewId, + customFilterInfo ) tabItem.componentData[index] = tabComponent }) @@ -1314,11 +1324,25 @@ export const dvMainStore = defineStore('dataVisualization', { }) } }, - trackFilterCursor(element, checkQDList, trackInfo, preActiveComponentIds, viewId) { + trackFilterCursor( + element, + checkQDList, + trackInfo, + preActiveComponentIds, + viewId, + customFilter? + ) { let currentFilters = element.linkageFilters || [] // 当前联动filter if (['table-info', 'table-normal'].includes(element.innerType)) { currentFilters = [] } + if (currentFilters.length) { + for (let i = currentFilters.length - 1; i >= 0; i--) { + if (currentFilters[i].filterType === 3) { + currentFilters.splice(i, 1) + } + } + } // 联动的图表情况历史条件 // const currentFilters = [] checkQDList.forEach(QDItem => { @@ -1330,38 +1354,46 @@ export const dvMainStore = defineStore('dataVisualization', { const targetInfoArray = targetInfo.split('#') const targetViewId = targetInfoArray[0] // 目标图表 if (element.component === 'UserView' && element.id === targetViewId) { - // 如果目标图表 和 当前循环组件id相等 则进行条件增减 - const targetFieldId = targetInfoArray[1] // 目标图表列ID - let condition - if (QDItem.timeValue && Array.isArray(QDItem.timeValue)) { - // 如果dimension.timeValue存在值且是数组 目前判断为是时间组件 - condition = { - fieldId: targetFieldId, - operator: 'between', - value: QDItem.timeValue, - viewIds: [targetViewId], - sourceViewId: viewId - } + // 如果含有customFilter 仅加入customFilter + if (customFilter) { + currentFilters.push({ + filterType: 3, + customFilter: customFilter + }) } else { - condition = { - fieldId: targetFieldId, - operator: 'eq', - value: [QDItem.value], - viewIds: [targetViewId], - sourceViewId: viewId + // 如果目标图表 和 当前循环组件id相等 则进行条件增减 + const targetFieldId = targetInfoArray[1] // 目标图表列ID + let condition + if (QDItem.timeValue && Array.isArray(QDItem.timeValue)) { + // 如果dimension.timeValue存在值且是数组 目前判断为是时间组件 + condition = { + fieldId: targetFieldId, + operator: 'between', + value: QDItem.timeValue, + viewIds: [targetViewId], + sourceViewId: viewId + } + } else { + condition = { + fieldId: targetFieldId, + operator: 'eq', + value: [QDItem.value], + viewIds: [targetViewId], + sourceViewId: viewId + } } - } - let j = currentFilters.length - while (j--) { - const filter = currentFilters[j] - // 兼容性准备 viewIds 只会存放一个值 - if (targetFieldId === filter.fieldId && filter.viewIds.includes(targetViewId)) { - currentFilters.splice(j, 1) + let j = currentFilters.length + while (j--) { + const filter = currentFilters[j] + // 兼容性准备 viewIds 只会存放一个值 + if (targetFieldId === filter.fieldId && filter.viewIds.includes(targetViewId)) { + currentFilters.splice(j, 1) + } } + // 不存在该条件 且 条件有效 直接保存该条件 + // !filterExist && vValid && currentFilters.push(condition) + currentFilters.push(condition) } - // 不存在该条件 且 条件有效 直接保存该条件 - // !filterExist && vValid && currentFilters.push(condition) - currentFilters.push(condition) preActiveComponentIds.includes(element.id) || preActiveComponentIds.push(element.id) } if (element.component === 'VQuery') { diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java index 1d653cefa7..b5b85e5d4f 100644 --- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java +++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java @@ -4,6 +4,7 @@ package io.dataease.extensions.view.dto; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.fasterxml.jackson.annotation.JsonIgnore; import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; +import io.dataease.extensions.view.filter.FilterTreeObj; import lombok.Data; @@ -25,6 +26,6 @@ public class ChartExtFilterDTO { private String datePattern; @JsonIgnore private List originValue; - private int filterType;// 0-过滤组件，1-下钻，2-联动，外部参数 - + private int filterType;// 0-过滤组件，1-下钻，2-联动，外部参数 3-联动 自定义参数 + private FilterTreeObj customFilter; }