From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/mob/mobshell/index.jsx | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/src/mob/mobshell/index.jsx b/src/mob/mobshell/index.jsx
index c7b5442..de4fabb 100644
--- a/src/mob/mobshell/index.jsx
+++ b/src/mob/mobshell/index.jsx
@@ -162,6 +162,7 @@
timeline: '鏃堕棿杞�',
officialAccount: '鍏虫敞鍏紬鍙�',
sharecode: '鍒嗕韩鐮�',
+ map: '鍦板浘',
iframe: 'iframe',
login: '鐧诲綍'
}
@@ -182,7 +183,6 @@
config: item.config,
width: item.width || 24,
name: name,
- floor: 1, // 缁勪欢鐨勫眰绾�
isNew: true // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
}
@@ -216,12 +216,48 @@
_cards.push(Navbar)
}
- if (style) {
- handleList({...menu, style, components: _cards})
+ if (item.component === 'navbar') {
+ let appMenus = sessionStorage.getItem('appViewList')
+ if (appMenus) {
+ try {
+ appMenus = JSON.parse(appMenus)
+ appMenus = appMenus.filter(item => item.keys_type === 'navbar')
+ } catch (e) {
+ appMenus = []
+ }
+ } else {
+ appMenus = []
+ }
+
+ if (appMenus.length) {
+ confirm({
+ title: '濡傞渶浣跨敤褰撳墠搴旂敤涓凡鏈夌殑鑿滃崟鏍忥紝璇风偣鍑诲彸渚у叧鑱旇彍鍗曟爮锛屽闇�鏂板璇风偣纭畾銆�',
+ onOk() {
+ if (style) {
+ handleList({...menu, style, components: _cards})
+ } else {
+ handleList({...menu, components: _cards})
+ }
+ setCards(_cards)
+ },
+ onCancel() {}
+ })
+ } else {
+ if (style) {
+ handleList({...menu, style, components: _cards})
+ } else {
+ handleList({...menu, components: _cards})
+ }
+ setCards(_cards)
+ }
} else {
- handleList({...menu, components: _cards})
+ if (style) {
+ handleList({...menu, style, components: _cards})
+ } else {
+ handleList({...menu, components: _cards})
+ }
+ setCards(_cards)
}
- setCards(_cards)
}
})
--
Gitblit v1.8.0