From 474c68f0fea10cc62977c67d186732b3346cdd53 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 一月 2023 18:04:45 +0800
Subject: [PATCH] 2023-01-17
---
src/menu/components/card/cardsimplecomponent/index.jsx | 56 +++++++++++++++++++++++++++-----------------------------
1 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/src/menu/components/card/cardsimplecomponent/index.jsx b/src/menu/components/card/cardsimplecomponent/index.jsx
index 1edd5d7..cf6e1d3 100644
--- a/src/menu/components/card/cardsimplecomponent/index.jsx
+++ b/src/menu/components/card/cardsimplecomponent/index.jsx
@@ -212,7 +212,7 @@
let _style = {...card.style}
if (cards.type === 'carousel') {
- _style.height = cards.style.height
+ _style.height = cards.wrap.height
}
let control = true
@@ -223,34 +223,32 @@
_style = resetStyle(_style)
return (
- <div className="ant-col ant-col-24">
- <div className="card-item" style={_style}>
- <CardCellComponent cards={cards} cardCell={card} elements={card.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">
- <PlusOutlined className="plus" title="娣诲姞鍏冪礌" onClick={this.addElement}/>
- <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton}/>
- {cards.type !== 'timeline' ? <NormalForm title="鍗＄墖璁剧疆" width={800} update={this.updateSetting} getForms={this.getSettingForms}>
- <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
- </NormalForm> : <NodesWrap card={card} updateMenus={this.updateNodes}/>}
- {cards.type !== 'timeline' ? <CopyComponent type="cardcell" card={card}/> : null}
- <PasteController options={['action', 'customCardElement']} updateConfig={this.paste} />
- <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
- {control ? <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
- <div className="mk-popover-control">
- <ArrowLeftOutlined className="plus" title="鍓嶇Щ" onClick={() => this.props.move(card, 'left')} />
- <ArrowRightOutlined className="close" title="鍚庣Щ" onClick={() => this.props.move(card, 'right')} />
- </div>
- } trigger="hover" getPopupContainer={() => document.getElementById(card.uuid + 'swap')}>
- <SwapOutlined id={card.uuid + 'swap'}/>
- </Popover> : null}
- {control ? <DeleteOutlined className="close" title="鍒犻櫎鍗＄墖" onClick={() => this.props.deleteElement(card)} /> : null}
- </div>
- } trigger="hover">
- <ToolOutlined/>
- </Popover>
- </div>
+ <div className="card-item" style={_style}>
+ <CardCellComponent cards={cards} cardCell={card} elements={card.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">
+ <PlusOutlined className="plus" title="娣诲姞鍏冪礌" onClick={this.addElement}/>
+ <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton}/>
+ {cards.type !== 'timeline' ? <NormalForm title="鍗＄墖璁剧疆" width={800} update={this.updateSetting} getForms={this.getSettingForms}>
+ <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
+ </NormalForm> : <NodesWrap card={card} updateMenus={this.updateNodes}/>}
+ {cards.type !== 'timeline' ? <CopyComponent type="cardcell" card={card}/> : null}
+ <PasteController options={['action', 'customCardElement']} updateConfig={this.paste} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
+ {control ? <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+ <div className="mk-popover-control">
+ <ArrowLeftOutlined className="plus" title="鍓嶇Щ" onClick={() => this.props.move(card, 'left')} />
+ <ArrowRightOutlined className="close" title="鍚庣Щ" onClick={() => this.props.move(card, 'right')} />
+ </div>
+ } trigger="hover" getPopupContainer={() => document.getElementById(card.uuid + 'swap')}>
+ <SwapOutlined id={card.uuid + 'swap'}/>
+ </Popover> : null}
+ {control ? <DeleteOutlined className="close" title="鍒犻櫎鍗＄墖" onClick={() => this.props.deleteElement(card)} /> : null}
+ </div>
+ } trigger="hover">
+ <ToolOutlined/>
+ </Popover>
</div>
</div>
)
--
Gitblit v1.8.0