From 8a6ce370f1aa1c061b76fa3e9d2d4d1df53ca4c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:38:09 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/base-table/columns/editColumn/index.jsx | 263 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 164 insertions(+), 99 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/editColumn/index.jsx b/src/menu/components/table/base-table/columns/editColumn/index.jsx
index f7b9799..dac43a3 100644
--- a/src/menu/components/table/base-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/base-table/columns/editColumn/index.jsx
@@ -1,23 +1,22 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Cascader, Modal } from 'antd'
+import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Cascader, Modal, Checkbox, Popover } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import { getColumnForm } from './formconfig'
-import { formRule } from '@/utils/option.js'
import './index.scss'
const { TextArea } = Input
const columnTypeOptions = {
text: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'prefix', 'postfix', 'textFormat', 'fieldlength', 'blacklist', 'perspective', 'rowspan'],
number: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'decimal', 'format', 'prefix', 'postfix', 'blacklist', 'perspective', 'sum', 'rowspan'],
- link: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'joint', 'Width', 'fieldlength', 'blacklist', 'nameField'],
+ link: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'fieldlength', 'blacklist', 'nameField'],
textarea: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'fieldlength', 'prefix', 'postfix', 'blacklist'],
- picture: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'fieldlength', 'blacklist', 'scale', 'lenWidRadio', 'backgroundSize', 'span'],
+ picture: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'fieldlength', 'blacklist', 'scale', 'lenWidRadio', 'backgroundSize', 'span', 'lostTip'],
video: ['label', 'field', 'type', 'Align', 'Hide', 'startTime', 'Width', 'fieldlength', 'blacklist', 'aspectRatio'],
colspan: ['label', 'type', 'Align', 'Hide', 'blacklist'],
- custom: ['label', 'type', 'Align', 'Hide', 'Width', 'blacklist'],
+ custom: ['label', 'type', 'Align', 'Width', 'blacklist', 'IsSort'],
action: ['label', 'type', 'Align', 'Width'],
formula: ['label', 'type', 'Align', 'Hide', 'Width', 'prefix', 'postfix', 'eval', 'formula', 'blacklist'],
index: ['label', 'type', 'Align', 'Width']
@@ -25,7 +24,6 @@
class NormalTableColumn extends Component {
static propTpyes = {
- visible: PropTypes.bool,
column: PropTypes.object,
fields: PropTypes.array,
submitCol: PropTypes.func, // 鎻愪氦浜嬩欢
@@ -36,6 +34,8 @@
visible: false,
formlist: null
}
+
+ record = null
UNSAFE_componentWillReceiveProps (nextProps) {
if (nextProps.column && !is(fromJS(this.props.column), fromJS(nextProps.column))) {
@@ -50,20 +50,26 @@
})
let formlist = getColumnForm(column, fields)
- let _options = fromJS(columnTypeOptions[column.type]).toJS()
- if (column.type === 'text' || column.type === 'number') {
- if (column.perspective === 'linkmenu') {
- _options.push('linkmenu', 'linkfields', 'open')
- } else if (column.perspective === 'linkurl') {
- _options.push('linkurl', 'linkfields', 'open')
- }
- }
+
+ this.record = {}
+
+ formlist.forEach(item => {
+ this.record[item.key] = item.initVal
+ })
+
+ let _options = this.getOptions()
this.setState({
visible: true,
- type: column.type,
formlist: formlist.map(item => {
item.hidden = !_options.includes(item.key)
+
+ if (item.key === 'formula') {
+ item.fields = this.props.fields.map(col => col.field)
+ item.fields = item.fields.join(', ')
+ } else if (this.record.type === 'formula' && item.key === 'decimal') {
+ item.required = false
+ }
return item
})
@@ -80,24 +86,66 @@
}
}
+ getOptions = () => {
+ let _options = fromJS(columnTypeOptions[this.record.type]).toJS()
+
+ if (this.record.type === 'text' || this.record.type === 'number') {
+ if (this.record.perspective === 'linkmenu') {
+ _options.push('linkmenu', 'open')
+ } else if (this.record.perspective === 'linkurl') {
+ _options.push('linkurl', 'open')
+ }
+ } else if (this.record.type === 'formula' && this.record.eval === 'true') {
+ _options.push('decimal')
+ } else if (this.record.type === 'custom' && this.record.IsSort === 'true') {
+ _options.push('sortField')
+ }
+
+ if (this.record.Hide !== 'true') {
+ if (['number', 'formula'].includes(this.record.type)) {
+ _options.push('noValue')
+ } else if (this.record.type === 'text' && ['YYYY-MM-DD', 'YYYY-MM-DD HH:mm:ss'].includes(this.record.textFormat)) {
+ _options.push('noValue')
+ }
+ }
+
+ return _options
+ }
+
typeChange = (key, value, option) => {
+ const { column } = this.props
+ this.record[key] = value
+
if (key === 'type') {
- let _options = fromJS(columnTypeOptions[value]).toJS()
+ if (['link', 'textarea', 'picture', 'custom'].includes(value)) {
+ this.record.IsSort = 'false'
+ }
+
+ let _options = this.getOptions()
this.setState({
- type: value,
formlist: this.state.formlist.map(item => {
+ if (item.key === 'decimal') {
+ item.required = !(column.isSub || value === 'formula')
+ if (value === 'formula') {
+ this.record.decimal = ''
+ }
+ }
+
+ item.initVal = this.record[item.key]
item.hidden = !_options.includes(item.key)
return item
})
}, () => {
- if (value === 'link' || value === 'textarea' || value === 'picture') {
+ if (['link', 'textarea', 'picture', 'custom'].includes(value)) {
this.props.form.setFieldsValue({IsSort: 'false'})
} else if (value === 'text' || value === 'number') {
this.props.form.setFieldsValue({perspective: ''})
- } else if (value === 'action' || value === 'colspan') {
+ } else if (value === 'colspan') {
this.props.form.setFieldsValue({Align: 'center'})
+ } else if (value === 'index') {
+ this.props.form.setFieldsValue({label: '搴忓彿'})
}
})
} else if (key === 'field') {
@@ -113,13 +161,18 @@
values.type = 'text'
}
- if (values.type !== this.state.type) {
+ let _type = this.record.type
+ this.record.type = values.type
+
+ if (values.type !== _type) {
values.perspective = ''
- let _options = fromJS(columnTypeOptions[values.type]).toJS()
+ this.record.perspective = ''
+
+ let _options = this.getOptions()
this.setState({
- type: values.type,
formlist: this.state.formlist.map(item => {
+ item.initVal = this.record[item.key]
item.hidden = !_options.includes(item.key)
return item
@@ -132,21 +185,12 @@
}
} else if (key === 'format' && value === 'percent') {
this.props.form.setFieldsValue({postfix: '%'})
- }
- }
-
- changeRadio = (key, value) => {
- if (key === 'perspective') {
- let _options = fromJS(columnTypeOptions[this.state.type]).toJS()
-
- if (value === 'linkmenu') {
- _options.push('linkmenu', 'linkfields', 'open')
- } else if (value === 'linkurl') {
- _options.push('linkurl', 'linkfields', 'open')
- }
+ } else if (['perspective', 'eval', 'IsSort', 'textFormat'].includes(key)) {
+ let _options = this.getOptions()
this.setState({
formlist: this.state.formlist.map(item => {
+ item.initVal = this.record[item.key]
item.hidden = !_options.includes(item.key)
return item
@@ -165,30 +209,19 @@
formlist.forEach((item, index) => {
if (item.hidden || item.forbid) return
- if (item.type === 'text') {
- let rules = []
- if (item.key === 'field') {
- rules = [{
- pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig,
- message: '瀛楁鍚嶅彧鍏佽鍖呭惈鏁板瓧銆佸瓧姣嶃�佹眽瀛椾互鍙奯'
- }, {
- max: formRule.input.max,
- message: formRule.input.message
- }]
- } else if (item.key !== 'linkurl') {
- rules = [{
- max: formRule.input.max,
- message: formRule.input.message
- }]
+ let label = item.label
+ if (item.tooltip) {
+ if (item.toolWidth) {
+ label = <Tooltip placement="topLeft" overlayStyle={{maxWidth: item.toolWidth}} title={<div onClick={(e) => e.stopPropagation()}>{item.tooltip}</div>}><QuestionCircleOutlined className="mk-form-tip" />{item.label}</Tooltip>
+ } else {
+ label = <Tooltip placement="topLeft" title={<div onClick={(e) => e.stopPropagation()}>{item.tooltip}</div>}><QuestionCircleOutlined className="mk-form-tip" />{item.label}</Tooltip>
}
+ }
+
+ if (item.type === 'text') {
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
- <QuestionCircleOutlined className="mk-form-tip" />
- {item.label}
- </Tooltip> : item.label
- }>
+ <Form.Item label={label}>
{getFieldDecorator(item.key, {
initialValue: item.initVal || '',
rules: [
@@ -196,7 +229,7 @@
required: !!item.required,
message: '璇疯緭鍏�' + item.label + '!'
},
- ...rules
+ ...item.rules
]
})(<Input placeholder="" autoComplete="off" disabled={item.readonly} onPressEnter={this.handleSubmit} />)}
</Form.Item>
@@ -205,12 +238,7 @@
} else if (item.type === 'number') {
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
- <QuestionCircleOutlined className="mk-form-tip" />
- {item.label}
- </Tooltip> : item.label
- }>
+ <Form.Item label={label}>
{getFieldDecorator(item.key, {
initialValue: item.initVal,
rules: [
@@ -227,7 +255,7 @@
} else if (item.type === 'select') {
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.label}>
+ <Form.Item label={label}>
{getFieldDecorator(item.key, {
initialValue: item.initVal || '',
rules: [
@@ -256,12 +284,7 @@
} else if (item.type === 'radio') {
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
- <QuestionCircleOutlined className="mk-form-tip" />
- {item.label}
- </Tooltip> : item.label
- }>
+ <Form.Item label={label}>
{getFieldDecorator(item.key, {
initialValue: item.initVal,
rules: [
@@ -271,15 +294,25 @@
}
]
})(
- <Radio.Group onChange={(e) => {this.changeRadio(item.key, e.target.value)}}>
- {
- item.options.map(option => {
- return (
- <Radio key={option.value} value={option.value}>{option.text}</Radio>
- )
- })
- }
+ <Radio.Group onChange={(e) => {this.typeChange(item.key, e.target.value)}}>
+ {item.options.map(option => {
+ return (<Radio key={option.value} value={option.value}>{option.text}</Radio>)
+ })}
</Radio.Group>
+ )}
+ </Form.Item>
+ </Col>
+ )
+ } else if (item.type === 'checkbox') {
+ fields.push(
+ <Col span={12} key={index}>
+ <Form.Item label={label}>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal
+ })(
+ <Checkbox.Group>
+ {item.options.map(option => <Checkbox key={option.value} value={option.value}>{option.text}</Checkbox>)}
+ </Checkbox.Group>
)}
</Form.Item>
</Col>
@@ -287,7 +320,7 @@
} else if (item.type === 'multiselect') { // 澶氶��
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.label}>
+ <Form.Item label={label}>
{getFieldDecorator(item.key, {
initialValue: item.initVal || []
})(
@@ -307,7 +340,7 @@
} else if (item.type === 'cascader') { // 澶氶��
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.label}>
+ <Form.Item label={label}>
{getFieldDecorator(item.key, {
initialValue: item.initVal || [],
rules: [
@@ -327,35 +360,66 @@
</Col>
)
} else if (item.type === 'textarea') {
- fields.push(
- <Col span={24} key={index} className="textarea">
- <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.required,
- message: '璇疯緭鍏�' + item.label + '!'
- }
- ]
- })(<TextArea rows={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={label}>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal || '',
+ rules: [
+ {
+ required: !!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} key={index} className="textarea">
+ <Form.Item label={label}>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal || '',
+ rules: [
+ {
+ required: !!item.required,
+ message: '璇疯緭鍏�' + item.label + '!'
+ }
+ ]
+ })(<TextArea rows={2} disabled={item.readonly} placeholder={item.placeholder || ''}/>)}
+ </Form.Item>
+ </Col>
+ )
+ }
}
})
return fields
}
handleSubmit = () => {
+ const { fields } = this.props
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
+ // eslint-disable-next-line
+ if (values.type === 'formula' && values.eval === 'true' && /^[\u4E00-\u9FA50-9a-zA-Z_\s@\+\-\*\/]*$/ig.test(values.formula) && /[\+\-\*\/]/ig.test(values.formula)) {
+ let cols = []
+ fields.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)
+ })
+ }
+
this.props.submitCol(values, () => {
this.setState({visible: false, formlist: null})
})
@@ -386,6 +450,7 @@
<div style={{display: 'inline-block'}}>
<Modal
title="鏄剧ず鍒楃紪杈�"
+ wrapClassName="mk-scroll-modal"
visible={visible}
width={850}
maskClosable={false}
--
Gitblit v1.8.0