From 20185ab64a165df51515d9fa1c9b12a7a8c55f59 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 07 四月 2023 23:11:04 +0800
Subject: [PATCH] 2023-04-07
---
src/menu/components/card/cardcomponent/index.jsx | 109 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 35 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index 5554b8f..db2c7f5 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -12,8 +12,10 @@
import MKEmitter from '@/utils/events.js'
import './index.scss'
+const { confirm } = Modal
+
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
-const CardCellComponent = asyncComponent(() => import('../cardcellcomponent'))
+const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteController = asyncIconComponent(() => import('@/components/paste'))
@@ -47,10 +49,6 @@
})
}
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
- }
-
shouldComponentUpdate (nextProps, nextState) {
const { cards } = this.props
@@ -64,14 +62,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') {
@@ -127,7 +121,6 @@
}
addElement = () => {
- const { cards } = this.props
const { card } = this.state
let newcard = {}
@@ -138,12 +131,15 @@
newcard.datatype = 'dynamic'
newcard.height = 1
+ if (card.$cardType === 'extendCard' && card.setting.cardRole === 'header') {
+ newcard.datatype = 'static'
+ }
+
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('cardAddElement', [cards.uuid, card.uuid], newcard)
+ MKEmitter.emit('cardAddElement', card.uuid, newcard)
}
addButton = () => {
- const { cards } = this.props
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'}
@@ -151,11 +147,10 @@
newcard.focus = true
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('cardAddElement', [cards.uuid, card.uuid], newcard)
+ MKEmitter.emit('cardAddElement', card.uuid, newcard)
}
changeStyle = () => {
- const { cards } = this.props
const { card, side } = this.state
let _style = null
@@ -167,7 +162,7 @@
options = ['background', 'padding']
}
- MKEmitter.emit('changeStyle', [cards.uuid, card.uuid], options, _style)
+ MKEmitter.emit('changeStyle', options, _style, this.getStyle)
}
getSettingForms = () => {
@@ -198,6 +193,39 @@
updateSetting = (res) => {
const { card, side, appType } = this.state
+
+ if (card.$cardType === 'extendCard' && res.cardRole === 'header') {
+ let _card = {...card, setting: res}
+
+ let originLength = _card.elements.length
+ _card.elements = _card.elements.filter(item => item.eleType === 'text')
+ _card.backElements = []
+
+ delete _card.menus
+
+ if (_card.elements.length < originLength) {
+ const that = this
+
+ confirm({
+ title: '琛ㄦ牸澶翠粎鏀寔鏂囨湰锛岀‘瀹氳鍒囨崲鍗＄墖瑙掕壊鍚�?',
+ content: '',
+ okText: '纭畾',
+ cancelText: '鍙栨秷',
+ onOk() {
+ that.setState({ card: _card, side: '', elements: fromJS(_card.elements).toJS() }, () => {
+ that.setState({ side: 'front' })
+ })
+ that.props.updateElement(_card)
+ },
+ onCancel() {}
+ })
+ } else {
+ this.setState({ card: _card, side: 'front' })
+ this.props.updateElement(_card)
+ }
+
+ return
+ }
if (appType === '' && res.menu) {
let list = null
@@ -244,19 +272,17 @@
}
paste = (element, resolve) => {
- const { cards } = this.props
const { card } = this.state
let _uuid = Utils.getuuid()
+ if (card.$cardType === 'extendCard' && card.setting.cardRole === 'header' && element.eleType !== 'text') {
+ resolve({status: false, message: '琛ㄦ牸澶翠粎鏀寔鏂囨湰鍏冪礌锛�'})
+ return
+ }
+
if (element.copyType === 'action') {
element.eleType = 'button'
- if (element.OpenType === 'popview') { // 寮圭獥鏍囩澶嶅埗
- let _cell = fromJS(element).toJS()
- _cell.$originUuid = element.uuid
- _cell.uuid = _uuid
- MKEmitter.emit('copyButtons', [_cell])
- }
}
element.uuid = _uuid
@@ -265,14 +291,7 @@
resolve({status: true})
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('cardAddElement', [cards.uuid, card.uuid], element)
- }
-
- 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')
- }
+ MKEmitter.emit('cardAddElement', card.uuid, element)
}
doubleClickCard = () => {
@@ -336,16 +355,36 @@
}
_style = resetStyle(_style)
+ let checkAll = ''
+ if ((cards.subtype === 'datacard' || cards.subtype === 'dualdatacard') && card.$cardType === 'extendCard') {
+ checkAll = card.setting.checkAll === 'show' ? ' mk-checkable mk-extend-card' : ''
+ if (checkAll && cards.wrap.selStyle === 'check square') {
+ checkAll = ' mk-checkable square mk-extend-card'
+ }
+ } else if (cards.subtype === 'datacard') {
+ if (cards.wrap.selStyle === 'check') {
+ checkAll = ' mk-checkable'
+ } else if (cards.wrap.selStyle === 'check square') {
+ checkAll = ' mk-checkable square'
+ }
+ }
+
+ let tablerole = ''
+ if (card.$cardType === 'extendCard' && card.setting.cardRole === 'header') {
+ tablerole = ' mk-table-header'
+ }
+
return (
<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}>
+ <div className={'card-item ' + (card.setting.btnControl || '') + checkAll + tablerole} style={_style} onDoubleClick={(e) => {e.stopPropagation(); this.doubleClickCard()}} id={card.uuid}>
+ <span className="circle-select"></span>
<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">
<PlusOutlined className="plus" title="娣诲姞鍏冪礌" onClick={this.addElement} />
- <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} />
- <NormalForm title="鍗＄墖璁剧疆" width={800} update={this.updateSetting} getForms={this.getSettingForms}>
+ {!tablerole ? <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} /> : null}
+ <NormalForm title={cards.subtype === 'datacard' && card.$cardType !== 'extendCard' ? '寰幆鍗＄墖璁剧疆' : '灞炴�у崱鐗囪缃�'} width={950} update={this.updateSetting} getForms={this.getSettingForms}>
<EditOutlined className="edit" title="缂栬緫"/>
</NormalForm>
<CopyComponent type="cardcell" card={card}/>
@@ -363,7 +402,7 @@
{card.setting.type === 'multi' ? <Switch size="small" onClick={this.changeSide} defaultChecked /> : null}
</div>
} trigger="hover">
- <ToolOutlined />
+ <ToolOutlined style={cards.subtype === 'datacard' && card.$cardType === 'extendCard' ? {color: '#26C281'} : null}/>
</Popover>
</div>
</div>
--
Gitblit v1.8.0