From 50b49c1b760489c3430fc382656d57c5fbbab07c Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 29 四月 2024 16:07:24 +0800 Subject: [PATCH] 2024-04-29 --- src/menu/components/share/actioncomponent/index.jsx | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx index 4029b06..96a9190 100644 --- a/src/menu/components/share/actioncomponent/index.jsx +++ b/src/menu/components/share/actioncomponent/index.jsx @@ -120,7 +120,17 @@ const { card, actionlist } = this.state let _card = fromJS(card).toJS() - _card.style = style + _card.style = fromJS(style).toJS() + + if (_card.style.paddingLeft === '15px') { + delete _card.style.paddingLeft + } + if (_card.style.paddingRight === '15px') { + delete _card.style.paddingRight + } + if (_card.style.minHeight === '28px') { + delete _card.style.minHeight + } let _actionlist = actionlist.map(cell => { if (cell.uuid === _card.uuid) return _card @@ -137,6 +147,10 @@ changeBtnStyle = (element) => { let _style = element.style ? fromJS(element.style).toJS() : {} let options = ['font', 'border', 'background', 'margin', 'padding', 'minHeight'] + + _style.paddingLeft = _style.paddingLeft || '15px' + _style.paddingRight = _style.paddingRight || '15px' + _style.minHeight = _style.minHeight || '28px' this.setState({ card: element @@ -718,6 +732,7 @@ destroyOnClose > <ActionForm + type={config.type === 'tree' ? 'card' : ''} card={card} formlist={this.state.formlist} inputSubmit={this.handleSubmit} -- Gitblit v1.8.0