From 43008f1240d6568a3364721bb01fc7e31b33d147 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 24 十二月 2023 23:39:51 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/group/normal-group/index.jsx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/group/normal-group/index.jsx b/src/menu/components/group/normal-group/index.jsx
index ae1d50b..e26fb57 100644
--- a/src/menu/components/group/normal-group/index.jsx
+++ b/src/menu/components/group/normal-group/index.jsx
@@ -15,7 +15,7 @@
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
-const PasteComponent = asyncIconComponent(() => import('../paste'))
+const PasteController = asyncIconComponent(() => import('@/menu/pastecontroller'))
const GroupComponents = asyncComponent(() => import('../groupcomponents'))
class NormalGroup extends Component {
@@ -178,9 +178,9 @@
<NormalForm title="鍒嗙粍璁剧疆" width={700} update={this.updateWrap} getForms={this.getWrapForms}>
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
- <CopyComponent type="tabs" card={group}/>
+ <CopyComponent type="group" card={group}/>
<UngroupOutlined title="閲婃斁" style={group.components.length > 0 ? {color: '#32c5d2'} : {color: '#eeeeee', cursor: 'not-allowed'}} onClick={this.unGroup}/>
- <PasteComponent insert={this.insert} />
+ <PasteController type="group" tab={group} insert={this.insert} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<DeleteOutlined className="close" title="delete" onClick={() => this.props.deletecomponent(group.uuid)} />
</div>
--
Gitblit v1.8.0