From 46f79b491173d284a4900d19e7aecf7509481438 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 一月 2022 17:21:25 +0800
Subject: [PATCH] 2022-01-21
---
src/menu/components/card/cardcomponent/index.jsx | 84 ++++++++++++++++++++++++++++-------------
1 files changed, 57 insertions(+), 27 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index 4b43fef..7e36906 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, Modal, Button } 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,7 +14,6 @@
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'))
@@ -194,7 +194,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) => {
@@ -220,18 +220,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) => {
@@ -271,20 +281,42 @@
const { card, appType } = this.state
if (card.setting.click === 'menu' && card.setting.menu) {
- MKEmitter.emit('changeEditMenu', {MenuID: card.setting.menu})
- } else if (card.setting.click === 'menus' && card.menus && card.menus.length > 0 && cards.subtype === 'datacard' && card.$cardType !== 'extendCard' && (appType === 'mob' || appType === 'pc')) {
+ 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() {
@@ -312,29 +344,27 @@
<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>
@@ -359,7 +389,7 @@
<div className="sort">{index + 1}</div>
<div className="sign">{item.sign}</div>
<div className="name">{item.label}</div>
- <div className="action"><span onClick={() => MKEmitter.emit('changeEditMenu', {MenuID: item.menu})}>璇︽儏</span></div>
+ <div className="action"><span onClick={() => this.changeMenu(item.menu)}>璇︽儏</span></div>
</div>
})}
</Modal>
--
Gitblit v1.8.0