From cb9ade2afd2a367ad767bc605ab7086c695dd010 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 09 十二月 2022 15:53:32 +0800
Subject: [PATCH] 2022-12-09
---
src/menu/menushell/index.jsx | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/menu/menushell/index.jsx b/src/menu/menushell/index.jsx
index 26e58b6..ecef5dc 100644
--- a/src/menu/menushell/index.jsx
+++ b/src/menu/menushell/index.jsx
@@ -4,8 +4,6 @@
import { Empty, notification, Modal } from 'antd'
import Utils from '@/utils/utils.js'
-import MKEmitter from '@/utils/events.js'
-import MenuUtils from '@/utils/utils-custom.js'
import Card from './card'
import './index.scss'
@@ -50,8 +48,6 @@
})
}
- let uuids = MenuUtils.getDelButtonIds(card)
-
confirm({
title: `纭畾鍒犻櫎銆�${card.name}銆嬪悧锛焋,
content: hasComponent ? '褰撳墠缁勪欢涓惈鏈夊瓙缁勪欢锛�' : '',
@@ -59,10 +55,6 @@
const _cards = cards.filter(item => item.uuid !== card.uuid)
handleList({...menu, components: _cards})
setCards(_cards)
-
- if (uuids.length === 0) return
-
- MKEmitter.emit('delButtons', uuids)
},
onCancel() {}
})
@@ -106,6 +98,8 @@
tree: '鏍戝舰鍒楄〃',
balcony: '娴姩鍗�',
timeline: '鏃堕棿杞�',
+ antvG6: '鏍戝浘',
+ iframe: 'iframe',
card: '鍗＄墖'
}
let i = 1
@@ -124,7 +118,6 @@
subtype: item.subtype,
config: item.config,
width: item.width || 24,
- dataName: Utils.getdataName(),
name: name,
floor: 1, // 缁勪欢鐨勫眰绾�
isNew: true // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
@@ -147,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