From 80e0c5eb7648e77cae844e4628b433704e0fb865 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 22 二月 2023 00:21:07 +0800
Subject: [PATCH] 2023-02-22
---
src/menu/components/card/double-data-card/index.jsx | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/card/double-data-card/index.jsx b/src/menu/components/card/double-data-card/index.jsx
index 98cddef..32dd303 100644
--- a/src/menu/components/card/double-data-card/index.jsx
+++ b/src/menu/components/card/double-data-card/index.jsx
@@ -82,7 +82,7 @@
borderRightWidth: '1px', borderRightColor: '#e8e8e8',
borderBottomWidth: '1px', borderBottomColor: '#e8e8e8',
paddingTop: '15px', paddingBottom: '15px', paddingLeft: '15px', paddingRight: '15px',
- marginLeft: '8px', marginRight: '8px', marginBottom: '8px'
+ marginLeft: '8px', marginRight: '8px'
},
backElements: [{
uuid: Utils.getuuid(),
@@ -584,6 +584,14 @@
let _style = resetStyle(card.style)
+ let extraName = ''
+ card.subcards.forEach(subcard => {
+ if (subcard.$cardType === 'extendCard') return
+ if (subcard.setting.controlIcon === 'left') {
+ extraName = ' mk-control-icon'
+ }
+ })
+
return (
<div className={'menu-double-data-card-edit-box ' + appType} style={_style} onClick={this.clickComponent} id={card.uuid}>
<NormalHeader config={card} updateComponent={this.updateComponent}/>
@@ -607,7 +615,7 @@
<ToolOutlined />
</Popover>
<ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
- <div className={'float-' + (card.wrap.cardFloat || 'left') + ' select-' + card.wrap.selStyle}>
+ <div className={'select-' + card.wrap.selStyle + extraName}>
{card.subcards.map(subcard => {
if (subcard.$cardType === 'extendCard') {
return (<CardComponent key={subcard.uuid} cards={card} card={subcard} move={this.move} updateElement={this.updateCard} deleteElement={this.deleteCard}/>)
--
Gitblit v1.8.0