From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14
---
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 329 +++++++++++++++++++++++++++++-------------------------
1 files changed, 179 insertions(+), 150 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 009826c..10007af 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader, Popover } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
@@ -15,8 +15,8 @@
const cardTypeOptions = {
sequence: ['eleType', 'width'],
- text: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'link', 'anchors', 'noValue', 'bgImage', 'fixStyle', 'copyable'],
- number: ['eleType', 'datatype', 'width', 'height', 'prefix', 'postfix', 'noValue', 'fixStyle'],
+ text: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'link', 'anchors', 'noValue', 'bgImage', 'fixStyle', 'copyable', 'alignItems', 'sortField'],
+ number: ['eleType', 'datatype', 'width', 'height', 'prefix', 'postfix', 'noValue', 'fixStyle', 'alignItems'],
picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'maxWidth', 'link', 'noValue'],
video: ['eleType', 'datatype', 'width', 'aspectRatio', 'autoPlay', 'loop', 'startTime', 'noValue', 'posterType'],
icon: ['eleType', 'datatype', 'width', 'tooltip'],
@@ -25,11 +25,11 @@
barcode: ['eleType', 'datatype', 'width', 'barHeight', 'displayValue', 'interval', 'noValue'],
qrcode: ['eleType', 'datatype', 'width', 'qrWidth', 'color', 'url', 'noValue'],
currentDate: ['eleType', 'width', 'dateFormat', 'prefix', 'postfix', 'fixStyle'],
- formula: ['eleType', 'width', 'height', 'prefix', 'postfix', 'eval', 'formula', 'noValue', 'fixStyle'],
+ formula: ['eleType', 'width', 'height', 'prefix', 'postfix', 'eval', 'formula', 'noValue', 'fixStyle', 'alignItems'],
color: ['eleType', 'datatype', 'width', 'lenWidRadio', 'noValue', 'copyable'],
}
-class MainSearch extends Component {
+class ElementEditForm extends Component {
static propTpyes = {
config: PropTypes.object, // 缁勪欢淇℃伅
formlist: PropTypes.any, // 琛ㄥ崟淇℃伅
@@ -38,28 +38,24 @@
}
state = {
- formlist: null, // 琛ㄥ崟淇℃伅
- eleType: '',
- datatype: '',
- showType: '',
- showInfo: 'false',
- fixStyle: '',
- link: ''
+ formlist: null // 琛ㄥ崟淇℃伅
}
+ record = null
+
UNSAFE_componentWillMount () {
- const { card, config, side } = this.props
- let _options = this.getOptions(card.eleType, card.datatype, card.link, (card.showType || 'line'), card.showInfo, card.fixStyle || '', card.posterType || '')
+ const { card, config, side, formlist } = this.props
+ this.record = {}
+
+ formlist.forEach(item => {
+ this.record[item.key] = item.initVal
+ })
+
+ let _options = this.getOptions()
+
this.setState({
- link: card.link,
- eleType: card.eleType,
- datatype: card.datatype,
- showType: card.showType || 'line',
- showInfo: card.showInfo || 'false',
- fixStyle: card.fixStyle || '',
- posterType: card.posterType || '',
- formlist: this.props.formlist.map(item => {
+ formlist: formlist.map(item => {
item.hidden = !_options.includes(item.key)
if (item.key === 'field' || item.key === 'linkurl' || item.key === 'bgImage' || item.key === 'posterField') {
@@ -96,9 +92,43 @@
}
})
}
+ } else if (item.key === 'sortField' && !item.forbid) {
+ item.options = []
+
+ config.columns.forEach(col => {
+ let label = `${col.field}锛�${col.label}锛塦
+ item.options.push({
+ value: col.field,
+ text: label
+ })
+ })
+
+ if (config.subColumns) {
+ config.subColumns.forEach(col => {
+ let label = `${col.field}锛�${col.label}锛塦
+ item.options.push({
+ value: col.field,
+ text: label
+ })
+ })
+ }
} else if (item.key === 'value' && card.eleType === 'slider') {
item.type = 'number'
item.label = '鍊�'
+ } else if (item.key === 'formula') {
+ item.fields = []
+
+ config.columns.forEach(col => {
+ item.fields.push(col.field)
+ })
+
+ if (config.subColumns) {
+ config.subColumns.forEach(col => {
+ item.fields.push(col.field)
+ })
+ }
+
+ item.fields = item.fields.join(', ')
} else if (item.key === 'value' && card.eleType === 'text') {
item.type = 'textarea'
item.label = '鍐呭'
@@ -120,50 +150,62 @@
})
}
- getOptions = (eleType, datatype, link, showType, showInfo, fixStyle, posterType) => {
- let _options = fromJS(cardTypeOptions[eleType]).toJS() // 閫夐」鍒楄〃
+ getOptions = () => {
+ let _options = fromJS(cardTypeOptions[this.record.eleType]).toJS() // 閫夐」鍒楄〃
- if (['text', 'number', 'picture', 'slider', 'barcode', 'qrcode', 'video', 'color'].includes(eleType)) {
- if (datatype === 'dynamic') {
+ if (['text', 'number', 'picture', 'slider', 'barcode', 'qrcode', 'video', 'color'].includes(this.record.eleType)) {
+ if (this.record.datatype === 'dynamic') {
_options.push('field')
- if (eleType === 'number') {
+ if (this.record.eleType === 'number') {
_options.push('decimal', 'format')
}
- } else if (eleType === 'picture' || eleType === 'video') {
+ } else if (this.record.eleType === 'picture' || this.record.eleType === 'video') {
_options.push('url')
} else {
_options.push('value')
}
- if (eleType === 'video' && posterType) {
- if (posterType === 'dynamic') {
+ if (this.record.eleType === 'video' && this.record.posterType) {
+ if (this.record.posterType === 'dynamic') {
_options.push('posterField')
} else {
_options.push('posterUrl')
}
}
- if (['text', 'picture'].includes(eleType) && link) {
- // if (link === 'dynamic' || link === 'static') {
- _options.push('linkurl', 'joint', 'linkType')
- // }
- } else if (eleType === 'picture' && !link) {
+ if (['text', 'picture'].includes(this.record.eleType) && this.record.link) {
+ _options.push('linkType')
+ if (this.record.linkType === 'linkmenu') {
+ _options.push('open', 'joint')
+ if (this.record.link === 'static') {
+ _options.push('linkmenu')
+ } else {
+ _options.push('linkurl')
+ }
+ } else if (this.record.linkType === 'other') {
+ _options.push('linkurl', 'joint', 'open')
+ } else {
+ _options.push('linkurl')
+ }
+ } else if (this.record.eleType === 'picture' && !this.record.link) {
_options.push('scale')
- } else if (eleType === 'slider') {
- if (showInfo === 'true') {
+ } else if (this.record.eleType === 'slider') {
+ if (this.record.showInfo === 'true') {
_options.push('infoColor')
}
- if (showType !== 'line') {
+ if (this.record.showType !== 'line') {
_options.push('outlineWidth', 'textAlign')
}
}
- } else if (eleType === 'icon') {
- if (datatype === 'dynamic') {
+ } else if (this.record.eleType === 'icon') {
+ if (this.record.datatype === 'dynamic') {
_options.push('field', 'noValue')
} else {
_options.push('icon')
}
+ } else if (this.record.eleType === 'formula' && this.record.eval === 'true') {
+ _options.push('decimal')
}
- if (_options.includes('fixStyle') && fixStyle === 'alone') {
+ if (_options.includes('fixStyle') && this.record.fixStyle === 'alone') {
_options.push('fixSize', 'fixColor', 'fixLeft', 'fixRight')
}
@@ -177,13 +219,22 @@
* 3銆佸垏鎹㈡爣绛剧被鍨嬶紝閲嶇疆鍙�夋爣绛�
*/
selectChange = (key, value, option) => {
- const { card, config, side } = this.props
- const { datatype, eleType, showType, showInfo, fixStyle, posterType } = this.state
+ const { config, side } = this.props
+
+ this.record[key] = value
if (key === 'eleType') {
- let _options = this.getOptions(value, datatype, '', showType, showInfo, fixStyle, posterType)
+ this.record.link = ''
+ let _options = this.getOptions()
+
+ if (value === 'splitline') {
+ this.record.color = '#EBE9E9'
+ } else if (value === 'formula') {
+ this.record.decimal = ''
+ }
let _formlist = this.state.formlist.map(item => {
+ item.initVal = this.record[item.key]
item.hidden = !_options.includes(item.key)
if (item.key === 'field') {
@@ -240,25 +291,17 @@
}
} else if (item.key === 'url') {
item.required = value !== 'qrcode'
- } else if (item.key === 'showInfo') {
- item.initVal = showInfo
- } else if (item.key === 'posterType') {
- item.initVal = posterType
- } else if (item.key === 'fixStyle') {
- item.initVal = fixStyle
- } else if (item.key === 'color') {
- if (value === 'splitline') {
- item.initVal = '#EBE9E9'
- }
}
return item
})
+ let _field = ''
+ if (value === 'formula') {
+ _field = this.props.form.getFieldValue('field') || ''
+ }
+
this.setState({
- link: '',
- eleType: value,
- showType: card.showType || 'line',
formlist: _formlist
}, () => {
if (value === 'splitline') {
@@ -269,6 +312,8 @@
this.props.form.setFieldsValue({color: '#000000'})
} else if (value === 'text' || value === 'number') {
this.props.form.setFieldsValue({format: ''})
+ } else if (value === 'formula' && _field) {
+ this.props.form.setFieldsValue({formula: '@' + _field + '@'})
}
if (value === 'text' || value === 'picture') {
this.props.form.setFieldsValue({link: ''})
@@ -279,90 +324,27 @@
this.props.form.setFieldsValue({value: option.props.title})
}
} else if (key === 'link') {
- let _options = this.getOptions(eleType, datatype, value, showType, showInfo, fixStyle, posterType)
+ let _options = this.getOptions()
this.setState({
- link: value,
formlist: this.state.formlist.map(item => {
+ item.initVal = this.record[item.key]
item.hidden = !_options.includes(item.key)
+
if (item.key === 'linkurl') {
item.type = value === 'dynamic' ? 'select' : 'textarea'
}
return item
})
})
- }
- }
-
- onChange = (e, key) => {
- const { eleType, datatype, link, showType, showInfo, fixStyle, posterType } = this.state
- let value = e.target.value
-
- if (key === 'datatype') {
- let _options = this.getOptions(eleType, value, link, showType, showInfo, fixStyle, posterType)
+ } else if (['datatype', 'showInfo', 'showType', 'fixStyle', 'posterType', 'eval', 'linkType'].includes(key)) {
+ let _options = this.getOptions()
this.setState({
- datatype: value,
formlist: this.state.formlist.map(item => {
+ item.initVal = this.record[item.key]
item.hidden = !_options.includes(item.key)
return item
- })
- })
- } else if (key === 'link') {
- let _options = this.getOptions(eleType, datatype, value, showType, showInfo, fixStyle, posterType)
- this.setState({
- link: value,
- formlist: this.state.formlist.map(item => {
- item.hidden = !_options.includes(item.key)
- if (item.key === 'linkurl') {
- item.type = value === 'dynamic' ? 'select' : 'textarea'
- }
- return item
- })
- })
- } else if (key === 'showInfo') {
- let _options = this.getOptions(eleType, datatype, link, showType, value, fixStyle, posterType)
- this.setState({
- showInfo: value,
- formlist: this.state.formlist.map(item => {
- item.hidden = !_options.includes(item.key)
- return item
- })
- })
- } else if (key === 'showType') {
- this.setState({
- showType: value
- }, () => {
- let _options = this.getOptions(eleType, datatype, link, value, showInfo, fixStyle, posterType)
- this.setState({
- formlist: this.state.formlist.map(item => {
- item.hidden = !_options.includes(item.key)
- return item
- })
- })
- })
- } else if (key === 'fixStyle') {
- this.setState({
- fixStyle: value
- }, () => {
- let _options = this.getOptions(eleType, datatype, link, showType, showInfo, value, posterType)
- this.setState({
- formlist: this.state.formlist.map(item => {
- item.hidden = !_options.includes(item.key)
- return item
- })
- })
- })
- } else if (key === 'posterType') {
- this.setState({
- posterType: value
- }, () => {
- let _options = this.getOptions(eleType, datatype, link, showType, showInfo, fixStyle, value)
- this.setState({
- formlist: this.state.formlist.map(item => {
- item.hidden = !_options.includes(item.key)
- return item
- })
})
})
}
@@ -409,26 +391,52 @@
</Col>
)
} else if (item.type === 'textarea') {
- fields.push(
- <Col span={24} className="textarea" key={index}>
- <Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
- <QuestionCircleOutlined className="mk-form-tip" />
- {item.label}
- </Tooltip> : item.label
- }>
- {getFieldDecorator(item.key, {
- initialValue: item.initVal || '',
- rules: [
- {
- required: item.readonly ? false : !!item.required,
- message: '璇疯緭鍏�' + item.label + '!'
- }
- ]
- })(<TextArea autoSize={{minRows: 2}} disabled={item.readonly} placeholder={item.placeholder || ''} />)}
- </Form.Item>
- </Col>
- )
+ if (item.key === 'formula') {
+ fields.push(
+ <Col span={24} className="textarea" key={index}>
+ <Form.Item label={item.tooltip ?
+ <Tooltip placement="topLeft" title={item.tooltip}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal || '',
+ rules: [
+ {
+ required: item.readonly ? false : !!item.required,
+ message: '璇疯緭鍏�' + item.label + '!'
+ }
+ ]
+ })(<TextArea autoSize={{minRows: 2}} disabled={item.readonly} placeholder={item.placeholder || ''} />)}
+ </Form.Item>
+ <Popover overlayClassName="formula-fields" placement="topLeft" title="" content={<div>{item.fields}</div>} trigger="click">
+ <span className="formula-icon">瀛楁闆�</span>
+ </Popover>
+ </Col>
+ )
+ } else {
+ fields.push(
+ <Col span={24} className="textarea" key={index}>
+ <Form.Item label={item.tooltip ?
+ <Tooltip placement="topLeft" title={item.tooltip}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal || '',
+ rules: [
+ {
+ required: item.readonly ? false : !!item.required,
+ message: '璇疯緭鍏�' + item.label + '!'
+ }
+ ]
+ })(<TextArea autoSize={{minRows: 2}} disabled={item.readonly} placeholder={item.placeholder || ''} />)}
+ </Form.Item>
+ </Col>
+ )
+ }
} else if (item.type === 'number') {
fields.push(
<Col span={12} key={index}>
@@ -472,8 +480,8 @@
getPopupContainer={() => document.getElementById('card-winter')}
>
{item.options.map((option, index) =>
- <Select.Option id={`${index}`} title={option.text} key={`${index}`} value={option.value}>
- {option.text}
+ <Select.Option id={`${index}`} title={option.text || option.label} key={`${index}`} value={option.value}>
+ {option.text || option.label}
</Select.Option>
)}
</Select>
@@ -518,7 +526,7 @@
message: '璇烽�夋嫨' + item.label + '!'
}]
})(
- <Radio.Group onChange={(e) => {this.onChange(e, item.key)}} disabled={item.readonly}>
+ <Radio.Group onChange={(e) => {this.selectChange(item.key, e.target.value)}} disabled={item.readonly}>
{item.options.map(option => {
return (
<Radio key={option.value} value={option.value}>{option.text}</Radio>
@@ -603,12 +611,33 @@
}
handleConfirm = () => {
+ const { config } = this.props
+
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
return new Promise((resolve, reject) => {
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
values.uuid = this.props.card.uuid
values.marks = this.props.card.marks || null
+
+ // eslint-disable-next-line
+ if (values.eleType === 'formula' && values.eval !== 'false' && /^[\u4E00-\u9FA50-9a-zA-Z_\s@\+\-\*\/]*$/ig.test(values.formula) && /[\+\-\*\/]/ig.test(values.formula)) {
+ let cols = []
+ config.subColumns && config.subColumns.forEach(col => {
+ if (/^(Int|Decimal)/ig.test(col.datatype)) {
+ cols.push({reg: new RegExp('@' + col.field + '@', 'ig'), value: `(@${col.field}@)`})
+ }
+ })
+ config.columns.forEach(col => {
+ if (/^(Int|Decimal)/ig.test(col.datatype)) {
+ cols.push({reg: new RegExp('@' + col.field + '@', 'ig'), value: `(@${col.field}@)`})
+ }
+ })
+
+ cols.forEach(col => {
+ values.formula = values.formula.replace(col.reg, col.value)
+ })
+ }
resolve(values)
} else {
@@ -637,4 +666,4 @@
}
}
-export default Form.create()(MainSearch)
\ No newline at end of file
+export default Form.create()(ElementEditForm)
\ No newline at end of file
--
Gitblit v1.8.0