From 326aa6b3effaccc71cfe0775d47b0f29eb3695a6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 25 八月 2024 00:36:40 +0800
Subject: [PATCH] 2024-08-25
---
src/menu/components/group/normal-group/index.jsx | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/menu/components/group/normal-group/index.jsx b/src/menu/components/group/normal-group/index.jsx
index 2786f97..aa41f27 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 {
@@ -136,15 +136,15 @@
if (group.components.length === 0) return
- const _this = this
+ const that = this
confirm({
title: '纭畾閲婃斁鍒嗙粍鍏冪礌鍚楋紵',
content: '',
onOk() {
- _this.props.unGroup(group.uuid)
+ that.props.unGroup(group.uuid)
setTimeout(() => {
- _this.updataGroup()
+ that.updataGroup()
}, 10)
},
onCancel() {}
@@ -178,16 +178,15 @@
<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>
} trigger="hover">
<ToolOutlined />
</Popover>
- {/* {group.setting && group.setting.print === 'true' ? <Button className="print-button" onClick={this.print}><PrinterOutlined /></Button> : null} */}
<GroupComponents config={group} handleList={this.updateComponent} deleteCard={this.deleteCard} />
</div>
)
--
Gitblit v1.8.0