From 238987f2d0765dd5d7f5978ed71793632c4eff5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 12 七月 2023 12:06:49 +0800
Subject: [PATCH] 2023-07-12
---
src/menu/components/card/cardcomponent/index.jsx | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index 0d6a97d..2e45d8c 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -157,7 +157,7 @@
const { card, side } = this.state
let _style = null
- let options = ['height', 'background', 'border', 'padding', 'margin', 'shadow']
+ let options = ['height', 'background', 'border', 'padding', 'margin', 'shadow', 'clear']
if (side === 'front') {
_style = card.style ? fromJS(card.style).toJS() : {}
} else if (side === 'back') {
@@ -378,8 +378,16 @@
tablerole = ' mk-table-header'
}
+ let _style_ = null
+
+ if (card.style.clear === 'left') {
+ _style_ = {clear: 'left'}
+ } else if (card.style.clear === 'right') {
+ _style_ = {float: 'right'}
+ }
+
return (
- <Col span={card.setting.width || 6}>
+ <Col span={card.setting.width || 6} style={_style_}>
<div className={'card-item ' + (card.setting.btnControl || '') + checkAll + tablerole} style={_style} onDoubleClick={(e) => {e.stopPropagation(); this.doubleClickCard()}} id={card.uuid}>
<span className="circle-select"></span>
<CardCellComponent cards={cards} cardCell={card} side={side} elements={elements} updateElement={this.updateCard}/>
--
Gitblit v1.8.0