From cb9ade2afd2a367ad767bc605ab7086c695dd010 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 09 十二月 2022 15:53:32 +0800
Subject: [PATCH] 2022-12-09
---
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 75 ++++++++++++++++++++++++++-----------
1 files changed, 53 insertions(+), 22 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index 2b3e7fd..c4365b3 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/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, notification, Tooltip, InputNumber, Checkbox, Cascader } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, notification, Tooltip, InputNumber, Checkbox, Cascader, AutoComplete } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import { dateOptions, matchReg, formRule } from '@/utils/option.js'
@@ -109,7 +109,6 @@
class MainSearch extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
formlist: PropTypes.any, // 琛ㄥ崟
card: PropTypes.object, // 鎼滅储鏉′欢淇℃伅
inputSubmit: PropTypes.any // 鍥炶溅鎻愪氦浜嬩欢
@@ -119,7 +118,6 @@
openType: null, // 鎼滅储鏉′欢鏄剧ず绫诲瀷
resourceType: null, // 涓嬫媺鎼滅储鏃讹紝閫夐」鏉ユ簮绫诲瀷
formlist: null, // 琛ㄥ崟
- display: null,
cFields: [],
textTooltip: '瀛楁鍚嶅彲浠ヤ娇鐢ㄩ�楀彿鍒嗛殧锛岃繘琛岀患鍚堟悳绱�',
}
@@ -189,17 +187,28 @@
shows.push('dataSource', 'valueField', 'valueText', 'orderBy', 'orderType', 'database')
}
} else if (type === 'checkcard') {
+ reRequired.fields = false
if (this.record.display === 'picture') {
if (this.record.resourceType === '0') { // 鑷畾涔夎祫婧�
- shows.push('options', 'picratio')
+ shows.push('options', 'fields', 'picratio')
} else if (this.record.resourceType === '1') { // 鏁版嵁婧�
- shows.push('dataSource', 'cardValField', 'urlField', 'orderBy', 'orderType', 'database', 'picratio')
+ shows.push('dataSource', 'cardValField', 'fields', 'urlField', 'orderBy', 'orderType', 'database', 'picratio')
+ }
+ } else if (this.record.display === 'color') {
+ if (this.record.resourceType === '0') { // 鑷畾涔夎祫婧�
+ shows.push('options', 'fields')
+ } else if (this.record.resourceType === '1') { // 鏁版嵁婧�
+ shows.push('dataSource', 'cardValField', 'fields', 'orderBy', 'orderType', 'database')
}
} else {
+ reRequired.fields = true
if (this.record.resourceType === '0') { // 鑷畾涔夎祫婧�
- shows.push('options', 'fields', 'backgroundColor', 'borderColor')
+ shows.push('options', 'fields', 'selectStyle')
} else if (this.record.resourceType === '1') { // 鏁版嵁婧�
- shows.push('dataSource', 'cardValField', 'fields', 'orderBy', 'orderType', 'database', 'backgroundColor', 'borderColor')
+ shows.push('dataSource', 'cardValField', 'fields', 'orderBy', 'orderType', 'database', 'selectStyle')
+ }
+ if (this.record.selectStyle === 'custom') {
+ shows.push('backgroundColor')
}
}
shows.push('linkField')
@@ -257,7 +266,6 @@
}
optionChange = (key, value) => {
- let oriType = this.record.type
this.record[key] = value
let _fieldval = {}
@@ -282,9 +290,6 @@
if (value === 'checkcard') {
this.record.multiple = 'false'
_fieldval.multiple = 'false'
- _fieldval.ratio = 24
- } else if (oriType === 'checkcard') {
- _fieldval.ratio = 6
}
if (this.record.options.length > 0) {
@@ -419,9 +424,14 @@
this.props.form.setFieldsValue({dataSource: resource})
}
+ complete = (key, option) => {
+ let label = option.props.label
+
+ this.props.form.setFieldsValue({label: label})
+ }
+
getFields() {
const { getFieldDecorator } = this.props.form
- const { dict } = this.props
const { formlist } = this.state
const fields = []
@@ -438,7 +448,7 @@
if (item.type === 'text') {
let type = this.record.type
rules = [
- { required: item.required, message: dict['form.required.input'] + item.label + '!' }
+ { required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
]
if (item.key === 'field' || item.key === 'datefield') {
rules.push({
@@ -455,10 +465,23 @@
})
}
- content = <Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />
+ if (item.key === 'field' && item.options && item.options.length > 0) {
+ content = <AutoComplete
+ dataSource={item.options.map((cell) => <AutoComplete.Option label={cell.label} value={cell.value} key={cell.key}>
+ {cell.text}
+ </AutoComplete.Option>)}
+ filterOption={(input, option) => option.props.children.indexOf(input) > -1}
+ onSelect={this.complete}
+ placeholder=""
+ >
+ <Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />
+ </AutoComplete>
+ } else {
+ content = <Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />
+ }
} else if (item.type === 'number') {
rules = [
- { required: item.required, message: dict['form.required.input'] + item.label + '!' }
+ { required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
]
initVal = item.initVal
@@ -469,7 +492,7 @@
}
} else if (item.type === 'select') { // 涓嬫媺鎼滅储
rules = [
- { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
]
content = <Select
@@ -487,10 +510,10 @@
</Select>
} else if (item.type === 'radio') {
rules = [
- { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
]
- content = <Radio.Group onChange={(e) => {this.optionChange(item.key, e.target.value)}}>
+ content = <Radio.Group style={{whiteSpace: 'nowrap'}} onChange={(e) => {this.optionChange(item.key, e.target.value)}}>
{item.options.map(option => {
return (
<Radio key={option.value} value={option.value}>{option.text}</Radio>
@@ -499,7 +522,7 @@
</Radio.Group>
} else if (item.type === 'codemirror') {
rules = [
- { required: item.required, message: dict['form.required.input'] + item.label + '!' }
+ { required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
]
span = 24
className = 'text-area'
@@ -521,16 +544,20 @@
if (this.record.linkField) {
type = 'link'
}
- content = <DataTable dict={dict} type={type} display={this.record.display} linkSubFields={[]} transfield={{}} fields={this.record.fields || []} onChange={this.changeOptions}/>
+ content = <DataTable type={type} display={this.record.display} linkSubFields={[]} transfield={{}} fields={this.record.fields || []} onChange={this.changeOptions}/>
}
} else if (item.type === 'fields') {
span = 24
className = 'text-area'
- content = <FieldsTable dict={dict} onChange={this.changeField}/>
+ rules = [
+ { required: item.required, message: '璇锋坊鍔�' + item.label + '!' }
+ ]
+
+ content = <FieldsTable onChange={this.changeField}/>
} else if (item.type === 'checkbox') {
rules = [
- { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
]
content = <Checkbox.Group style={{width: '105%'}} options={item.options} onChange={(values) => this.optionChange(item.key, values)}/>
@@ -548,6 +575,10 @@
content = <Cascader options={item.options} placeholder="" />
} else if (item.type === 'color') {
className = 'color-form-item'
+ rules = [
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
+ ]
+
content = <ColorSketch allowClear={true}/>
}
--
Gitblit v1.8.0