From a32680376f672028b1fe364860561d1cee67bd69 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Thu, 22 Aug 2024 23:52:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8-=E7=83=AD=E5=8A=9B?=
 =?UTF-8?q?=E5=9B=BE):=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/manage/ChartDataManage.java         |  3 +-
 .../drag-item/components/CustomSortEdit.vue   |  2 +-
 .../views/chart/components/editor/index.vue   |  2 +-
 .../js/panel/charts/table/t-heatmap.ts        | 54 +++++++++++--------
 4 files changed, 37 insertions(+), 24 deletions(-)

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 f689f7c77d..4e4d8a9c2c 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
@@ -621,7 +621,8 @@ public class ChartDataManage {
         if (StringUtils.equalsIgnoreCase(view.getType(), "table-pivot")
                 || StringUtils.containsIgnoreCase(view.getType(), "group")
                 || ("antv".equalsIgnoreCase(view.getRender()) && "line".equalsIgnoreCase(view.getType()))
-                || StringUtils.equalsIgnoreCase(view.getType(), "flow-map")) {
+                || StringUtils.equalsIgnoreCase(view.getType(), "flow-map")
+                || StringUtils.equalsIgnoreCase(view.getType(), "t-heatmap")) {
             xAxis.addAll(xAxisExt);
         }
         List<ChartViewFieldDTO> yAxis = new ArrayList<>(view.getYAxis());
diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/components/CustomSortEdit.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/components/CustomSortEdit.vue
index 9db974c3b8..eb666a424b 100644
--- a/core/core-frontend/src/views/chart/components/editor/drag-item/components/CustomSortEdit.vue
+++ b/core/core-frontend/src/views/chart/components/editor/drag-item/components/CustomSortEdit.vue
@@ -101,7 +101,7 @@ init()
 
 <style lang="less" scoped>
 .drag-list {
-  height: 100%;
+  height: 50vh;
 }
 
 .item-dimension {
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 e28cd17459..235ad83470 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -4660,7 +4660,7 @@ span {
 }
 
 .custom_sort_dialog {
-  max-height: calc(100vh - 120px);
+  max-height: calc(100vh - 100px);
   min-height: 152px;
 
   display: flex;
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/t-heatmap.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/t-heatmap.ts
index d34b99cfe2..8f0e19159f 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/t-heatmap.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/t-heatmap.ts
@@ -8,13 +8,11 @@ import { useI18n } from '@/hooks/web/useI18n'
 import { deepCopy } from '@/utils/utils'
 import { cloneDeep } from 'lodash-es'
 import {
-  getLegend,
   getPadding,
   getXAxis,
   getYAxis
 } from '@/views/chart/components/js/panel/common/common_antv'
 import { valueFormatter } from '@/views/chart/components/js/formatter'
-import { Datum } from '@antv/g2plot/esm/types/common'
 
 const { t } = useI18n()
 const DEFAULT_DATA = []
@@ -53,7 +51,7 @@ export class TableHeatmap extends G2PlotChartView<HeatmapOptions, Heatmap> {
       'fontShadow'
     ],
     'legend-selector': ['orient', 'color', 'fontSize', 'hPosition', 'vPosition'],
-    'tooltip-selector': ['color', 'fontSize', 'backgroundColor']
+    'tooltip-selector': ['show', 'color', 'fontSize', 'backgroundColor']
   }
   axis: AxisType[] = ['xAxis', 'xAxisExt', 'extColor', 'filter']
   axisConfig: AxisConfig = {
@@ -114,7 +112,8 @@ export class TableHeatmap extends G2PlotChartView<HeatmapOptions, Heatmap> {
           type: 'cat'
         },
         [xFieldExt]: {
-          type: 'cat'
+          type: 'cat',
+          values: [...new Set(data.map(i => i[[xFieldExt]]))].reverse()
         }
       },
       legend: {
@@ -162,10 +161,10 @@ export class TableHeatmap extends G2PlotChartView<HeatmapOptions, Heatmap> {
         data: {
           data: {
             ...param.data.data,
-            value: quotaList[0].value,
-            name: dimensionList[0].id,
+            value: dimensionList[1].value,
+            name: dimensionList[1].id,
             dimensionList: dimensionList,
-            quotaList: quotaList
+            quotaList: [dimensionList[1]]
           }
         }
       })
@@ -200,24 +199,30 @@ export class TableHeatmap extends G2PlotChartView<HeatmapOptions, Heatmap> {
       // tooltip
       if (customAttr.tooltip) {
         const extColor = deepCopy(chart.extColor)
+        const xAxisExt = deepCopy(chart.xAxisExt)
+        const tooltipFiledList = [xAxisExt, extColor]
         const t = JSON.parse(JSON.stringify(customAttr.tooltip))
         if (t.show) {
           tooltip = {
             showTitle: true,
             customItems(originalItems) {
-              const name = extColor[0]?.chartShowName
-                ? extColor[0]?.chartShowName
-                : extColor[0]?.name
-              let value = originalItems[0].value
-              if (!isNaN(Number(value))) {
-                value = valueFormatter(originalItems[0].value, extColor[0]?.formatterCfg)
+              const items = []
+              const createItem = (fieldObj, items, originalItems) => {
+                const name = fieldObj?.chartShowName ? fieldObj?.chartShowName : fieldObj?.name
+                let value = originalItems[0].data[fieldObj.dataeaseName]
+                if (!isNaN(Number(value))) {
+                  value = valueFormatter(value, fieldObj?.formatterCfg)
+                }
+                items.push({
+                  ...originalItems[0],
+                  name: name,
+                  value: value
+                })
               }
-              const newItems = {
-                ...originalItems[0],
-                name: name,
-                value: value
-              }
-              return [newItems]
+              tooltipFiledList.forEach(field => {
+                createItem(field[0], items, originalItems)
+              })
+              return items
             }
           }
         } else {
@@ -233,12 +238,18 @@ export class TableHeatmap extends G2PlotChartView<HeatmapOptions, Heatmap> {
 
   protected configXAxis(chart: Chart, options: HeatmapOptions): HeatmapOptions {
     const xAxis = getXAxis(chart, options)
-    return { ...options, xAxis: { ...xAxis, grid: null } }
+    return {
+      ...options,
+      xAxis: xAxis ? { ...xAxis, grid: null } : false
+    }
   }
 
   protected configYAxis(chart: Chart, options: HeatmapOptions): HeatmapOptions {
     const yAxis = getYAxis(chart)
-    return { ...options, yAxis: { ...yAxis, grid: null } }
+    return {
+      ...options,
+      yAxis: yAxis ? { ...yAxis, grid: null } : false
+    }
   }
 
   protected configLegend(chart: Chart, options: HeatmapOptions): HeatmapOptions {
@@ -305,6 +316,7 @@ export class TableHeatmap extends G2PlotChartView<HeatmapOptions, Heatmap> {
 
   protected setupOptions(chart: Chart, options: HeatmapOptions): HeatmapOptions {
     return flow(
+      this.configTheme,
       this.configXAxis,
       this.configYAxis,
       this.configBasicStyle,