Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [story#66940] fix error.

Browse Source
This commit is contained in:
qixinzhi
2024-09-10 15:29:06 +08:00
committed by 宋辰轩
parent 062e3f92d8
commit 58f4e63ceb
2 changed files with 33 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zin/wg/pivottable/js/v1.js
-48
View File
@@ -17,51 +17,3 @@ window.getHeight = function(height = 800, filterCount = 0)
return Math.min(dtableContent - titleContent - conditionHeight, height);
}
/**
* 如果列包含切片字段，重新渲染单元格。
* If column contains slice field, re-render cell.
*
* @param array result
* @param object cell
* @access public
* @return array
*/
window.renderCell = function(result, {row, col})
{
if(result && col.setting.colspan)
{
let values = result.shift();
if(typeof(values.type) != 'undefined' && values.type == 'a') values = values.props['children'];
result.push({className: 'gap-0 px-0'});
values.forEach((value, index) =>
result.push({
html: value || !Number.isNaN(value) ? `${value}` : ' ',
className: 'flex justify-center items-center h-full w-1/2' + (index == 0 ? ' border-r': ''),
style: 'border-color: var(--dtable-border-color)'
})
);
}
return result;
}
/**
* 合并单元格。
* Merge cell.
*
* @param object cell
* @access public
* @return object|void
*/
window.getCellSpan = function(cell)
{
const options = this.options.cellSpanOptions[cell.col.name];
if(options)
{
const rowSpan = cell.row.data[options.rowspan ?? 'rowspan'] ?? 1;
const colSpan = cell.row.data[options.colspan ?? 'colspan'] ?? 1;
return {rowSpan, colSpan};
}
}
lib/zin/wg/pivottable/v1.php
+33 -2
View File
@@ -56,7 +56,27 @@ class pivotTable extends wg
list($cols, $data, $cellSpan, $filters, $onRenderCell, $onCellClick) = $this->prop(array('cols', 'data', 'cellSpan', 'filters', 'onRenderCell', 'onCellClick'));
$filterCount = count($filters);
if(empty($onRenderCell)) $onRenderCell = jsRaw('renderCell');
if(empty($onRenderCell)) $onRenderCell = jsRaw(<<<JS
function(result, {row, col})
{
if(result && col.setting.colspan)
{
let values = result.shift();
if(typeof(values.type) != 'undefined' && values.type == 'a') values = values.props['children'];
result.push({className: 'gap-0 px-0'});
values.forEach((value, index) =>
result.push({
html: value || !Number.isNaN(value) ? `\${value}` : '&nbsp;',
className: 'flex justify-center items-center h-full w-1/2' + (index == 0 ? ' border-r': ''),
style: 'border-color: var(--dtable-border-color)'
})
);
}
return result;
}
JS);
return dtable
(
setID('designTable'),
@@ -70,7 +90,18 @@ class pivotTable extends wg
set::onCellClick($onCellClick),
set::rowKey('ROW_ID'),
set::plugins(array('header-group', $cellSpan ? 'cellspan' : null)),
$cellSpan ? set::getCellSpan(jsRaw('getCellSpan')) : null,
$cellSpan ? set::getCellSpan(jsRaw(<<<JS
function(cell)
{
const options = this.options.cellSpanOptions[cell.col.name];
if(options)
{
const rowSpan = cell.row.data[options.rowspan ?? 'rowspan'] ?? 1;
const colSpan = cell.row.data[options.colspan ?? 'colspan'] ?? 1;
return {rowSpan, colSpan};
}
}
JS)) : null,
$cellSpan ? set::cellSpanOptions($cellSpan) : null
);
}