From dc93325eac45ce52376616f4eb6a8cc293c1a162 Mon Sep 17 00:00:00 2001 From: ulleo Date: Wed, 13 May 2026 16:17:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D[=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E6=8A=A5]=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/constant/SQLConstants.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/common/src/main/java/io/dataease/constant/SQLConstants.java b/sdk/common/src/main/java/io/dataease/constant/SQLConstants.java index 9bff29588d..06253c96d2 100644 --- a/sdk/common/src/main/java/io/dataease/constant/SQLConstants.java +++ b/sdk/common/src/main/java/io/dataease/constant/SQLConstants.java @@ -64,6 +64,9 @@ public class SQLConstants { public static final String CAST = "CAST(%s AS %s)"; public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; + public static final String DEFAULT_YEAR_FORMAT = "yyyy"; + public static final String DEFAULT_YEAR_MONTH_FORMAT = "yyyy-MM"; + public static final String DEFAULT_YEAR_MONTH_DAY_FORMAT = "yyyy-MM-dd"; public static final String DEFAULT_INT_FORMAT = "DECIMAL(19,0)"; From b642c7063ecd3281ceb78851fe1b901ee0d7dd9c Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Thu, 14 May 2026 10:37:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=9F=A9=E5=BD=A2=E6=A0=91=E5=9B=BE=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E7=A1=AE=E4=BF=9D=E6=AD=A3=E7=A1=AE=E8=8E=B7=E5=8F=96=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/panel/charts/g2/distribution/treemap.ts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/distribution/treemap.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/distribution/treemap.ts index 60aa0f12cb..33e45e18eb 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/g2/distribution/treemap.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/g2/distribution/treemap.ts @@ -90,7 +90,22 @@ export class Treemap extends G2ChartView { const options = this.setupOptions(chart, baseOptions, { total, chartObj: newChart }) handleChartDashboardHidden(chart, options) newChart.options(options) - newChart.on('polygon:click', action) + const dataById = new Map(data.map(item => [item.id, item])) + const handleClick = event => { + const pointData = + event?.target?.__data__?.data?.data ?? + event?.target?.attributes?.dependentElement?.__data__?.data?.data ?? + dataById.get(event?.data?.data?.id) + if (!pointData) { + return + } + action({ + x: event.x ?? event?.client?.x, + y: event.y ?? event?.client?.y, + data: { data: pointData } + }) + } + ;['element:click', 'label:click'].forEach(eventName => newChart.on(eventName, handleClick)) return newChart }