From 07969dd2fb6bf732655e6700577b3fb4cdaca374 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 四月 2021 17:36:34 +0800
Subject: [PATCH] 2021-04-20

---
 src/mob/mobshell/index.jsx |   42 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/mob/mobshell/index.jsx b/src/mob/mobshell/index.jsx
index 4000cf1..1b95799 100644
--- a/src/mob/mobshell/index.jsx
+++ b/src/mob/mobshell/index.jsx
@@ -82,6 +82,24 @@
           })
           return
         }
+      } else if (item.component === 'navbar') {
+        if (cards.filter(card => card.type === 'navbar').length > 0) {
+          notification.warning({
+            top: 92,
+            message: '鑿滃崟鏍忎笉鍙噸澶嶆坊鍔狅紒',
+            duration: 5
+          })
+          return
+        }
+      } else if (item.component === 'topbar') {
+        if (cards.filter(card => card.type === 'topbar').length > 0) {
+          notification.warning({
+            top: 92,
+            message: '瀵艰埅鏍忎笉鍙噸澶嶆坊鍔狅紒',
+            duration: 5
+          })
+          return
+        }
       }
 
       let name = ''
@@ -134,7 +152,25 @@
       }
 
       const { index: overIndex } = findCard(`${targetId}`)
-      const _cards = update(cards, { $splice: [[overIndex + 1, 0, newcard]] })
+      let _cards = update(cards, { $splice: [[overIndex + 1, 0, newcard]] })
+      let Topbar = null
+      let Navbar = null
+      _cards = _cards.filter(item => {
+        if (item.type === 'topbar') {
+          Topbar = item
+        } else if (item.type === 'navbar') {
+          Navbar = item
+        }
+
+        return item.type !== 'topbar' && item.type !== 'navbar'
+      })
+
+      if (Topbar) {
+        _cards.unshift(Topbar)
+      }
+      if (Navbar) {
+        _cards.push(Navbar)
+      }
 
       handleList({...menu, components: _cards})
       setCards(_cards)
@@ -142,8 +178,8 @@
   })
 
   return (
-    <div ref={drop} className="mob-shell-inner" id="menu-shell-inner" style={menu.style}>
-      <div className="ant-row">
+    <div ref={drop} className="mob-shell-inner" id="menu-shell-inner">
+      <div className="ant-row" style={menu.style}>
         {cards.map(card => (
           <Card
             id={card.uuid}

--
Gitblit v1.8.0