From 95afd40fc2741ac0ce59c2091f6cfce1f98877d4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 六月 2021 09:15:45 +0800
Subject: [PATCH] 2021-06-24
---
src/menu/components/card/cardcellcomponent/index.jsx | 341 +++++++++++++++++++++++++-------------------------------
1 files changed, 154 insertions(+), 187 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index a26c5e4..3f1b073 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -1,7 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import {connect} from 'react-redux'
import { Modal, Button } from 'antd'
import zhCN from '@/locales/zh-CN/model.js'
@@ -11,6 +10,7 @@
import { getActionForm } from '@/menu/components/share/actioncomponent/formconfig'
import MKEmitter from '@/utils/events.js'
+import MenuUtils from '@/utils/utils-custom.js'
import ElementForm from './elementform'
import DragElement from './dragaction'
import './index.scss'
@@ -18,7 +18,6 @@
const { confirm } = Modal
const ActionForm = asyncComponent(() => import('@/menu/components/share/actioncomponent/actionform'))
-const CreateFunc = asyncComponent(() => import('@/templates/zshare/createfunc'))
const VerifyCard = asyncComponent(() => import('@/templates/zshare/verifycard'))
const VerifyPrint = asyncComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyprint'))
const VerifyExcelIn = asyncComponent(() => import('@/templates/sharecomponent/actioncomponent/verifyexcelin'))
@@ -34,7 +33,7 @@
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null, // 缂栬緫涓厓绱�
formlist: null, // 琛ㄥ崟淇℃伅
elements: null, // 鎸夐挳缁�
@@ -48,9 +47,18 @@
*/
UNSAFE_componentWillMount () {
const { elements } = this.props
+ let _elements = fromJS(elements).toJS()
this.setState({
- elements: fromJS(elements).toJS()
+ elements: _elements.map(item => {
+ if (item.btnstyle) { // 鍏煎
+ item.style = item.style || {}
+ item.style = {...item.style, ...item.btnstyle}
+ delete item.btnstyle
+ }
+
+ return item
+ })
})
}
@@ -58,6 +66,7 @@
MKEmitter.addListener('cardAddElement', this.cardAddElement)
MKEmitter.addListener('submitStyle', this.getStyle)
MKEmitter.addListener('submitModal', this.handleSave)
+ MKEmitter.addListener('submitComponentStyle', this.updateComponentStyle)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -65,16 +74,11 @@
}
UNSAFE_componentWillReceiveProps(nextProps) {
- const { cards } = this.props
if (this.props.side !== nextProps.side) {
this.setState({
elements: fromJS(nextProps.elements).toJS()
})
- } else if (nextProps.elements.length === 0 && this.state.elements.length > 0) {
- this.setState({
- elements: []
- })
- } else if (cards.subtype === 'normaltable' && this.state.elements.length > nextProps.elements.length) { // 琛ㄦ牸涓寜閽Щ鍑�
+ } else if (!is(fromJS(this.props.elements), fromJS(nextProps.elements)) && nextProps.elements.length !== this.state.elements.length) {
this.setState({
elements: fromJS(nextProps.elements).toJS()
})
@@ -91,6 +95,28 @@
MKEmitter.removeListener('cardAddElement', this.cardAddElement)
MKEmitter.removeListener('submitStyle', this.getStyle)
MKEmitter.removeListener('submitModal', this.handleSave)
+ MKEmitter.removeListener('submitComponentStyle', this.updateComponentStyle)
+ }
+
+ updateComponentStyle = (parentId, keys, style) => {
+ const { cardCell } = this.props
+
+ if (!cardCell || cardCell.uuid !== parentId) return
+
+ const { elements } = this.state
+
+ let _elements = elements.map(item => {
+ if (keys.includes(item.uuid)) {
+ return this.resetCardStyle(item, {...item.style, ...style})
+ }
+ return item
+ })
+
+ this.setState({
+ elements: _elements
+ }, () => {
+ this.props.updateElement(_elements)
+ })
}
cardAddElement = (ids, element) => {
@@ -112,9 +138,7 @@
let options = ['font', 'border', 'padding', 'margin', 'backgroundColor']
if (element.eleType === 'button') {
- if (element.btnstyle) {
- _style = {..._style, ...element.btnstyle}
- }
+ options.push('width')
} else if (element.eleType === 'picture') {
options = ['border', 'margin']
} else if (element.eleType === 'slider') {
@@ -134,80 +158,9 @@
const { cards, cardCell } = this.props
const { card, elements } = this.state
- if (comIds.length !== 3 || comIds[0] !== cards.uuid || comIds[1] !== cardCell.uuid) return
+ if (comIds.length !== 3 || comIds[0] !== cards.uuid || comIds[1] !== cardCell.uuid || !card) return
- let _card = fromJS(card).toJS()
-
- if (_card.eleType === 'text' || _card.eleType === 'number') {
- _card.style = style
-
- let fontSize = 14
- let lineHeight = 1.5
- let line = _card.height || 1
-
- if (_card.style.fontSize) {
- fontSize = parseInt(_card.style.fontSize)
- }
- if (_card.style.lineHeight) {
- lineHeight = parseFloat(_card.style.lineHeight)
- }
-
- _card.innerHeight = fontSize * lineHeight * line
- } else if (_card.eleType === 'barcode') {
- _card.style = style
-
- let fontSize = 14
-
- if (_card.style.fontSize) {
- fontSize = parseInt(_card.style.fontSize)
- }
-
- _card.innerHeight = _card.barHeight + (_card.displayValue === 'true' ? fontSize + 2 : 0)
- } else if (_card.eleType === 'button') { // 鎷嗗垎style
- let _style = fromJS(style).toJS()
- _card.style = {}
-
- if (_style.marginTop) {
- _card.style.marginTop = _style.marginTop
- delete _style.marginTop
- }
- if (_style.marginBottom) {
- _card.style.marginBottom = _style.marginBottom
- delete _style.marginBottom
- }
- if (_style.marginLeft) {
- _card.style.marginLeft = _style.marginLeft
- delete _style.marginLeft
- }
- if (_style.marginRight) {
- _card.style.marginRight = _style.marginRight
- delete _style.marginRight
- }
- if (_style.paddingTop) {
- _card.style.paddingTop = _style.paddingTop
- delete _style.paddingTop
- }
- if (_style.paddingBottom) {
- _card.style.paddingBottom = _style.paddingBottom
- delete _style.paddingBottom
- }
- if (_style.paddingLeft) {
- _card.style.paddingLeft = _style.paddingLeft
- delete _style.paddingLeft
- }
- if (_style.paddingRight) {
- _card.style.paddingRight = _style.paddingRight
- delete _style.paddingRight
- }
- if (_style.textAlign) {
- _card.style.textAlign = _style.textAlign
- delete _style.textAlign
- }
-
- _card.btnstyle = _style
- } else {
- _card.style = style
- }
+ let _card = this.resetCardStyle(card, style)
let _elements = elements.map(cell => {
if (cell.uuid === _card.uuid) return _card
@@ -219,6 +172,56 @@
}, () => {
this.props.updateElement(_elements)
})
+ }
+
+ resetCardStyle = (card, style) => {
+ let _card = fromJS(card).toJS()
+
+ if (_card.eleType === 'text' || _card.eleType === 'number') {
+ _card.style = style
+
+ let fontSize = 14
+ let lineHeight = 1.5
+ let line = _card.height || null
+
+ if (_card.style.fontSize) {
+ fontSize = parseInt(_card.style.fontSize)
+ }
+ if (_card.style.lineHeight) {
+ lineHeight = parseFloat(_card.style.lineHeight)
+ }
+
+ if (line) {
+ _card.innerHeight = fontSize * lineHeight * line
+ }
+ } 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
+
+ let fontSize = 14
+
+ if (_card.style.fontSize) {
+ fontSize = parseInt(_card.style.fontSize)
+ }
+
+ _card.innerHeight = _card.barHeight + (_card.displayValue === 'true' ? fontSize + 2 : 0)
+ } else if (_card.eleType === 'button') { // 鎷嗗垎style
+ _card.style = style
+ } else {
+ _card.style = style
+ }
+
+ return _card
}
/**
@@ -234,7 +237,7 @@
* @description 鍏冪礌缂栬緫锛岃幏鍙栧厓绱犺〃鍗曚俊鎭�
*/
handleElement = (card) => {
- const { cards } = this.props
+ const { cards, cardCell } = this.props
if (card.eleType === 'button') {
this.handleAction(card)
@@ -242,7 +245,7 @@
this.setState({
visible: true,
card: card,
- formlist: getCardCellForm(card, cards.type)
+ formlist: getCardCellForm(card, cards.type, cards.subtype, cardCell)
})
}
}
@@ -251,7 +254,7 @@
* @description 鎸夐挳缂栬緫锛岃幏鍙栨寜閽〃鍗曚俊鎭�
*/
handleAction = (card) => {
- const { menu, cards } = this.props
+ const { cards } = this.props
let usefulFields = sessionStorage.getItem('permFuncField')
if (usefulFields) {
@@ -267,7 +270,6 @@
let ableField = usefulFields.join(', ')
let functip = <div>
<p style={{marginBottom: '5px'}}>{this.state.dict['model.tooltip.func.innerface'].replace('@ableField', ableField)}</p>
- <p>{this.state.dict['model.tooltip.func.outface']}</p>
</div>
let menulist = sessionStorage.getItem('fstMenuList')
@@ -281,64 +283,13 @@
menulist = []
}
- let modules = this.getModules(menu.components, cards.uuid)
+ let modules = MenuUtils.getSubModules(window.GLOB.customMenu.components, cards.uuid)
this.setState({
actvisible: true,
card: card,
- formlist: getActionForm(card, functip, cards.setting, usefulFields, 'card', menulist, modules)
+ formlist: getActionForm(card, functip, cards.setting, usefulFields, 'card', menulist, modules, cards.columns)
})
- }
-
- getModules = (components, selfId) => {
- let modules = components.map(item => {
- if (item.uuid === selfId) {
- return {
- children: null
- }
- } else if (item.format) {
- return {
- value: item.uuid,
- label: item.name
- }
- } else if (item.type === 'tabs') {
- let _item = {
- value: item.uuid,
- label: item.name,
- children: item.subtabs.map(f_tab => {
- let subItem = {
- value: f_tab.uuid,
- label: f_tab.label,
- children: this.getModules(f_tab.components, selfId)
- }
-
- if (!subItem.children || subItem.children.length === 0) {
- return {children: null}
- }
- return subItem
- })
- }
-
- _item.children = _item.children.filter(t => t.children !== null)
-
- if (_item.children.length === 0) {
- return {children: null}
- }
-
- return _item
- } else {
- return {
- children: null
- }
- }
- })
-
- modules = modules.filter(mod => mod.children !== null)
-
- if (modules.length === 0) {
- return null
- }
- return modules
}
/**
@@ -379,7 +330,7 @@
} else if (res.eleType === 'text' || res.eleType === 'number') {
let fontSize = 14
let lineHeight = 1.5
- let line = res.height || 1
+ let line = res.height || null
if (res.style && res.style.fontSize) {
fontSize = parseInt(res.style.fontSize)
@@ -387,10 +338,13 @@
if (res.style && res.style.lineHeight) {
lineHeight = parseFloat(res.style.lineHeight)
}
- res.innerHeight = fontSize * lineHeight * line
+
+ if (line) {
+ res.innerHeight = fontSize * lineHeight * line
+ }
if (res.eleType === 'text' && res.link && !res.style.color) {
- res.style.color = 'rgba(24, 144, 255, 1)'
+ res.style.color = '#2440B3'
}
} else if (res.eleType === 'barcode') {
let fontSize = 14
@@ -428,18 +382,18 @@
if (cell.uuid === res.uuid) {
res = {...cell, ...res}
delete res.focus
- let btnstyle = {}
+ let style = {}
- if (res.class !== cell.class || res.show !== cell.show || !res.btnstyle) {
+ if (res.class !== cell.class || res.show !== cell.show || !res.style) {
if (res.show === 'link' || res.show === 'icon') {
- btnstyle.color = color[res.class]
- btnstyle.backgroundColor = 'transparent'
+ style.color = color[res.class]
+ style.backgroundColor = 'transparent'
} else {
- btnstyle.color = '#ffffff'
- btnstyle.backgroundColor = color[res.class]
+ style.color = '#ffffff'
+ style.backgroundColor = color[res.class]
}
}
- res.btnstyle = {...res.btnstyle, ...btnstyle}
+ res.style = {...res.style, ...style}
return res
}
@@ -459,6 +413,7 @@
* @description 鎸夐挳鍒犻櫎
*/
deleteElement = (card) => {
+ const { cards, cardCell, side } = this.props
const { dict, elements } = this.state
let _this = this
@@ -466,6 +421,16 @@
content: dict['model.confirm'] + dict['model.delete'] + '鍏冪礌鍚楋紵',
onOk() {
let _elements = elements.filter(item => item.uuid !== card.uuid)
+
+ if (card.eleType === 'button') {
+ MKEmitter.emit('delButtons', [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({
elements: _elements
@@ -513,29 +478,35 @@
handleSubConfig = (item) => {
const { cards } = this.props
+ let btn = fromJS(item).toJS()
- if (item.eleType !== 'button') return
- if (item.OpenType === 'pop') {
- let btn = fromJS(item).toJS()
- if (!btn.modal) {
- btn.modal = {
- setting: {
- title: btn.label,
- width: 60,
- cols: '2',
- container: 'tab',
- focus: '',
- finish: 'close',
- clickouter: 'unclose',
- display: 'modal'
- },
- tables: [],
- groups: [],
- fields: []
+ if ((sessionStorage.getItem('style-control') && sessionStorage.getItem('style-control') === 'true')) return
+
+ if (btn.eleType === 'button') {
+ if (btn.OpenType === 'pop') {
+ if (!btn.modal) {
+ btn.modal = {
+ setting: { title: btn.label, width: 60, cols: '2', container: 'view', focus: '', finish: 'close', clickouter: 'unclose', display: 'modal' },
+ tables: [],
+ groups: [],
+ fields: []
+ }
}
+
+ MKEmitter.emit('changeModal', cards, btn)
+ } else if (btn.OpenType === 'popview') {
+ MKEmitter.emit('changePopview', cards, btn)
+ } else if (btn.OpenType === 'innerpage' && btn.pageTemplate === 'page') {
+ MKEmitter.emit('changeEditMenu', {MenuID: btn.uuid, copyMenuId: btn.copyMenuId})
+ } else if (btn.OpenType === 'innerpage' && btn.pageTemplate === 'linkpage') {
+ MKEmitter.emit('changeEditMenu', {MenuID: btn.linkmenu})
}
-
- MKEmitter.emit('changeModal', cards, btn)
+ } else {
+ if (btn.link === 'page') {
+ MKEmitter.emit('changeEditMenu', {MenuID: btn.uuid, copyMenuId: btn.copyMenuId})
+ } else if (btn.link === 'linkpage') {
+ MKEmitter.emit('changeEditMenu', {MenuID: btn.linkmenu})
+ }
}
}
@@ -544,6 +515,10 @@
const { elements } = this.state
if (cards.uuid !== _cards.uuid) return
+
+ let _index = elements.findIndex(cell => cell.uuid === btn.uuid)
+
+ if (_index === -1) return
let _elements = elements.map(cell => {
if (cell.uuid === btn.uuid) {
@@ -577,6 +552,9 @@
dropButton = (id) => {
const { cards } = this.props
+
+ if (!cards.action) return
+
let index = cards.action.findIndex(item => item.uuid === id)
if (index === -1) return
@@ -595,13 +573,14 @@
}
render() {
- const { cards } = this.props
+ const { cards, cardCell } = this.props
const { elements, visible, actvisible, profVisible, card, dict } = this.state
return (
<div className="model-menu-card-cell-list">
<DragElement
list={elements}
+ parent={{...cardCell, components: elements}}
fields={cards.columns}
updateMarks={this.updateMarks}
handleList={this.handleList}
@@ -639,7 +618,6 @@
maskClosable={false}
onCancel={this.editModalCancel}
footer={[
- <CreateFunc key="create" dict={dict} ref="btnCreatFunc" trigger={this.creatFunc}/>,
<Button key="cancel" onClick={this.editModalCancel}>{dict['model.cancel']}</Button>,
<Button key="confirm" type="primary" onClick={this.handleActionSubmit}>{dict['model.confirm']}</Button>
]}
@@ -662,7 +640,6 @@
visible={profVisible}
width={'75vw'}
maskClosable={false}
- style={{minWidth: '900px', maxWidth: '1200px'}}
okText={dict['model.submit']}
onOk={this.verifySubmit}
onCancel={() => { this.setState({ profVisible: false }) }}
@@ -707,14 +684,4 @@
}
}
-const mapStateToProps = (state) => {
- return {
- menu: state.customMenu
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(CardCellComponent)
\ No newline at end of file
+export default CardCellComponent
\ No newline at end of file
--
Gitblit v1.8.0