From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/group/normal-group/index.jsx | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/group/normal-group/index.jsx b/src/menu/components/group/normal-group/index.jsx
index 2c087bc..509829e 100644
--- a/src/menu/components/group/normal-group/index.jsx
+++ b/src/menu/components/group/normal-group/index.jsx
@@ -35,7 +35,6 @@
let _group = {
uuid: group.uuid,
type: group.type,
- floor: group.floor,
tabId: group.tabId || '',
parentId: group.parentId || '',
subtype: group.subtype,
@@ -145,7 +144,6 @@
insert = (item) => {
let group = fromJS(this.state.group).toJS()
- item.floor = group.floor || 1
item.parentId = group.parentId
group.components.push(item)
@@ -181,7 +179,7 @@
}
return (
- <div className={'menu-group-edit-box' + (paddingTop ? ' padding' : '')} style={_style} onClick={this.clickComponent} id={group.uuid}>
+ <div className={'menu-group-edit-box ' + (paddingTop ? 'padding ' : '') + (group.setting.layout || '')} style={_style} onClick={this.clickComponent} id={group.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<NormalForm title="鍒嗙粍璁剧疆" width={700} update={this.updateWrap} getForms={this.getWrapForms}>
--
Gitblit v1.8.0