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
   }
 
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)";