From aacc847e20302cd33147b87bef14dbee6361599d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 14 Jun 2024 17:21:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=99=A4=E6=98=8E=E7=BB=86=E8=A1=A8?= =?UTF-8?q?=E5=A4=96=EF=BC=8C=E5=AF=B9=E4=BA=8E=E5=85=B6=E4=BB=96=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E7=B1=BB=E5=9E=8B=EF=BC=8C=E8=84=B1=E6=95=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=8D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/chart/manage/ChartDataManage.java | 2 +- .../dataease/chart/manage/ChartViewManege.java | 5 ++++- .../dataease/chart/server/ChartViewServer.java | 4 ++-- core/core-frontend/src/api/chart.ts | 4 ++-- .../views/chart/components/editor/index.vue | 18 +++++++++--------- .../io/dataease/api/chart/ChartViewApi.java | 2 +- 6 files changed, 19 insertions(+), 16 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 e189b67497..c76d6f2de8 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 @@ -1594,7 +1594,7 @@ public class ChartDataManage { private List getAllChartFields(ChartViewDTO view) { // get all fields - Map> stringListMap = chartViewManege.listByDQ(view.getTableId(), view.getId()); + Map> stringListMap = chartViewManege.listByDQ(view.getTableId(), view.getId(), view); List dimensionList = stringListMap.get("dimensionList"); List quotaList = stringListMap.get("quotaList"); List allFields = new ArrayList<>(); diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java index b27edb4538..556d71328f 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java @@ -118,7 +118,7 @@ public class ChartViewManege { return chartDataManage.calcData(details); } - public Map> listByDQ(Long id, Long chartId) { + public Map> listByDQ(Long id, Long chartId, ChartViewDTO chartViewDTO) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("dataset_group_id", id); wrapper.eq("checked", true); @@ -133,6 +133,9 @@ public class ChartViewManege { // filter column disable field Map desensitizationList = new HashMap<>(); List datasetTableFieldDTOS = permissionManage.filterColumnPermissions(collect, desensitizationList, id, null); + if (!chartViewDTO.getType().equalsIgnoreCase("table-info")) { + datasetTableFieldDTOS = datasetTableFieldDTOS.stream().filter(datasetTableFieldDTO -> !desensitizationList.keySet().contains(datasetTableFieldDTO.getDataeaseName())).collect(Collectors.toList()); + } datasetTableFieldDTOS.add(createCountField(id)); List list = transFieldDTO(datasetTableFieldDTOS); diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java index d998eb9b6e..ecfb167754 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java +++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartViewServer.java @@ -34,8 +34,8 @@ public class ChartViewServer implements ChartViewApi { } @Override - public Map> listByDQ(Long id, Long chartId) { - return chartViewManege.listByDQ(id, chartId); + public Map> listByDQ(Long id, Long chartId, ChartViewDTO dto) { + return chartViewManege.listByDQ(id, chartId, dto); } @Override diff --git a/core/core-frontend/src/api/chart.ts b/core/core-frontend/src/api/chart.ts index f03cf4d11a..0dee589af3 100644 --- a/core/core-frontend/src/api/chart.ts +++ b/core/core-frontend/src/api/chart.ts @@ -26,8 +26,8 @@ export interface ComponentInfo { datasetId: string } -export const getFieldByDQ = async (id, chartId): Promise => { - return request.post({ url: `/chart/listByDQ/${id}/${chartId}`, data: {} }).then(res => { +export const getFieldByDQ = async (id, chartId, data): Promise => { + return request.post({ url: `/chart/listByDQ/${id}/${chartId}`, data: data }).then(res => { return res?.data }) } 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 4771b34f25..68c649c4c2 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -213,7 +213,7 @@ watch( { deep: true } ) const watchDs = () => { - getFields(props.view.tableId, props.view.id) + getFields(props.view.tableId, props.view.id, props.view.type) const nodeId = view.value['tableId'] if (!!nodeId) { cacheId = nodeId as unknown as string @@ -223,10 +223,10 @@ const watchDs = () => { curDatasetWeight.value = node.data.weight } } -const getFields = (id, chartId) => { +const getFields = (id, chartId, type) => { if (id && chartId) { fieldLoading.value = true - getFieldByDQ(id, chartId) + getFieldByDQ(id, chartId, { type: type }) .then(res => { state.dimension = (res.dimensionList as unknown as Field[]) || [] state.quota = (res.quotaList as unknown as Field[]) || [] @@ -1294,7 +1294,7 @@ const confirmEditCalc = () => { const obj = cloneDeep(calcEdit.value.fieldForm) setFieldDefaultValue(obj) saveField(obj).then(() => { - getFields(view.value.tableId, view.value.id) + getFields(view.value.tableId, view.value.id, view.value.type) closeEditCalc() }) } @@ -1310,7 +1310,7 @@ const chartFieldEdit = param => { state.currEditField.name = getFieldName(state.dimension.concat(state.quota), param.item.name) saveField(state.currEditField).then(() => { - getFields(view.value.tableId, view.value.id) + getFields(view.value.tableId, view.value.id, view.value.type) }) break case 'edit': @@ -1318,7 +1318,7 @@ const chartFieldEdit = param => { break case 'delete': deleteField(param.item?.id).then(() => { - getFields(view.value.tableId, view.value.id) + getFields(view.value.tableId, view.value.id, view.value.type) }) break } @@ -1534,7 +1534,7 @@ const copyChartFieldItem = id => { fieldLoading.value = true copyChartField(id, view.value.id) .then(() => { - getFields(view.value.tableId, view.value.id) + getFields(view.value.tableId, view.value.id, view.value.type) }) .catch(() => { fieldLoading.value = false @@ -1545,7 +1545,7 @@ const deleteChartFieldItem = id => { fieldLoading.value = true deleteChartField(id) .then(() => { - getFields(view.value.tableId, view.value.id) + getFields(view.value.tableId, view.value.id, view.value.type) }) .catch(() => { fieldLoading.value = false @@ -2557,7 +2557,7 @@ const deleteChartFieldItem = id => { > listByDQ(@PathVariable Long id, @PathVariable Long chartId); + Map> listByDQ(@PathVariable Long id, @PathVariable Long chartId, @RequestBody ChartViewDTO dto); @Operation(summary = "保存图表") @PostMapping("save")