From 0227c25e4ed573d3095ada3f9c9a4ba5f18b0de5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 20 一月 2021 10:53:01 +0800
Subject: [PATCH] 2021-01-20
---
src/menu/menushell/index.jsx | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/menu/menushell/index.jsx b/src/menu/menushell/index.jsx
index 2656df8..cb51df3 100644
--- a/src/menu/menushell/index.jsx
+++ b/src/menu/menushell/index.jsx
@@ -5,6 +5,8 @@
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 Card from './card'
import './index.scss'
@@ -46,10 +48,13 @@
})
}
+ let uuids = MenuUtils.getDelButtonIds(card)
+
confirm({
title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋,
content: hasComponent ? '褰撳墠缁勪欢涓惈鏈夊瓙缁勪欢锛�' : '',
onOk() {
+ MKEmitter.emit('delButtons', uuids)
handleList({...menu, components: cards.filter(item => item.uuid !== card.uuid)})
},
onCancel() {}
@@ -63,6 +68,7 @@
delete item.added // 鍒犻櫎缁勪欢娣诲姞鏍囪
return
}
+
if (item.component === 'search') { // 鎼滅储缁勪欢涓嶅彲閲嶅娣诲姞
if (cards.filter(card => card.type === 'search').length > 0) {
notification.warning({
@@ -81,6 +87,10 @@
tabs: '鏍囩缁�',
pie: '楗煎浘',
search: '鎼滅储',
+ table: '琛ㄦ牸',
+ group: '鍒嗙粍',
+ editor: '瀵屾枃鏈�',
+ code: '鑷畾涔�',
card: '鍗＄墖'
}
let i = 1
@@ -99,6 +109,7 @@
subtype: item.subtype,
config: item.config,
width: item.width || 24,
+ dataName: Utils.getdataName(),
name: name,
floor: 1, // 缁勪欢鐨勫眰绾�
isNew: true // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
@@ -110,7 +121,7 @@
targetId = item.dropTargetId
delete item.dropTargetId
} else if (cards.length > 0) {
- targetId = cards[cards.length - 1].uuid
+ targetId = cards.slice(-1)[0].uuid
}
const { index: overIndex } = findCard(`${targetId}`)
@@ -121,7 +132,7 @@
})
return (
- <div ref={drop} className="menu-shell-inner" style={menu.style}>
+ <div ref={drop} className="menu-shell-inner" id="menu-shell-inner" style={menu.style}>
<div className="ant-row">
{cards.map(card => (
<Card
--
Gitblit v1.8.0