From ecbe0dc46ce2b8f607b9afd063104adeb7f10fe8 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 30 三月 2021 15:19:31 +0800 Subject: [PATCH] 2021-03-30 --- src/pc/menushell/index.jsx | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/pc/menushell/index.jsx b/src/pc/menushell/index.jsx index 714e6c9..29be748 100644 --- a/src/pc/menushell/index.jsx +++ b/src/pc/menushell/index.jsx @@ -1,12 +1,11 @@ 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' import Utils from '@/utils/utils.js' import MKEmitter from '@/utils/events.js' -import MenuUtils from '@/menu/utils/menuUtils.js' +import MenuUtils from '@/utils/utils-custom.js' import Card from './card' import './index.scss' @@ -18,10 +17,7 @@ const { card, index } = findCard(id) const _cards = update(cards, { $splice: [[index, 1], [atIndex, 0, card]] }) handleList({...menu, components: _cards}) - } - - if (!is(fromJS(cards), fromJS(menu.components))) { - setCards(menu.components) + setCards(_cards) } const findCard = id => { @@ -33,7 +29,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) => { @@ -55,7 +53,9 @@ 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() {} }) @@ -101,6 +101,7 @@ editor: '瀵屾枃鏈�', code: '鑷畾涔�', navbar: '瀵艰埅鏍�', + carousel: '杞挱', card: '鍗$墖' } let i = 1 @@ -138,6 +139,7 @@ const _cards = update(cards, { $splice: [[overIndex + 1, 0, newcard]] }) handleList({...menu, components: _cards}) + setCards(_cards) } }) -- Gitblit v1.8.0