From 44074369f672f0aafade03d398bafac3f504b37d Mon Sep 17 00:00:00 2001
From: qixinzhi <qixinzhi@easycorp.ltd>
Date: Mon, 28 Oct 2024 02:45:44 +0000
Subject: [PATCH] * [bug#56323,0.5h] fix bug.

---
 lib/zin/wg/pivottable/v1.php  | 9 +++++----
 module/pivot/ui/show.html.php | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/zin/wg/pivottable/v1.php b/lib/zin/wg/pivottable/v1.php
index 456f27f959..4adaf06ed6 100644
--- a/lib/zin/wg/pivottable/v1.php
+++ b/lib/zin/wg/pivottable/v1.php
@@ -99,8 +99,8 @@ class pivotTable extends wg
             set::onRenderCell($onRenderCell),
             set::onCellClick($onCellClick),
             set::rowKey('ROW_ID'),
-            set::plugins(array('header-group', $cellSpan ? 'cellspan' : null)),
-            $cellSpan ? set::getCellSpan(jsRaw(<<<JS
+            set::plugins(array('header-group', 'cellspan')),
+            set::getCellSpan(jsRaw(<<<JS
             function(cell)
             {
                 const options = this.options.cellSpanOptions[cell.col.name];
@@ -110,9 +110,10 @@ class pivotTable extends wg
                     const colSpan = cell.row.data[options.colspan ?? 'colspan'] ?? 1;
                     return {rowSpan, colSpan};
                 }
+                console.log(options);
             }
-            JS)) : null,
-            $cellSpan ? set::cellSpanOptions($cellSpan) : null
+            JS)),
+            set::cellSpanOptions($cellSpan)
         );
     }
 
diff --git a/module/pivot/ui/show.html.php b/module/pivot/ui/show.html.php
index e0442def55..c712334c07 100644
--- a/module/pivot/ui/show.html.php
+++ b/module/pivot/ui/show.html.php
@@ -149,9 +149,9 @@ $generateData = function() use ($lang, $pivotName, $pivot, $data, $configs, $sho
                 set::onRenderCell(jsRaw('renderCell')),
                 set::onCellClick(jsRaw('clickCell')),
                 set::rowKey('ROW_ID'),
-                set::plugins(array('header-group', $cellSpan ? 'cellspan' : null)),
-                $cellSpan ? set::getCellSpan(jsRaw('getCellSpan')) : null,
-                $cellSpan ? set::cellSpanOptions($cellSpan) : null
+                set::plugins(array('header-group', 'cellspan')),
+                set::getCellSpan(jsRaw('getCellSpan')),
+                set::cellSpanOptions($cellSpan)
             ),
             div
             (