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 | 166 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 101 insertions(+), 65 deletions(-)
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 2ee1aaa..11d86ec 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -7,17 +7,18 @@
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 MKEmitter from '@/utils/events.js'
import MKInput from './mkInput'
import './index.scss'
const MutilForm = asyncSpinComponent(() => import('./advanceform'))
-const MKCheckCard = asyncComponent(() => import('@/tabviews/zshare/mutilform/mkCheckCard'))
+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'))
@@ -25,10 +26,7 @@
class MainSearch extends Component {
static propTpyes = {
BID: PropTypes.any, // 鐖剁骇Id锛岀敤浜庢煡璇笅鎷夐�夋嫨椤�
- searchlist: PropTypes.array, // 鎼滅储鏉′欢鍒楄〃
- config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅(鑷畾涔夐〉闈�)
- setting: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅(鑷畾涔夐〉闈�)
- refreshdata: PropTypes.func // 鍒锋柊鏁版嵁
+ config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
}
state = {
@@ -43,7 +41,7 @@
sign = ''
UNSAFE_componentWillMount () {
- const { config, searchlist, setting } = this.props
+ const { config } = this.props
let _searchlist = []
let fieldMap = new Map()
@@ -53,46 +51,31 @@
let advanceValues = []
let linkFields = {}
let record = {}
- let hasReqFields = false
-
let forbid = false // header涓笉璁剧疆楂樼骇鎼滅储
- let _setting = {showAdv: false, show: false}
+ let _setting = {showAdv: false, show: false, style: null}
- if (setting) {
- _setting.show = setting.show !== 'false'
- _setting.float = setting.float || 'left'
- _setting.advanceType = setting.advanceType || 'modal'
- _setting.advWidth = setting.advanceWidth || 1000
- _setting.placement = setting.drawerPlacement || 'right'
- _setting.ratio = setting.searchRatio || 6
- _setting.labelwidth = setting.searchLwidth !== undefined ? setting.searchLwidth : 33.3
+ 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.style = null
- } else if (config) {
- 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.style = null
-
- if (config.type === 'search') {
- _setting.float = config.wrap.float || 'left'
- _setting.style = config.style
- } else if (config.type === 'table') {
- _setting.float = 'left'
- } else {
- _setting.float = 'right'
- _setting.show = false
- forbid = true
- }
+ _setting.borderRadius = config.wrap.borderRadius
+ _setting.resetContrl = config.wrap.resetContrl || 'init'
+ }
+
+ if (config.type === 'search') {
+ _setting.float = config.wrap.float || 'left'
+ _setting.style = config.style
+ } else if (config.type === 'table') {
+ _setting.float = 'left'
+ } else {
+ _setting.float = 'right'
+ _setting.show = false
+ forbid = true
}
if (_setting.advanceType === 'drawer' && _setting.advWidth) {
@@ -110,11 +93,7 @@
}
}
- if (searchlist) {
- _searchlist = fromJS(searchlist).toJS()
- } else if (config) {
- _searchlist = fromJS(config.search).toJS()
- }
+ _searchlist = fromJS(config.search).toJS()
_searchlist.forEach(item => {
if (item.linkField) {
@@ -133,10 +112,6 @@
item.field = item.field + '@tail@'
}
- if (item.required) {
- hasReqFields = true
- }
-
if (item.advanced && !forbid) {
_setting.showAdv = true
} else {
@@ -152,7 +127,9 @@
val = val + ':00'
}
}
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+ 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') {
@@ -162,7 +139,7 @@
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)) {
@@ -178,12 +155,12 @@
if (item.resourceType === '1' && item.dataSource) {
let _option = Utils.getSelectQueryOptions(item)
- if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
+ if (window.GLOB.debugger === true) {
console.info(_option.sql)
}
// 娴嬭瘯绯荤粺鍗曚釜璇锋眰
- if (!window.GLOB.mkHS && options.sysType === 'local' && !window.GLOB.systemType) {
+ if (!window.GLOB.mkHS && window.GLOB.sysType === 'local' && !window.GLOB.systemType) {
deForms.push({
...item,
arr_field: _option.field,
@@ -198,6 +175,10 @@
}
}
item.oriOptions = fromJS(item.options).toJS()
+
+ if (item.type === 'checkcard' && item.multiple === 'dropdown' && item.resourceType === '0') {
+ this.resetCheckcard(item)
+ }
}
fieldMap.set(item.field, item)
@@ -233,16 +214,48 @@
this.setState({
setting: _setting,
- hasReqFields,
+ hasReqFields: config.$s_req,
advanceValues,
searchlist: _list
}, () => {
- if (!window.GLOB.mkHS && options.sysType === 'local' && window.GLOB.systemType !== 'production') {
+ if (!window.GLOB.mkHS && window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') {
this.improveSimpleSearch(deForms)
} else if (mainItems.length > 0 || localItems.length > 0) {
this.improveSearch(mainItems, localItems)
}
})
+ }
+
+ 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
}
// 鏌ヨ涓嬫媺鑿滃崟
@@ -308,8 +321,8 @@
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') || ''
}
@@ -404,7 +417,7 @@
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
@@ -452,6 +465,10 @@
})
item.oriOptions = [...item.oriOptions, ...options]
+
+ if (item.type === 'checkcard' && item.multiple === 'dropdown') {
+ this.resetCheckcard(item)
+ }
}
if (item.linkField) {
@@ -534,6 +551,8 @@
content = <DateGroup position={index} config={item} onChange={(val, type) => this.dateGroupChange(val, type, item)} />
} else if (item.type === 'checkcard') {
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') {
@@ -613,7 +632,9 @@
val = val + ':00'
}
}
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+ 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})
@@ -668,7 +689,12 @@
this.sign = ''
}, 2000)
- this.props.refreshdata(searches)
+ 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)
+ }
})
})
}
@@ -677,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
@@ -697,7 +729,9 @@
val = val + ':00'
}
}
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+ if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+ }
}
return item
@@ -812,7 +846,9 @@
val = val + ':00'
}
}
- advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+ if (['text', 'date', 'datemonth', 'dateweek', 'daterange'].includes(item.type)) {
+ advanceValues.push({field: item.field, type: item.type, label: item.label, value: val})
+ }
}
})
--
Gitblit v1.8.0