From f3ec8c20eeabee6eaab1508d2f3896c28aab611c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 七月 2021 14:42:42 +0800
Subject: [PATCH] 修改页面中按钮保存

---
 src/menu/components/group/groupcomponents/index.jsx |   44 ++++++--------------------------------------
 1 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/src/menu/components/group/groupcomponents/index.jsx b/src/menu/components/group/groupcomponents/index.jsx
index b35112f..ac14bfa 100644
--- a/src/menu/components/group/groupcomponents/index.jsx
+++ b/src/menu/components/group/groupcomponents/index.jsx
@@ -6,6 +6,7 @@
 
 import Utils from '@/utils/utils.js'
 import MKEmitter from '@/utils/events.js'
+import MenuUtils from '@/utils/utils-custom.js'
 import Card from './card'
 import './index.scss'
 
@@ -38,49 +39,16 @@
   const deleteCard = (id) => {
     const { card } = findCard(id)
 
-    let uuids = []
-    if (card.action && card.action.length) {
-      card.action.forEach(act => {
-        if (!act.origin) {
-          uuids.push(act.uuid)
-        }
-      })
-    }
-    if (card.type === 'card') {
-      card.subcards.forEach(_card => {
-        _card.elements && _card.elements.forEach(cell => {
-          if (cell.eleType === 'button') {
-            uuids.push(cell.uuid)
-          }
-        })
-        _card.backElements && _card.backElements.forEach(cell => {
-          if (cell.eleType === 'button') {
-            uuids.push(cell.uuid)
-          }
-        })
-      })
-    } else if (card.type === 'table' && card.subtype === 'tablecard') {
-      card.subcards.forEach(_card => {
-        _card.elements && _card.elements.forEach(cell => {
-          if (cell.eleType === 'button') {
-            uuids.push(cell.uuid)
-          }
-        })
-      })
-    } else if (card.type === 'table' && card.subtype === 'normaltable') {
-      card.cols && card.cols.forEach(col => {
-        if (col.type !== 'action') return
-        col.elements && col.elements.forEach(cell => {
-          uuids.push(cell.uuid)
-        })
-      })
-    }
+    let uuids = MenuUtils.getDelButtonIds(card)
 
     confirm({
       title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋,
       onOk() {
-        MKEmitter.emit('delButtons', uuids)
         handleList({...config, components: cards.filter(item => item.uuid !== card.uuid)})
+
+        if (uuids.length === 0) return
+
+        MKEmitter.emit('delButtons', uuids)
       },
       onCancel() {}
     })

--
Gitblit v1.8.0