From 73c0258e4e30f1d2e407cb067feea8e79fad081d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 九月 2021 14:37:10 +0800
Subject: [PATCH] 2021-09-16
---
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 232 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 133 insertions(+), 99 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 4f1819e..306d61c 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -1,25 +1,30 @@
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, Icon, Radio, Tooltip, InputNumber } from 'antd'
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 MkIcon = asyncComponent(() => import('@/components/mkIcon'))
const cardTypeOptions = {
sequence: ['eleType', 'width'],
- text: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'link'],
+ text: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'link', 'noValue'],
number: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix'],
- picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'link'],
- video: ['eleType', 'datatype', 'width', 'aspectRatio', 'autoPlay'],
+ picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'maxWidth', 'link', 'noValue'],
+ video: ['eleType', 'datatype', 'width', 'aspectRatio', 'autoPlay', 'loop', 'noValue'],
icon: ['eleType', 'icon', 'datatype', 'width'],
slider: ['eleType', 'datatype', 'width', 'color', 'maxValue'],
splitline: ['eleType', 'color', 'width', 'borderWidth'],
- barcode: ['eleType', 'datatype', 'width', 'barHeight', 'displayValue', 'interval'],
- qrcode: ['eleType', 'datatype', 'width', 'qrWidth', 'color', 'url'],
+ barcode: ['eleType', 'datatype', 'width', 'barHeight', 'displayValue', 'interval', 'noValue'],
+ qrcode: ['eleType', 'datatype', 'width', 'qrWidth', 'color', 'url', 'noValue'],
currentDate: ['eleType', 'width', 'dateFormat', 'prefix', 'postfix'],
+ formula: ['eleType', 'width', 'height', 'prefix', 'postfix', 'formula'],
}
class MainSearch extends Component {
@@ -38,7 +43,6 @@
link: ''
}
-
UNSAFE_componentWillMount () {
const { card, config } = this.props
let _options = this.getOptions(card.eleType, card.datatype, card.link)
@@ -53,12 +57,12 @@
if (item.key === 'field' || item.key === 'linkurl') {
item.options = []
config.columns.forEach(col => {
- if (!/^Nvarchar/ig.test(col.datatype) && (card.eleType === 'number' || card.eleType === 'slider')) {
+ if (/^(Int|Decimal)/ig.test(col.datatype) && (card.eleType === 'number' || card.eleType === 'slider')) {
item.options.push({
value: col.field,
text: col.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
@@ -74,9 +78,11 @@
} else if (card.eleType === 'number') {
item.options = item.oriOptions.filter(op => op.value !== 'YYYY-MM-DD')
}
+ } else if (item.key === 'url') {
+ item.required = card.eleType !== 'qrcode'
}
if (item.key === 'linkurl') {
- item.type = card.link === 'dynamic' ? 'select' : 'text'
+ item.type = card.link === 'dynamic' ? 'select' : 'textarea'
}
return item
@@ -97,7 +103,15 @@
}
if (['text', 'picture'].includes(eleType) && link) {
- _options.push('linkurl', 'joint')
+ if (link === 'dynamic' || link === 'static' || link === 'custom') {
+ _options.push('linkurl', 'joint')
+ } else if (link === 'page') {
+ _options.push('copyMenuId', 'joint', 'open')
+ } else if (link === 'linkpage') {
+ _options.push('linkmenu', 'joint', 'open')
+ }
+ } else if (eleType === 'picture' && !link) {
+ _options.push('scale')
}
} else if (eleType === 'icon') {
if (datatype === 'dynamic') {
@@ -118,7 +132,7 @@
*/
selectChange = (key, value, option) => {
const { config } = this.props
- const { datatype } = this.state
+ const { datatype, eleType } = this.state
if (key === 'eleType') {
let _options = this.getOptions(value, datatype, '')
@@ -129,12 +143,12 @@
if (item.key === 'field') {
item.options = []
config.columns.forEach(col => {
- if (!/^Nvarchar/ig.test(col.datatype) && (value === 'number' || value === 'slider')) {
+ if (/^(Int|Decimal)/ig.test(col.datatype) && (value === 'number' || value === 'slider')) {
item.options.push({
value: col.field,
text: col.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
@@ -155,6 +169,8 @@
} else if (value === 'number') {
item.options = item.oriOptions.filter(op => op.value !== 'YYYY-MM-DD')
}
+ } else if (item.key === 'url') {
+ item.required = value !== 'qrcode'
}
return item
@@ -180,6 +196,18 @@
if (this.props.form.getFieldValue('value') !== undefined) {
this.props.form.setFieldsValue({value: option.props.title})
}
+ } else if (key === 'link') {
+ let _options = this.getOptions(eleType, this.state.datatype, value)
+ 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
+ })
+ })
}
}
@@ -205,7 +233,7 @@
formlist: this.state.formlist.map(item => {
item.hidden = !_options.includes(item.key)
if (item.key === 'linkurl') {
- item.type = value === 'dynamic' ? 'select' : 'text'
+ item.type = value === 'dynamic' ? 'select' : 'textarea'
}
return item
})
@@ -226,15 +254,13 @@
const fields = []
this.state.formlist.forEach((item, index) => {
- if (item.hidden) return
+ if (item.hidden || item.forbid) return
if (item.type === 'text') { // 鏂囨湰鎼滅储
- let rules = []
-
fields.push(
<Col span={12} key={index}>
<Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
+ <Tooltip placement="topLeft" title={item.tooltip}>
<Icon type="question-circle" />
{item.label}
</Tooltip> : item.label
@@ -249,39 +275,17 @@
{
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" />
- {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>
- )
- } else if (item.type === 'select') { // 涓嬫媺鎼滅储
- fields.push(
- <Col span={12} key={index}>
- <Form.Item label={item.tooltip ?
- <Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
+ <Tooltip placement="topLeft" title={item.tooltip}>
<Icon type="question-circle" />
{item.label}
</Tooltip> : item.label
@@ -290,10 +294,52 @@
initialValue: item.initVal || '',
rules: [
{
- required: !!item.required,
- message: this.props.dict['form.required.select'] + item.label + '!'
+ required: item.readonly ? false : !!item.required,
+ message: this.props.dict['form.required.input'] + item.label + '!'
+ },
+ {
+ max: formRule.input.max,
+ message: formRule.input.message
}
]
+ })(<TextArea rows={2} disabled={item.readonly} placeholder={item.placeholder || ''} />)}
+ </Form.Item>
+ </Col>
+ )
+ } else if (item.type === 'number') {
+ fields.push(
+ <Col span={12} key={index}>
+ <Form.Item label={item.tooltip ?
+ <Tooltip placement="topLeft" title={item.tooltip}>
+ <Icon type="question-circle" />
+ {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>
+ )
+ } else if (item.type === 'select') { // 涓嬫媺鎼滅储
+ fields.push(
+ <Col span={12} key={index}>
+ <Form.Item label={item.tooltip ?
+ <Tooltip placement="topLeft" title={item.tooltip}>
+ <Icon type="question-circle" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal || '',
+ rules: [{
+ required: !!item.required,
+ message: this.props.dict['form.required.select'] + item.label + '!'
+ }]
})(
<Select
showSearch
@@ -311,27 +357,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}>
+ <Icon type="question-circle" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal || '',
+ rules: [{
+ required: !!item.required,
+ message: this.props.dict['form.required.select'] + item.label + '!'
+ }]
+ })(
+ <MkIcon />
+ )}
+ </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}>
+ <Icon type="question-circle" />
+ {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>
@@ -356,22 +424,11 @@
</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
- }]
- }
-
fields.push(
<Col span={12} key={index}>
<Form.Item label={item.label}>
{getFieldDecorator(item.key, {
- initialValue: filelist,
+ initialValue: item.initVal,
rules: [
{
required: !!item.required,
@@ -379,7 +436,7 @@
}
]
})(
- <FileUpload accept=".jpg,.png,.gif,.pjp,.pjpeg,.jpeg,.jfif,.webp,.mp4,.webm,.ogg" maxFile={item.maxfile} fileType={'text'} />
+ <SourceComponent type={this.state.eleType} />
)}
</Form.Item>
</Col>
@@ -396,29 +453,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