From 9a11e62adeb8d435b52a361eb62d5b59e1deef2a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 23 五月 2024 21:14:50 +0800
Subject: [PATCH] 2024-05-23
---
src/menu/components/share/actioncomponent/index.jsx | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index f0c909a..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
@@ -285,12 +299,17 @@
output: 'true',
required: 'false',
type: 'text',
+ noValue: 'true',
uuid: Utils.getuuid()
}
if (item.type === 'number') {
cell.type = 'number'
cell.decimal = item.decimal
+
+ if (item.noValue === 'hide') {
+ cell.noValue = 'false'
+ }
}
columns.push(cell)
@@ -713,6 +732,7 @@
destroyOnClose
>
<ActionForm
+ type={config.type === 'tree' ? 'card' : ''}
card={card}
formlist={this.state.formlist}
inputSubmit={this.handleSubmit}
--
Gitblit v1.8.0