From 72419e2f826031a158173f46d723a672064e37cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 八月 2021 22:42:51 +0800
Subject: [PATCH] 2021-08-31
---
src/menu/components/tabs/tabcomponents/index.jsx | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/menu/components/tabs/tabcomponents/index.jsx b/src/menu/components/tabs/tabcomponents/index.jsx
index e2b9908..657c5d9 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() {}
})
@@ -89,6 +97,16 @@
tabs: '鏍囩缁�',
pie: '楗煎浘',
search: '鎼滅储',
+ table: '琛ㄦ牸',
+ group: '鍒嗙粍',
+ editor: '瀵屾枃鏈�',
+ code: '鑷畾涔�',
+ carousel: '杞挱',
+ form: '琛ㄥ崟',
+ dashboard: '浠〃鐩�',
+ scatter: '鏁ｇ偣鍥�',
+ tree: '鏍戝舰鍒楄〃',
+ balcony: '娴姩鍗�',
card: '鍗＄墖'
}
let i = 1
@@ -100,14 +118,6 @@
}
i++
}
-
- let dataName = ''
- while (!dataName) {
- let _dataName = Utils.getdataName()
- if (config.components.filter(com => com.dataName === _dataName).length === 0) {
- dataName = _dataName
- }
- }
let newcard = {
uuid: Utils.getuuid(),
@@ -117,7 +127,7 @@
subtype: item.subtype,
config: item.config,
width: item.width || 24,
- dataName: dataName,
+ dataName: Utils.getdataName(),
name: name,
floor: config.floor ? (config.floor + 1) : 2, // 缁勪欢鐨勫眰绾�
isNew: true // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
@@ -129,7 +139,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