From c8dec113736cc78c47cd63377d756d364b42a94e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 四月 2025 16:39:15 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/mob/components/navbar/normal-navbar/index.jsx | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/mob/components/navbar/normal-navbar/index.jsx b/src/mob/components/navbar/normal-navbar/index.jsx
index 48a06f5..6f2d5ce 100644
--- a/src/mob/components/navbar/normal-navbar/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/index.jsx
@@ -120,6 +120,8 @@
render() {
const { card } = this.state
+ if (!card.wrap) return null
+
let _style = {...card.style}
_style.height = card.wrap.height
@@ -140,7 +142,7 @@
} trigger="hover">
<ToolOutlined />
</Popover>
- <MenuComponent menus={card.menus} columns={card.columns} updateConfig={(menus) => this.updateComponent({...card, menus: menus})}/>
+ <MenuComponent menus={card.menus} datatype={card.wrap.datatype} columns={card.columns} updateConfig={(menus) => this.updateComponent({...card, menus: menus})}/>
</div>
)
}
--
Gitblit v1.8.0