From 79f96c2224f61640fc08c5634bf4b869fd13d63d Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Thu, 9 May 2024 20:37:50 +0300 Subject: [PATCH] =?UTF-8?q?WEB=20APP:=20P8PTable=20-=20=D0=B8=D1=81=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8?= =?UTF-8?q?=D0=B1=D0=BA=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BE=D0=BF=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C?= =?UTF-8?q?=D1=81=D0=BA=D0=BE=D0=B3=D0=BE=20=D1=81=D1=82=D0=B8=D0=BB=D1=8F?= =?UTF-8?q?=20=D1=8F=D1=87=D0=B5=D0=B9=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/p8p_table.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/components/p8p_table.js b/app/components/p8p_table.js index 9d77a0a..43d910b 100644 --- a/app/components/p8p_table.js +++ b/app/components/p8p_table.js @@ -747,9 +747,9 @@ const P8PTable = ({ key={`head-cell-${j}`} align={getAlignByDataType(columnDef)} sx={{ - ...customRender.cellStyle, ...(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} colSpan={columnDef.colSpan} @@ -826,11 +826,11 @@ const P8PTable = ({ key={`data-cell-${j}`} align={getAlignByDataType(columnDef)} sx={{ - ...customRender.cellStyle, ...(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} >