From 03af4dbb38036084d85d295fb556fc087247665a Mon Sep 17 00:00:00 2001
From: qixinzhi <qixinzhi@easycorp.ltd>
Date: Tue, 13 Aug 2024 08:53:56 +0000
Subject: [PATCH] * [refac] fix pivot colspan config.

---
 module/pivot/model.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/module/pivot/model.php b/module/pivot/model.php
index 987269c115..0bff252d75 100644
--- a/module/pivot/model.php
+++ b/module/pivot/model.php
@@ -1355,6 +1355,25 @@ class pivotModel extends model
         return $configs;
     }
 
+    /**
+     * Calculate merge cell config.
+     *
+     * @param  array    $groups
+     * @param  array    $records
+     * @access public
+     * @return array
+     */
+    public function calculateMergeCellConfig(array $groups, array $columns, array $records)
+    {
+        if(empty($records)) return array();
+
+        $showOrigins = $this->getShowOriginsFromColumns($columns);
+        $showOrigins = $this->getShowOriginsWithRecord($records[0], $showOrigins);
+
+        $configs = $this->calculateGroupMergeCellConfig($groups, $records);
+        return $this->calculateColumnMergeCellConfig($configs, $showOrigins);
+    }
+
     /**
      * Gen sheet.
      *