From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/menushell/index.jsx | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/menu/menushell/index.jsx b/src/menu/menushell/index.jsx
index f83e918..ecef5dc 100644
--- a/src/menu/menushell/index.jsx
+++ b/src/menu/menushell/index.jsx
@@ -98,6 +98,8 @@
tree: '鏍戝舰鍒楄〃',
balcony: '娴姩鍗�',
timeline: '鏃堕棿杞�',
+ antvG6: '鏍戝浘',
+ iframe: 'iframe',
card: '鍗＄墖'
}
let i = 1
@@ -138,8 +140,12 @@
}
})
+ let style = JSON.stringify(menu.style || {})
+ style = style.replace(/@mywebsite@\//ig, window.GLOB.baseurl)
+ style = JSON.parse(style)
+
return (
- <div ref={drop} className="menu-shell-inner" id="menu-shell-inner" style={menu.style}>
+ <div ref={drop} className="menu-shell-inner" id="menu-shell-inner" style={style}>
<div className="ant-row">
{cards.map(card => (
<Card
--
Gitblit v1.8.0