From 5902ba5c3ff85efc78c95364196cd6ab5d2d1601 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 11 十月 2020 12:21:17 +0800
Subject: [PATCH] 2020-10-11

---
 src/menu/components/card/cardcomponent/index.jsx |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index 3fa532f..cc22efb 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -153,7 +153,7 @@
     newcard.Ot = 'requiredSgl'
     newcard.OpenType = 'prompt'
     newcard.icon = ''
-    newcard.class = 'default'
+    newcard.class = 'primary'
     newcard.intertype = 'system'
     newcard.method = 'POST'
     newcard.execSuccess = 'grid'
@@ -177,7 +177,7 @@
       _style = card.style ? fromJS(card.style).toJS() : {}
     } else if (side === 'back') {
       _style = card.backStyle ? fromJS(card.backStyle).toJS() : {}
-      options = ['background', 'border', 'padding', 'margin']
+      options = ['background', 'padding']
     }
 
     MKEmitter.emit('changeStyle', [cards.uuid, card.uuid], options, _style)
@@ -214,7 +214,7 @@
 
     return (
       <div className={'ant-col card-item ant-col-' + (card.setting.width || 6)} style={_style}>
-        <CardCellComponent cards={cards} card={card} elements={elements} updateElement={this.updateCard}/>
+        <CardCellComponent cards={cards} cardCell={card} side={side} elements={elements} updateElement={this.updateCard}/>
         <div className="card-control">
           <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
             <div className="mk-popover-control">
@@ -222,8 +222,8 @@
               <Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" />
               <Icon className="edit" type="edit" onClick={() => this.setState({settingVisible: true})} />
               <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
-              {card.setting.type === 'multi' ? <Switch size="small" onClick={this.changeSide} defaultChecked /> : null}
               <Icon className="close" title="鍒犻櫎鍗$墖" type="delete" onClick={() => this.props.deleteElement(card)} />
+              {card.setting.type === 'multi' ? <Switch size="small" onClick={this.changeSide} defaultChecked /> : null}
             </div>
           } trigger="hover">
             <Icon type="tool" />

--
Gitblit v1.8.0