From 400fee62fb40006a9839f1c3a8244b82566b5057 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:30:39 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/topSearch/index.jsx | 550 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 469 insertions(+), 81 deletions(-)
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 11d86ec..6a50820 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -22,11 +22,12 @@
const MKSelect = asyncComponent(() => import('./mkSelect'))
const DateGroup = asyncComponent(() => import('./dategroup'))
const MKDatePicker = asyncComponent(() => import('./mkDatePicker'))
+const MKNumber = asyncComponent(() => import('./mkNumber'))
class MainSearch extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id锛岀敤浜庢煡璇笅鎷夐�夋嫨椤�
- config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
+ BID: PropTypes.any,
+ config: PropTypes.object
}
state = {
@@ -47,12 +48,31 @@
let fieldMap = new Map()
let mainItems = [] // 浜戠鎴栧崟鐐规暟鎹�
let localItems = [] // 鏈湴鏁版嵁
+ let backMItems = [] // 浜戠鎴栧崟鐐规暟鎹�
+ let backLItems = [] // 鏈湴鏁版嵁
let deForms = [] // 娴嬭瘯绯荤粺锛屽崟涓姹�
let advanceValues = []
let linkFields = {}
let record = {}
let forbid = false // header涓笉璁剧疆楂樼骇鎼滅储
- let _setting = {showAdv: false, show: false, style: null}
+ let _setting = {showAdv: false, show: false, style: null, $pageId: config.$pageId || ''}
+ let BID = this.props.BID
+ let sysvals = {}
+
+ if (window.backend) {
+ sysvals = {
+ mk_departmentcode: sessionStorage.getItem('departmentcode') || '',
+ mk_organization: sessionStorage.getItem('organization') || '',
+ mk_user_type: sessionStorage.getItem('mk_user_type') || '',
+ bid: BID || '',
+ datam: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ datam_begin: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ datam_end: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ }
+ if (window.GLOB.externalDatabase !== null) {
+ sysvals.db = window.GLOB.externalDatabase
+ }
+ }
if (config.wrap) {
_setting.show = config.wrap.show !== 'false'
@@ -65,6 +85,16 @@
_setting.wrapperCol = {style: {width: (100 - _setting.labelwidth) + '%'}}
_setting.borderRadius = config.wrap.borderRadius
_setting.resetContrl = config.wrap.resetContrl || 'init'
+ _setting.order = config.wrap.searchSize || ''
+
+ if (config.wrap.searchBtn === 'show') {
+ _setting.showBtn = true
+ }
+
+ if (config.wrap.supModule) {
+ let BData = window.GLOB.CacheData.get(config.wrap.supModule)
+ BID = BData ? (BData.$BID || '') : ''
+ }
}
if (config.type === 'search') {
@@ -114,21 +144,49 @@
if (item.advanced && !forbid) {
_setting.showAdv = true
+ if (!['group', 'check', 'switch'].includes(item.type)) {
+ item.signValue = true
+ }
} else {
item.advanced = false
}
- if (item.advanced && 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 (item.checkShift && !item.initval) {
+ let d = ''
+ if (window.GLOB.CacheData.has(item.$supId)) {
+ d = window.GLOB.CacheData.get(item.$supId)
+ d = d[item.dateShift] || ''
+ if (d) {
+ d = moment(d).format('YYYY-MM-DD')
+ d = d === 'Invalid date' ? '' : d
}
}
- if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+
+ if (d) {
+ if (item.type === 'daterange') {
+ if (item.$initval === 'week') {
+ item.initval = [moment(d).startOf('week').format(item.format), moment(d).endOf('week').format(item.format)].join(',')
+ } else if (item.$initval === 'month') {
+ item.initval = [moment(d).startOf('month').format(item.format), moment(d).endOf('month').format(item.format)].join(',')
+ } else if (item.$initval === 'lastMonth') {
+ item.initval = [moment(d).subtract(1, 'months').startOf('month').format(item.format), moment(d).subtract(1, 'months').endOf('month').format(item.format)].join(',')
+ } else if (item.$initval === 'year') {
+ item.initval = [moment(d).startOf('year').format(item.format), moment(d).endOf('year').format(item.format)].join(',')
+ } else if (item.$initval === 'lastYear') {
+ item.initval = [moment(d).subtract(1, 'years').startOf('year').format(item.format), moment(d).subtract(1, 'years').endOf('year').format(item.format)].join(',')
+ } else {
+ try {
+ let _initval = JSON.parse(item.$initval)
+ let _vals = [moment(d).subtract(_initval[0], 'days').format(item.format), moment(d).subtract(_initval[1], 'days').format(item.format)]
+ item.initval = _vals.join(',')
+ } catch (e) {
+ item.initval = ''
+ }
+ }
+ } else {
+ item.initval = moment(d).subtract(item.$initval, 'month').format('YYYY-MM')
+ }
+ item.oriInitval = item.initval
}
}
@@ -153,24 +211,78 @@
// 鏁版嵁婧愭煡璇㈣鍙�
if (item.resourceType === '1' && item.dataSource) {
- let _option = Utils.getSelectQueryOptions(item)
+ if (window.backend && window.GLOB.CacheData.has('sql_' + item.uuid)) {
+ let ex = window.GLOB.CacheData.get('sql_' + item.uuid)
+ let exps = []
- if (window.GLOB.debugger === true) {
- console.info(_option.sql)
- }
-
- // 娴嬭瘯绯荤粺鍗曚釜璇锋眰
- if (!window.GLOB.mkHS && window.GLOB.sysType === 'local' && !window.GLOB.systemType) {
- deForms.push({
- ...item,
- arr_field: _option.field,
- data_sql: Utils.formatOptions(_option.sql)
+ ex.reps.forEach(n => {
+ let key = n.toLowerCase()
+ if (sysvals.hasOwnProperty(key)) {
+ exps.push({
+ key: n,
+ value: sysvals[key]
+ })
+ }
})
- } else { // 鍚堝苟璇锋眰锛屽尯鍒嗘湰鍦板強绯荤粺
- if (item.database === 'sso') {
- mainItems.push(`select '${item.field}' as obj_name,'${_option.field}' as arr_field,'${window.btoa(window.encodeURIComponent(_option.sql.replace(/%/ig, ' mpercent ')))}' as LText`)
+
+ let cell = {
+ id: ex.id,
+ exps: exps,
+ menuname: item.label + '锛堟悳绱級',
+ md5_id: ''
+ }
+ if (item.checkBid) {
+ item.sqlId = ex.id
+ item.exps = exps
+ }
+
+ if (item.checkBid && !BID) {
+
+ } else if (item.database === 'sso' && window.GLOB.mainSystemApi) {
+ backMItems.push(cell)
} else {
- localItems.push(`select '${item.field}' as obj_name,'${_option.field}' as arr_field,'${window.btoa(window.encodeURIComponent(_option.sql.replace(/%/ig, ' mpercent ')))}' as LText`)
+ backLItems.push(cell)
+ }
+ } else {
+ let _option = Utils.getSelectQueryOptions(item)
+ let _declare = `Declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20) select @mk_departmentcode='${sessionStorage.getItem('departmentcode') || ''}',@mk_organization='${sessionStorage.getItem('organization') || ''}',@mk_user_type='${sessionStorage.getItem('mk_user_type') || ''}'\n`
+
+ let exec = true
+ if (item.checkBid) {
+ item.sql = _declare + _option.sql
+ item.arr_field = _option.field
+
+ exec = !!BID
+ }
+
+ if (exec) {
+ let _sql = _option.sql.replace(/@BID@/ig, `'${BID || ''}'`)
+
+ if (window.GLOB.debugger === true) {
+ window.mkInfo(_declare + _sql)
+ }
+
+ // 娴嬭瘯绯荤粺鍗曚釜璇锋眰
+ if (!window.GLOB.mkHS && window.GLOB.sysType === 'local' && !window.GLOB.systemType) {
+ deForms.push({
+ ...item,
+ arr_field: _option.field,
+ data_sql: Utils.formatOptions(_declare + _sql, window.GLOB.execType)
+ })
+ } else { // 鍚堝苟璇锋眰锛屽尯鍒嗘湰鍦板強绯荤粺
+ _sql = _sql.replace(/%/ig, ' mpercent ')
+ if (item.database === 'sso') {
+ if (mainItems.length === 0) {
+ _sql = _declare + _sql
+ }
+ mainItems.push(`select '${item.field}' as obj_name,'${_option.field}' as arr_field,'${window.btoa(window.encodeURIComponent(_sql))}' as LText`)
+ } else {
+ if (localItems.length === 0) {
+ _sql = _declare + _sql
+ }
+ localItems.push(`select '${item.field}' as obj_name,'${_option.field}' as arr_field,'${window.btoa(window.encodeURIComponent(_sql))}' as LText`)
+ }
+ }
}
}
}
@@ -179,6 +291,29 @@
if (item.type === 'checkcard' && item.multiple === 'dropdown' && item.resourceType === '0') {
this.resetCheckcard(item)
}
+ }
+
+ if (item.signValue && 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'
+ }
+ }
+
+ let text = val
+
+ if (item.type === 'select' || item.type === 'link' || item.type === 'radio') {
+ item.oriOptions.forEach(cell => {
+ if (cell.Value === val) {
+ text = cell.Text
+ }
+ })
+ }
+
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val, text})
}
fieldMap.set(item.field, item)
@@ -218,12 +353,139 @@
advanceValues,
searchlist: _list
}, () => {
- if (!window.GLOB.mkHS && window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') {
- this.improveSimpleSearch(deForms)
+ if (window.backend && (backMItems.length > 0 || backLItems.length > 0)) {
+ this.improveBackSearch(backMItems, backLItems, false)
+ } else if (!window.GLOB.mkHS && window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') {
+ this.improveSimpleSearch(deForms, false, null, BID)
} else if (mainItems.length > 0 || localItems.length > 0) {
- this.improveSearch(mainItems, localItems)
+ this.improveSearch(mainItems, localItems, BID)
}
})
+ }
+
+ componentDidMount () {
+ const { config } = this.props
+
+ if (config.type === 'search' && config.wrap.supModule) {
+ MKEmitter.addListener('resetSelectLine', this.resetParentParam)
+ }
+ }
+
+ componentWillUnmount () {
+ this.setState = () => {
+ return
+ }
+ MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ }
+
+ UNSAFE_componentWillReceiveProps(nextProps) {
+ const { config, BID } = this.props
+
+ if (config.$checkBid && nextProps.BID !== BID) {
+ this.resetOptions(nextProps.BID)
+ }
+ }
+
+ resetParentParam = (MenuID, id) => {
+ const { config } = this.props
+
+ if (config.wrap.supModule !== MenuID) return
+
+ this.resetOptions(id)
+ }
+
+ resetOptions = (BID) => {
+ let deForms = []
+ let backMItems = [] // 浜戠鎴栧崟鐐规暟鎹�
+ let backLItems = [] // 鏈湴鏁版嵁
+ let searchlist = fromJS(this.state.searchlist).toJS().map(item => {
+ if (item.checkBid) {
+ if (window.backend && item.sqlId) {
+ let cell = {
+ id: item.sqlId,
+ menuname: item.label + '锛堟悳绱級',
+ md5_id: '',
+ exps: item.exps.map(n => {
+ if (n.key === 'BID') {
+ n.value = BID
+ }
+ return n
+ })
+ }
+
+ if (item.database === 'sso' && window.GLOB.mainSystemApi) {
+ backMItems.push(cell)
+ } else {
+ backLItems.push(cell)
+ }
+ } else {
+ let sql = item.sql.replace(/@BID@/ig, `'${BID || ''}'`)
+
+ if (window.GLOB.debugger === true) {
+ window.mkInfo(sql)
+ }
+
+ deForms.push({
+ ...item,
+ arr_field: item.arr_field,
+ data_sql: Utils.formatOptions(sql, window.GLOB.execType)
+ })
+ }
+ } else if (item.checkShift) {
+ let d = ''
+ if (window.GLOB.CacheData.has(item.$supId)) {
+ d = window.GLOB.CacheData.get(item.$supId)
+ d = d[item.dateShift] || ''
+ if (d) {
+ d = moment(d).format('YYYY-MM-DD')
+ d = d === 'Invalid date' ? '' : d
+ }
+ }
+
+ if (d) {
+ if (item.type === 'daterange') {
+ if (item.$initval === 'week') {
+ item.initval = [moment(d).startOf('week').format(item.format), moment(d).endOf('week').format(item.format)].join(',')
+ } else if (item.$initval === 'month') {
+ item.initval = [moment(d).startOf('month').format(item.format), moment(d).endOf('month').format(item.format)].join(',')
+ } else if (item.$initval === 'lastMonth') {
+ item.initval = [moment(d).subtract(1, 'months').startOf('month').format(item.format), moment(d).subtract(1, 'months').endOf('month').format(item.format)].join(',')
+ } else if (item.$initval === 'year') {
+ item.initval = [moment(d).startOf('year').format(item.format), moment(d).endOf('year').format(item.format)].join(',')
+ } else if (item.$initval === 'lastYear') {
+ item.initval = [moment(d).subtract(1, 'years').startOf('year').format(item.format), moment(d).subtract(1, 'years').endOf('year').format(item.format)].join(',')
+ } else {
+ try {
+ let _initval = JSON.parse(item.$initval)
+ let _vals = [moment(d).subtract(_initval[0], 'days').format(item.format), moment(d).subtract(_initval[1], 'days').format(item.format)]
+ item.initval = _vals.join(',')
+ } catch (e) {
+ item.initval = ''
+ }
+ }
+ } else {
+ item.initval = moment(d).subtract(item.$initval, 'month').format('YYYY-MM')
+ }
+ item.oriInitval = item.initval
+ }
+ }
+
+ return item
+ })
+
+ if (window.backend && (backMItems.length > 0 || backLItems.length > 0)) {
+ this.improveBackSearch(backMItems, backLItems, true, searchlist)
+ } else if (deForms.length > 0) {
+ this.improveSimpleSearch(deForms, true, searchlist, BID)
+ } else {
+ this.setState({
+ searchlist: searchlist
+ })
+
+ setTimeout(() => {
+ this.handleSubmit()
+ }, 20)
+ }
}
resetCheckcard = (item) => {
@@ -259,8 +521,7 @@
}
// 鏌ヨ涓嬫媺鑿滃崟
- improveSearch = (mainItems, localItems) => {
- const { BID } = this.props
+ improveSearch = (mainItems, localItems, BID) => {
let deffers = []
// 鏈湴璇锋眰
@@ -277,9 +538,13 @@
}
if (param.LText) {
- param.LText = Utils.formatOptions(param.LText)
+ if (window.GLOB.execType === 'x') {
+ param.exec_type = 'x'
+ }
+
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : param.LText, param.timestamp)
if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
@@ -288,7 +553,7 @@
deffers.push(
new Promise(resolve => {
Api.getSystemCacheConfig(param).then(res => {
- if (!res.status) {
+ if (!res.status && res.ErrCode !== '-2') {
notification.warning({
top: 92,
message: res.message,
@@ -315,25 +580,25 @@
}
if (mainparam.LText) {
- mainparam.LText = Utils.formatOptions(mainparam.LText)
- mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- mainparam.secretkey = Utils.encrypt(mainparam.LText, mainparam.timestamp)
+ if (window.GLOB.execType === 'x') {
+ mainparam.exec_type = 'x'
+ }
+ mainparam.LText = Utils.formatOptions(mainparam.LText, mainparam.exec_type)
+ mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ mainparam.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : mainparam.LText, mainparam.timestamp)
+
+ if (window.GLOB.mainSystemApi) {
+ mainparam.rduri = window.GLOB.mainSystemApi
+ }
if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
mainparam.open_key = Utils.encryptOpenKey(mainparam.secretkey, mainparam.timestamp)
- if (window.GLOB.cloudServiceApi) {
- mainparam.rduri = window.GLOB.cloudServiceApi
- mainparam.userid = sessionStorage.getItem('CloudUserID') || ''
- mainparam.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
- }
- } else if (window.GLOB.mainSystemApi) {
- mainparam.rduri = window.GLOB.mainSystemApi
}
deffers.push(
new Promise(resolve => {
Api.getSystemCacheConfig(mainparam).then(res => {
- if (!res.status) {
+ if (!res.status && res.ErrCode !== '-2') {
notification.warning({
top: 92,
message: res.message,
@@ -354,12 +619,60 @@
delete result.message
delete result.status
- this.resetSearch(result)
+ this.resetSearch(result, false)
+ })
+ }
+
+ // 鏌ヨ涓嬫媺鑿滃崟
+ improveBackSearch = (mainItems, localItems, trigger, searchlist) => {
+ let deffers = []
+
+ if (localItems.length) {
+ deffers.push({
+ $backend: true,
+ $type: 's_Get_SelectedList',
+ data: localItems
+ })
+ }
+
+ if (mainItems.length) {
+ deffers.push({
+ $backend: true,
+ $type: 's_Get_SelectedList',
+ data: mainItems,
+ rduri: window.GLOB.mainSystemApi
+ })
+ }
+
+ deffers = deffers.map(item => {
+ return new Promise(resolve => {
+ Api.getSystemCacheConfig(item).then(res => {
+ if (!res.status && res.ErrCode !== '-2') {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
+ })
+ }
+ resolve(res)
+ })
+ })
+ })
+
+ Promise.all(deffers).then(response => {
+ let result = {...response[0], ...(response[1] || {})}
+
+ delete result.ErrCode
+ delete result.ErrMesg
+ delete result.message
+ delete result.status
+
+ this.resetSearch(result, trigger, searchlist)
})
}
// 娴嬭瘯绯荤粺鍗曚釜璇锋眰涓嬫媺閫夐」
- improveSimpleSearch = (deForms) => {
+ improveSimpleSearch = (deForms, trigger, searchlist, BID) => {
if (deForms.length === 0) return
let deffers = deForms.map((item, index) => {
@@ -370,12 +683,16 @@
arr_field: item.arr_field
}
- if (this.props.BID) {
- param.BID = this.props.BID
+ if (BID) {
+ param.BID = BID
+ }
+
+ if (window.GLOB.execType === 'x') {
+ param.exec_type = 'x'
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : param.LText, param.timestamp)
if (item.database === 'sso' && window.GLOB.mainSystemApi) {
param.rduri = window.GLOB.mainSystemApi
@@ -385,7 +702,7 @@
new Promise(resolve => {
setTimeout(() => {
Api.getSystemCacheConfig(param).then(res => {
- if (!res.status) {
+ if (!res.status && res.ErrCode !== '-2') {
notification.warning({
top: 92,
message: res.message,
@@ -411,12 +728,13 @@
delete result.message
delete result.status
- this.resetSearch(result)
+ this.resetSearch(result, trigger, searchlist)
})
}
- resetSearch = (result) => {
- let _searchlist = fromJS(this.state.searchlist).toJS().map(item => {
+ resetSearch = (result, submit, searchlist) => {
+ let trigger = submit
+ let _searchlist = fromJS(searchlist || this.state.searchlist).toJS().map(item => {
if (['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(item.type) && result[item.field] && result[item.field].length > 0) {
let options = []
let map = new Map()
@@ -428,11 +746,11 @@
}
if (item.linkField) {
- _item.ParentID = cell[item.linkField]
+ _item.ParentID = cell[item.linkField] + ''
}
if (item.type !== 'checkcard') {
- _item.Value = cell[item.valueField]
+ _item.Value = cell[item.valueField] + ''
_item.Text = cell[item.valueText] + ''
if (map.has(_item.ParentID + _item.Value)) return
@@ -447,7 +765,7 @@
map.set(_item.ParentID + _item.Value, 0)
} else {
- _item.$value = cell[item.cardValField]
+ _item.$value = cell[item.cardValField] + ''
_item = {..._item, ...cell}
if (item.urlField) {
@@ -481,12 +799,27 @@
item.options = item.oriOptions
}
+ if (item.$first) {
+ if (item.options.length > 0) {
+ item.initval = item.options[0].Value
+ trigger = true
+ } else {
+ item.initval = ''
+ }
+ }
+
return item
})
this.setState({
searchlist: _searchlist
})
+
+ if (trigger) {
+ setTimeout(() => {
+ this.handleSubmit()
+ }, 20)
+ }
}
recordChange = (val, defer, item) => {
@@ -533,7 +866,7 @@
const _rules = [
{
required: item.required,
- message: item.label + '涓嶅彲涓虹┖!'
+ message: item.label + (window.GLOB.dict['not_empty'] || '涓嶅彲涓虹┖锛�')
}
]
@@ -545,7 +878,7 @@
} else if (item.type === 'select' || item.type === 'link' || item.type === 'multiselect') {
content = (<MKSelect config={item} onChange={(val, defer) => this.recordChange(val, defer, item)} />)
} else if (item.type === 'date' || item.type === 'datemonth' || item.type === 'dateweek' || item.type === 'daterange') {
- content = (<MKDatePicker config={item} onChange={(val) => this.recordChange(val, false, item)} />)
+ content = (<MKDatePicker config={item} onChange={(val, defer) => this.recordChange(val, defer, item)} />)
} else if (item.type === 'group') {
field = item.datefield
content = <DateGroup position={index} config={item} onChange={(val, type) => this.dateGroupChange(val, type, item)} />
@@ -557,6 +890,8 @@
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)} />
+ } else if (item.type === 'range') {
+ content = <MKNumber config={item} onInputSubmit={this.handleSubmit} />
}
if (content) {
@@ -592,14 +927,24 @@
wrapperCol={setting.wrapperCol}
>
{setting.show ? <Button style={style} type="primary" onClick={this.handleSubmit}>
- 鎼滅储
+ {window.GLOB.dict['search'] || '鎼滅储'}
</Button> : null}
{setting.show ? <Button style={{ marginLeft: 8, ...style }} onClick={this.handleReset}>
- 閲嶇疆
+ {window.GLOB.dict['reset'] || '閲嶇疆'}
</Button> : null}
{setting.showAdv ? <Button className={visible ? 'visible' : ''} type="link" onClick={this.handleAdvance}>
- 楂樼骇{setting.advanceType === 'pulldown' ? <DownOutlined /> : null}
+ {window.GLOB.dict['senior'] || '楂樼骇'}{setting.advanceType === 'pulldown' ? <DownOutlined /> : null}
</Button> : null}
+ </Form.Item>
+ </Col>
+ )
+ } else if (setting.showBtn) {
+ fields.push(
+ <Col className="mk-search-col search-button" key="actions">
+ <Form.Item>
+ <Button type="primary" onClick={this.handleSubmit}>
+ {window.GLOB.dict['search'] || '鎼滅储'}
+ </Button>
</Form.Item>
</Col>
)
@@ -621,7 +966,7 @@
if (visible) {
let advanceValues = []
this.state.searchlist.forEach(item => {
- if (!item.advanced) return
+ if (!item.signValue) return
let val = this.record[item.field]
if (val || val === 0) {
@@ -632,9 +977,18 @@
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})
+
+ let text = val
+
+ if (item.type === 'select' || item.type === 'link' || item.type === 'radio') {
+ item.oriOptions.forEach(cell => {
+ if (cell.Value === val) {
+ text = cell.Text
+ }
+ })
}
+
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val, text})
}
})
this.setState({advanceValues})
@@ -652,6 +1006,8 @@
}
handleSubmit = () => {
+ const { config } = this.props
+
this.setState({}, () => {
this.props.form.validateFields((err, values) => {
if (err) return
@@ -673,7 +1029,7 @@
notification.warning({
top: 92,
- message: '璇疯緭鍏�' + labels.join('銆�') + ' !',
+ message: (window.GLOB.dict['input_tip'] || '璇疯緭鍏�') + labels.join('銆�') + ' !',
duration: 3
})
return
@@ -689,11 +1045,20 @@
this.sign = ''
}, 2000)
+ if (config.wrap && config.wrap.cacheSearch === 'true') {
+ let _values = {}
+ searches.forEach(item => {
+ _values[item.key] = item.value
+ })
+
+ window.GLOB.SearchBox.set(config.$searchId + 'cache', _values)
+ }
+
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)
+ window.GLOB.SearchBox.set(config.$searchId, searches)
+ MKEmitter.emit('searchRefresh', config.$searchId)
}
})
})
@@ -705,12 +1070,17 @@
handleReset = () => {
const { setting } = this.state
+ if (setting.resetContrl === 'refresh') {
+ MKEmitter.emit('reloadMenuView', setting.$pageId, true)
+ return
+ }
+
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)) {
+ if (setting.resetContrl === 'clear' && ['text', 'date', 'datemonth', 'dateweek', 'daterange', 'range'].includes(item.type)) {
item.initval = ''
}
@@ -720,7 +1090,7 @@
} else {
record[item.field] = item.initval
}
- if (item.advanced && item.initval) {
+ if (item.signValue && item.initval) {
let val = item.initval
if (item.precision === 'hour') {
if (/,/ig.test(val)) {
@@ -729,9 +1099,18 @@
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})
+
+ let text = val
+
+ if (item.type === 'select' || item.type === 'link' || item.type === 'radio') {
+ item.oriOptions.forEach(cell => {
+ if (cell.Value === val) {
+ text = cell.Text
+ }
+ })
}
+
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val, text})
}
return item
@@ -811,7 +1190,7 @@
}
if (typeof(val) === 'string') {
- val = val.replace(/(^\s*|\s*$)/ig, '')
+ val = val.replace(/(^\s+|\s+$)/ig, '').replace(/\t+|\v+/g, '')
}
search.push({
@@ -835,7 +1214,7 @@
let advanceValues = []
this.state.searchlist.forEach(item => {
- if (!item.advanced) return
+ if (!item.signValue) return
let val = this.record[item.field]
if (val || val === 0) {
@@ -846,9 +1225,18 @@
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})
+
+ let text = val
+
+ if (item.type === 'select' || item.type === 'link' || item.type === 'radio') {
+ item.oriOptions.forEach(cell => {
+ if (cell.Value === val) {
+ text = cell.Text
+ }
+ })
}
+
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val, text})
}
})
@@ -878,7 +1266,7 @@
return (
<>
- <Form {...formItemLayout} className={`mk-search-wrap mk-float-${setting.float}`} style={setting.style}>
+ <Form {...formItemLayout} className={`mk-search-wrap mk-float-${setting.float} mk-order-${setting.order}`} style={setting.style}>
<Row gutter={24}>{this.getFields()}</Row>
{advanceValues.length && (setting.advanceType !== 'pulldown' || (setting.advanceType === 'pulldown' && !visible)) ? <Row gutter={24}>
<div className="advanced-list">
@@ -886,7 +1274,7 @@
return (
<div key={index}>
<span>{item.label}: </span>
- <span className="advance-value">{item.value}</span>
+ <span className="advance-value">{item.text}</span>
<CloseOutlined onClick={() => this.closeAdvanceForm(item)} />
</div>)
})}
@@ -894,7 +1282,7 @@
</Row> : null}
</Form>
{setting.advanceType === 'modal' ? <Modal
- title="楂樼骇鎼滅储"
+ title={window.GLOB.dict['adv_search'] || '楂樼骇鎼滅储'}
maskClosable={false}
visible={visible}
width={setting.advWidth}
@@ -910,7 +1298,7 @@
/>
</Modal> : null}
{setting.advanceType === 'drawer' ? <Drawer
- title="楂樼骇鎼滅储"
+ title={window.GLOB.dict['adv_search'] || '楂樼骇鎼滅储'}
className="mk-search-drawer"
width={setting.advWidth}
height={setting.advHeight}
--
Gitblit v1.8.0