* [bug#56323,0.5h] fix bug.

This commit is contained in:
qixinzhi
2024-10-28 13:19:56 +08:00
committed by 代婷婷
parent a4094e3c61
commit 44074369f6
2 changed files with 8 additions and 7 deletions
+5 -4
View File
@@ -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)
);
}
+3 -3
View File
@@ -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
(