From 06a670976e2145a10ea05207041d3cf3164cd380 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 18:13:25 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/menu/components/card/double-data-card/index.jsx | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/card/double-data-card/index.jsx b/src/menu/components/card/double-data-card/index.jsx
index 81cf755..cedcc93 100644
--- a/src/menu/components/card/double-data-card/index.jsx
+++ b/src/menu/components/card/double-data-card/index.jsx
@@ -331,8 +331,30 @@
getWrapForms = () => {
const { card } = this.state
+
+ let buttons = []
+
+ card.action && card.action.forEach(n => {
+ buttons.push({
+ value: n.uuid,
+ label: n.label
+ })
+ })
+
+ card.subcards.forEach(m => {
+ if (m.$cardType !== 'extendCard') return
+
+ m.elements.forEach(n => {
+ if (n.eleType === 'button') {
+ buttons.push({
+ value: n.uuid,
+ label: n.label
+ })
+ }
+ })
+ })
- return getWrapForm(card.wrap, card.columns, card.setting)
+ return getWrapForm(card.wrap, card.columns, card.setting, buttons)
}
updateWrap = (res) => {
@@ -501,7 +523,7 @@
<NormalForm title="鍙岄噸鏁版嵁鍗¤缃�" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
- <CopyComponent type="datacard" card={card}/>
+ <CopyComponent type="doublecard" card={card}/>
<PasteComponent options={['action', 'search', 'form', 'cardcell']} updateConfig={this.pasteComponent} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<ClockComponent config={card} updateConfig={this.updateComponent}/>
--
Gitblit v1.8.0