Dollerok/P8-Panels
1
0
Fork 0
forked from CITKParus/P8-Panels
Code Issues Pull Requests Projects Releases Wiki Activity

WEB APP: P8PTable - исправлена ошибка переопределения пользовательского стиля ячейки

Browse Source
This commit is contained in:
Mikhail Chechnev 2024-05-09 20:37:50 +03:00
parent 320521a054
commit 79f96c2224
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/components/p8p_table.js
View File

@ -747,9 +747,9 @@ const P8PTable = ({
key={`head-cell-${j}`} key={`head-cell-${j}`}
align={getAlignByDataType(columnDef)} align={getAlignByDataType(columnDef)}
sx={{ sx={{
...customRender.cellStyle,
...(columnDef.width ? { minWidth: columnDef.width, maxWidth: columnDef.width } : {}), ...(columnDef.width ? { minWidth: columnDef.width, maxWidth: columnDef.width } : {}),
...(columnDef.fixed ? STYLES.TABLE_HEAD_CELL_STICKY(theme, columnDef.fixedLeft) : {}) ...(columnDef.fixed ? STYLES.TABLE_HEAD_CELL_STICKY(theme, columnDef.fixedLeft) : {}),
...customRender.cellStyle
}} }}
rowSpan={columnDef.rowSpan} rowSpan={columnDef.rowSpan}
colSpan={columnDef.colSpan} colSpan={columnDef.colSpan}
@ -826,11 +826,11 @@ const P8PTable = ({
key={`data-cell-${j}`} key={`data-cell-${j}`}
align={getAlignByDataType(columnDef)} align={getAlignByDataType(columnDef)}
sx={{ sx={{
...customRender.cellStyle,
...(columnDef.width ...(columnDef.width
? { minWidth: columnDef.width, maxWidth: columnDef.width } ? { minWidth: columnDef.width, maxWidth: columnDef.width }
: {}), : {}),
...(columnDef.fixed ? STYLES.TABLE_CELL_STICKY(theme, columnDef.fixedLeft) : {}) ...(columnDef.fixed ? STYLES.TABLE_CELL_STICKY(theme, columnDef.fixedLeft) : {}),
...customRender.cellStyle
}} }}
{...customRender.cellProps} {...customRender.cellProps}
> >