From c7aece35a62b6e91fd98a625bf0e53f64bfbd18d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 八月 2023 16:22:15 +0800
Subject: [PATCH] 2023-08-17
---
src/tabviews/zshare/topSearch/index.jsx | 466 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 331 insertions(+), 135 deletions(-)
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 8cbca63..11d86ec 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -1,22 +1,24 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { is, fromJS } from 'immutable'
-import { Form, Row, Col, Button, notification, Modal } from 'antd'
-import { CloseOutlined } from '@ant-design/icons'
+import { fromJS } from 'immutable'
+import { Form, Row, Col, Button, notification, Modal, Drawer } from 'antd'
+import { CloseOutlined, DownOutlined } from '@ant-design/icons'
import moment from 'moment'
+import md5 from 'md5'
import Api from '@/api'
-import options from '@/store/options.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
+import MKEmitter from '@/utils/events.js'
import MKInput from './mkInput'
import './index.scss'
const MutilForm = asyncSpinComponent(() => import('./advanceform'))
-const MKCheckCard = asyncComponent(() => import('@/tabviews/zshare/mutilform/checkCard'))
+const MKCheckCard = asyncComponent(() => import('./mkCheckCard'))
+const MKCheck = asyncComponent(() => import('@/tabviews/zshare/mutilform/mkCheck'))
+const MKSwitch = asyncComponent(() => import('@/tabviews/zshare/mutilform/mkSwitch'))
+const MKRadio = asyncComponent(() => import('./mkRadio'))
const MKSelect = asyncComponent(() => import('./mkSelect'))
const DateGroup = asyncComponent(() => import('./dategroup'))
const MKDatePicker = asyncComponent(() => import('./mkDatePicker'))
@@ -24,98 +26,110 @@
class MainSearch extends Component {
static propTpyes = {
BID: PropTypes.any, // 鐖剁骇Id锛岀敤浜庢煡璇笅鎷夐�夋嫨椤�
- menuType: PropTypes.any, // 鑿滃崟鏉冮檺锛屾槸鍚︿负HS
- searchlist: PropTypes.array, // 鎼滅储鏉′欢鍒楄〃
- config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅(鑷畾涔夐〉闈�)
- setting: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅(鑷畾涔夐〉闈�)
- refreshdata: PropTypes.func // 鍒锋柊鏁版嵁
+ config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
searchlist: null, // 鎼滅储椤�
- reset: true, // 鎺у埗缁勫悎鎼滅储椤归噸缃�
- float: '', // 娴姩
- showButton: true, // 鏄惁鏄剧ず鎼滅储鎸夐挳
- showAdvanced: false, // 鏄惁鏄剧ず楂樼骇鎼滅储
- searchStyle: null, // 鎼滅储鏉′欢鏍峰紡
+ setting: {},
advanceValues: [], // 楂樼骇鎼滅储鏉′欢淇濆瓨鍊�
visible: false,
- adModelWidth: '1000px',
hasReqFields: false
}
record = {}
+ sign = ''
UNSAFE_componentWillMount () {
- const { config, menuType, searchlist, setting } = this.props
+ const { config } = this.props
let _searchlist = []
let fieldMap = new Map()
let mainItems = [] // 浜戠鎴栧崟鐐规暟鎹�
let localItems = [] // 鏈湴鏁版嵁
let deForms = [] // 娴嬭瘯绯荤粺锛屽崟涓姹�
- let float = ''
- let showButton = true
- let searchStyle = null
let advanceValues = []
- let showAdvanced = false
- let adModelWidth = 1000
let linkFields = {}
let record = {}
- let hasReqFields = false
-
- if (setting && setting.advanceWidth) {
- adModelWidth = setting.advanceWidth
- } else if (config && config.wrap && config.wrap.advanceWidth) {
- adModelWidth = config.wrap.advanceWidth
+ let forbid = false // header涓笉璁剧疆楂樼骇鎼滅储
+ let _setting = {showAdv: false, show: false, style: null}
+
+ if (config.wrap) {
+ _setting.show = config.wrap.show !== 'false'
+ _setting.advanceType = config.wrap.advanceType || 'modal'
+ _setting.advWidth = config.wrap.advanceWidth || 1000
+ _setting.placement = config.wrap.drawerPlacement || 'right'
+ _setting.ratio = config.wrap.searchRatio || 6
+ _setting.labelwidth = config.wrap.searchLwidth !== undefined ? config.wrap.searchLwidth : 33.3
+ _setting.labelCol = {style: {width: _setting.labelwidth + '%'}}
+ _setting.wrapperCol = {style: {width: (100 - _setting.labelwidth) + '%'}}
+ _setting.borderRadius = config.wrap.borderRadius
+ _setting.resetContrl = config.wrap.resetContrl || 'init'
}
-
- if (adModelWidth < 100) {
- adModelWidth = adModelWidth + 'vw'
+
+ if (config.type === 'search') {
+ _setting.float = config.wrap.float || 'left'
+ _setting.style = config.style
+ } else if (config.type === 'table') {
+ _setting.float = 'left'
} else {
- adModelWidth = adModelWidth + 'px'
+ _setting.float = 'right'
+ _setting.show = false
+ forbid = true
}
- if (searchlist) {
- if (setting && setting.show === 'false') {
- showButton = false
- }
- _searchlist = fromJS(searchlist).toJS()
- } else if (config) {
- _searchlist = fromJS(config.search).toJS()
- if (config.type === 'search' && config.subtype === 'mainsearch') {
- float = config.wrap.float
- showButton = config.wrap.show !== 'false'
- searchStyle = config.style
+ if (_setting.advanceType === 'drawer' && _setting.advWidth) {
+ if (_setting.placement === 'top' || _setting.placement === 'bottom') {
+ _setting.advHeight = _setting.advWidth > 100 ? _setting.advWidth + 'px' : _setting.advWidth + 'vh'
+ _setting.advWidth = '100vw'
} else {
- showButton = false
- float = 'right'
+ _setting.advWidth = _setting.advWidth > 100 ? _setting.advWidth + 'px' : _setting.advWidth + 'vw'
+ }
+ } else if (_setting.advanceType === 'modal' && _setting.advWidth) {
+ if (_setting.advWidth < 100) {
+ _setting.advWidth = _setting.advWidth + 'vw'
+ } else {
+ _setting.advWidth = _setting.advWidth + 'px'
}
}
+
+ _searchlist = fromJS(config.search).toJS()
_searchlist.forEach(item => {
- if (item.type === 'link') {
+ if (item.linkField) {
linkFields[item.linkField] = linkFields[item.linkField] || []
linkFields[item.linkField].push({field: item.field, uuid: item.uuid})
}
+
+ let labelwidth = item.labelwidth || 33.3
+ if (item.labelShow === 'false') {
+ labelwidth = 0
+ }
+ item.labelCol = {style: {width: labelwidth + '%'}}
+ item.wrapperCol = {style: {width: (100 - labelwidth) + '%'}}
if (fieldMap.has(item.field)) {
item.field = item.field + '@tail@'
}
- if (item.required) {
- hasReqFields = true
- }
-
- if (showButton && item.advanced) {
- showAdvanced = true
+ if (item.advanced && !forbid) {
+ _setting.showAdv = true
} else {
item.advanced = false
}
if (item.advanced && item.initval) {
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: item.initval})
+ let val = item.initval
+ if (item.precision === 'hour') {
+ if (/,/ig.test(val)) {
+ val = val.split(',').map(m => m + ':00').join(',')
+ } else {
+ val = val + ':00'
+ }
+ }
+ if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+ }
}
if (item.type === 'group') {
@@ -125,13 +139,15 @@
record[item.field] = item.initval
}
- if (['select', 'link', 'multiselect', 'checkcard'].includes(item.type)) {
+ if (['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(item.type)) {
item.options = item.options || []
+ item.options = item.options.filter(op => !op.Hide)
if (item.setAll === 'true' && ['select', 'link'].includes(item.type)) {
item.options.unshift({
key: Utils.getuuid(),
Value: '',
- Text: this.state.dict['main.all']
+ Text: '鍏ㄩ儴',
+ ParentID: ''
})
}
@@ -139,8 +155,12 @@
if (item.resourceType === '1' && item.dataSource) {
let _option = Utils.getSelectQueryOptions(item)
+ if (window.GLOB.debugger === true) {
+ console.info(_option.sql)
+ }
+
// 娴嬭瘯绯荤粺鍗曚釜璇锋眰
- if (menuType !== 'HS' && options.sysType === 'local' && !window.GLOB.systemType) {
+ if (!window.GLOB.mkHS && window.GLOB.sysType === 'local' && !window.GLOB.systemType) {
deForms.push({
...item,
arr_field: _option.field,
@@ -148,13 +168,17 @@
})
} else { // 鍚堝苟璇锋眰锛屽尯鍒嗘湰鍦板強绯荤粺
if (item.database === 'sso') {
- mainItems.push(`select '${item.field}' as obj_name,'${_option.field}' as arr_field,'${window.btoa(window.encodeURIComponent(_option.sql))}' as LText`)
+ mainItems.push(`select '${item.field}' as obj_name,'${_option.field}' as arr_field,'${window.btoa(window.encodeURIComponent(_option.sql.replace(/%/ig, ' mpercent ')))}' as LText`)
} else {
- localItems.push(`select '${item.field}' as obj_name,'${_option.field}' as arr_field,'${window.btoa(window.encodeURIComponent(_option.sql))}' as LText`)
+ localItems.push(`select '${item.field}' as obj_name,'${_option.field}' as arr_field,'${window.btoa(window.encodeURIComponent(_option.sql.replace(/%/ig, ' mpercent ')))}' as LText`)
}
}
}
item.oriOptions = fromJS(item.options).toJS()
+
+ if (item.type === 'checkcard' && item.multiple === 'dropdown' && item.resourceType === '0') {
+ this.resetCheckcard(item)
+ }
}
fieldMap.set(item.field, item)
@@ -165,11 +189,11 @@
let _list = _searchlist.map(item => {
if (item.hidden) return item
- if (linkFields[item.field]) {
+ if (linkFields[item.field] && (item.type === 'select' || item.type === 'link' || (item.type === 'checkcard' && item.multiple !== 'true'))) {
item.linkFields = linkFields[item.field]
}
- if (item.type === 'link') {
+ if (item.linkField) {
let supItem = fieldMap.get(item.linkField)
if (!supItem) {
@@ -189,36 +213,55 @@
})
this.setState({
- float,
- showButton,
- searchStyle,
- hasReqFields,
- showAdvanced,
- adModelWidth,
+ setting: _setting,
+ hasReqFields: config.$s_req,
advanceValues,
searchlist: _list
}, () => {
- if (menuType !== 'HS' && options.sysType === 'local' && !window.GLOB.systemType) {
+ if (!window.GLOB.mkHS && window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') {
this.improveSimpleSearch(deForms)
- } else {
+ } else if (mainItems.length > 0 || localItems.length > 0) {
this.improveSearch(mainItems, localItems)
}
})
}
- shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState))
+ resetCheckcard = (item) => {
+ let pid = item.resourceType === '0' ? 'pid' : item.parentField
+ let _options = []
+ let _others = []
+ item.oriOptions.forEach(op => {
+ if (op[pid] === item.mark) {
+ _options.push(op)
+ } else {
+ _others.push(op)
+ }
+ })
+
+ _options = _options.map(op => {
+ op.children = []
+
+ _others = _others.filter(cell => {
+ if (cell[pid] === op.$value) {
+ op.children.push(cell)
+ return false
+ }
+ return true
+ })
+
+ op.subIds = op.children.map(cell => cell.$value)
+
+ return op
+ })
+
+ item.oriOptions = _options
+ item.options = _options
}
// 鏌ヨ涓嬫媺鑿滃崟
improveSearch = (mainItems, localItems) => {
- const { menuType, BID } = this.props
+ const { BID } = this.props
let deffers = []
-
- if (menuType !== 'HS' && window.GLOB.systemType !== 'production') {
- localItems = [...localItems, ...mainItems]
- mainItems = []
- }
// 鏈湴璇锋眰
let param = {
@@ -238,7 +281,7 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
- if (menuType === 'HS') { // 浜戠鏁版嵁楠岃瘉
+ if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
@@ -276,10 +319,10 @@
mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
mainparam.secretkey = Utils.encrypt(mainparam.LText, mainparam.timestamp)
- if (menuType === 'HS') { // 浜戠鏁版嵁楠岃瘉
+ if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
mainparam.open_key = Utils.encryptOpenKey(mainparam.secretkey, mainparam.timestamp)
- if (options.cloudServiceApi) {
- mainparam.rduri = options.cloudServiceApi
+ if (window.GLOB.cloudServiceApi) {
+ mainparam.rduri = window.GLOB.cloudServiceApi
mainparam.userid = sessionStorage.getItem('CloudUserID') || ''
mainparam.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
}
@@ -334,6 +377,10 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ if (item.database === 'sso' && window.GLOB.mainSystemApi) {
+ param.rduri = window.GLOB.mainSystemApi
+ }
+
return (
new Promise(resolve => {
setTimeout(() => {
@@ -370,41 +417,67 @@
resetSearch = (result) => {
let _searchlist = fromJS(this.state.searchlist).toJS().map(item => {
- if (['select', 'link', 'multiselect', 'checkcard'].includes(item.type) && result[item.field] && result[item.field].length > 0) {
+ if (['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(item.type) && result[item.field] && result[item.field].length > 0) {
let options = []
+ let map = new Map()
+ let all = false
result[item.field].forEach(cell => {
let _item = {
- key: Utils.getuuid()
+ key: Utils.getuuid(),
+ ParentID: ''
+ }
+
+ if (item.linkField) {
+ _item.ParentID = cell[item.linkField]
}
if (item.type !== 'checkcard') {
_item.Value = cell[item.valueField]
- _item.Text = cell[item.valueText]
- if (!_item.Text && _item.Text !== 0) {
- return
+ _item.Text = cell[item.valueText] + ''
+
+ if (map.has(_item.ParentID + _item.Value)) return
+ if (!_item.Text) {
+ if (!all) {
+ _item.Text = '鍏ㄩ儴'
+ all = true
+ } else {
+ return
+ }
}
+
+ map.set(_item.ParentID + _item.Value, 0)
} else {
_item.$value = cell[item.cardValField]
_item = {..._item, ...cell}
- }
- if (item.type === 'link') {
- _item.ParentID = cell[item.linkField]
+ if (item.urlField) {
+ _item.$url = cell[item.urlField] || ''
+ } else if (item.colorField) {
+ _item.$color = cell[item.colorField] || ''
+ }
+
+ if (map.has(_item.ParentID + _item.$value)) return
+
+ map.set(_item.ParentID + _item.$value, 0)
}
options.push(_item)
})
item.oriOptions = [...item.oriOptions, ...options]
+
+ if (item.type === 'checkcard' && item.multiple === 'dropdown') {
+ this.resetCheckcard(item)
+ }
}
- if (item.type === 'link') {
+ if (item.linkField) {
if (item.supInitVal) {
item.options = item.oriOptions.filter(option => option.ParentID === item.supInitVal || option.Value === '')
} else {
item.options = item.oriOptions
}
- } else if (item.type === 'select' || item.type === 'multiselect' || item.type === 'checkcard') {
+ } else if (item.oriOptions) {
item.options = item.oriOptions
}
@@ -426,7 +499,9 @@
this.handleSubmit()
}, 1000)
} else {
- this.handleSubmit()
+ setTimeout(() => {
+ this.handleSubmit()
+ }, 10)
}
}
@@ -437,14 +512,23 @@
this.handleSubmit()
}
+ cardChange = (val, item) => {
+ this.record[item.field] = val
+
+ if (!item.linkFields) {
+ setTimeout(() => {
+ this.handleSubmit()
+ }, 10)
+ }
+ }
+
getFields() {
const { getFieldDecorator } = this.props.form
- const { dict, showButton, showAdvanced, float, visible } = this.state
+ const { visible, setting } = this.state
const fields = []
- let lastRadio = 6
this.state.searchlist.forEach((item, index) => {
- if (item.hidden || item.advanced) return
+ if (item.hidden || (item.advanced && (setting.advanceType !== 'pulldown' || !visible))) return
const _rules = [
{
@@ -454,9 +538,7 @@
]
let content = null
- let className = ''
let field = item.field
- lastRadio = item.ratio || 6
if (item.type === 'text') {
content = (<MKInput config={item} onInputSubmit={this.handleSubmit} />)
@@ -468,14 +550,23 @@
field = item.datefield
content = <DateGroup position={index} config={item} onChange={(val, type) => this.dateGroupChange(val, type, item)} />
} else if (item.type === 'checkcard') {
- className = 'checkcard'
- content = <MKCheckCard card={item} onChange={this.handleSubmit} />
+ content = <MKCheckCard config={item} onChange={(val) => this.cardChange(val, item)} />
+ } else if (item.type === 'radio') {
+ content = <MKRadio config={item} onChange={(val) => this.recordChange(val, false, item)} />
+ } else if (item.type === 'check') {
+ content = <MKCheck config={item} onChange={(val) => this.recordChange(val, false, item)} />
+ } else if (item.type === 'switch') {
+ content = <MKSwitch config={item} onChange={(val) => this.recordChange(val, false, item)} />
}
if (content) {
fields.push(
- <Col span={item.ratio || 6} key={index}>
- <Form.Item className={className} label={item.labelShow !== 'false' ? item.label : ''}>
+ <Col className="mk-search-col" span={item.ratio || 6} key={index}>
+ <Form.Item
+ label={item.labelShow !== 'false' ? item.label : ''}
+ labelCol={item.labelCol}
+ wrapperCol={item.wrapperCol}
+ >
{getFieldDecorator(field, {
initialValue: item.initval,
rules: _rules
@@ -486,41 +577,85 @@
}
})
- if (showButton) {
- let action = (
- <Col span={lastRadio < 6 ? 6 : lastRadio} style={{ whiteSpace: 'nowrap' }} className="search-button" key="actions">
- <Form.Item label={' '} colon={false} style={{ minHeight: '40px' }}>
- <Button type="primary" onClick={this.handleSubmit}>
- {dict['main.search']}
- </Button>
- <Button style={{ marginLeft: 8 }} onClick={this.handleReset}>
- {dict['main.reset']}
- </Button>
- {showAdvanced && !visible ? <Button type="link" onClick={this.handleAdvance}>
- 楂樼骇
+ if (setting.show || setting.showAdv) {
+ let style = {}
+ if (setting.borderRadius) {
+ style.borderRadius = setting.borderRadius
+ }
+
+ fields.push(
+ <Col span={setting.ratio} style={{ whiteSpace: 'nowrap' }} className="mk-search-col search-button" key="actions">
+ <Form.Item
+ label={' '}
+ colon={false}
+ labelCol={setting.labelCol}
+ wrapperCol={setting.wrapperCol}
+ >
+ {setting.show ? <Button style={style} type="primary" onClick={this.handleSubmit}>
+ 鎼滅储
+ </Button> : null}
+ {setting.show ? <Button style={{ marginLeft: 8, ...style }} onClick={this.handleReset}>
+ 閲嶇疆
+ </Button> : null}
+ {setting.showAdv ? <Button className={visible ? 'visible' : ''} type="link" onClick={this.handleAdvance}>
+ 楂樼骇{setting.advanceType === 'pulldown' ? <DownOutlined /> : null}
</Button> : null}
</Form.Item>
</Col>
)
- if (float === 'right') {
- fields.unshift(action)
- } else {
- fields.push(action)
- }
}
return fields
}
handleAdvance = () => {
- this.setState({visible: true})
+ const { setting, visible } = this.state
+
+ if (setting.advanceType !== 'pulldown' && visible) {
+ return
+ }
+
+ this.setState({visible: !visible})
+
+ if (setting.advanceType === 'pulldown') {
+ if (visible) {
+ let advanceValues = []
+ this.state.searchlist.forEach(item => {
+ if (!item.advanced) return
+
+ let val = this.record[item.field]
+ if (val || val === 0) {
+ if (item.precision === 'hour') {
+ if (/,/ig.test(val)) {
+ val = val.split(',').map(m => m + ':00').join(',')
+ } else {
+ val = val + ':00'
+ }
+ }
+ if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+ }
+ }
+ })
+ this.setState({advanceValues})
+ } else {
+ let list = this.state.searchlist.map(item => {
+ if (!item.advanced) return item
+
+ item.initval = this.record[item.field]
+
+ return item
+ })
+ this.setState({searchlist: list})
+ }
+ }
}
handleSubmit = () => {
this.setState({}, () => {
this.props.form.validateFields((err, values) => {
if (err) return
-
+
let { searches, error } = this.getFieldsValues(values)
if (error) {
@@ -538,14 +673,28 @@
notification.warning({
top: 92,
- message: this.state.dict['form.required.input'] + labels.join('銆�') + ' !',
+ message: '璇疯緭鍏�' + labels.join('銆�') + ' !',
duration: 3
})
return
}
}
- this.props.refreshdata(searches)
+ let sign = md5(JSON.stringify(searches))
+
+ if (sign === this.sign) return
+
+ this.sign = sign
+ setTimeout(() => {
+ this.sign = ''
+ }, 2000)
+
+ if (this.props.refreshdata) {
+ this.props.refreshdata(searches)
+ } else {
+ window.GLOB.SearchBox.set(this.props.config.$searchId, searches)
+ MKEmitter.emit('searchRefresh', this.props.config.$searchId)
+ }
})
})
}
@@ -554,10 +703,16 @@
* @description 鎼滅储鏉′欢閲嶇疆
*/
handleReset = () => {
+ const { setting } = this.state
+
let record = {}
let advanceValues = []
let searchlist = this.state.searchlist.map(item => {
item.initval = item.oriInitval
+
+ if (setting.resetContrl === 'clear' && ['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
+ item.initval = ''
+ }
if (item.type === 'group') {
record[item.datefield] = item.initval
@@ -566,7 +721,17 @@
record[item.field] = item.initval
}
if (item.advanced && item.initval) {
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: item.initval})
+ let val = item.initval
+ if (item.precision === 'hour') {
+ if (/,/ig.test(val)) {
+ val = val.split(',').map(m => m + ':00').join(',')
+ } else {
+ val = val + ':00'
+ }
+ }
+ if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+ }
}
return item
@@ -598,6 +763,7 @@
label: item.label,
match: 'between',
required: item.required,
+ precision: 'day',
forbid: item.$forbid
}, {
type: 'group',
@@ -617,6 +783,8 @@
} else if (type === 'text' && !error) {
if (/'/ig.test(val)) {
error = `鎼滅储鏉′欢${item.label}涓紝涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙枫�俙
+ } else if (/--/ig.test(val)) {
+ error = `鎼滅储鏉′欢${item.label}涓紝涓嶅彲浣跨敤 -- 銆俙
} else if (/(^|\s)select\s/ig.test(val)) {
error = `鎼滅储鏉′欢${item.label}涓紝涓嶅彲浣跨敤鍏抽敭瀛梥elect銆俙
} else if (/\sfrom(\s|\()/ig.test(val)) {
@@ -653,6 +821,7 @@
label: item.label,
match: item.match,
required: item.required,
+ precision: item.precision || 'day',
forbid: item.$forbid
})
}
@@ -670,7 +839,16 @@
let val = this.record[item.field]
if (val || val === 0) {
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+ if (item.precision === 'hour') {
+ if (/,/ig.test(val)) {
+ val = val.split(',').map(m => m + ':00').join(',')
+ } else {
+ val = val + ':00'
+ }
+ }
+ if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+ }
}
})
@@ -686,7 +864,7 @@
}
render() {
- const { float, searchStyle, visible, searchlist, showAdvanced, advanceValues, adModelWidth } = this.state
+ const { visible, searchlist, advanceValues, setting } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -700,10 +878,10 @@
return (
<>
- <Form {...formItemLayout} className={`top-search ${float}`} style={searchStyle}>
+ <Form {...formItemLayout} className={`mk-search-wrap mk-float-${setting.float}`} style={setting.style}>
<Row gutter={24}>{this.getFields()}</Row>
- <Row gutter={24}>
- {showAdvanced ? <div className="advanced-list">
+ {advanceValues.length && (setting.advanceType !== 'pulldown' || (setting.advanceType === 'pulldown' && !visible)) ? <Row gutter={24}>
+ <div className="advanced-list">
{advanceValues.map((item, index) => {
return (
<div key={index}>
@@ -712,14 +890,14 @@
<CloseOutlined onClick={() => this.closeAdvanceForm(item)} />
</div>)
})}
- </div> : null}
- </Row>
+ </div>
+ </Row> : null}
</Form>
- <Modal
+ {setting.advanceType === 'modal' ? <Modal
title="楂樼骇鎼滅储"
maskClosable={false}
visible={visible}
- width={adModelWidth}
+ width={setting.advWidth}
closable={false}
footer={null}
destroyOnClose
@@ -730,7 +908,25 @@
advanceSubmit={this.handleOk}
handleClose={() => this.setState({visible: false})}
/>
- </Modal>
+ </Modal> : null}
+ {setting.advanceType === 'drawer' ? <Drawer
+ title="楂樼骇鎼滅储"
+ className="mk-search-drawer"
+ width={setting.advWidth}
+ height={setting.advHeight}
+ maskClosable={false}
+ onClose={() => this.setState({visible: false})}
+ visible={visible}
+ placement={setting.placement}
+ destroyOnClose
+ >
+ <MutilForm
+ searchlist={searchlist}
+ record={this.record}
+ advanceSubmit={this.handleOk}
+ handleClose={() => this.setState({visible: false})}
+ />
+ </Drawer> : null}
</>
)
}
--
Gitblit v1.8.0