From f66e19dd13af07ee466306632ad43c72f1f16ae7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 26 五月 2021 14:49:55 +0800
Subject: [PATCH] 2021-05-26
---
src/menu/components/card/cardcomponent/index.jsx | 312 +++++++++++++++++++++++++++------------------------
1 files changed, 163 insertions(+), 149 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index 7eb7da9..79b4767 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -1,33 +1,39 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Modal, Popover, Icon, Switch } from 'antd'
+import { Modal, Popover, Icon, Switch, Col } from 'antd'
import asyncComponent from '@/utils/asyncComponent'
+import asyncIconComponent from '@/utils/asyncIconComponent'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
-// import { getCardCellForm } from './formconfig'
-
+import SettingForm from './settingform'
+import { resetStyle } from '@/utils/utils-custom.js'
import Utils from '@/utils/utils.js'
import MKEmitter from '@/utils/events.js'
import './index.scss'
-const { confirm } = Modal
const CardCellComponent = asyncComponent(() => import('../cardcellcomponent'))
+const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
+const PasteComponent = asyncIconComponent(() => import('./pastecomponent'))
class CardBoxComponent extends Component {
static propTpyes = {
- config: PropTypes.object, // 鑿滃崟閰嶇疆淇℃伅
+ offset: PropTypes.any, // 鍋忕Щ閲�
+ cards: PropTypes.object, // 鍗＄墖琛岄厤缃俊鎭�
card: PropTypes.object, // 鍗＄墖閰嶇疆淇℃伅
+ move: PropTypes.func, // 鍗＄墖绉诲姩
+ deleteElement: PropTypes.func, // 鍗＄墖鍒犻櫎
updateElement: PropTypes.func // 鑿滃崟閰嶇疆鏇存柊
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
- card: null, // 鍗＄墖淇℃伅锛屽寘鎷鍙嶉潰
- formlist: null, // 璁剧疆琛ㄥ崟淇℃伅
- elements: null, // 缂栬緫缁�
- visible: false, // 妯℃�佹鎺у埗
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ card: null, // 鍗＄墖淇℃伅锛屽寘鎷鍙嶉潰
+ formlist: null, // 璁剧疆琛ㄥ崟淇℃伅
+ elements: null, // 缂栬緫缁�
+ visible: false, // 妯℃�佹鎺у埗
+ settingVisible: false,
side: 'front'
}
@@ -44,11 +50,13 @@
}
componentDidMount () {
- MKEmitter.addListener('cardAddElement', this.cardAddElement)
+ MKEmitter.addListener('submitStyle', this.getStyle)
}
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState))
+ const { cards } = this.props
+
+ return !is(fromJS(cards), fromJS(nextProps.cards)) || !is(fromJS(this.state), fromJS(nextState))
}
/**
@@ -58,107 +66,52 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('cardAddElement', this.cardAddElement)
+ MKEmitter.removeListener('submitStyle', this.getStyle)
}
- cardAddElement = (cardId, element) => {
- if (cardId !== this.props.config.uuid) return
+ getStyle = (comIds, style) => {
+ const { cards } = this.props
+ const { card, side } = this.state
- const { elements } = this.state
+ if (comIds.length !== 2 || comIds[0] !== cards.uuid || comIds[1] !== card.uuid) return
- this.setState({elements: [...elements, element]})
- this.handleElement(element)
- }
-
- /**
- * @description 鎸夐挳椤哄簭璋冩暣
- */
- handleList = (list) => {
- const { config } = this.props
-
- this.setState({elements: list}, () => {
- this.props.updateElement({...config, elements: list})
- })
- }
-
- /**
- * @description 鎸夐挳缂栬緫锛岃幏鍙栨寜閽〃鍗曚俊鎭�
- */
- handleElement = (card) => {
- this.setState({
- visible: true,
- card: card,
- // formlist: getCardCellForm(card)
- })
- }
-
- /**
- * @description 鍙栨秷淇濆瓨锛屽鏋滃厓绱犱负鏂版坊鍏冪礌锛屽垯浠庡簭鍒椾腑鍒犻櫎
- */
- editModalCancel = () => {
- const { card, elements } = this.state
- let _elements = null
-
- if (card.focus) {
- _elements = elements.filter(item => item.uuid !== card.uuid)
+ let _card = fromJS(card).toJS()
+ if (side === 'back') {
+ _card.backStyle = style
} else {
- _elements = elements
+ _card.style = style
}
this.setState({
- card: null,
- elements: _elements,
- visible: false
+ card: _card
})
+
+ this.props.updateElement(_card)
}
- /**
- * @description 鎼滅储淇敼鍚庢彁浜や繚瀛�
- * 1銆佸幓闄ょ郴缁熼粯璁ゆ悳绱㈡潯浠�
- * 2銆佸瓧娈靛強鎻愮ず鏂囧瓧閲嶅鏍￠獙
- * 3銆佹洿鏂颁笅鎷夎彍鍗曞彲閫夐泦鍚�
- * 4銆佷笅鎷夎彍鍗曟暟鎹簮璇硶楠岃瘉
- */
- handleSubmit = () => {
- const { config } = this.props
- const { elements } = this.state
+ updateCard = (elements, type) => {
+ const { card, side } = this.state
- this.elementFormRef.handleConfirm().then(ele => {
- let _elements = elements.map(cell => {
- if (cell.uuid === ele.uuid) return ele
- return cell
- })
+ let _card = {}
+ if (side === 'back') {
+ _card = {...card, backElements: elements}
+ } else {
+ _card = {...card, elements: elements}
+ }
+
+ if (type === 'paste') {
this.setState({
- elements: _elements,
- visible: false
- }, () => {
- this.props.updateElement({...config, elements: _elements})
+ card: _card,
+ elements: fromJS(elements).toJS()
})
- })
- }
+ } else {
+ this.setState({
+ card: _card
+ })
+ }
- /**
- * @description 鎸夐挳鍒犻櫎
- */
- deleteElement = (card) => {
- const { config } = this.props
- const { dict, elements } = this.state
- let _this = this
-
- confirm({
- content: dict['model.confirm'] + dict['model.delete'] + '鍏冪礌鍚楋紵',
- onOk() {
- let _elements = elements.filter(item => item.uuid !== card.uuid)
-
- _this.setState({
- elements: _elements
- }, () => {
- _this.props.updateElement({...config, elements: _elements})
- })
- },
- onCancel() {}
- })
+ this.props.updateElement(_card)
}
changeSide = () => {
@@ -183,6 +136,7 @@
}
addElement = () => {
+ const { cards } = this.props
const { card } = this.state
let newcard = {}
@@ -191,29 +145,28 @@
newcard.eleType = 'text'
newcard.datatype = 'dynamic'
- newcard.color = 'rgba(0,0,0,0.85)'
- newcard.padding = '5px'
- newcard.align = 'left'
+ newcard.height = 1
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('cardAddElement', card.uuid, newcard)
+ MKEmitter.emit('cardAddElement', [cards.uuid, card.uuid], newcard)
}
addButton = () => {
+ const { cards } = this.props
const { card } = this.state
let newcard = {}
newcard.uuid = Utils.getuuid()
newcard.focus = true
+ newcard.eleType = 'button'
newcard.label = 'button'
newcard.sqlType = ''
newcard.Ot = 'requiredSgl'
newcard.OpenType = 'prompt'
newcard.icon = ''
- newcard.class = 'default'
+ newcard.class = 'primary'
newcard.intertype = 'system'
- newcard.method = 'POST'
newcard.execSuccess = 'grid'
newcard.execError = 'never'
newcard.popClose = 'never'
@@ -222,62 +175,123 @@
newcard.show = 'link'
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('addButton', card.uuid, newcard)
+ MKEmitter.emit('cardAddElement', [cards.uuid, card.uuid], newcard)
}
changeStyle = () => {
- const { card } = this.state
+ const { cards } = this.props
+ const { card, side } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['font', 'background', 'border'], {})
+ let _style = null
+ let options = ['height', 'background', 'border', 'padding', 'margin', 'shadow']
+ if (side === 'front') {
+ _style = card.style ? fromJS(card.style).toJS() : {}
+ } else if (side === 'back') {
+ _style = card.backStyle ? fromJS(card.backStyle).toJS() : {}
+ options = ['background', 'padding']
+ }
+
+ MKEmitter.emit('changeStyle', [cards.uuid, card.uuid], options, _style)
+ }
+
+ settingSubmit = () => {
+ const { card, side } = this.state
+
+ this.settingRef.handleConfirm().then(res => {
+ this.setState({
+ settingVisible: false,
+ card: {...card, setting: res}
+ })
+
+ if (side === 'back' && res.type === 'simple') {
+ this.setState({
+ side: 'front',
+ elements: fromJS(card.elements).toJS()
+ })
+ }
+
+ this.props.updateElement({...card, setting: res})
+ })
+ }
+
+ clickComponent = (e) => {
+ if ((sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'propcard') && this.props.cards.subtype === 'propcard') {
+ e.stopPropagation()
+ MKEmitter.emit('clickComponent', this.state.card, this.props.cards, 'propcard')
+ }
}
render() {
- // const { config } = this.props
- const { card, elements } = this.state
+ const { cards, offset } = this.props
+ const { card, elements, side, settingVisible, dict } = this.state
+
+ let _style = {...card.style}
+
+ if (_style.shadow) {
+ _style.boxShadow = '0 0 4px ' + _style.shadow
+ }
+
+ if (side === 'back') {
+ _style = {
+ ...card.backStyle,
+ height: card.style.height,
+ marginBottom: card.style.marginBottom,
+ marginLeft: card.style.marginLeft,
+ marginRight: card.style.marginRight,
+ marginTop: card.style.marginTop
+ }
+ }
+ _style = resetStyle(_style)
return (
- <div className={'ant-col card-item ant-col-' + (card.setting.width || 6)} style={{height: card.setting.height ? card.setting.height + 'px' : 'auto'}}>
- <CardCellComponent config={card} elements={elements} updateElement={this.updateComponent}/>
- <div className="card-control">
- <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" />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
- <Switch size="small" onClick={this.changeSide} defaultChecked />
- </div>
- } trigger="hover">
- <Icon type="tool" />
- </Popover>
+ <Col span={card.setting.width || 6} offset={offset || 0}>
+ <div className="card-item" style={_style} onClick={this.clickComponent} id={card.uuid}>
+ <CardCellComponent cards={cards} cardCell={card} side={side} elements={elements} updateElement={this.updateCard}/>
+ <div className="card-control">
+ <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" />
+ <Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.setState({settingVisible: true})} />
+ <CopyComponent type="cardcell" card={card}/>
+ <PasteComponent elements={elements} options={['action', 'customCardElement']} updateConfig={(list) => this.updateCard(list, 'paste')} />
+ <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
+ {cards.subtype === 'propcard' ? <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')} />
+ </div>
+ } trigger="hover" getPopupContainer={() => document.getElementById(card.uuid + 'swap')}>
+ <Icon type="swap" id={card.uuid + 'swap'}/>
+ </Popover> : null}
+ {cards.subtype === 'propcard' || card.$cardType === 'extendCard' ? <Icon className="close" title="鍒犻櫎鍗＄墖" type="delete" onClick={() => this.props.deleteElement(card)} /> : null}
+ {card.setting.type === 'multi' ? <Switch size="small" onClick={this.changeSide} defaultChecked /> : null}
+ </div>
+ } trigger="hover">
+ <Icon type="tool" />
+ </Popover>
+ </div>
</div>
- </div>
- // <div className="model-menu-card-cell-list">
- // <DragElement
- // list={elements}
- // handleList={this.handleList}
- // handleMenu={this.handleElement}
- // deleteMenu={this.deleteElement}
- // />
- // {/* 缂栬緫鎸夐挳锛氬鍒躲�佺紪杈� */}
- // <Modal
- // title={'缂栬緫鍏冪礌'}
- // visible={visible}
- // width={800}
- // maskClosable={false}
- // onCancel={this.editModalCancel}
- // onOk={this.handleSubmit}
- // destroyOnClose
- // >
- // <ElementForm
- // dict={dict}
- // card={card}
- // formlist={this.state.formlist}
- // inputSubmit={this.handleSubmit}
- // config={config}
- // wrappedComponentRef={(inst) => this.elementFormRef = inst}
- // />
- // </Modal>
- // </div>
+ <Modal
+ wrapClassName="popview-modal"
+ title={'鍗＄墖璁剧疆'}
+ visible={settingVisible}
+ width={800}
+ maskClosable={false}
+ okText={dict['model.submit']}
+ onOk={this.settingSubmit}
+ onCancel={() => { this.setState({ settingVisible: false }) }}
+ destroyOnClose
+ >
+ <SettingForm
+ dict={dict}
+ cards={cards}
+ setting={card.setting}
+ inputSubmit={this.settingSubmit}
+ wrappedComponentRef={(inst) => this.settingRef = inst}
+ />
+ </Modal>
+ </Col>
)
}
}
--
Gitblit v1.8.0