From acde46abf25656d01c82196d7272e9f552f70142 Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Fri, 1 Nov 2024 18:15:08 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E8=A1=A8=E5=90=88=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E5=88=97=E5=BA=8F=E5=8F=B7=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/panel/charts/table/table-info.ts       | 13 ++++++--
 .../js/panel/common/common_table.ts           | 30 +++++++++++++++++--
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts
index d308a2b251..16fe08d371 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-info.ts
@@ -14,7 +14,11 @@ import { S2ChartView, S2DrawOptions } from '../../types/impl/s2'
 import { TABLE_EDITOR_PROPERTY, TABLE_EDITOR_PROPERTY_INNER } from './common'
 import { useI18n } from '@/hooks/web/useI18n'
 import { isNumber } from 'lodash-es'
-import { copyContent, SortTooltip } from '@/views/chart/components/js/panel/common/common_table'
+import {
+  copyContent,
+  getRowIndex,
+  SortTooltip
+} from '@/views/chart/components/js/panel/common/common_table'
 
 const { t } = useI18n()
 class ImageCell extends TableDataCell {
@@ -192,7 +196,12 @@ export class TableInfo extends S2ChartView<TableSheet> {
         return new ImageCell(viewMeta, viewMeta?.spreadsheet)
       }
       if (viewMeta.colIndex === 0 && s2Options.showSeriesNumber) {
-        viewMeta.fieldValue = pageInfo.pageSize * (pageInfo.currentPage - 1) + viewMeta.rowIndex + 1
+        if (tableCell.mergeCells) {
+          viewMeta.fieldValue = getRowIndex(s2Options.mergedCellsInfo, viewMeta)
+        } else {
+          viewMeta.fieldValue =
+            pageInfo.pageSize * (pageInfo.currentPage - 1) + viewMeta.rowIndex + 1
+        }
       }
       return new TableDataCell(viewMeta, viewMeta?.spreadsheet)
     }
diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
index a86c21239e..9d7beb60d6 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
@@ -32,7 +32,9 @@ import {
   TableDataCell,
   MergedCell,
   getPolygonPoints,
-  renderPolygon
+  renderPolygon,
+  MergedCellInfo,
+  ViewMeta
 } from '@antv/s2'
 import { keys, intersection, filter, cloneDeep, merge, find, repeat } from 'lodash-es'
 import { createVNode, render } from 'vue'
@@ -1419,12 +1421,12 @@ export function configMergeCells(chart: Chart, options: S2Options) {
     const xAxis = chart.xAxis
     const quotaIndex = xAxis.findIndex(axis => axis.groupType === 'q')
     const data = chart.data?.tableRow
-    if (quotaIndex <= 0 || !data?.length) {
+    if (quotaIndex === 0 || !data?.length) {
       return
     }
     const mergedColInfo: number[][][] = [[[0, data.length - 1]]]
     const mergedCellsInfo = []
-    const axisToMerge = xAxis.filter((a, i) => a.hide !== true && i < quotaIndex)
+    const axisToMerge = xAxis.filter((a, i) => a.hide !== true && (i < quotaIndex || quotaIndex === -1))
     axisToMerge.forEach((a, i) => {
       const preMergedColInfo = mergedColInfo[i]
       const curMergedColInfo = []
@@ -1476,11 +1478,33 @@ export function configMergeCells(chart: Chart, options: S2Options) {
     }
     options.mergedCellsInfo = mergedCellsInfo
     options.mergedCell = (sheet, cells, meta) => {
+      if (showIndex && meta.colIndex === 0) {
+        meta.fieldValue = getRowIndex(mergedCellsInfo, meta)
+      }
       return new CustomMergedCell(sheet, cells, meta)
     }
   }
 }
 
+export function getRowIndex(mergedCellsInfo: MergedCellInfo[][], meta: ViewMeta): number {
+  let curRangeStartIndex = 0
+  const lostCells = mergedCellsInfo.reduce((p, n) => {
+    if (n[0].colIndex !== 0) {
+      return p
+    }
+    const start = n[0].rowIndex
+    const end = n[n.length - 1].rowIndex
+    const lost = end - start
+    if (meta.rowIndex >= start && meta.rowIndex <= end) {
+      curRangeStartIndex = start
+    }
+    if (meta.rowIndex > end) {
+      return p + lost
+    }
+    return p
+  }, 0)
+  return curRangeStartIndex - lostCells + 1
+}
 class CustomMergedCell extends MergedCell {
   protected drawBackgroundShape() {
     const allPoints = getPolygonPoints(this.cells)