From 6cf62480d0d8af2eb0121b5d6ef81f899d5ee5e1 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 25 Jan 2024 17:10:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=97=E8=84=B1=E6=95=8F=E5=90=8E=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/chart/manage/ChartDataManage.java | 4 ++++ 1 file changed, 4 insertions(+) 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 80f2873052..a8df862022 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 @@ -203,6 +203,7 @@ public class ChartDataManage { switch (view.getType()) { case "label": xAxis = xAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + xAxisBase = xAxisBase.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); yAxis = new ArrayList<>(); if (ObjectUtils.isEmpty(xAxis)) { return emptyChartViewDTO(view); @@ -220,16 +221,19 @@ public class ChartDataManage { case "table-info": yAxis = new ArrayList<>(); xAxis = xAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + xAxisBase = xAxisBase.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); if (ObjectUtils.isEmpty(xAxis)) { return emptyChartViewDTO(view); } break; case "table-normal": xAxis = xAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + xAxisBase = xAxisBase.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); yAxis = yAxis.stream().filter(item -> dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); break; default: xAxis = xAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); + xAxisBase = xAxisBase.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); yAxis = yAxis.stream().filter(item -> !desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); } From 5fdbe78794830196c1940888ab84df85da509933 Mon Sep 17 00:00:00 2001 From: ulleo Date: Thu, 25 Jan 2024 18:13:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(=E6=8C=87=E6=A0=87=E5=8D=A1):=20?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=A2=9E=E5=8A=A0=E9=99=90=E5=88=B6:=20?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=8B=96=E4=B8=80=E4=B8=AA=E6=8C=87=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chart/components/editor/index.vue | 6 ++++++ 1 file changed, 6 insertions(+) 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 f8294724a7..798925d287 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -470,6 +470,12 @@ const addAxis = (e, axis: AxisType) => { emitter.emit('removeAxis', { axisType: 'yAxis', axis, editType: 'remove' }) } } + if (view.value.type === 'indicator') { + if (view.value?.yAxis?.length > 1) { + const axis = view.value.yAxis.splice(1) + emitter.emit('removeAxis', { axisType: 'yAxis', axis, editType: 'remove' }) + } + } } const addXaxis = e => { From 5eaa291bb21d074c28fbde0350a0c6f99b4e78fe Mon Sep 17 00:00:00 2001 From: ulleo Date: Thu, 25 Jan 2024 18:34:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(=E6=8C=87=E6=A0=87=E5=8D=A1):=20?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=A2=9E=E5=8A=A0=E9=99=90=E5=88=B6:=20?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=8B=96=E6=95=B0=E5=80=BC=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=8C=87=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/zh-CN.ts | 1 + .../views/chart/components/editor/index.vue | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 5bff42219b..b1fe059a6d 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -1081,6 +1081,7 @@ export default { conform_below: '符合以下', addition: '条件', drill_field_error: '下钻起始字段需在维度中', + error_not_number: '不支持拖拽非数值类型指标', error_q_2_d: '不支持拖拽指标至维度', error_d_2_q: '不支持拖拽维度至指标', only_input_number: '请输入正确数值', 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 798925d287..a61fd09645 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -442,6 +442,27 @@ const addAxis = (e, axis: AxisType) => { if (type) { typeValid = dragCheckType(view.value[axis], type) } + // 针对指标卡进行数值类型判断 + if (typeValid && type === 'q' && view.value.type === 'indicator') { + const list = view.value[axis] + if (list && list.length > 0) { + let valid = true + for (let i = 0; i < list.length; i++) { + if (list[i].deType !== 2 && list[i].deType !== 3) { + list.splice(i, 1) + valid = false + } + } + typeValid = valid + if (!typeValid) { + ElMessage({ + message: t('chart.error_not_number'), + type: 'warning' + }) + } + } + } + if (!duplicate) { dup = dragMoveDuplicate(view.value[axis], e, 'chart') }