From 876a5e6657d67df66bb525d02dd6d147ba81cae5 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 05 一月 2023 09:53:37 +0800 Subject: [PATCH] 2023-01-05 --- src/tabviews/custom/components/share/normalTable/index.jsx | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx index 34e9aad..7cb3013 100644 --- a/src/tabviews/custom/components/share/normalTable/index.jsx +++ b/src/tabviews/custom/components/share/normalTable/index.jsx @@ -385,7 +385,10 @@ <CardCellComponent data={record} cards={config} elements={col.elements}/> ) } else if (col.type === 'action') { - style.padding = '0px 5px' + style.padding = '0px' + if (col.style) { + style = {...style, ...col.style} + } resProps.children = ( <CardCellComponent data={record} cards={config} elements={col.elements}/> ) @@ -960,7 +963,7 @@ let height = setting.height || false return ( - <div className={`normal-custom-table ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''}`} id={tableId}> + <div className={`normal-custom-table ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || ''}`} id={tableId}> {(setting.tableType === 'radio' || setting.tableType === 'checkbox') && data && data.length > 0 ? <Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /> : null } -- Gitblit v1.8.0