From cbeffcc0902631909c0373f274752a97ddaf2d4e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 06 八月 2022 01:41:54 +0800
Subject: [PATCH] 2022-08-06
---
src/menu/components/card/prop-card/index.jsx | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/card/prop-card/index.jsx b/src/menu/components/card/prop-card/index.jsx
index 9e382eb..257fe0b 100644
--- a/src/menu/components/card/prop-card/index.jsx
+++ b/src/menu/components/card/prop-card/index.jsx
@@ -574,7 +574,9 @@
}
updateWrap = (res) => {
- let _card = {...this.state.card, wrap: res}
+ const { card } = this.state
+
+ let _card = {...card, wrap: res}
if (res.datatype === 'static') {
if (res.supModule && res.supModule.length > 0) {
@@ -587,7 +589,26 @@
_card.wrap.pagestyle = 'page'
}
- this.updateComponent(_card)
+ if (res.selStyle === 'tabs' && card.wrap.selStyle !== 'tabs') {
+ Object.keys(_card.style).forEach(key => {
+ if (/^border/.test(key)) {
+ delete _card.style[key]
+ }
+ })
+ _card.style.borderBottomColor = '#eeeeee'
+ _card.style.borderBottomWidth = '1px'
+ _card.style.paddingBottom = '0px'
+
+ _card.subcards.forEach(item => {
+ delete item.style.marginBottom
+ })
+
+ this.setState({card: {..._card, subcards: []}}, () => {
+ this.updateComponent(_card)
+ })
+ } else {
+ this.updateComponent(_card)
+ }
}
clickComponent = (e) => {
@@ -624,7 +645,7 @@
} trigger="hover">
<ToolOutlined />
</Popover>
- <div className={(card.wrap.layout || 'grid') + '-layout float-' + (card.wrap.cardFloat || 'left')}>
+ <div className={(card.wrap.layout || 'grid') + '-layout float-' + (card.wrap.cardFloat || 'left') + ' select-' + card.wrap.selStyle}>
{card.subcards.map(subcard => (<CardComponent key={subcard.uuid} cards={card} card={subcard} move={this.move} updateElement={this.updateCard} deleteElement={this.deleteCard}/>))}
</div>
<div className="component-name">
--
Gitblit v1.8.0