From ac1d52c46ff9019fcc93cf3d5e7ab17cf850824e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 八月 2023 16:05:24 +0800
Subject: [PATCH] 2023-08-10
---
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 86 ++++++++++++++++++++++++------------------
1 files changed, 49 insertions(+), 37 deletions(-)
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index 06d7186..34b71e8 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -84,9 +84,12 @@
{value: '[3, 0]', label: '杩戜笁澶�'},
{value: '[7, 0]', label: '杩戜竷澶�'},
{value: '[30, 0]', label: '杩�30澶�'},
+ {value: '[90, 0]', label: '杩�90澶�'},
{value: '[7, -7]', label: '鍓嶅悗涓冨ぉ'},
{value: '[30, -30]', label: '鍓嶅悗30澶�'},
{value: '[90, -90]', label: '鍓嶅悗90澶�'},
+ {value: '[180, -180]', label: '鍓嶅悗180澶�'},
+ {value: '[365, -365]', label: '鍓嶅悗365澶�'},
{value: '[-1, -1]', label: '鏄庡ぉ'},
{value: '[-2, -2]', label: '鍚庡ぉ'}
]
@@ -96,6 +99,7 @@
const searchTypeOptions = {
text: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'inputType', 'advanced', 'query', 'labelwidth'],
select: ['label', 'field', 'resourceType', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'setAll', 'dropdown', 'query', 'labelwidth'],
+ radio: ['label', 'field', 'resourceType', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'setAll', 'query', 'labelwidth'],
multiselect: ['label', 'field', 'resourceType', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'query', 'labelwidth'],
link: ['label', 'field', 'resourceType', 'initval', 'type', 'linkField', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'setAll', 'dropdown', 'query', 'labelwidth'],
date: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'query', 'precision', 'labelwidth'],
@@ -104,23 +108,20 @@
datemonth: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'query', 'labelwidth'],
daterange: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'required', 'Hide', 'labelShow', 'advanced', 'query', 'precision', 'labelwidth'],
group: ['label', 'type', 'field', 'datefield', 'initval', 'blacklist', 'ratio', 'items', 'required', 'labelShow', 'query', 'labelwidth'],
+ switch: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'openVal', 'closeVal', 'openText', 'closeText', 'Hide', 'labelShow', 'advanced', 'query', 'labelwidth'],
+ check: ['label', 'field', 'initval', 'type', 'match', 'ratio', 'blacklist', 'openVal', 'closeVal', 'checkTip', 'Hide', 'labelShow', 'advanced', 'query', 'labelwidth'],
range: ['label', 'type', 'field', 'initval', 'match', 'blacklist', 'Hide', 'required', 'maxValue', 'minValue', 'step', 'labelShow', 'query', 'labelwidth']
}
class MainSearch extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
formlist: PropTypes.any, // 琛ㄥ崟
card: PropTypes.object, // 鎼滅储鏉′欢淇℃伅
inputSubmit: PropTypes.any // 鍥炶溅鎻愪氦浜嬩欢
}
state = {
- openType: null, // 鎼滅储鏉′欢鏄剧ず绫诲瀷
- resourceType: null, // 涓嬫媺鎼滅储鏃讹紝閫夐」鏉ユ簮绫诲瀷
- formlist: null, // 琛ㄥ崟
- cFields: [],
- textTooltip: '瀛楁鍚嶅彲浠ヤ娇鐢ㄩ�楀彿鍒嗛殧锛岃繘琛岀患鍚堟悳绱�',
+ formlist: null
}
record = {}
@@ -180,7 +181,7 @@
let reRequired = {}
let reLabel = {}
- if (['multiselect', 'select', 'link'].includes(type)) {
+ if (['multiselect', 'select', 'link', 'radio'].includes(type)) {
reRequired.linkField = true
if (this.record.resourceType === '0') { // 鑷畾涔夎祫婧�
shows.push('options')
@@ -199,17 +200,20 @@
if (this.record.resourceType === '0') { // 鑷畾涔夎祫婧�
shows.push('options', 'fields')
} else if (this.record.resourceType === '1') { // 鏁版嵁婧�
- shows.push('dataSource', 'cardValField', 'fields', 'orderBy', 'orderType', 'database')
+ shows.push('dataSource', 'cardValField', 'colorField', 'fields', 'orderBy', 'orderType', 'database')
}
} else {
reRequired.fields = true
if (this.record.resourceType === '0') { // 鑷畾涔夎祫婧�
- shows.push('options', 'fields', 'selectStyle')
+ shows.push('options', 'fields', 'selectStyle', 'border')
} else if (this.record.resourceType === '1') { // 鏁版嵁婧�
- shows.push('dataSource', 'cardValField', 'fields', 'orderBy', 'orderType', 'database', 'selectStyle')
+ shows.push('dataSource', 'cardValField', 'fields', 'orderBy', 'orderType', 'database', 'selectStyle', 'border')
}
if (this.record.selectStyle === 'custom') {
shows.push('backgroundColor')
+ }
+ if (this.record.multiple === 'dropdown' && this.record.resourceType === '1') {
+ shows.push('mark', 'parentField')
}
}
shows.push('linkField')
@@ -227,22 +231,24 @@
}
if (type === 'text') {
- reOptions.match = matchReg.text
+ reOptions.match = matchReg.class1
} else if (type === 'multiselect') {
- reOptions.match = matchReg.multiselect
+ reOptions.match = matchReg.class3
} else if (type === 'select' || type === 'link') {
- reOptions.match = matchReg.select
+ reOptions.match = matchReg.class1
+ } else if (type === 'switch' || type === 'check') {
+ reOptions.match = matchReg.class2
} else if (type === 'date') {
- reOptions.match = matchReg.date
+ reOptions.match = matchReg.class4
} else if (type === 'datemonth') {
- reOptions.match = matchReg.datemonth
+ reOptions.match = matchReg.class5
} else if (type === 'dateweek' || type === 'daterange' || type === 'range') {
- reOptions.match = matchReg.daterange
+ reOptions.match = matchReg.class5
} else if (type === 'checkcard') {
if (this.record.multiple === 'false') {
- reOptions.match = matchReg.select
+ reOptions.match = matchReg.class1
} else if (this.record.multiple === 'true') {
- reOptions.match = matchReg.multiselect
+ reOptions.match = matchReg.class3
}
}
@@ -267,7 +273,6 @@
}
optionChange = (key, value) => {
- let oriType = this.record.type
this.record[key] = value
let _fieldval = {}
@@ -292,9 +297,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) {
@@ -318,7 +320,7 @@
uuid: key
}]
}
- } else if (['multiselect', 'select', 'link'].includes(value)) {
+ } else if (['multiselect', 'select', 'link', 'radio'].includes(value)) {
if (!this.record.options[0].Text && this.record.fields.length > 0) {
let field = this.record.fields[0].field
@@ -424,7 +426,11 @@
let resource = this.props.form.getFieldValue('dataSource') || ''
- resource = `select '' as ${field},'鍏ㄩ儴' as ${text} union all \n${resource}`
+ if (field === text) {
+ resource = `select '' as ${field} union all \n${resource}`
+ } else {
+ resource = `select '' as ${field},'鍏ㄩ儴' as ${text} union all \n${resource}`
+ }
this.props.form.setFieldsValue({dataSource: resource})
}
@@ -437,7 +443,6 @@
getFields() {
const { getFieldDecorator } = this.props.form
- const { dict } = this.props
const { formlist } = this.state
const fields = []
@@ -454,7 +459,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({
@@ -483,11 +488,11 @@
<Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />
</AutoComplete>
} else {
- content = <Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />
+ content = <Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} onChange={(e) => {this.optionChange(item.key, e.target.value)}}/>
}
} 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
@@ -498,7 +503,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
@@ -516,7 +521,7 @@
</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 style={{whiteSpace: 'nowrap'}} onChange={(e) => {this.optionChange(item.key, e.target.value)}}>
@@ -528,7 +533,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'
@@ -550,7 +555,7 @@
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} multiple={this.record.multiple} display={this.record.display} linkSubFields={[]} transfield={{}} fields={this.record.fields || []} onChange={this.changeOptions}/>
}
} else if (item.type === 'fields') {
span = 24
@@ -560,10 +565,10 @@
{ required: item.required, message: '璇锋坊鍔�' + item.label + '!' }
]
- content = <FieldsTable dict={dict} onChange={this.changeField}/>
+ 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)}/>
@@ -582,7 +587,7 @@
} else if (item.type === 'color') {
className = 'color-form-item'
rules = [
- { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
]
content = <ColorSketch allowClear={true}/>
@@ -615,7 +620,7 @@
if (!err) {
values.uuid = this.props.card.uuid
// 涓嬫媺鑿滃崟鎴栬仈鍔ㄨ彍鍗�
- if (['multiselect', 'select', 'link'].includes(values.type)) {
+ if (['multiselect', 'select', 'link', 'radio'].includes(values.type)) {
if (values.resourceType === '0') {
values.options = values.options || []
values.dataSource = ''
@@ -661,10 +666,15 @@
values.options = []
}
} else if (values.type === 'checkcard') {
+ if (values.multiple === 'dropdown' && values.display !== 'text') {
+ values.multiple = 'false'
+ }
+
if (values.resourceType === '0') {
values.options = values.options || []
values.options = values.options.map(m => {
m.ParentID = m.ParentID || ''
+ m.pid = m.pid || ''
return m
})
@@ -740,11 +750,13 @@
})
return
}
+ } else if (values.type === 'switch' || values.type === 'check') {
+ values.initval = values.initval === values.openVal ? values.openVal : values.closeVal
}
['linkField', 'valueField', 'valueText', 'orderBy'].forEach(item => {
if (values[item]) {
- values[item] = values[item].replace(/\s* | \t* | \v* | \r*/ig, '')
+ values[item] = values[item].replace(/\s+|\t+|\v+|\r+/ig, '')
}
})
--
Gitblit v1.8.0