~jinfei/pc-plat.git

			@@ -2,6 +2,7 @@
			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'
			@@ -75,7 +76,7 @@
			}

			UNSAFE_componentWillReceiveProps(nextProps) {
			if (this.props.side !== nextProps.side) {
			if (this.props.side !== nextProps.side && nextProps.side) {
			this.setState({
			elements: fromJS(nextProps.elements).toJS()
			})
			@@ -159,6 +160,8 @@
			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')
			@@ -166,6 +169,10 @@
			options = ['padding', 'margin']
			} else if (element.eleType === 'splitline') {
			options = ['padding', 'margin']
			}

			if (element.eleType !== 'button') {
			options.push('position')
			}

			options.push('clear')
			@@ -179,12 +186,6 @@

			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)

			@@ -207,7 +208,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
			}

			@@ -372,7 +373,7 @@
			if (cell.uuid === res.uuid) {
			res.style = cell.style \|\| {}

			if (res.eleType !== 'text') {
			if (!['text', 'number', 'icon'].includes(res.eleType)) {
			delete res.style.display
			}

			@@ -382,7 +383,7 @@
			} 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
			}

			@@ -443,17 +444,7 @@
			if (cell.uuid === res.uuid) {
			res.eleType = cell.eleType \|\| null
			res.style = cell.style \|\| null
			// res.modal = cell.modal \|\| null
			// res.config = cell.config \|\| 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') {
			@@ -479,6 +470,8 @@
			}
			res.style = {...res.style, ...style}
			}

			res.updateTime = moment().format('YYYY-MM-DD HH:mm')

			return res
			}
			@@ -536,6 +529,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
			@@ -624,10 +618,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)

			@@ -751,7 +744,7 @@
			const { elements, visible, actvisible, profVisible, card, record } = this.state

			return (
			<div className={'model-menu-card-cell-list ' + (cardCell && cardCell.setting.layout === 'flex' ? 'mk-flex' : '') }>
			<div className={'model-menu-card-cell-list ' + (cardCell && cardCell.setting && cardCell.setting.layout === 'flex' ? 'mk-flex' : '') }>
			<DragElement
			list={elements}
			parent={cardCell}
			@@ -800,7 +793,7 @@
			destroyOnClose
			>
			<ActionForm
			type={cards.type === 'balcony' ? '' : 'card'}
			type={cards.type === 'balcony' \|\| cardCell.$cardType === 'extendCard' ? '' : 'card'}
			card={card}
			formlist={this.state.formlist}
			inputSubmit={this.handleActionSubmit}