From e8edfdadb561cd83bf6e1c3e00d55b8cc2aee6d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 十月 2022 17:57:34 +0800
Subject: [PATCH] 2022-10-17
---
src/menu/components/card/cardcellcomponent/index.jsx | 179 +++++++++++++++++++++++++++++------------------------------
1 files changed, 87 insertions(+), 92 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index f5275c9..2cb20e5 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -3,8 +3,6 @@
import { is, fromJS } from 'immutable'
import { Modal, Button } from 'antd'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import asyncComponent from '@/utils/asyncComponent'
import { getCardCellForm } from './formconfig'
import { getActionForm } from '@/menu/components/share/actioncomponent/formconfig'
@@ -34,7 +32,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
appType: sessionStorage.getItem('appType'),
card: null, // 缂栬緫涓厓绱�
formlist: null, // 琛ㄥ崟淇℃伅
@@ -66,22 +63,18 @@
}
componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
MKEmitter.addListener('submitModal', this.handleSave)
MKEmitter.addListener('cardAddElement', this.cardAddElement)
+ MKEmitter.addListener('cardDelElement', this.cardDelElement)
MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
}
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.props.cards), fromJS(nextProps.cards)) || !is(fromJS(this.state), fromJS(nextState))
+ return !is(fromJS(this.state), fromJS(nextState)) || !is(fromJS(this.props.cards), fromJS(nextProps.cards))
}
UNSAFE_componentWillReceiveProps(nextProps) {
if (this.props.side !== nextProps.side) {
- this.setState({
- elements: fromJS(nextProps.elements).toJS()
- })
- } else if (!is(fromJS(this.props.elements), fromJS(nextProps.elements)) && nextProps.elements.length !== this.state.elements.length) {
this.setState({
elements: fromJS(nextProps.elements).toJS()
})
@@ -95,16 +88,16 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
MKEmitter.removeListener('submitModal', this.handleSave)
MKEmitter.removeListener('cardAddElement', this.cardAddElement)
+ MKEmitter.removeListener('cardDelElement', this.cardDelElement)
MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
}
updateComponentStyle = (parentId, keys, style) => {
const { cardCell } = this.props
- if (!cardCell || cardCell.uuid !== parentId) return
+ if (cardCell.uuid !== parentId) return
const { elements } = this.state
@@ -122,10 +115,18 @@
})
}
- cardAddElement = (ids, element) => {
- const { cards, cardCell } = this.props
+ cardDelElement = (id, eleId) => {
+ const { cardCell } = this.props
- if (!ids || ids.length !== 2 || ids[0] !== cards.uuid || ids[1] !== cardCell.uuid) return
+ if (id !== cardCell.uuid) return
+
+ this.setState({elements: this.state.elements.filter(item => item.uuid !== eleId)})
+ }
+
+ cardAddElement = (id, element) => {
+ const { cardCell } = this.props
+
+ if (id !== cardCell.uuid) return
if (window.GLOB.$lock) return
window.GLOB.$lock = true
@@ -141,13 +142,11 @@
}
handleStyle = (element) => {
- const { cards, cardCell } = this.props
-
let _style = element.style ? fromJS(element.style).toJS() : {}
let options = ['font', 'border', 'padding', 'margin', 'background']
if (element.eleType === 'button') {
- if (element.OpenType === 'form') {
+ if (element.OpenType === 'form' && element.formType !== 'scan') {
options = ['margin', 'float']
} else {
options.push('width', 'minHeight', 'float')
@@ -169,14 +168,11 @@
card: element
})
- MKEmitter.emit('changeStyle', [cards.uuid, cardCell.uuid, element.uuid], options, _style)
+ MKEmitter.emit('changeStyle', options, _style, this.getStyle)
}
- getStyle = (comIds, style) => {
- const { cards, cardCell } = this.props
+ getStyle = (style) => {
const { card, elements } = this.state
-
- if (comIds.length !== 3 || comIds[0] !== cards.uuid || comIds[1] !== cardCell.uuid || !card) return
// if (card.eleType === 'button') {
// if ((style.paddingLeft || style.paddingRight) && !style.width) {
@@ -200,35 +196,30 @@
resetCardStyle = (card, style) => {
let _card = fromJS(card).toJS()
-
- if (['text', 'number', 'formula'].includes(_card.eleType)) {
- _card.style = style
- let fontSize = 14
- let lineHeight = 1.5
+ if (['text', 'number', 'formula', 'currentDate', 'sequence', 'icon'].includes(_card.eleType)) {
+ _card.style = style
let line = _card.height || null
- if (_card.style.fontSize) {
- fontSize = parseInt(_card.style.fontSize)
- }
- if (_card.style.lineHeight) {
- lineHeight = parseFloat(_card.style.lineHeight)
+ if (['currentDate', 'sequence', 'icon'].includes(_card.eleType)) {
+ line = 1
}
if (line) {
+ let fontSize = 14
+ let lineHeight = 1.5
+
+ if (_card.style.fontSize) {
+ fontSize = parseInt(_card.style.fontSize)
+ }
+ if (_card.style.lineHeight) {
+ lineHeight = parseFloat(_card.style.lineHeight)
+ }
+
_card.innerHeight = fontSize * lineHeight * line
+ } else {
+ _card.innerHeight = 'auto'
}
- } else if (_card.eleType === 'sequence') {
- _card.style = style
-
- let fontSize = 14
- let lineHeight = 1.5
-
- if (_card.style.fontSize) {
- fontSize = parseInt(_card.style.fontSize)
- }
-
- _card.innerHeight = fontSize * lineHeight
} else if (_card.eleType === 'barcode') {
_card.style = style
@@ -299,28 +290,28 @@
}
let ableField = usefulFields.join(', ')
+ let msg = `鍑芥暟鍚嶇О闇�浠�${ableField}绛夊瓧绗﹀紑濮�;`
let functip = <div>
- <p style={{marginBottom: '5px'}}>{this.state.dict['model.tooltip.func.innerface'].replace('@ableField', ableField)}</p>
+ <p style={{marginBottom: '5px'}}>{msg}</p>
</div>
- let menulist = sessionStorage.getItem('fstMenuList')
- if (menulist) {
- try {
- menulist = JSON.parse(menulist)
- } catch (e) {
- menulist = []
+ let supId = ''
+ if (cards.setting && cards.setting.supModule) {
+ let pid = cards.setting.supModule[cards.setting.supModule.length - 1]
+ if (pid && pid !== 'empty') {
+ supId = pid
+ } else {
+ supId = ''
}
- } else {
- menulist = []
}
- let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, cards.uuid) || []
+ let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, cards.uuid, supId) || []
let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, cards.uuid) || []
this.setState({
actvisible: true,
card: card,
- formlist: getActionForm(card, functip, cards, usefulFields, 'card', menulist, modules, anchors)
+ formlist: getActionForm(card, functip, cards, usefulFields, modules, anchors)
})
}
@@ -361,23 +352,30 @@
let _elements = elements.map(cell => {
if (cell.uuid === res.uuid) {
res.style = cell.style || {}
- if (res.eleType === 'splitline' && cell.eleType !== 'splitline') {
+ if (res.eleType === 'splitline' && (cell.eleType !== 'splitline' || cell.focus)) {
res.style.paddingTop = '5px'
res.style.paddingBottom = '5px'
- } else if (['text', 'number', 'formula'].includes(res.eleType)) {
- let fontSize = 14
- let lineHeight = 1.5
+ } else if (['text', 'number', 'formula', 'currentDate', 'sequence', 'icon'].includes(res.eleType)) {
let line = res.height || null
-
- if (res.style && res.style.fontSize) {
- fontSize = parseInt(res.style.fontSize)
- }
- if (res.style && res.style.lineHeight) {
- lineHeight = parseFloat(res.style.lineHeight)
+
+ if (['currentDate', 'sequence', 'icon'].includes(res.eleType)) {
+ line = 1
}
if (line) {
+ let fontSize = 14
+ let lineHeight = 1.5
+
+ if (res.style && res.style.fontSize) {
+ fontSize = parseInt(res.style.fontSize)
+ }
+ if (res.style && res.style.lineHeight) {
+ lineHeight = parseFloat(res.style.lineHeight)
+ }
+
res.innerHeight = fontSize * lineHeight * line
+ } else {
+ res.innerHeight = 'auto'
}
if (res.eleType === 'text' && res.link && !res.style.color) {
@@ -417,14 +415,18 @@
this.actionFormRef.handleConfirm().then(res => {
let _elements = elements.map(cell => {
if (cell.uuid === res.uuid) {
- res = {...cell, ...res}
+ 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
- }
+ // if (!res.control) {
+ // delete res.controlField
+ // delete res.controlVal
+ // }
- delete res.focus
+ // delete res.focus
if (res.OpenType === 'form') {
if (cell.OpenType !== 'form') {
@@ -461,19 +463,17 @@
*/
deleteElement = (card) => {
const { cardCell, side } = this.props
- const { dict, elements, appType } = this.state
+ const { elements, appType } = this.state
let _this = this
confirm({
- content: dict['model.confirm'] + dict['model.delete'] + '鍏冪礌鍚楋紵',
+ content: '纭畾鍒犻櫎鍏冪礌鍚楋紵',
onOk() {
let _elements = elements.filter(item => item.uuid !== card.uuid)
if (card.OpenType === 'popview' || card.verify || card.modal) {
card.$parentId = cardCell.uuid
card.$side = side || ''
-
- // MKEmitter.emit('logButton', cards.uuid, card)
}
_this.setState({
@@ -550,6 +550,8 @@
MKEmitter.emit('changePopview', cards, btn)
} else if (btn.OpenType === 'innerpage' && btn.pageTemplate === 'linkpage') {
MKEmitter.emit('changeEditMenu', {MenuID: btn.linkmenu})
+ } else if (btn.OpenType === 'funcbutton' && (btn.funcType === 'copyurl' || btn.funcType === 'scan') && btn.linkmenu) {
+ MKEmitter.emit('changeEditMenu', {MenuID: btn.linkmenu})
} else {
this.handleElement(item)
}
@@ -596,9 +598,10 @@
}
dropButton = (id) => {
- const { cards } = this.props
+ const { cards, cardCell } = this.props
if (!cards.action) return
+ if (cardCell.type === 'custom') return
let index = cards.action.findIndex(item => item.uuid === id)
@@ -637,14 +640,12 @@
getVerify = (card) => {
const { cards } = this.props
- const { dict } = this.state
if (!card) return null
- if (['pop', 'prompt', 'exec'].includes(card.OpenType)) {
+ if (['pop', 'prompt', 'exec', 'form'].includes(card.OpenType)) {
return <VerifyCard
card={card}
- dict={dict}
config={cards}
columns={cards.columns}
wrappedComponentRef={(inst) => this.verifyRef = inst}
@@ -652,21 +653,18 @@
} else if (card.OpenType === 'excelIn') {
return <VerifyExcelIn
card={card}
- dict={dict}
columns={cards.columns}
wrappedComponentRef={(inst) => this.verifyRef = inst}
/>
} else if (card.OpenType === 'excelOut') {
return <VerifyExcelOut
card={card}
- dict={dict}
config={cards}
wrappedComponentRef={(inst) => this.verifyRef = inst}
/>
} else if (card.OpenType === 'funcbutton' && card.funcType === 'print') {
return <VerifyPrint
card={card}
- dict={dict}
columns={cards.columns}
wrappedComponentRef={(inst) => this.verifyRef = inst}
/>
@@ -675,13 +673,13 @@
render() {
const { cards, cardCell } = this.props
- const { elements, visible, actvisible, profVisible, card, dict, record } = this.state
+ const { elements, visible, actvisible, profVisible, card, record } = this.state
return (
<div className="model-menu-card-cell-list">
<DragElement
list={elements}
- parent={{...cardCell, components: elements}}
+ parent={cardCell}
fields={cards.columns}
updateMarks={this.updateMarks}
handleList={this.handleList}
@@ -704,7 +702,6 @@
destroyOnClose
>
<ElementForm
- dict={dict}
card={card}
formlist={this.state.formlist}
inputSubmit={this.handleSubmit}
@@ -716,18 +713,17 @@
<Modal
title="鎸夐挳路缂栬緫"
visible={actvisible}
- width={800}
+ width={920}
maskClosable={false}
onCancel={this.editModalCancel}
footer={[
- record && record.intertype === 'inner' ? <CreateFunc key="create" dict={dict} ref="btnCreatFunc" trigger={this.creatFunc}/> : null,
- <Button key="cancel" onClick={this.editModalCancel}>{dict['model.cancel']}</Button>,
- <Button key="confirm" type="primary" onClick={this.handleActionSubmit}>{dict['model.confirm']}</Button>
+ record && record.intertype === 'inner' ? <CreateFunc key="create" ref="btnCreatFunc" trigger={this.creatFunc}/> : null,
+ <Button key="cancel" onClick={this.editModalCancel}>鍙栨秷</Button>,
+ <Button key="confirm" type="primary" onClick={this.handleActionSubmit}>纭畾</Button>
]}
destroyOnClose
>
<ActionForm
- dict={dict}
type={cards.type === 'balcony' ? '' : 'card'}
card={card}
formlist={this.state.formlist}
@@ -739,12 +735,11 @@
</Modal>
{/* 鎸夐挳浣跨敤绯荤粺瀛樺偍杩囩▼鏃讹紝楠岃瘉淇℃伅妯℃�佹 */}
<Modal
- wrapClassName="model-table-action-verify-modal"
- title={(card && card.label ? card.label + ' - ' : '') + '楠岃瘉淇℃伅'}
+ wrapClassName="mk-pop-modal"
visible={profVisible}
width={'90vw'}
maskClosable={false}
- okText={dict['model.submit']}
+ okText="鎻愪氦"
onOk={this.verifySubmit}
onCancel={() => {
if (this.verifyRef.handleCancel) {
--
Gitblit v1.8.0