From e052b254ed09e05a65396ee3b67201bcf5b0694e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 18 六月 2022 23:22:16 +0800
Subject: [PATCH] 2022-06-18
---
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 405 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 301 insertions(+), 104 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 25490a1..2e2b905 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -1,25 +1,31 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, Icon, Radio, Tooltip, InputNumber, notification } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
-import FileUpload from '@/tabviews/zshare/fileupload'
-import ColorSketch from '@/mob/colorsketch'
+import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
+
+const { TextArea } = Input
+const ColorSketch = asyncComponent(() => import('@/mob/colorsketch'))
+const SourceComponent = asyncComponent(() => import('@/menu/components/share/sourcecomponent'))
+const MkEditIcon = asyncComponent(() => import('@/components/mkIcon'))
const cardTypeOptions = {
sequence: ['eleType', 'width'],
- text: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix'],
- number: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix'],
- picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'url'],
+ text: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'link', 'anchors', 'noValue', 'bgImage', 'fixStyle', 'copyable'],
+ number: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'noValue', 'fixStyle'],
+ picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'maxWidth', 'link', 'noValue'],
+ video: ['eleType', 'datatype', 'width', 'aspectRatio', 'autoPlay', 'loop', 'startTime', 'noValue', 'posterType'],
icon: ['eleType', 'icon', 'datatype', 'width'],
- link: ['eleType', 'datatype', 'label', 'width', 'height', 'joint'],
- slider: ['eleType', 'datatype', 'width', 'color', 'maxValue'],
+ slider: ['eleType', 'datatype', 'width', 'color', 'maxValue', 'showInfo', 'showType', 'strokeWidth', 'strokeLinecap', 'trailColor'],
splitline: ['eleType', 'color', 'width', 'borderWidth'],
- barcode: ['eleType', 'datatype', 'width', 'barHeight', 'displayValue', 'interval'],
- qrcode: ['eleType', 'datatype', 'width', 'qrWidth', 'color', 'url'],
- currentDate: ['eleType', 'width', 'dateFormat', 'prefix', 'postfix'],
+ 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'],
}
class MainSearch extends Component {
@@ -34,38 +40,64 @@
state = {
formlist: null, // 琛ㄥ崟淇℃伅
eleType: '',
- datatype: ''
+ datatype: '',
+ showType: '',
+ showInfo: 'false',
+ fixStyle: '',
+ link: ''
}
-
UNSAFE_componentWillMount () {
const { card, config } = this.props
- let _options = this.getOptions(card.eleType, card.datatype)
+ let _options = this.getOptions(card.eleType, card.datatype, card.link, (card.showType || 'line'), card.showInfo, card.fixStyle || '', card.posterType || '')
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 => {
item.hidden = !_options.includes(item.key)
- if (item.key === 'field') {
+ if (item.key === 'field' || item.key === 'linkurl' || item.key === 'bgImage' || item.key === 'posterField') {
item.options = []
config.columns.forEach(col => {
- if (!/^Nvarchar/ig.test(col.datatype) && (card.eleType === 'number' || card.eleType === 'slider')) {
+ let label = col.label
+ if (label !== col.field) {
+ label = col.field + ' ' + col.label
+ }
+ if (/^(Int|Decimal)/ig.test(col.datatype) && (card.eleType === 'number' || card.eleType === 'slider')) {
item.options.push({
value: col.field,
- text: col.label
+ text: label
})
- } else if (/^Nvarchar/ig.test(col.datatype) && card.eleType !== 'number' && card.eleType !== 'slider') {
+ } else if (/^(Nvarchar|date)/ig.test(col.datatype) && card.eleType !== 'number' && card.eleType !== 'slider') {
item.options.push({
value: col.field,
- text: col.label
+ text: label
})
}
})
} else if (item.key === 'value' && card.eleType === 'slider') {
item.type = 'number'
item.label = '鍊�'
+ } else if (item.key === 'value' && card.eleType === 'text') {
+ item.type = 'textarea'
+ item.label = '鍐呭'
+ } else if (item.key === 'format') {
+ if (card.eleType === 'text') {
+ item.options = item.oriOptions.filter(op => !['percent', 'thdSeparator', 'abs'].includes(op.value))
+ } else if (card.eleType === 'number') {
+ item.options = item.oriOptions.filter(op => !op.value || ['percent', 'thdSeparator', 'abs'].includes(op.value))
+ }
+ } else if (item.key === 'url') {
+ item.required = card.eleType !== 'qrcode'
+ }
+ if (item.key === 'linkurl') {
+ item.type = card.link === 'dynamic' ? 'select' : 'textarea'
}
return item
@@ -73,14 +105,41 @@
})
}
- getOptions = (eleType, datatype) => {
+ getOptions = (eleType, datatype, link, showType, showInfo, fixStyle, posterType) => {
let _options = fromJS(cardTypeOptions[eleType]).toJS() // 閫夐」鍒楄〃
- if (['text', 'number', 'picture', 'link', 'slider', 'barcode', 'qrcode'].includes(eleType)) {
+ if (['text', 'number', 'picture', 'slider', 'barcode', 'qrcode', 'video'].includes(eleType)) {
if (datatype === 'dynamic') {
_options.push('field')
- } else if (eleType !== 'picture') {
+ if (eleType === 'number') {
+ _options.push('decimal')
+ }
+ } else if (eleType === 'picture' || eleType === 'video') {
+ _options.push('url')
+ } else {
_options.push('value')
+ }
+ if (eleType === 'video' && posterType) {
+ if (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) {
+ _options.push('scale')
+ } else if (eleType === 'slider') {
+ if (showInfo === 'true') {
+ _options.push('infoColor')
+ }
+ if (showType !== 'line') {
+ _options.push('outlineWidth', 'textAlign')
+ }
}
} else if (eleType === 'icon') {
if (datatype === 'dynamic') {
@@ -88,6 +147,9 @@
} else {
_options.push('tooltip')
}
+ }
+ if (_options.includes('fixStyle') && fixStyle === 'alone') {
+ _options.push('fixSize', 'fixColor', 'fixLeft', 'fixRight')
}
return _options
@@ -100,11 +162,11 @@
* 3銆佸垏鎹㈡爣绛剧被鍨嬶紝閲嶇疆鍙�夋爣绛�
*/
selectChange = (key, value, option) => {
- const { config } = this.props
- const { datatype } = this.state
+ const { card, config } = this.props
+ const { datatype, eleType, showType, showInfo, fixStyle, posterType } = this.state
if (key === 'eleType') {
- let _options = this.getOptions(value, datatype)
+ let _options = this.getOptions(value, datatype, '', showType, showInfo, fixStyle, posterType)
let _formlist = this.state.formlist.map(item => {
item.hidden = !_options.includes(item.key)
@@ -112,15 +174,20 @@
if (item.key === 'field') {
item.options = []
config.columns.forEach(col => {
- if (!/^Nvarchar/ig.test(col.datatype) && (value === 'number' || value === 'slider')) {
+ let label = col.label
+ if (label !== col.field) {
+ label = col.field + ' ' + col.label
+ }
+
+ if (/^(Int|Decimal)/ig.test(col.datatype) && (value === 'number' || value === 'slider')) {
item.options.push({
value: col.field,
- text: col.label
+ text: label
})
- } else if (/^Nvarchar/ig.test(col.datatype) && value !== 'number' && value !== 'slider') {
+ } else if (/^(Nvarchar|date)/ig.test(col.datatype) && value !== 'number' && value !== 'slider') {
item.options.push({
value: col.field,
- text: col.label
+ text: label
})
}
})
@@ -128,38 +195,76 @@
if (value === 'slider') {
item.type = 'number'
item.label = '鍊�'
+ } else if (value === 'text') {
+ item.type = 'textarea'
+ item.label = '鍐呭'
} else {
item.type = 'text'
item.label = '鍐呭'
}
+ } else if (item.key === 'format') {
+ if (value === 'text') {
+ item.options = item.oriOptions.filter(op => !['percent', 'thdSeparator', 'abs'].includes(op.value))
+ } else if (value === 'number') {
+ item.options = item.oriOptions.filter(op => !op.value || ['percent', 'thdSeparator', 'abs'].includes(op.value))
+ }
+ } 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
}
return item
})
this.setState({
+ link: '',
eleType: value,
+ showType: card.showType || 'line',
formlist: _formlist
}, () => {
if (value === 'slider') {
this.props.form.setFieldsValue({width: 24, color: '#1890ff'})
} else if (value === 'splitline') {
this.props.form.setFieldsValue({width: 24, color: '#e8e8e8'})
+ } else if (value === 'qrcode') {
+ this.props.form.setFieldsValue({color: '#000000'})
+ } else if (value === 'text' || value === 'number') {
+ this.props.form.setFieldsValue({format: ''})
+ }
+ if (value === 'text' || value === 'picture') {
+ this.props.form.setFieldsValue({link: ''})
}
})
} else if (key === 'field') {
if (this.props.form.getFieldValue('value') !== undefined) {
this.props.form.setFieldsValue({value: option.props.title})
}
+ } 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
+ })
+ })
}
}
onChange = (e, key) => {
- const { eleType } = this.state
+ const { eleType, datatype, link, showType, showInfo, fixStyle, posterType } = this.state
let value = e.target.value
if (key === 'datatype') {
- let _options = this.getOptions(eleType, value)
+ let _options = this.getOptions(eleType, value, link, showType, showInfo, fixStyle, posterType)
this.setState({
datatype: value,
@@ -167,6 +272,63 @@
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
+ })
})
})
}
@@ -185,16 +347,14 @@
const fields = []
this.state.formlist.forEach((item, index) => {
- if (item.hidden) return
+ if (item.hidden || item.forbid) return
- if (item.type === 'text') { // 鏂囨湰鎼滅储
- let rules = []
-
+ if (item.type === 'text') {
fields.push(
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <Tooltip placement="topLeft" title={item.tooltip}>
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
@@ -208,30 +368,48 @@
{
max: formRule.input.max,
message: formRule.input.message
- },
- ...rules
+ }
]
})(<Input placeholder="" autoComplete="off" disabled={item.readonly} onPressEnter={this.handleSubmit} />)}
</Form.Item>
</Col>
)
- } else if (item.type === 'number') {
+ } else if (item.type === 'textarea') {
fields.push(
- <Col span={12} key={index}>
+ <Col span={24} className="textarea" key={index}>
<Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <Tooltip placement="topLeft" title={item.tooltip}>
+ <QuestionCircleOutlined className="mk-form-tip" />
{item.label}
</Tooltip> : item.label
}>
{getFieldDecorator(item.key, {
- initialValue: item.initVal,
+ initialValue: item.initVal || '',
rules: [
{
required: item.readonly ? false : !!item.required,
message: this.props.dict['form.required.input'] + 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}>
+ <Form.Item help={item.help || null} 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: this.props.dict['form.required.input'] + item.label + '!'
+ }]
})(<InputNumber min={item.min || 0} max={item.max || 10000} precision={item.precision || 0} onPressEnter={this.handleSubmit} />)}
</Form.Item>
</Col>
@@ -240,29 +418,28 @@
fields.push(
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
- <Icon type="question-circle" />
+ <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: this.props.dict['form.required.select'] + item.label + '!'
- }
- ]
+ rules: [{
+ required: !!item.required,
+ message: this.props.dict['form.required.select'] + item.label + '!'
+ }]
})(
<Select
showSearch
- filterOption={(input, option) => option.props.children[2].toLowerCase().indexOf(input.toLowerCase()) >= 0}
+ allowClear={item.allowClear || false}
+ filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={(value, option) => {this.selectChange(item.key, value, option)}}
getPopupContainer={() => document.getElementById('card-winter')}
>
{item.options.map((option, index) =>
<Select.Option id={`${index}`} title={option.text} key={`${index}`} value={option.value}>
- {item.key === 'icon' && option.value && <Icon type={option.value} />} {option.text}
+ {option.text}
</Select.Option>
)}
</Select>
@@ -270,27 +447,49 @@
</Form.Item>
</Col>
)
+ } else if (item.type === 'icon') {
+ 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
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal || '',
+ rules: [{
+ required: !!item.required,
+ message: this.props.dict['form.required.select'] + item.label + '!'
+ }]
+ })(
+ <MkEditIcon />
+ )}
+ </Form.Item>
+ </Col>
+ )
} else if (item.type === 'radio') {
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.label}>
+ <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: this.props.dict['form.required.select'] + item.label + '!'
- }
- ]
+ rules: [{
+ required: !!item.required,
+ message: this.props.dict['form.required.select'] + item.label + '!'
+ }]
})(
<Radio.Group onChange={(e) => {this.onChange(e, item.key)}} disabled={item.readonly}>
- {
- item.options.map(option => {
- return (
- <Radio key={option.value} value={option.value}>{option.text}</Radio>
- )
- })
- }
+ {item.options.map(option => {
+ return (
+ <Radio key={option.value} value={option.value}>{option.text}</Radio>
+ )
+ })}
</Radio.Group>
)}
</Form.Item>
@@ -315,22 +514,20 @@
</Col>
)
} else if (item.type === 'file') {
- let filelist = []
- if (item.initVal) {
- filelist = [{
- uid: `1`,
- name: item.initVal.slice(item.initVal.lastIndexOf('/') + 1),
- status: 'done',
- url: item.initVal,
- origin: true
- }]
+ let type = this.state.eleType
+ if (item.key === 'posterUrl') {
+ type = 'picture'
}
-
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.label}>
+ <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: filelist,
+ initialValue: item.initVal,
rules: [
{
required: !!item.required,
@@ -338,7 +535,30 @@
}
]
})(
- <FileUpload maxFile={item.maxfile} fileType={'text'} />
+ <SourceComponent type={type} />
+ )}
+ </Form.Item>
+ </Col>
+ )
+ } else if (item.type === 'cascader') {
+ fields.push(
+ <Col span={12} key={index}>
+ <Form.Item label={item.tooltip ?
+ <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal || [],
+ rules: [
+ {
+ required: !!item.required,
+ message: this.props.dict['form.required.select'] + item.label + '!'
+ }
+ ]
+ })(
+ <Cascader options={item.options || []} expandTrigger="hover" placeholder=""/>
)}
</Form.Item>
</Col>
@@ -355,29 +575,6 @@
if (!err) {
values.uuid = this.props.card.uuid
values.marks = this.props.card.marks || null
-
- if (values.url) {
- if (values.url.length > 0) {
- if (values.url[0].origin && values.url[0].url) {
- values.url = values.url[0].url
- } else if (!values.url[0].origin && values.url[0].status === 'done' && values.url[0].response) {
- values.url = values.url[0].response
- } else {
- values.url = ''
- }
- } else {
- values.url = ''
- }
- }
-
- if (values.eleType === 'picture' && values.datatype === 'static' && !values.url) {
- notification.warning({
- top: 92,
- message: '灏氭湭娣诲姞鍥剧墖鎴栧浘鐗囦笂浼犲け璐ワ紝璇烽噸鏂版坊鍔狅紒',
- duration: 5
- })
- return
- }
resolve(values)
} else {
--
Gitblit v1.8.0