From 8a1ee7d651500f848a3c2f05c7fe3be2b7114a43 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 10 四月 2024 00:47:56 +0800
Subject: [PATCH] 2024-04-10
---
src/menu/components/card/cardcellcomponent/index.jsx | 230 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 177 insertions(+), 53 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 26e7108..9c1dbd3 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -2,11 +2,11 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Modal, Button } from 'antd'
+import moment from 'moment'
import asyncComponent from '@/utils/asyncComponent'
import { getCardCellForm } from './formconfig'
import { getActionForm, getBaseTableActionForm } from '@/menu/components/share/actioncomponent/formconfig'
-
import MKEmitter from '@/utils/events.js'
import MenuUtils from '@/utils/utils-custom.js'
import ElementForm from './elementform'
@@ -24,11 +24,12 @@
class CardCellComponent extends Component {
static propTpyes = {
- cards: PropTypes.object, // 鑿滃崟閰嶇疆淇℃伅
+ cards: PropTypes.object,
cardCell: PropTypes.object,
side: PropTypes.string,
- elements: PropTypes.array, // 鍏冪礌闆�
- updateElement: PropTypes.func // 鑿滃崟閰嶇疆鏇存柊
+ timestamp: PropTypes.any,
+ elements: PropTypes.array,
+ updateElement: PropTypes.func
}
state = {
@@ -74,7 +75,7 @@
}
UNSAFE_componentWillReceiveProps(nextProps) {
- if (this.props.side !== nextProps.side) {
+ if (this.props.timestamp !== nextProps.timestamp && nextProps.timestamp) {
this.setState({
elements: fromJS(nextProps.elements).toJS()
})
@@ -121,11 +122,12 @@
this.setState({elements: this.state.elements.filter(item => item.uuid !== eleId)})
}
- cardAddElement = (id, element) => {
- const { cardCell } = this.props
+ cardAddElement = (id, element, type) => {
+ const { cardCell, side } = this.props
if (id !== cardCell.uuid) return
if (window.GLOB.$lock) return
+ if (type && side !== type) return
window.GLOB.$lock = true
setTimeout(() => {
@@ -148,18 +150,28 @@
options = ['margin', 'float']
} else {
options.push('width', 'minHeight', 'float')
+ _style.minHeight = _style.minHeight || '28px'
}
if (element.wrapStyle) {
_style.float = element.wrapStyle.textAlign || 'left'
}
} else if (element.eleType === 'picture') {
- options = ['border', 'margin']
+ options = ['background', 'border', 'margin']
+ } else if (element.eleType === 'color') {
+ options = ['border', 'margin', 'padding']
+ } else if (element.eleType === 'number' || element.eleType === 'icon') {
+ options.push('display')
} else if (element.eleType === 'text') {
options[0] = 'font2'
+ options.push('display')
} else if (element.eleType === 'slider') {
options = ['padding', 'margin']
} else if (element.eleType === 'splitline') {
options = ['padding', 'margin']
+ }
+
+ if (element.eleType !== 'button' && element.eleType !== 'tag') {
+ options.push('position')
}
options.push('clear')
@@ -168,17 +180,11 @@
card: element
})
- MKEmitter.emit('changeStyle', options, _style, this.getStyle)
+ MKEmitter.emit('changeStyle', options, _style, this.getStyle, 'mk-' + element.eleType)
}
getStyle = (style) => {
const { card, elements } = this.state
-
- // if (card.eleType === 'button') {
- // if ((style.paddingLeft || style.paddingRight) && !style.width) {
- // style.width = 'auto'
- // }
- // }
let _card = this.resetCardStyle(card, style)
@@ -201,7 +207,7 @@
_card.style = style
let line = _card.height || null
- if (['currentDate', 'sequence', 'icon'].includes(_card.eleType)) {
+ if (['currentDate', 'sequence'].includes(_card.eleType) || (_card.eleType === 'icon' && _card.tipType !== 'text')) {
line = 1
}
@@ -237,6 +243,13 @@
_card.wrapStyle = {textAlign: style.float}
delete _card.style.float
}
+ } else if (_card.eleType === 'picture') {
+ _card.style = style
+ delete _card.style.backgroundImage
+ delete _card.style.paddingTop
+ delete _card.style.paddingBottom
+ delete _card.style.paddingLeft
+ delete _card.style.paddingRight
} else {
_card.style = style
}
@@ -274,7 +287,7 @@
* @description 鎸夐挳缂栬緫锛岃幏鍙栨寜閽〃鍗曚俊鎭�
*/
handleAction = (card) => {
- const { cards } = this.props
+ const { cards, side } = this.props
let usefulFields = sessionStorage.getItem('permFuncField')
if (usefulFields) {
@@ -302,22 +315,23 @@
supId = ''
}
}
+ let menu = window.GLOB.customMenu
- let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, cards.uuid, supId)
+ let modules = MenuUtils.getSubModules(menu.components, cards.uuid, supId, menu.interfaces || null)
if (cards.subtype === 'basetable') {
this.setState({
actvisible: true,
card: card,
- formlist: getBaseTableActionForm(card, functip, cards, usefulFields, modules)
+ formlist: getBaseTableActionForm(card, functip, cards, usefulFields, modules, 'line')
})
} else {
- let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, cards.uuid) || []
-
+ let anchors = MenuUtils.getAnchors(menu.components, cards.uuid) || []
+
this.setState({
actvisible: true,
card: card,
- formlist: getActionForm(card, functip, cards, usefulFields, modules, anchors)
+ formlist: getActionForm(card, functip, cards, usefulFields, modules, anchors, side, 'line')
})
}
}
@@ -352,16 +366,28 @@
const { elements } = this.state
this.elementFormRef.handleConfirm().then(res => {
+ if (res.width % 0.5) {
+ res.width = parseInt(res.width / 0.5) * 0.5
+ }
+ if (res.width % 1) {
+ res.width = (res.width + '').replace(/.5/, 'x')
+ }
+
let _elements = elements.map(cell => {
if (cell.uuid === res.uuid) {
res.style = cell.style || {}
+
+ if (!['text', 'number', 'icon'].includes(res.eleType)) {
+ delete res.style.display
+ }
+
if (res.eleType === 'splitline' && (cell.eleType !== 'splitline' || cell.focus)) {
res.style.paddingTop = '5px'
res.style.paddingBottom = '5px'
} else if (['text', 'number', 'formula', 'currentDate', 'sequence', 'icon'].includes(res.eleType)) {
let line = res.height || null
- if (['currentDate', 'sequence', 'icon'].includes(res.eleType)) {
+ if (['currentDate', 'sequence'].includes(res.eleType) || (res.eleType === 'icon' && res.tipType !== 'text')) {
line = 1
}
@@ -392,6 +418,27 @@
}
res.innerHeight = res.barHeight + (res.displayValue === 'true' ? fontSize + 2 : 0)
+ } else if (res.eleType === 'picture') {
+ delete res.style.backgroundImage
+ delete res.style.paddingTop
+ delete res.style.paddingBottom
+ delete res.style.paddingLeft
+ delete res.style.paddingRight
+ } else if (res.eleType === 'tag') {
+ delete res.style.position
+ if (cell.eleType !== 'tag') {
+ res.style = {
+ backgroundColor: 'var(--mk-sys-color1)',
+ color: 'var(--mk-sys-color)',
+ borderColor: 'var(--mk-sys-color)',
+ borderWidth: '1px',
+ borderRadius: '4px',
+ paddingLeft: '7px',
+ paddingRight: '7px',
+ marginRight: '8px',
+ marginBottom: '8px',
+ }
+ }
}
return res
@@ -416,37 +463,58 @@
let color = { primary: '#1890ff', yellow: '#c49f47', orange: 'orange', danger: '#ff4d4f', green: '#26C281', dgreen: '#32c5d2', purple: '#8E44AD', cyan: '#13c2c2', gray: '#666666', default: 'rgba(0, 0, 0, 0.65)' }
this.actionFormRef.handleConfirm().then(res => {
+ if (res.width % 0.5) {
+ res.width = parseInt(res.width / 0.5) * 0.5
+ }
+ if (res.width % 1) {
+ res.width = (res.width + '').replace(/.5/, 'x')
+ }
+
let _elements = elements.map(cell => {
if (cell.uuid === res.uuid) {
res.eleType = cell.eleType || null
res.style = cell.style || null
- res.modal = cell.modal || null
res.wrapStyle = cell.wrapStyle || null
- // res = {...cell, ...res}
-
- // if (!res.control) {
- // delete res.controlField
- // delete res.controlVal
- // }
-
- // delete res.focus
if (res.OpenType === 'form') {
if (cell.OpenType !== 'form') {
res.style = {}
}
- } else if (res.class !== cell.class || res.show !== cell.show || !res.style) {
- let cl = res.class.replace('border-', '')
- let style = {}
- if (res.show === 'link' || res.show === 'icon') {
- style.color = color[cl]
- style.backgroundColor = 'transparent'
+ // } else if (res.class !== cell.class || res.show !== cell.show || !res.style) {
+ } else if (res.class !== cell.class || !res.style) {
+ if (res.class) {
+ let cl = res.class.replace('border-', '')
+ let style = {}
+ if (res.class === 'default') {
+ style.color = 'rgba(0, 0, 0, 0.65)'
+ style.backgroundColor = 'transparent'
+ style.borderColor = '#d9d9d9'
+ } else if (res.class.indexOf('border') > -1) {
+ style.color = color[cl]
+ style.backgroundColor = 'transparent'
+ style.borderColor = color[cl]
+ } else {
+ style.color = '#ffffff'
+ style.backgroundColor = color[cl]
+ }
+ res.style = {...res.style, ...style}
} else {
- style.color = '#ffffff'
- style.backgroundColor = color[cl]
+ res.style = res.style || {}
}
- res.style = {...res.style, ...style}
}
+
+ if (res.width === 0 && cell.width !== 0) {
+ res.style = res.style || {}
+
+ res.style.paddingLeft = '15px'
+ res.style.paddingRight = '15px'
+ res.style.marginRight = '15px'
+ res.style.width = 'auto'
+
+ delete res.style.marginLeft
+ }
+
+ res.updateTime = moment().format('YYYY-MM-DD HH:mm')
return res
}
@@ -504,6 +572,7 @@
let _elements = elements.map(cell => {
if (cell.uuid === card.uuid) {
cell.verify = res
+ cell.updateTime = moment().format('YYYY-MM-DD HH:mm')
}
return cell
@@ -519,9 +588,13 @@
}
handleSubConfig = (item) => {
- const { cards } = this.props
+ const { cards, side } = this.props
const { appType } = this.state
let btn = fromJS(item).toJS()
+
+ if (side === 'sub') {
+ btn.$sub = true
+ }
if ((sessionStorage.getItem('style-control') && sessionStorage.getItem('style-control') === 'true')) return
@@ -588,10 +661,9 @@
}
dropButton = (id) => {
- const { cards, cardCell } = this.props
+ const { cards } = this.props
if (!cards.action) return
- if (cardCell.type === 'custom') return
let index = cards.action.findIndex(item => item.uuid === id)
@@ -628,8 +700,56 @@
})
}
- getVerify = (card) => {
+ /**
+ * @description 鍒涘缓鎸夐挳瀛樺偍杩囩▼
+ */
+ creatFunc = () => {
const { cards } = this.props
+ const menu = window.GLOB.customMenu
+
+ return new Promise((resolve) => {
+ this.actionFormRef.handleConfirm().then(res => {
+ let btn = fromJS(res).toJS()
+ let _config = fromJS(cards).toJS()
+
+ if (btn.OpenType === 'excelIn') {
+ btn.func = btn.innerFunc
+ btn.menuNo = menu.MenuNo
+ btn.MenuName = menu.MenuName + _config.name
+ btn.$type = 'excelIn'
+
+ resolve(btn)
+ } else if (btn.OpenType === 'excelOut') {
+ _config.MenuName = menu.MenuName + '-' + _config.name
+ _config.menuNo = menu.MenuNo
+ _config.MenuID = menu.MenuID
+ _config.func = btn.innerFunc
+ _config.$type = 'table'
+
+ resolve(_config)
+ } else {
+ btn.func = btn.innerFunc
+ btn.name = _config.setting.tableName || ''
+ btn.menuNo = menu.MenuNo
+ btn.MenuID = menu.MenuID
+ btn.MenuName = menu.MenuName + _config.name
+ btn.fields = []
+ btn.columns = _config.columns
+ btn.primaryKey = _config.setting.primaryKey || 'ID'
+ btn.$type = 'btn'
+
+ if (btn.OpenType === 'pop') {
+ btn.fields = btn.modal ? btn.modal.fields : []
+ }
+
+ resolve(btn)
+ }
+ })
+ })
+ }
+
+ getVerify = (card) => {
+ const { cards, side } = this.props
if (!card) return null
@@ -637,13 +757,14 @@
return <VerifyCard
card={card}
config={cards}
- columns={cards.columns}
+ side={side || ''}
+ columns={side === 'sub' ? cards.subColumns : cards.columns}
wrappedComponentRef={(inst) => this.verifyRef = inst}
/>
} else if (card.OpenType === 'excelIn') {
return <VerifyExcelIn
card={card}
- columns={cards.columns}
+ columns={side === 'sub' ? cards.subColumns : cards.columns}
wrappedComponentRef={(inst) => this.verifyRef = inst}
/>
} else if (card.OpenType === 'excelOut') {
@@ -655,22 +776,22 @@
} else if (card.OpenType === 'funcbutton' && card.funcType === 'print') {
return <VerifyPrint
card={card}
- columns={cards.columns}
+ columns={side === 'sub' ? cards.subColumns : cards.columns}
wrappedComponentRef={(inst) => this.verifyRef = inst}
/>
}
}
render() {
- const { cards, cardCell } = this.props
+ const { cards, cardCell, side } = this.props
const { elements, visible, actvisible, profVisible, card, record } = this.state
return (
- <div className="model-menu-card-cell-list">
+ <div className={'model-menu-card-cell-list ' + (cardCell && cardCell.setting && cardCell.setting.layout === 'flex' ? 'mk-flex' : '') }>
<DragElement
list={elements}
parent={cardCell}
- fields={cards.columns}
+ fields={side === 'sub' ? cards.subColumns : cards.columns}
updateMarks={this.updateMarks}
handleList={this.handleList}
handleMenu={this.handleElement}
@@ -684,6 +805,7 @@
{/* 缂栬緫鎸夐挳锛氬鍒躲�佺紪杈� */}
<Modal
title="缂栬緫鍏冪礌"
+ wrapClassName="mk-scroll-modal"
visible={visible}
width={850}
maskClosable={false}
@@ -693,6 +815,7 @@
>
<ElementForm
card={card}
+ side={side}
formlist={this.state.formlist}
inputSubmit={this.handleSubmit}
config={cards}
@@ -702,19 +825,20 @@
{/* 缂栬緫鎸夐挳锛氬鍒躲�佺紪杈� */}
<Modal
title="鎸夐挳路缂栬緫"
+ wrapClassName="mk-scroll-modal"
visible={actvisible}
width={920}
maskClosable={false}
onCancel={this.editModalCancel}
footer={[
- record && record.intertype === 'inner' ? <CreateFunc key="create" ref="btnCreatFunc" trigger={this.creatFunc}/> : null,
+ record && record.intertype === 'inner' && cards.subtype === 'dualdatacard' ? <CreateFunc key="create" getMsg={this.creatFunc}/> : null,
<Button key="cancel" onClick={this.editModalCancel}>鍙栨秷</Button>,
<Button key="confirm" type="primary" onClick={this.handleActionSubmit}>纭畾</Button>
]}
destroyOnClose
>
<ActionForm
- type={cards.type === 'balcony' ? '' : 'card'}
+ type={cards.type === 'balcony' || cardCell.$cardType === 'extendCard' ? '' : 'card'}
card={card}
formlist={this.state.formlist}
inputSubmit={this.handleActionSubmit}
--
Gitblit v1.8.0