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/menushell/index.jsx |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/menu/menushell/index.jsx b/src/menu/menushell/index.jsx
index 05c87c4..7e03f6c 100644
--- a/src/menu/menushell/index.jsx
+++ b/src/menu/menushell/index.jsx
@@ -1,6 +1,5 @@
 import React, { useState } from 'react'
 import { useDrop } from 'react-dnd'
-import { is, fromJS } from 'immutable'
 import update from 'immutability-helper'
 import { Empty, notification, Modal } from 'antd'
 
@@ -18,9 +17,10 @@
     const { card, index } = findCard(id)
     const _cards = update(cards, { $splice: [[index, 1], [atIndex, 0, card]] })
     handleList({...menu, components: _cards})
+    setCards(_cards)
   }
 
-  if (!is(fromJS(cards), fromJS(menu.components))) {
+  if (menu.components.length > cards.length) {
     setCards(menu.components)
   }
   
@@ -33,7 +33,9 @@
   }
 
   const updateConfig = (element) => {
-    handleList({...menu, components: cards.map(item => item.uuid === element.uuid ? element : item)})
+    const _cards = cards.map(item => item.uuid === element.uuid ? element : item)
+    handleList({...menu, components: _cards})
+    setCards(_cards)
   }
 
   const deleteCard = (id) => {
@@ -54,8 +56,13 @@
       title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋,
       content: hasComponent ? '褰撳墠缁勪欢涓惈鏈夊瓙缁勪欢锛�' : '',
       onOk() {
+        const _cards = cards.filter(item => item.uuid !== card.uuid)
+        handleList({...menu, components: _cards})
+        setCards(_cards)
+
+        if (uuids.length === 0) return
+        
         MKEmitter.emit('delButtons', uuids)
-        handleList({...menu, components: cards.filter(item => item.uuid !== card.uuid)})
       },
       onCancel() {}
     })
@@ -93,6 +100,10 @@
         code: '鑷畾涔�',
         carousel: '杞挱',
         form: '琛ㄥ崟',
+        dashboard: '浠〃鐩�',
+        scatter: '鏁g偣鍥�',
+        tree: '鏍戝舰鍒楄〃',
+        balcony: '娴姩鍗�',
         card: '鍗$墖'
       }
       let i = 1
@@ -130,6 +141,7 @@
       const _cards = update(cards, { $splice: [[overIndex + 1, 0, newcard]] })
 
       handleList({...menu, components: _cards})
+      setCards(_cards)
     }
   })
 

--
Gitblit v1.8.0