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/pc/menushell/card.jsx |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/pc/menushell/card.jsx b/src/pc/menushell/card.jsx
index fc878d3..519ea30 100644
--- a/src/pc/menushell/card.jsx
+++ b/src/pc/menushell/card.jsx
@@ -56,9 +56,7 @@
     style = { opacity: 0.3}
   }
   let col = ' ant-col ant-col-' + (card.width || 24)
-  if (card.type === 'navbar') {
-    col = ''
-  } else if (card.type === 'login') {
+  if (card.type === 'login') {
     let height = ''
     if (card.wrap && card.wrap.height) {
       // scaleview
@@ -113,10 +111,15 @@
       return (<NormalLogin card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
     }
   }
-  return (
-    <div className={`mk-component-card ${col}`} ref={node => drag(drop(node))} style={style}>
-      {getCardComponent()}
-    </div>
-  )
+
+  if (card.type === 'navbar') {
+    return getCardComponent()
+  } else {
+    return (
+      <div className={`mk-component-card ${col}`} ref={node => drag(drop(node))} style={style}>
+        {getCardComponent()}
+      </div>
+    )
+  }
 }
 export default Card

--
Gitblit v1.8.0