From f8c3c53f9e29541f8c0e3fcbf682c301fd17e06a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 23 十一月 2020 17:49:23 +0800
Subject: [PATCH] 2020-11-23
---
src/templates/menuconfig/editfirstmenu/dragelement/index.jsx | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/templates/headerconfig/dragelement/index.jsx b/src/templates/menuconfig/editfirstmenu/dragelement/index.jsx
similarity index 72%
rename from src/templates/headerconfig/dragelement/index.jsx
rename to src/templates/menuconfig/editfirstmenu/dragelement/index.jsx
index 365437c..bf3872f 100644
--- a/src/templates/headerconfig/dragelement/index.jsx
+++ b/src/templates/menuconfig/editfirstmenu/dragelement/index.jsx
@@ -1,6 +1,7 @@
import React, { useState } from 'react'
import { useDrop } from 'react-dnd'
import { Icon, Button } from 'antd'
+import { is, fromJS } from 'immutable'
import update from 'immutability-helper'
import Card from './card'
import ItemTypes from './itemtypes'
@@ -15,8 +16,12 @@
handlePreviewList(_cards)
}
+ if (!is(fromJS(cards), fromJS(list))) {
+ setCards(list)
+ }
+
const findCard = id => {
- const card = cards.filter(c => `${c.id}` === id)[0]
+ const card = cards.filter(c => c.MenuID === id)[0]
return {
card,
index: cards.indexOf(card),
@@ -58,23 +63,21 @@
<div ref={drop} className="dragdashboard">
{cards.map(card => (
<Card
- key={card.id}
- id={`${card.id}`}
- text={card.text}
+ key={card.MenuID}
+ id={`${card.MenuID}`}
+ text={card.MenuName}
moveCard={moveCard}
editCard={editCard}
delCard={delCard}
findCard={findCard}
/>
))}
- <div className="btn-group">
- <div className="card-add" onClick={add}>
- <Icon type="plus" />
- </div>
- <Button type="primary" onClick={thawmenu}>{dict['model.thaw'] + dict['model.menu']}</Button>
- <Button type="primary" onClick={confirm}>{dict['model.confirm']}</Button>
- <Button onClick={cancel}>{dict['model.close']}</Button>
+ <div className="card-add" onClick={add}>
+ <Icon type="plus" />
</div>
+ <Button type="primary" onClick={thawmenu}>{dict['model.thaw'] + dict['model.menu']}</Button>
+ <Button type="primary" onClick={confirm}>{dict['model.confirm']}</Button>
+ <Button onClick={cancel}>{dict['model.close']}</Button>
</div>
)
}
--
Gitblit v1.8.0