From 5df578ff69f6b02e821d59a8883bc75d78695a62 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 十一月 2020 11:07:31 +0800
Subject: [PATCH] 2020-11-10
---
src/menu/menushell/index.jsx | 99 +++++++++++++++++++++++++++++++++----------------
1 files changed, 66 insertions(+), 33 deletions(-)
diff --git a/src/menu/menushell/index.jsx b/src/menu/menushell/index.jsx
index 81e2bbb..382b732 100644
--- a/src/menu/menushell/index.jsx
+++ b/src/menu/menushell/index.jsx
@@ -2,15 +2,15 @@
import { useDrop } from 'react-dnd'
import { is, fromJS } from 'immutable'
import update from 'immutability-helper'
-import { Empty, notification } from 'antd'
+import { Empty, notification, Modal } from 'antd'
import Utils from '@/utils/utils.js'
import Card from './card'
import './index.scss'
-const Container = ({menu, handleList, deleteCard, doubleClickCard }) => {
- let target = null
+const { confirm } = Modal
+const Container = ({menu, handleList }) => {
const [cards, setCards] = useState(menu.components)
const moveCard = (id, atIndex) => {
const { card, index } = findCard(id)
@@ -30,18 +30,37 @@
}
}
- const hasDrop = (item) => {
- target = item
- }
-
const updateConfig = (element) => {
handleList({...menu, components: cards.map(item => item.uuid === element.uuid ? element : item)})
+ }
+
+ const deleteCard = (id) => {
+ const { card } = findCard(id)
+
+ let hasComponent = false
+ if (card.type === 'tabs') {
+ card.subtabs.forEach(tab => {
+ if (tab.components.length > 0) {
+ hasComponent = true
+ }
+ })
+ }
+
+ confirm({
+ title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋,
+ content: hasComponent ? '褰撳墠缁勪欢涓惈鏈夊瓙缁勪欢锛�' : '',
+ onOk() {
+ handleList({...menu, components: cards.filter(item => item.uuid !== card.uuid)})
+ },
+ onCancel() {}
+ })
}
const [, drop] = useDrop({
accept: 'menu',
drop(item) {
if (item.hasOwnProperty('originalIndex') || item.added) {
+ delete item.added // 鍒犻櫎缁勪欢娣诲姞鏍囪
return
}
if (item.component === 'search') { // 鎼滅储缁勪欢涓嶅彲閲嶅娣诲姞
@@ -59,59 +78,73 @@
let names = {
bar: '鏌辩姸鍥�',
line: '鎶樼嚎鍥�',
- tabs: '鏍囩缁�'
+ tabs: '鏍囩缁�',
+ pie: '楗煎浘',
+ search: '鎼滅储',
+ table: '琛ㄦ牸',
+ card: '鍗＄墖'
}
let i = 1
while (!name && names[item.component]) {
let _name = names[item.component] + i
- if (menu.components.filter(com => com.setting && com.setting.name === _name).length === 0) {
+ if (menu.components.filter(com => com.name === _name).length === 0) {
name = _name
}
i++
+ }
+
+ let dataName = ''
+ while (!dataName) {
+ let _dataName = Utils.getdataName()
+ if (menu.components.filter(com => com.dataName === _dataName).length === 0) {
+ dataName = _dataName
+ }
}
let newcard = {
uuid: Utils.getuuid(),
type: item.component,
subtype: item.subtype,
+ config: item.config,
+ width: item.width || 24,
+ dataName: dataName,
+ name: name,
floor: 1, // 缁勪欢鐨勫眰绾�
isNew: true // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
}
- let targetId = cards.length > 0 ? cards[cards.length - 1].uuid : 0
- if (target) {
- targetId = target.uuid
+ let targetId = ''
+
+ if (item.dropTargetId) {
+ targetId = item.dropTargetId
+ delete item.dropTargetId
+ } else if (cards.length > 0) {
+ targetId = cards[cards.length - 1].uuid
}
const { index: overIndex } = findCard(`${targetId}`)
- let targetIndex = overIndex
-
- targetIndex++
-
- const _cards = update(cards, { $splice: [[targetIndex, 0, newcard]] })
+ const _cards = update(cards, { $splice: [[overIndex + 1, 0, newcard]] })
handleList({...menu, components: _cards})
- target = null
}
})
return (
- <div ref={drop} className="ant-row menu-shell-inner">
- {cards.map(card => (
- <Card
- id={card.uuid}
- key={card.uuid}
- menu={menu}
- card={card}
- moveCard={moveCard}
- delCard={deleteCard}
- findCard={findCard}
- hasDrop={hasDrop}
- updateConfig={updateConfig}
- doubleClickCard={doubleClickCard}
- />
- ))}
+ <div ref={drop} className="menu-shell-inner" id="menu-shell-inner" style={menu.style}>
+ <div className="ant-row">
+ {cards.map(card => (
+ <Card
+ id={card.uuid}
+ key={card.uuid}
+ card={card}
+ moveCard={moveCard}
+ delCard={deleteCard}
+ findCard={findCard}
+ updateConfig={updateConfig}
+ />
+ ))}
+ </div>
{cards.length === 0 ?
<Empty description="璇锋坊鍔犵粍浠�" /> : null
}
--
Gitblit v1.8.0