From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/pc/menushell/index.jsx | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/pc/menushell/index.jsx b/src/pc/menushell/index.jsx
index 29be748..33df2ba 100644
--- a/src/pc/menushell/index.jsx
+++ b/src/pc/menushell/index.jsx
@@ -19,6 +19,10 @@
handleList({...menu, components: _cards})
setCards(_cards)
}
+
+ if (menu.components.length > cards.length) {
+ setCards(menu.components)
+ }
const findCard = id => {
const card = cards.filter(c => `${c.uuid}` === id)[0]
@@ -49,13 +53,16 @@
let uuids = MenuUtils.getDelButtonIds(card)
confirm({
- title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋,
+ title: `纭畾鍒犻櫎${card.name ? `銆�${card.name}銆媊 : '缁勪欢'}鍚楋紵`,
content: hasComponent ? '褰撳墠缁勪欢涓惈鏈夊瓙缁勪欢锛�' : '',
onOk() {
- MKEmitter.emit('delButtons', uuids)
const _cards = cards.filter(item => item.uuid !== card.uuid)
handleList({...menu, components: _cards})
setCards(_cards)
+
+ if (uuids.length === 0) return
+
+ MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
@@ -68,6 +75,8 @@
delete item.added // 鍒犻櫎缁勪欢娣诲姞鏍囪
return
}
+
+ let style = null
if (item.component === 'search') { // 鎼滅储缁勪欢涓嶅彲閲嶅娣诲姞
if (cards.filter(card => card.type === 'search').length > 0) {
@@ -87,11 +96,16 @@
})
return
}
+
+ if (!menu.style.paddingTop) {
+ style = {...menu.style, paddingTop: '50px'}
+ }
}
let name = ''
let names = {
bar: '鏌辩姸鍥�',
+ chart: '鍥捐〃',
line: '鎶樼嚎鍥�',
tabs: '鏍囩缁�',
pie: '楗煎浘',
@@ -102,7 +116,12 @@
code: '鑷畾涔�',
navbar: '瀵艰埅鏍�',
carousel: '杞挱',
- card: '鍗＄墖'
+ dashboard: '浠〃鐩�',
+ tree: '鏍戝舰鍒楄〃',
+ card: '鍗＄墖',
+ balcony: '娴姩鍗�',
+ timeline: '鏃堕棿杞�',
+ login: '鐧诲綍'
}
let i = 1
@@ -138,7 +157,11 @@
const { index: overIndex } = findCard(`${targetId}`)
const _cards = update(cards, { $splice: [[overIndex + 1, 0, newcard]] })
- handleList({...menu, components: _cards})
+ if (style) {
+ handleList({...menu, style, components: _cards})
+ } else {
+ handleList({...menu, components: _cards})
+ }
setCards(_cards)
}
})
--
Gitblit v1.8.0