From c98e45bfac25e9110ad0383faac54a54d98ea9d5 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 18 十一月 2021 20:47:04 +0800 Subject: [PATCH] 2021-11-18 --- src/menu/components/tabs/tabcomponents/index.jsx | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/src/menu/components/tabs/tabcomponents/index.jsx b/src/menu/components/tabs/tabcomponents/index.jsx index e0f397d..bc80a38 100644 --- a/src/menu/components/tabs/tabcomponents/index.jsx +++ b/src/menu/components/tabs/tabcomponents/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 '@/utils/utils-custom.js' import Card from './card' import './index.scss' @@ -46,11 +48,17 @@ }) } + let uuids = MenuUtils.getDelButtonIds(card) + confirm({ title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋, content: hasComponent ? '褰撳墠缁勪欢涓惈鏈夊瓙缁勪欢锛�' : '', onOk() { handleList({...config, components: cards.filter(item => item.uuid !== card.uuid)}) + + if (uuids.length === 0) return + + MKEmitter.emit('delButtons', uuids) }, onCancel() {} }) @@ -61,7 +69,10 @@ drop(item) { if (item.hasOwnProperty('originalIndex') || item.added) { return + } else if (['login', 'navbar', 'topbar'].includes(item.component)) { + return } + item.added = true if (item.component === 'search') { // 鎼滅储缁勪欢涓嶅彲閲嶅娣诲姞 @@ -85,10 +96,22 @@ let name = '' let names = { bar: '鏌辩姸鍥�', + chart: '鍥捐〃', line: '鎶樼嚎鍥�', tabs: '鏍囩缁�', pie: '楗煎浘', search: '鎼滅储', + table: '琛ㄦ牸', + group: '鍒嗙粍', + editor: '瀵屾枃鏈�', + code: '鑷畾涔�', + carousel: '杞挱', + form: '琛ㄥ崟', + dashboard: '浠〃鐩�', + scatter: '鏁g偣鍥�', + tree: '鏍戝舰鍒楄〃', + balcony: '娴姩鍗�', + timeline: '鏃堕棿杞�', card: '鍗$墖' } let i = 1 @@ -109,6 +132,7 @@ subtype: item.subtype, config: item.config, width: item.width || 24, + dataName: Utils.getdataName(), name: name, floor: config.floor ? (config.floor + 1) : 2, // 缁勪欢鐨勫眰绾� isNew: true // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖� @@ -120,7 +144,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}`) -- Gitblit v1.8.0