public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-17 21:08:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-v3' into dev-v3

Browse Source
This commit is contained in:
wangjiahao
2026-05-14 10:48:27 +08:00
parent 63ffd59763 b642c7063e
commit c71d88c0c3
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/core-frontend/src/views/chart/components/js/panel/charts/g2/distribution/treemap.ts
View File

@@ -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
}

3
sdk/common/src/main/java/io/dataease/constant/SQLConstants.java
View File

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