From 3e13e3e61854671fce6aac45679e1b7252126105 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 24 十二月 2023 23:41:01 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/card/data-card/index.jsx | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/card/data-card/index.jsx b/src/menu/components/card/data-card/index.jsx
index 5822912..b16fec5 100644
--- a/src/menu/components/card/data-card/index.jsx
+++ b/src/menu/components/card/data-card/index.jsx
@@ -341,8 +341,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.subtype, card.columns, card.uuid, card.supNodes, card.setting)
+ return getWrapForm(card.wrap, card.subtype, card.columns, card.uuid, card.supNodes, card.setting, buttons)
}
updateWrap = (res) => {
--
Gitblit v1.8.0