From c98e45bfac25e9110ad0383faac54a54d98ea9d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 18 十一月 2021 20:47:04 +0800
Subject: [PATCH] 2021-11-18
---
src/menu/components/group/normal-group/index.jsx | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/group/normal-group/index.jsx b/src/menu/components/group/normal-group/index.jsx
index aeb5715..41dc6ed 100644
--- a/src/menu/components/group/normal-group/index.jsx
+++ b/src/menu/components/group/normal-group/index.jsx
@@ -7,13 +7,14 @@
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
import { resetStyle } from '@/utils/utils-custom.js'
+import getSettingForm from './options'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
import './index.scss'
-const SettingComponent = asyncIconComponent(() => import('../groupsetting'))
+const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
-const PasteController = asyncIconComponent(() => import('@/menu/pastecontroller'))
+const PasteComponent = asyncIconComponent(() => import('../paste'))
const GroupComponents = asyncComponent(() => import('../groupcomponents'))
class NormalGroup extends Component {
@@ -101,7 +102,7 @@
changeStyle = () => {
const { group } = this.state
- MKEmitter.emit('changeStyle', [group.uuid], ['background', 'border', 'padding', 'margin'], group.style)
+ MKEmitter.emit('changeStyle', [group.uuid], ['background', 'border', 'padding', 'margin', 'shadow'], group.style)
}
getStyle = (comIds, style) => {
@@ -146,10 +147,23 @@
insert = (item) => {
let group = fromJS(this.state.group).toJS()
+ item.floor = group.floor || 1
+ item.parentId = group.parentId
+
group.components.push(item)
this.setState({group})
this.props.updateConfig(group)
+ }
+
+ getWrapForms = () => {
+ const { setting } = this.state.group
+
+ return getSettingForm(setting)
+ }
+
+ updateWrap = (res) => {
+ this.updateComponent({...this.state.group, setting: res})
}
clickComponent = (e) => {
@@ -163,13 +177,20 @@
const { group } = this.state
let _style = resetStyle(group.style)
+ let paddingTop = true
+ if (group.style.paddingTop && parseInt(group.style.paddingTop) >= 28) {
+ paddingTop = false
+ }
+
return (
- <div className="menu-group-edit-box" style={_style} onClick={this.clickComponent} id={group.uuid}>
+ <div className={'menu-group-edit-box' + (paddingTop ? ' padding' : '')} 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">
- <SettingComponent config={group} updateConfig={this.updateComponent} />
+ <NormalForm title="鍒嗙粍璁剧疆" width={700} update={this.updateWrap} getForms={this.getWrapForms}>
+ <Icon type="edit" style={{color: '#1890ff'}} title="缂栬緫"/>
+ </NormalForm>
<CopyComponent type="tabs" card={group}/>
- <PasteController type="tab" Tab={group} insert={this.insert} />
+ <PasteComponent insert={this.insert} />
<Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
<Icon className="close" title="delete" type="delete" onClick={() => this.props.deletecomponent(group.uuid)} />
</div>
--
Gitblit v1.8.0