From a4ef35bb323b5f8300f15a4eb604d61ff39a194a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 十二月 2020 17:35:39 +0800
Subject: [PATCH] 2020-12-17
---
src/menu/components/card/prop-card/index.jsx | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/card/prop-card/index.jsx b/src/menu/components/card/prop-card/index.jsx
index 0bf9bf8..a089c19 100644
--- a/src/menu/components/card/prop-card/index.jsx
+++ b/src/menu/components/card/prop-card/index.jsx
@@ -82,7 +82,7 @@
name: card.name,
subtype: card.subtype,
setting: { interType: 'system' },
- wrap: { name: card.name, width: 24, title: '', addable: 'false', switch: 'false', datatype: 'dynamic' },
+ wrap: { name: card.name, width: 24, title: '', addable: 'false', switch: 'false', datatype: 'static' },
style: { marginLeft: '0px', marginRight: '0px', marginTop: '8px', marginBottom: '8px' },
headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
columns: [],
@@ -226,6 +226,18 @@
const { menu } = this.props
const { card } = this.state
+ let offset = 0
+ if (card.wrap.cardFloat && card.wrap.cardFloat !== 'left') {
+ let _width = 0
+ card.subcards.forEach(card => {
+ _width += card.setting.width
+ })
+ offset = _width < 24 ? 24 - _width : 0
+ if (card.wrap.cardFloat === 'center') {
+ offset = Math.floor(offset / 2)
+ }
+ }
+
return (
<div className="menu-prop-card-edit-box" style={{...card.style, minHeight: card.wrap.minHeight}}>
<NormalHeader defaultshow="hidden" config={card} updateComponent={this.updateComponent}/>
@@ -240,7 +252,7 @@
} trigger="hover">
<Icon type="tool" />
</Popover>
- {card.subcards.map(subcard => (<CardComponent key={subcard.uuid} MenuType={menu ? menu.MenuType : ''} cards={card} card={subcard} updateElement={this.updateCard} deleteElement={this.deleteCard}/>))}
+ {card.subcards.map((subcard, index) => (<CardComponent key={subcard.uuid} offset={!index ? offset : 0} MenuType={menu ? menu.MenuType : ''} cards={card} card={subcard} updateElement={this.updateCard} deleteElement={this.deleteCard}/>))}
</div>
)
}
--
Gitblit v1.8.0