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/components/group/normal-group/index.jsx | 106 +++++++++++++++++++++--------------------------------
1 files changed, 42 insertions(+), 64 deletions(-)
diff --git a/src/menu/components/group/normal-group/index.jsx b/src/menu/components/group/normal-group/index.jsx
index aeb5715..0544f9d 100644
--- a/src/menu/components/group/normal-group/index.jsx
+++ b/src/menu/components/group/normal-group/index.jsx
@@ -1,19 +1,20 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Popover, Button } from 'antd'
+import { Popover, Button } from 'antd'
+import { EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined, PrinterOutlined } from '@ant-design/icons'
import MKEmitter from '@/utils/events.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
import { resetStyle } from '@/utils/utils-custom.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
+import getSettingForm from './options'
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 NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
+const PasteComponent = asyncIconComponent(() => import('../paste'))
const GroupComponents = asyncComponent(() => import('../groupcomponents'))
class NormalGroup extends Component {
@@ -24,7 +25,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
group: null,
editab: null,
}
@@ -36,9 +36,6 @@
let _group = {
uuid: group.uuid,
type: group.type,
- floor: group.floor,
- tabId: group.tabId || '',
- parentId: group.parentId || '',
subtype: group.subtype,
width: 24,
name: group.name,
@@ -61,12 +58,6 @@
return !is(fromJS(this.state), fromJS(nextState))
}
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
- MKEmitter.addListener('tabsChange', this.handleTabsChange)
- MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
- }
-
/**
* @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
*/
@@ -74,42 +65,16 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
- MKEmitter.removeListener('tabsChange', this.handleTabsChange)
- MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
- }
-
- updateComponentStyle = (parentId, keys, style) => {
- const { group } = this.state
-
- if (group.uuid !== parentId) return
-
- let components = group.components.map(item => {
- if (keys.includes(item.uuid)) {
- item.style = {...item.style, ...style}
- }
- return item
- })
-
- this.setState({
- group: {...group, components: []}
- }, () => {
- this.updateComponent({...group, components: components})
- })
}
changeStyle = () => {
const { group } = this.state
- MKEmitter.emit('changeStyle', [group.uuid], ['background', 'border', 'padding', 'margin'], group.style)
+ MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow', 'clear'], group.style, this.getStyle)
}
- getStyle = (comIds, style) => {
- const { group } = this.state
-
- if (comIds.length !== 1 || comIds[0] !== group.uuid) return
-
- let _card = {...group, style}
+ getStyle = (style) => {
+ let _card = {...this.state.group, style}
this.setState({
group: _card
@@ -118,20 +83,16 @@
this.props.updateConfig(_card)
}
- handleTabsChange = (parentId) => {
- const { group } = this.state
-
- if (parentId === group.parentId) {
- MKEmitter.emit('tabsChange', group.uuid)
- }
- }
-
updateComponent = (component) => {
const { group } = this.state
if (!is(fromJS(group.setting), fromJS(component.setting)) || !is(fromJS(group.style), fromJS(component.style))) {
// 娉ㄥ唽浜嬩欢-鏍囩鍙樺寲锛岄�氱煡缁勫唴鍏冪礌
- MKEmitter.emit('tabsChange', group.uuid)
+ let ids = []
+ group.components.forEach(item => {
+ ids.push(item.uuid)
+ })
+ MKEmitter.emit('tabsChange', ids.join(','))
}
component.width = component.setting.width
@@ -152,31 +113,48 @@
this.props.updateConfig(group)
}
- clickComponent = (e) => {
- if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
- e.stopPropagation()
- MKEmitter.emit('clickComponent', this.state.group)
+ getWrapForms = () => {
+ const { setting } = this.state.group
+
+ return getSettingForm(setting)
+ }
+
+ updateWrap = (res) => {
+ let group = {...this.state.group, setting: res}
+
+ if (res.title && !group.headerStyle) {
+ group.headerStyle = { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' }
}
+
+ this.updateComponent(group)
}
render() {
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 ' : '') + (group.setting.layout || '')} style={_style} id={group.uuid}>
+ <NormalHeader hideSearch="true" config={group} updateComponent={this.updateComponent}/>
<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}>
+ <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
+ </NormalForm>
<CopyComponent type="tabs" card={group}/>
- <PasteController type="tab" Tab={group} 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)} />
+ <PasteComponent insert={this.insert} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
+ <DeleteOutlined className="close" title="delete" onClick={() => this.props.deletecomponent(group.uuid)} />
</div>
} trigger="hover">
- <Icon type="tool" />
+ <ToolOutlined />
</Popover>
- {group.setting && group.setting.print === 'true' ? <Button className="print-button" icon="printer" onClick={this.print}></Button> : null}
+ {group.setting && group.setting.print === 'true' ? <Button className="print-button" onClick={this.print}><PrinterOutlined /></Button> : null}
<GroupComponents config={group} handleList={this.updateComponent} deleteCard={this.deleteCard} />
</div>
)
--
Gitblit v1.8.0