From 2e3bf38aced62c8ecf4af58ca2685f09d3d47dde Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 17 二月 2023 00:09:04 +0800
Subject: [PATCH] 2023-02-17
---
src/menu/components/card/doublecardcomponent/index.jsx | 191 ++++++++++++++++++++++-------------------------
1 files changed, 91 insertions(+), 100 deletions(-)
diff --git a/src/menu/components/card/doublecardcomponent/index.jsx b/src/menu/components/card/doublecardcomponent/index.jsx
index 6f1d02c..d79d883 100644
--- a/src/menu/components/card/doublecardcomponent/index.jsx
+++ b/src/menu/components/card/doublecardcomponent/index.jsx
@@ -27,7 +27,8 @@
state = {
card: null, // 鍗＄墖淇℃伅锛屽寘鎷鍙嶉潰
appType: sessionStorage.getItem('appType'),
- visible: false
+ visible: false,
+ side: ''
}
/**
@@ -60,7 +61,7 @@
const { card, side } = this.state
let _card = fromJS(card).toJS()
- if (side === 'back') {
+ if (side === 'sub') {
_card.backStyle = style
} else {
_card.style = style
@@ -73,12 +74,12 @@
this.props.updateElement(_card)
}
- updateCard = (elements, btn) => {
- const { card, side } = this.state
+ updateCard = (elements, btn, type) => {
+ const { card } = this.state
let _card = {}
- if (side === 'back') {
+ if (type === 'sub') {
_card = {...card, backElements: elements}
} else {
_card = {...card, elements: elements}
@@ -90,29 +91,8 @@
this.props.updateElement(_card, btn)
}
-
- changeSide = () => {
- const { card } = this.props
- const { side } = this.state
-
- let _side = ''
- let _elements = null
- if (side === 'front') {
- _side = 'back'
- } else {
- _side = 'front'
- }
-
- if (_side === 'front') {
- _elements = fromJS(card.elements).toJS()
- } else {
- _elements = fromJS(card.backElements).toJS()
- }
-
- this.setState({side: _side, elements: _elements})
- }
- addElement = () => {
+ addElement = (type) => {
const { card } = this.state
let newcard = {}
@@ -124,10 +104,10 @@
newcard.height = 1
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('cardAddElement', card.uuid, newcard)
+ MKEmitter.emit('cardAddElement', card.uuid, newcard, type)
}
- addButton = () => {
+ addButton = (type) => {
const { card } = this.state
let newcard = {eleType: 'button', label: 'button', verify: null, show: 'link', sqlType: '', Ot: 'requiredSgl', OpenType: 'prompt', icon: '', class: 'primary', intertype: 'system', execSuccess: 'grid', execError: 'never', popClose: 'never'}
@@ -135,30 +115,31 @@
newcard.focus = true
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('cardAddElement', card.uuid, newcard)
+ MKEmitter.emit('cardAddElement', card.uuid, newcard, type)
}
- changeStyle = () => {
- const { card, side } = this.state
+ changeStyle = (type) => {
+ const { card } = this.state
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']
+
+ if (type === 'sub') {
+ _style = fromJS(card.backStyle).toJS()
+ } else {
+ _style = fromJS(card.style).toJS()
}
+
+ this.setState({side: type})
MKEmitter.emit('changeStyle', options, _style, this.getStyle)
}
getSettingForms = () => {
- const { cards } = this.props
- const { card, appType } = this.state
+ const { card } = this.state
let buttons = []
- card.elements && card.elements.forEach(item => {
+ card.elements.forEach(item => {
if (item.eleType === 'button') {
buttons.push({
value: item.uuid,
@@ -166,21 +147,28 @@
})
}
})
- if (appType !== 'mob' && card.backElements) {
- card.backElements.forEach(item => {
- if (item.eleType === 'button') {
- buttons.push({
- value: item.uuid,
- label: item.label
- })
- }
- })
- }
- return getSettingForm(card.setting, cards.subtype, buttons, card.$cardType, cards.columns)
+
+ return getSettingForm(card.setting, buttons)
}
- updateSetting = (res) => {
- const { card, side, appType } = this.state
+ getBackSettingForms = () => {
+ const { card } = this.state
+
+ let buttons = []
+ card.backElements.forEach(item => {
+ if (item.eleType === 'button') {
+ buttons.push({
+ value: item.uuid,
+ label: item.label
+ })
+ }
+ })
+
+ return getSettingForm(card.backSetting, buttons)
+ }
+
+ updateSetting = (res, type) => {
+ const { card, appType } = this.state
if (appType === '' && res.menu) {
let list = null
@@ -202,23 +190,22 @@
})
}
- let _card = {...card, setting: res}
+ let _card = {...card}
+
+ if (type === 'sub') {
+ _card.backSetting = res
+ } else {
+ _card.setting = res
+ }
this.setState({
card: _card
})
- if (side === 'back' && res.type === 'simple') {
- this.setState({
- side: 'front',
- elements: fromJS(_card.elements).toJS()
- })
- }
-
this.props.updateElement(_card)
}
- paste = (element, resolve) => {
+ paste = (element, resolve, type) => {
const { card } = this.state
let _uuid = Utils.getuuid()
@@ -233,14 +220,16 @@
resolve({status: true})
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('cardAddElement', card.uuid, element)
+ MKEmitter.emit('cardAddElement', card.uuid, element, type)
}
- doubleClickCard = () => {
+ doubleClickCard = (type) => {
const { card } = this.state
- if (card.setting.click === 'menu' && card.setting.menu) {
+ if (type !== 'sub' && card.setting.click === 'menu' && card.setting.menu) {
MKEmitter.emit('changeEditMenu', {MenuID: card.setting.menu})
+ } else if (type === 'sub' && card.backSetting.click === 'menu' && card.backSetting.menu) {
+ MKEmitter.emit('changeEditMenu', {MenuID: card.backSetting.menu})
}
}
@@ -262,43 +251,45 @@
return (
<Col span={card.setting.width || 24}>
- <div className={'card-item ' + (card.setting.btnControl || '')} style={_style} onDoubleClick={(e) => {e.stopPropagation(); this.doubleClickCard()}} id={card.uuid}>
- <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">
- <PlusOutlined className="plus" title="娣诲姞鍏冪礌" onClick={this.addElement} />
- <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} />
- <NormalForm title={'寰幆鍗＄墖璁剧疆'} width={950} update={this.updateSetting} getForms={this.getSettingForms}>
- <EditOutlined className="edit" title="缂栬緫"/>
- </NormalForm>
- <CopyComponent type="cardcell" card={card}/>
- <PasteController options={['action', 'customCardElement']} updateConfig={this.paste} />
- <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} />
- </div>
- } trigger="hover">
- <ToolOutlined />
- </Popover>
+ <div className="card-item-wrap">
+ <div className={'card-item ' + (card.setting.btnControl || '')} style={_style} onDoubleClick={(e) => {e.stopPropagation(); this.doubleClickCard()}} id={card.uuid}>
+ <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">
+ <PlusOutlined className="plus" title="娣诲姞鍏冪礌" onClick={() => this.addElement('main')} />
+ <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={() => this.addButton('main')} />
+ <NormalForm title={'寰幆鍗＄墖璁剧疆'} width={950} update={(res) => this.updateSetting(res)} getForms={this.getSettingForms}>
+ <EditOutlined className="edit" title="缂栬緫"/>
+ </NormalForm>
+ <CopyComponent type="cardcell" card={card}/>
+ <PasteController options={['action', 'customCardElement']} updateConfig={(element, resolve) => this.paste(element, resolve, 'main')} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.changeStyle()} />
+ </div>
+ } trigger="hover">
+ <ToolOutlined />
+ </Popover>
+ </div>
+ <CardCellComponent cards={cards} cardCell={card} side="main" elements={card.elements} updateElement={(elements, btn) => this.updateCard(elements, btn)}/>
</div>
- <CardCellComponent cards={cards} cardCell={card} side="" elements={card.elements} updateElement={this.updateCard}/>
- </div>
- <div className={'card-item ' + (card.setting.btnControl || '')} style={_backStyle} onDoubleClick={(e) => {e.stopPropagation(); this.doubleClickCard()}} id={card.uuid}>
- <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">
- <PlusOutlined className="plus" title="娣诲姞鍏冪礌" onClick={this.addElement} />
- <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} />
- <NormalForm title={'寰幆瀛愬崱鐗囪缃�'} width={950} update={this.updateSetting} getForms={this.getSettingForms}>
- <EditOutlined className="edit" title="缂栬緫"/>
- </NormalForm>
- <CopyComponent type="cardcell" card={card}/>
- <PasteController options={['action', 'customCardElement']} updateConfig={this.paste} />
- <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} />
- </div>
- } trigger="hover">
- <ToolOutlined />
- </Popover>
+ <div className={'card-item ' + (card.backSetting.btnControl || '')} style={_backStyle} onDoubleClick={(e) => {e.stopPropagation(); this.doubleClickCard('sub')}} id={card.uuid}>
+ <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">
+ <PlusOutlined className="plus" title="娣诲姞鍏冪礌" onClick={() => this.addElement('sub')} />
+ <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={() => this.addButton('sub')} />
+ <NormalForm title={'寰幆瀛愬崱鐗囪缃�'} width={950} update={(res) => this.updateSetting(res, 'sub')} getForms={this.getBackSettingForms}>
+ <EditOutlined className="edit" title="缂栬緫"/>
+ </NormalForm>
+ <CopyComponent type="cardcell" card={card}/>
+ <PasteController options={['action', 'customCardElement']} updateConfig={(element, resolve) => this.paste(element, resolve, 'sub')} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.changeStyle('sub')} />
+ </div>
+ } trigger="hover">
+ <ToolOutlined />
+ </Popover>
+ </div>
+ <CardCellComponent cards={cards} cardCell={card} side="sub" elements={card.backElements} updateElement={(elements, btn) => this.updateCard(elements, btn, 'sub')}/>
</div>
- <CardCellComponent cards={cards} cardCell={card} side="" elements={card.backElements} updateElement={this.updateCard}/>
</div>
</Col>
)
--
Gitblit v1.8.0