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 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index a7efb6a..db2c7f5 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -12,6 +12,8 @@
import MKEmitter from '@/utils/events.js'
import './index.scss'
+const { confirm } = Modal
+
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
@@ -129,6 +131,10 @@
newcard.datatype = 'dynamic'
newcard.height = 1
+ if (card.$cardType === 'extendCard' && card.setting.cardRole === 'header') {
+ newcard.datatype = 'static'
+ }
+
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
MKEmitter.emit('cardAddElement', card.uuid, newcard)
}
@@ -188,6 +194,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
try {
@@ -237,6 +276,11 @@
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'
}
@@ -325,16 +369,21 @@
}
}
+ 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 || '') + checkAll} style={_style} 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} />
+ {!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>
--
Gitblit v1.8.0