From 32b84012bb8e2f05295c4237d17224700b149c8f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 十二月 2020 16:33:27 +0800
Subject: [PATCH] merge 2020-12-31
---
src/menu/components/card/data-card/index.jsx | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/card/data-card/index.jsx b/src/menu/components/card/data-card/index.jsx
index aec0a96..ff1bd6f 100644
--- a/src/menu/components/card/data-card/index.jsx
+++ b/src/menu/components/card/data-card/index.jsx
@@ -17,6 +17,8 @@
const WrapComponent = asyncIconComponent(() => import('./wrapsetting'))
const CardComponent = asyncComponent(() => import('../cardcomponent'))
const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
+const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
+const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
const ActionComponent = asyncComponent(() => import('@/menu/components/share/actioncomponent'))
@@ -374,13 +376,15 @@
}
return (
- <div className="menu-data-card-edit-box" style={{...card.style, minHeight: card.wrap.minHeight}}>
+ <div className="menu-data-card-edit-box" style={{...card.style}}>
<NormalHeader defaultshow="hidden" config={card} updateComponent={this.updateComponent}/>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<Icon className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch} type="plus-circle" />
<Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" />
<WrapComponent config={card} updateConfig={this.updateComponent} />
+ <CopyComponent type="datacard" card={card}/>
+ <PasteComponent config={card} options={['action', 'search', 'form']} updateConfig={this.updateComponent} />
<Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
<LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} />
<Icon className="close" title="鍒犻櫎缁勪欢" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
--
Gitblit v1.8.0