From 5cfe6db94c1449810a44660b299dba8e7e98e5c5 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 10 六月 2021 14:43:39 +0800 Subject: [PATCH] 2021-06-10 --- src/pc/menushell/index.jsx | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/pc/menushell/index.jsx b/src/pc/menushell/index.jsx index 7dac00b..acc2b18 100644 --- a/src/pc/menushell/index.jsx +++ b/src/pc/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) => { @@ -51,11 +53,13 @@ let uuids = MenuUtils.getDelButtonIds(card) confirm({ - title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋, + title: `纭畾鍒犻櫎${card.name ? `銆�${card.name}銆媊 : '缁勪欢'}鍚楋紵`, content: hasComponent ? '褰撳墠缁勪欢涓惈鏈夊瓙缁勪欢锛�' : '', onOk() { MKEmitter.emit('delButtons', uuids) - handleList({...menu, components: cards.filter(item => item.uuid !== card.uuid)}) + const _cards = cards.filter(item => item.uuid !== card.uuid) + handleList({...menu, components: _cards}) + setCards(_cards) }, onCancel() {} }) @@ -102,7 +106,10 @@ code: '鑷畾涔�', navbar: '瀵艰埅鏍�', carousel: '杞挱', - card: '鍗$墖' + dashboard: '浠〃鐩�', + tree: '鏍戝舰鍒楄〃', + card: '鍗$墖', + login: '鐧诲綍' } let i = 1 @@ -139,6 +146,7 @@ const _cards = update(cards, { $splice: [[overIndex + 1, 0, newcard]] }) handleList({...menu, components: _cards}) + setCards(_cards) } }) -- Gitblit v1.8.0