From cc1a76df575c18f0d0ee96e8658461efdce3a918 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 一月 2023 18:01:01 +0800
Subject: [PATCH] 2023-01-17
---
src/menu/components/tabs/tabcomponents/index.jsx | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/menu/components/tabs/tabcomponents/index.jsx b/src/menu/components/tabs/tabcomponents/index.jsx
index b7613f6..a0ed8c1 100644
--- a/src/menu/components/tabs/tabcomponents/index.jsx
+++ b/src/menu/components/tabs/tabcomponents/index.jsx
@@ -11,8 +11,6 @@
const { confirm } = Modal
const Container = ({ config, handleList }) => {
- let target = null
-
const [cards, setCards] = useState(config.components)
const moveCard = (id, atIndex) => {
const { card, index } = findCard(id)
@@ -30,10 +28,6 @@
card,
index: cards.indexOf(card),
}
- }
-
- const hasDrop = (item) => {
- target = item
}
const updateConfig = (element) => {
@@ -67,7 +61,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') { // 鎼滅储缁勪欢涓嶅彲閲嶅娣诲姞
@@ -79,20 +76,28 @@
})
return
}
- } else if (item.component === 'tabs' && config.floor === 3) {
- notification.warning({
- top: 92,
- message: '鏍囩椤垫渶澶氫负涓夐噸缁撴瀯锛�',
- duration: 5
- })
- return
}
let name = ''
let names = {
bar: '鏌辩姸鍥�',
+ chart: '鍥捐〃',
line: '鎶樼嚎鍥�',
tabs: '鏍囩缁�',
+ pie: '楗煎浘',
+ search: '鎼滅储',
+ table: '琛ㄦ牸',
+ group: '鍒嗙粍',
+ editor: '瀵屾枃鏈�',
+ code: '鑷畾涔�',
+ carousel: '杞挱',
+ form: '琛ㄥ崟',
+ dashboard: '浠〃鐩�',
+ scatter: '鏁ｇ偣鍥�',
+ tree: '鏍戝舰鍒楄〃',
+ balcony: '娴姩鍗�',
+ timeline: '鏃堕棿杞�',
+ antvG6: '鏍戝浘',
card: '鍗＄墖'
}
let i = 1
@@ -107,29 +112,27 @@
let newcard = {
uuid: Utils.getuuid(),
- tabId: config.uuid,
- parentId: config.parentId,
type: item.component,
subtype: item.subtype,
+ config: item.config,
+ width: item.width || 24,
name: name,
- floor: config.floor ? (config.floor + 1) : 2, // 缁勪欢鐨勫眰绾�
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.slice(-1)[0].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({...config, components: _cards})
- target = null
}
})
@@ -144,7 +147,6 @@
moveCard={moveCard}
delCard={deleteCard}
findCard={findCard}
- hasDrop={hasDrop}
updateConfig={updateConfig}
/>
))}
--
Gitblit v1.8.0