From 3b103caa6bfc9ed410e67156c3ca1785bf1cecc9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 19 八月 2022 01:15:31 +0800
Subject: [PATCH] 2022-08-19
---
src/menu/components/card/cardcomponent/index.jsx | 135 ++++++++++++++++++++++++++++++--------------
1 files changed, 92 insertions(+), 43 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index eabda1c..624eb32 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Popover, Icon, Switch, Col } from 'antd'
+import { Popover, Switch, Col, Modal, Button } from 'antd'
+import { PlusOutlined, PlusSquareOutlined, EditOutlined, ArrowLeftOutlined, ArrowRightOutlined, SwapOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
@@ -13,13 +14,11 @@
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
const CardCellComponent = asyncComponent(() => import('../cardcellcomponent'))
-const CardMenus = asyncComponent(() => import('./menus-wrap'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteController = asyncIconComponent(() => import('@/components/paste'))
class CardBoxComponent extends Component {
static propTpyes = {
- offset: PropTypes.any, // 鍋忕Щ閲�
cards: PropTypes.object, // 鍗＄墖琛岄厤缃俊鎭�
card: PropTypes.object, // 鍗＄墖閰嶇疆淇℃伅
move: PropTypes.func, // 鍗＄墖绉诲姩
@@ -32,7 +31,8 @@
formlist: null, // 璁剧疆琛ㄥ崟淇℃伅
elements: null, // 缂栬緫缁�
side: 'front',
- appType: sessionStorage.getItem('appType')
+ appType: sessionStorage.getItem('appType'),
+ visible: false
}
/**
@@ -45,10 +45,6 @@
card: fromJS(card).toJS(),
elements: fromJS(card.elements).toJS(),
})
- }
-
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -64,14 +60,10 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
}
- getStyle = (comIds, style) => {
- const { cards } = this.props
+ getStyle = (style) => {
const { card, side } = this.state
-
- if (comIds.length !== 2 || comIds[0] !== cards.uuid || comIds[1] !== card.uuid) return
let _card = fromJS(card).toJS()
if (side === 'back') {
@@ -155,7 +147,6 @@
}
changeStyle = () => {
- const { cards } = this.props
const { card, side } = this.state
let _style = null
@@ -167,7 +158,7 @@
options = ['background', 'padding']
}
- MKEmitter.emit('changeStyle', [cards.uuid, card.uuid], options, _style)
+ MKEmitter.emit('changeStyle', options, _style, this.getStyle)
}
getSettingForms = () => {
@@ -193,7 +184,7 @@
}
})
}
- return getSettingForm(card.setting, cards.subtype, buttons, card.$cardType, cards.columns)
+ return getSettingForm(card.setting, cards.subtype, buttons, card.$cardType, cards.columns, card.menus)
}
updateSetting = (res) => {
@@ -219,18 +210,28 @@
})
}
+ let _card = {...card, setting: res}
+
+ if (res.menus) {
+ _card.menus = res.menus
+
+ delete res.menus
+ } else {
+ delete _card.menus
+ }
+
this.setState({
- card: {...card, setting: res}
+ card: _card
})
if (side === 'back' && res.type === 'simple') {
this.setState({
side: 'front',
- elements: fromJS(card.elements).toJS()
+ elements: fromJS(_card.elements).toJS()
})
}
- this.props.updateElement({...card, setting: res})
+ this.props.updateElement(_card)
}
paste = (element, resolve) => {
@@ -266,26 +267,51 @@
}
doubleClickCard = () => {
- const { card } = this.state
+ const { cards } = this.props
+ const { card, appType } = this.state
if (card.setting.click === 'menu' && card.setting.menu) {
- MKEmitter.emit('changeEditMenu', {MenuID: card.setting.menu})
+ if (['IM'].includes(card.setting.menu)) {
+ if (!sessionStorage.getItem('instantMessage')) return
+
+ let param = {
+ MenuID: sessionStorage.getItem('instantMessage'),
+ copyMenuId: '',
+ type: 'view'
+ }
+
+ param = window.btoa(window.encodeURIComponent(JSON.stringify(param)))
+
+ MKEmitter.emit('changeEditMenu', {routerUrl: '/imdesign/' + param})
+ } else {
+ MKEmitter.emit('changeEditMenu', {MenuID: card.setting.menu})
+ }
+ } else if (card.setting.click === 'menus' && card.menus && card.menus.length > 0 && cards.subtype === 'datacard' && appType) {
+ this.setState({visible: true})
}
}
- updateMenus = (res) => {
- const { card } = this.state
+ changeMenu = (MenuId) => {
+ if (MenuId === 'IM') {
+ if (!sessionStorage.getItem('instantMessage')) return
- this.setState({
- card: {...card, menus: res}
- })
-
- this.props.updateElement({...card, menus: res})
+ let param = {
+ MenuID: sessionStorage.getItem('instantMessage'),
+ copyMenuId: '',
+ type: 'view'
+ }
+
+ param = window.btoa(window.encodeURIComponent(JSON.stringify(param)))
+
+ MKEmitter.emit('changeEditMenu', {routerUrl: '/imdesign/' + param})
+ } else {
+ MKEmitter.emit('changeEditMenu', {MenuID: MenuId})
+ }
}
render() {
- const { cards, offset } = this.props
- const { card, elements, side } = this.state
+ const { cards } = this.props
+ const { card, elements, side, visible } = this.state
let _style = {...card.style}
@@ -302,38 +328,61 @@
_style = resetStyle(_style)
return (
- <Col span={card.setting.width || 6} offset={offset || 0}>
- <div className="card-item" style={_style} onClick={this.clickComponent} onDoubleClick={(e) => {e.stopPropagation(); this.doubleClickCard()}} id={card.uuid}>
+ <Col span={card.setting.width || 6}>
+ <div className={'card-item ' + (card.setting.btnControl || '')} style={_style} onClick={this.clickComponent} onDoubleClick={(e) => {e.stopPropagation(); this.doubleClickCard()}} id={card.uuid}>
<CardCellComponent cards={cards} cardCell={card} side={side} elements={elements} updateElement={this.updateCard}/>
<div className="card-control" onDoubleClick={(e) => e.stopPropagation()}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="plus" title="娣诲姞鍏冪礌" onClick={this.addElement} type="plus" />
- <Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" />
+ <PlusOutlined className="plus" title="娣诲姞鍏冪礌" onClick={this.addElement} />
+ <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} />
<NormalForm title="鍗＄墖璁剧疆" width={800} update={this.updateSetting} getForms={this.getSettingForms}>
- <Icon type="edit" className="edit" title="缂栬緫"/>
+ <EditOutlined className="edit" title="缂栬緫"/>
</NormalForm>
- {cards.subtype === 'datacard' && card.$cardType !== 'extendCard' && card.setting.click === 'menus' ?
- <CardMenus card={card} updateMenus={this.updateMenus}/> : null}
<CopyComponent type="cardcell" card={card}/>
<PasteController options={['action', 'customCardElement']} updateConfig={this.paste} />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} />
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="plus" title="鍓嶇Щ" type="arrow-left" onClick={() => this.props.move(card, 'left')} />
- <Icon className="close" title="鍚庣Щ" type="arrow-right" onClick={() => this.props.move(card, 'right')} />
+ <ArrowLeftOutlined className="plus" title="鍓嶇Щ" onClick={() => this.props.move(card, 'left')} />
+ <ArrowRightOutlined className="close" title="鍚庣Щ" onClick={() => this.props.move(card, 'right')} />
</div>
} trigger="hover" getPopupContainer={() => document.getElementById(card.uuid + 'swap')}>
- <Icon type="swap" id={card.uuid + 'swap'}/>
+ <SwapOutlined id={card.uuid + 'swap'}/>
</Popover>
- {cards.subtype === 'propcard' || card.$cardType === 'extendCard' ? <Icon className="close" title="鍒犻櫎鍗＄墖" type="delete" onClick={() => this.props.deleteElement(card)} /> : null}
+ {cards.subtype === 'propcard' || card.$cardType === 'extendCard' ? <DeleteOutlined className="close" title="鍒犻櫎鍗＄墖" onClick={() => this.props.deleteElement(card)} /> : null}
{card.setting.type === 'multi' ? <Switch size="small" onClick={this.changeSide} defaultChecked /> : null}
</div>
} trigger="hover">
- <Icon type="tool" />
+ <ToolOutlined />
</Popover>
</div>
</div>
+ <Modal
+ title="鑿滃崟缁�"
+ wrapClassName="menus-detail-modal"
+ visible={visible}
+ closable={false}
+ width={900}
+ maskClosable={false}
+ footer={[<Button key="close" onClick={() => { this.setState({ visible: false })}}>鍏抽棴</Button>]}
+ destroyOnClose
+ >
+ <div className="menu-line">
+ <div className="sort">搴忓彿</div>
+ <div className="sign">鏍囪瘑</div>
+ <div className="name">鑿滃崟</div>
+ <div className="action">鎿嶄綔</div>
+ </div>
+ {card.menus && card.menus.map((item, index) => {
+ return <div className="menu-line" key={index}>
+ <div className="sort">{index + 1}</div>
+ <div className="sign">{item.sign}</div>
+ <div className="name">{item.label}</div>
+ <div className="action"><span onClick={() => this.changeMenu(item.menu)}>璇︽儏</span></div>
+ </div>
+ })}
+ </Modal>
</Col>
)
}
--
Gitblit v1.8.0