From 29b591bbe4e64225d1cff1515df3510ca2ede52d Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Wed, 6 Nov 2024 22:03:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=B8=96=E7=95=8C=E5=9C=B0=E5=9B=BE=E8=BD=AE=E6=92=AD?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20#12679?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/components/js/panel/charts/map/bubble-map.ts | 2 +- .../src/views/chart/components/js/panel/charts/map/map.ts | 2 +- .../components/js/panel/charts/map/tooltip-carousel.ts | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/map/bubble-map.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/map/bubble-map.ts index 4d17ae08f5..c04b42d228 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/map/bubble-map.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/map/bubble-map.ts @@ -135,7 +135,7 @@ export class BubbleMap extends L7PlotChartView { }) dotLayer.once('loaded', () => { chart.container = container - configCarouselTooltip(chart, view, chart.data?.data || [], null) + configCarouselTooltip(chart, view, chart.data?.data || [], null, areaId) }) }) return view diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/map/map.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/map/map.ts index b67ec32794..b6690065c3 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/map/map.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/map/map.ts @@ -178,7 +178,7 @@ export class Map extends L7PlotChartView { }) }) chart.container = container - configCarouselTooltip(chart, view, data, null) + configCarouselTooltip(chart, view, data, null, areaId) }) return view } diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/map/tooltip-carousel.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/map/tooltip-carousel.ts index ae451b5940..5a0f2fb1d9 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/map/tooltip-carousel.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/map/tooltip-carousel.ts @@ -6,16 +6,18 @@ import { parseJson } from '@/views/chart/components/js/util' import { Scene } from '@antv/l7-scene' import { deepCopy } from '@/utils/utils' -export const configCarouselTooltip = (chart, view, data, scene) => { +export const configCarouselTooltip = (chart, view, data, scene, areaId?) => { if (['bubble-map', 'map'].includes(chart.type)) { data = view.source.data.dataArray ?.filter(i => i.dimensionList?.length > 0) .reduce((acc, current) => { const existingItem = acc.find(obj => { - if (!obj.abbrev || obj.abbrev === 'China') { + if (areaId.startsWith('000')) { + return obj.name === current.name + } else if (areaId.startsWith('156')) { return obj.adcode === current.adcode } else { - return obj.abbrev === current.abbrev + return obj.name === current.name } }) if (!existingItem) { From cf2a882cf41f72ad8b169acd862ef233aef61c26 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 7 Nov 2024 09:31:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E9=93=BE=E6=8E=A5=E8=BF=87=E6=BB=A4=E5=99=A8?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/share/interceptor/LinkInterceptor.java | 2 +- de-xpack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java b/core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java index f73eaf66f6..2188711918 100644 --- a/core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java +++ b/core/core-backend/src/main/java/io/dataease/share/interceptor/LinkInterceptor.java @@ -19,7 +19,7 @@ import java.util.List; @Component public class LinkInterceptor implements HandlerInterceptor { - private final static String whiteListText = "/user/ipInfo, /apisix/check"; + private final static String whiteListText = "/user/ipInfo, /apisix/check, /datasetData/enumValueObj"; @Override diff --git a/de-xpack b/de-xpack index 75e1765cbe..db34a9f43b 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 75e1765cbebf599bcb3ee609ec445a9cd062633a +Subproject commit db34a9f43beaa57f8942dfdee2c748c0afb88040