From f6a1ab6a58215cf7546976a86eb6face1a7be32f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 30 七月 2021 15:37:17 +0800
Subject: [PATCH] 2021-07-30
---
src/mob/components/menubar/normal-menubar/index.jsx | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/mob/components/menubar/normal-menubar/index.jsx b/src/mob/components/menubar/normal-menubar/index.jsx
index e2e9dc2..89ed8ff 100644
--- a/src/mob/components/menubar/normal-menubar/index.jsx
+++ b/src/mob/components/menubar/normal-menubar/index.jsx
@@ -125,6 +125,11 @@
card.subMenus = card.subMenus.map(item => {
if (item.uuid === cell.uuid) return cell
+ if (cell.oriuuid && item.uuid === cell.oriuuid) {
+ delete cell.oriuuid
+
+ return cell
+ }
return item
})
@@ -155,7 +160,7 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin'], card.style)
+ MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin', 'shadow'], card.style)
}
getStyle = (comIds, style) => {
@@ -180,12 +185,14 @@
setting: { type: 'menu', width: 6, sign: 'icon', icon: 'user', name: '瀹㈡埛', url: '', color: '#ffffff', iconFont: 20, padding: 12, background: '#1890ff', imgWidth: '' },
style: {
paddingTop: '15px', paddingBottom: '15px'
- }
+ },
+ isnew: true
}
if (card.subMenus.length > 0) {
newcard = fromJS(card.subMenus.slice(-1)[0]).toJS()
newcard.uuid = Utils.getuuid()
+ newcard.isnew = true
}
card.subMenus.push(newcard)
@@ -240,12 +247,12 @@
return (
<div className="menu-menubar-edit-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
- <NormalHeader config={card} updateComponent={this.updateComponent}/>
+ {card.wrap.title ? <NormalHeader config={card} updateComponent={this.updateComponent}/> : null}
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<Icon className="plus" title="娣诲姞鑿滃崟" onClick={this.addMenu} type="plus" />
<WrapComponent config={card} updateConfig={this.updateComponent} />
- <CopyComponent type="normalmenu" card={card}/>
+ <CopyComponent type="menubar" card={card}/>
<PasteComponent config={card} options={['menucell']} updateConfig={this.updateComponent} />
<Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
<UserComponent config={card}/>
--
Gitblit v1.8.0