fix(图表): 修复明细表开启表头分组和总计后单元格区域高度计算错误 #15972

core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue

@@ -490,6 +490,7 @@ watch(
             />
           </collapse-switch-item>
           <collapse-switch-item
+            v-if="showProperties('tooltip-selector')"
             v-model="chart.customAttr.tooltip.show"
             :themes="themes"
             :change-model="chart.customAttr.tooltip"

core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts

@@ -22,7 +22,6 @@ import {
   getRowIndex,
   calculateHeaderHeight,
   SortTooltip,
-  summaryRowStyle,
   configEmptyDataStyle,
   getLeafNodes,
   getColumns,
@@ -230,7 +229,7 @@ export class TableInfo extends S2ChartView<TableSheet> {
     // 开始渲染
     const newChart = new TableSheet(containerDom, s2DataConfig, s2Options)
     // 总计紧贴在单元格后面
-    summaryRowStyle(newChart, newData, tableCell, tableHeader, basicStyle.showSummary)
+    this.summaryRowStyle(newChart, newData, tableCell, tableHeader, basicStyle.showSummary)
     // 开启自动换行
     if (basicStyle.autoWrap && !tableCell.mergeCells) {
       // 调整表头宽度时，计算表头高度
@@ -513,6 +512,23 @@ export class TableInfo extends S2ChartView<TableSheet> {
     }
   }
 
+  protected summaryRowStyle(newChart: TableSheet, newData, tableCell, tableHeader, showSummary) {
+    if (!showSummary || !newData.length) return
+    const columns = newChart.dataCfg.fields.columns
+    const showHeader = tableHeader.showTableHeader === true
+    // 不显示表头时，减少一个表头的高度
+    const headerAndSummaryHeight = showHeader ? getMaxTreeDepth(columns) + 1 : 1
+    newChart.on(S2Event.LAYOUT_BEFORE_RENDER, () => {
+      const totalHeight =
+        tableHeader.tableTitleHeight * headerAndSummaryHeight +
+        tableCell.tableItemHeight * (newData.length - 1)
+      if (totalHeight < newChart.container.cfg.height) {
+        newChart.options.height =
+          totalHeight < newChart.container.cfg.height - 8 ? totalHeight + 8 : totalHeight
+      }
+    })
+  }
+
   constructor() {
     super('table-info', [])
   }
@@ -533,3 +549,17 @@ function getStartPosition(node) {
   }
   return getStartPosition(node.children[0])
 }
+
+function getMaxTreeDepth(nodes) {
+  if (!nodes?.length) {
+    return 0
+  }
+  return Math.max(
+    ...nodes.map(node => {
+      if (!node.children?.length) {
+        return 1
+      }
+      return getMaxTreeDepth(node.children) + 1
+    })
+  )
+}

core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts

@@ -6,8 +6,7 @@ import {
   CustomDataCell,
   getSummaryRow,
   SortTooltip,
-  SummaryCell,
-  summaryRowStyle
+  SummaryCell
 } from '@/views/chart/components/js/panel/common/common_table'
 import { S2ChartView, S2DrawOptions } from '@/views/chart/components/js/panel/types/impl/s2'
 import { parseJson } from '@/views/chart/components/js/util'
@@ -187,7 +186,7 @@ export class TableNormal extends S2ChartView<TableSheet> {
     // 开始渲染
     const newChart = new TableSheet(containerDom, s2DataConfig, s2Options)
     // 总计紧贴在单元格后面
-    summaryRowStyle(newChart, newData, tableCell, tableHeader, basicStyle.showSummary)
+    this.summaryRowStyle(newChart, newData, tableCell, tableHeader, basicStyle.showSummary)
     // 自适应铺满
     if (basicStyle.tableColumnMode === 'adapt') {
       newChart.on(S2Event.LAYOUT_RESIZE_COL_WIDTH, () => {
@@ -333,6 +332,22 @@ export class TableNormal extends S2ChartView<TableSheet> {
     }
   }
 
+  protected summaryRowStyle(newChart, newData, tableCell, tableHeader, showSummary) {
+    if (!showSummary || !newData.length) return
+    newChart.on(S2Event.LAYOUT_BEFORE_RENDER, () => {
+      const showHeader = tableHeader.showTableHeader === true
+      // 不显示表头时，减少一个表头的高度
+      const headerAndSummaryHeight = showHeader ? 2 : 1
+      const totalHeight =
+        tableHeader.tableTitleHeight * headerAndSummaryHeight +
+        tableCell.tableItemHeight * (newData.length - 1)
+      if (totalHeight < newChart.container.cfg.height) {
+        newChart.options.height =
+          totalHeight < newChart.container.cfg.height - 8 ? totalHeight + 8 : totalHeight
+      }
+    })
+  }
+
   constructor() {
     super('table-normal', [])
   }

core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts

@@ -2249,30 +2249,6 @@ export function getSummaryRow(data, axis, sumCon = []) {
   return summaryObj
 }
 
-/**
- * 汇总行样式,紧贴在单元格后面
- * @param newChart
- * @param newData
- * @param tableCell
- * @param tableHeader
- * @param showSummary
- */
-export const summaryRowStyle = (newChart, newData, tableCell, tableHeader, showSummary) => {
-  if (!showSummary || !newData.length) return
-  newChart.on(S2Event.LAYOUT_BEFORE_RENDER, () => {
-    const showHeader = tableHeader.showTableHeader === true
-    // 不显示表头时，减少一个表头的高度
-    const headerAndSummaryHeight = showHeader ? 2 : 1
-    const totalHeight =
-      tableHeader.tableTitleHeight * headerAndSummaryHeight +
-      tableCell.tableItemHeight * (newData.length - 1)
-    if (totalHeight < newChart.container.cfg.height) {
-      newChart.options.height =
-        totalHeight < newChart.container.cfg.height - 8 ? totalHeight + 8 : totalHeight
-    }
-  })
-}
-
 export class SummaryCell extends CustomDataCell {
   getTextStyle() {
     const textStyle = cloneDeep(this.theme.colCell.bolderText)