From 69cd43786253e299f6856a200554ae7fc0621877 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 六月 2021 21:26:20 +0800
Subject: [PATCH] 2021-06-27
---
src/utils/utils.js | 268 +++++++++++++++++++++++++++--------------------------
1 files changed, 136 insertions(+), 132 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index da6456e..a113202 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -236,54 +236,55 @@
}
/**
- * @description 鍒濆鍖栨悳绱㈡潯浠�
+ * @description 鍒濆鍖栨悳绱㈡潯浠跺垵濮嬪��
* @param {Array} searches 鎼滅储鏉′欢
- * @return {String} searches 鏍煎紡鍖栧悗缁撴灉
*/
- static initMainSearch (searches) {
- if (!searches || searches.length === 0) return []
+ static initSearchVal (searches) {
+ if (!searches) return []
- let newsearches = []
- searches.forEach(search => {
- let item = {
- key: search.field,
- match: search.match,
- type: search.type,
- label: search.label,
- value: search.initval,
- required: search.required === 'true'
- }
+ let roleId = sessionStorage.getItem('role_id') || ''
- if (item.type === 'group') {
- let copy = JSON.parse(JSON.stringify(item))
- copy.key = search.datefield
+ return searches.map(item => {
+ item.hidden = item.Hide === 'true'
+ item.required = item.required === 'true'
+ item.advanced = item.advanced === 'true'
- item.value = search.initval && search.initval[0] ? search.initval[0] : ''
- item.match = '='
- item.forbid = true
-
- copy.type = 'daterange'
- copy.match = 'between'
- copy.value = ''
-
- if (search.initval && search.initval.length > 0) {
- let _type = search.initval[0]
- let _val = search.initval[1]
-
+ if (item.type === 'date') { // 鏃堕棿鎼滅储
+ item.initval = item.initval ? moment().subtract(item.initval, 'days').format('YYYY-MM-DD') : ''
+ } else if (item.type === 'datemonth') {
+ item.initval = item.initval ? moment().subtract(item.initval, 'month').format('YYYY-MM') : ''
+ } else if (item.type === 'dateweek') {
+ item.initval = item.initval ? moment().subtract(item.initval * 7, 'days').format('YYYY-MM-DD') : ''
+ } else if (item.type === 'daterange') {
+ if (item.initval) {
+ try {
+ let _initval = JSON.parse(item.initval)
+ let _vals = [moment().subtract(_initval[0], 'days').format('YYYY-MM-DD'), moment().subtract(_initval[1], 'days').format('YYYY-MM-DD')]
+ item.initval = _vals.join(',')
+ } catch {
+ item.initval = ''
+ }
+ }
+ } else if (item.type === 'group') {
+ if (item.initval && item.initval[0]) {
+ let _type = item.initval[0]
+ let _val = item.initval[1]
+ let _dateRange = ''
+
if (_type === 'day') {
- copy.value = [moment().subtract(_val, 'days').format('YYYY-MM-DD'),
+ _dateRange = [moment().subtract(_val, 'days').format('YYYY-MM-DD'),
moment().subtract(_val, 'days').format('YYYY-MM-DD')]
} else if (_type === 'week') {
- copy.value = [moment().subtract(_val * 7, 'days').startOf('week').format('YYYY-MM-DD'),
+ _dateRange = [moment().subtract(_val * 7, 'days').startOf('week').format('YYYY-MM-DD'),
moment().subtract(_val * 7, 'days').endOf('week').format('YYYY-MM-DD')]
} else if (_type === 'month') {
- copy.value = [moment().subtract(_val, 'month').startOf('month').format('YYYY-MM-DD'),
+ _dateRange = [moment().subtract(_val, 'month').startOf('month').format('YYYY-MM-DD'),
moment().subtract(_val, 'month').endOf('month').format('YYYY-MM-DD')]
} else if (_type === 'quarter') {
let _differ = parseInt(moment().format('MM')) % 3
let _pdiffer = 0
let _ndiffer = 0
-
+
// 宸�艰绠�
switch(_differ) {
case 0:
@@ -300,80 +301,107 @@
break
default:
}
-
- copy.value = [moment().subtract(_pdiffer + _val * 3, 'month').startOf('month').format('YYYY-MM-DD'),
+ _dateRange = [moment().subtract(_pdiffer + _val * 3, 'month').startOf('month').format('YYYY-MM-DD'),
moment().subtract(_ndiffer + _val * 3, 'month').endOf('month').format('YYYY-MM-DD')]
} else if (_type === 'year') {
let _year = parseInt(moment().format('YYYY')) - _val
- copy.value = [_year + '-01-01', _year + '-12-31']
+ _dateRange = [_year + '-01-01', _year + '-12-31']
} else if (_type === 'customized') {
try {
_val = JSON.parse(_val)
} catch {
_val = [0, 0]
}
- copy.value = [moment().subtract(_val[0], 'days').format('YYYY-MM-DD'),
+ _dateRange = [moment().subtract(_val[0], 'days').format('YYYY-MM-DD'),
moment().subtract(_val[1], 'days').format('YYYY-MM-DD')]
}
- }
- newsearches.push(item)
- newsearches.push(copy)
- return
- } else if (item.type === 'date') {
- item.value = item.value ? moment().subtract(item.value, 'days').format('YYYY-MM-DD') : ''
- } else if (item.type === 'datemonth') {
- item.value = item.value ? moment().subtract(item.value, 'month').format('YYYY-MM') : ''
- } else if (item.type === 'dateweek') {
- item.value = item.value ? [moment().subtract(item.value * 7, 'days').startOf('week').format('YYYY-MM-DD'),
- moment().subtract(item.value * 7, 'days').endOf('week').format('YYYY-MM-DD')] : ''
- } else if (item.type === 'daterange') {
- let _val = item.value
- if (_val) {
- try {
- _val = JSON.parse(_val)
- } catch {
- _val = ''
- }
+ item.initval = _dateRange.join(',')
+ item.initType = _type
+ } else {
+ item.initval = ''
+ item.initType = ''
}
- item.value = _val ? [moment().subtract(_val[0], 'days').format('YYYY-MM-DD'),
- moment().subtract(_val[1], 'days').format('YYYY-MM-DD')] : ''
- } else if (item.type === 'multiselect') {
- item.value = item.value ? item.value.split(',').filter(Boolean) : []
}
- newsearches.push(item)
+
+ item.oriInitval = item.initval
+
+ if (item.blacklist && item.blacklist.length > 0 && !item.hidden) {
+ if (item.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
+ item.hidden = true
+ }
+ }
+
+ return item
})
-
- return newsearches
}
/**
* @description 鍒濆鍖栨悳绱㈡潯浠�
* @param {Array} searches 鎼滅储鏉′欢
- * @return {String} searches 鏍煎紡鍖栧悗缁撴灉
+ */
+ static initMainSearch (searches) {
+ if (!searches) return []
+
+ let values = []
+ searches.forEach(cell => {
+ let item = {
+ key: cell.field,
+ match: cell.match,
+ type: cell.type,
+ label: cell.label,
+ value: cell.initval,
+ required: cell.required
+ }
+
+ if (cell.type === 'multiselect' || (cell.type === 'checkcard' && cell.multiple === 'true')) {
+ item.type = 'multi'
+ } else if (item.type === 'group') {
+ item.key = cell.datefield
+ item.type = 'daterange'
+ item.match = 'between'
+
+ values.push({
+ type: 'group',
+ key: cell.field,
+ value: cell.initType,
+ label: cell.label,
+ match: '=',
+ forbid: true,
+ required: cell.required
+ })
+ }
+
+ values.push(item)
+ })
+
+ return values
+ }
+
+ /**
+ * @description 鍒濆鍖栬嚜瀹氫箟鍑芥暟鎼滅储鏉′欢
+ * @param {Array} searches 鎼滅储鏉′欢
*/
static formatCustomMainSearch (searches) {
- if (!searches || searches.length === 0) return {}
+ if (!searches) return {}
let newsearches = {}
searches.forEach(item => {
if (item.type === 'date') {
- let timetail = ''
- let _val = item.value
+ let _val = item.value || ''
- if (item.match === '<' || item.match === '<=') {
- timetail = ' 00:00:00.000'
- if (_val) {
- _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ if (_val) {
+ if (item.match === '<' || item.match === '<=') {
+ _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ } else if (item.match === '>' || item.match === '>=') {
+ _val = _val + ' 00:00:00.000'
}
- } else if (item.match === '>' || item.match === '>=') {
- timetail = ' 00:00:00.000'
}
if (newsearches[item.key]) {
- newsearches[item.key + '1'] = _val ? _val + timetail : ''
+ newsearches[item.key + '1'] = _val
} else {
- newsearches[item.key] = _val ? _val + timetail : ''
+ newsearches[item.key] = _val
}
} else if (item.type === 'datemonth') {
// 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫
@@ -388,35 +416,32 @@
newsearches[item.key] = _startval
newsearches[item.key + '1'] = _endval
} else if (item.type === 'dateweek') {
+ let _startval = ''
let _endval = ''
if (item.value) {
- _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ _startval = moment(item.value, 'YYYY-MM-DD' ).startOf('week').format('YYYY-MM-DD') + ' 00:00:00.000'
+ _endval = moment(item.value, 'YYYY-MM-DD').endOf('week').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
}
- newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : ''
- newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : ''
+ newsearches[item.key] = _startval
+ newsearches[item.key + '1'] = _endval
} else if (item.type === 'daterange') {
+ let _startval = ''
let _endval = ''
if (item.value) {
- _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ let val = item.value.split(',')
+ _startval = val[0] + ' 00:00:00.000'
+ _endval = moment(val[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
}
- newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : ''
- newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : ''
+ newsearches[item.key] = _startval
+ newsearches[item.key + '1'] = _endval
} else if (item.type === 'text' || item.type === 'select') {
item.key.split(',').forEach(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
newsearches[field] = item.value
})
- } else if (item.type === 'multiselect') {
- newsearches[item.key] = item.value.join(',')
} else {
newsearches[item.key] = item.value
- }
- })
-
- Object.keys(newsearches).forEach(key => {
- if (!newsearches[key]) {
- delete newsearches[key]
}
})
@@ -433,7 +458,7 @@
let searchText = ''
searches.forEach(item => {
- if (item.forbid || !item.value || (item.type === 'multiselect' && item.value.length === 0)) return
+ if (item.forbid || !item.value) return
searchText += (searchText !== '' ? ' AND ' : '')
if (item.type === 'text' || item.type === 'select') { // 缁煎悎鎼滅储锛屾枃鏈垨涓嬫媺锛屾墍鏈夊瓧娈垫嫾鎺�
@@ -443,9 +468,8 @@
})
searchText += '(' + fields.join(' OR ') + ')'
- } else if (item.type === 'multiselect') {
-
- searchText += `'${item.value}' ` + item.match + ' \'%\'+' + item.key + '+\'%\''
+ } else if (item.type === 'multi') {
+ searchText += `'${item.value}' ${item.match} '%'+${item.key}+'%'`
} else if (item.type === 'date') {
let _val = item.value
let timetail = ' 00:00:00.000'
@@ -465,13 +489,14 @@
searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
} else if (item.type === 'dateweek') { // 鍛�-杩囨护鏉′欢
- let _startval = item.value[0] + ' 00:00:00.000'
- let _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ let _startval = moment(item.value, 'YYYY-MM-DD' ).startOf('week').format('YYYY-MM-DD') + ' 00:00:00.000'
+ let _endval = moment(item.value, 'YYYY-MM-DD').endOf('week').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
} else if (item.type === 'daterange') {
- let _startval = item.value[0] + ' 00:00:00.000'
- let _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ let val = item.value.split(',')
+ let _startval = val[0] + ' 00:00:00.000'
+ let _endval = moment(val[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
} else {
@@ -527,8 +552,8 @@
options.push(item)
options.push(copy)
} else if (item.type === 'dateweek') {
- let _startval = item.value && item.value[0] ? moment(item.value[0], 'YYYY-MM-DD').format('YYYY-MM-DD') + ' 00:00:00.000' : '1970-01-01 00:00:00.000'
- let _endval = item.value && item.value[1] ? moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '2050-01-01 00:00:00.000'
+ let _startval = item.value ? moment(item.value, 'YYYY-MM-DD').startOf('week').format('YYYY-MM-DD') + ' 00:00:00.000' : '1970-01-01 00:00:00.000'
+ let _endval = item.value ? moment(item.value, 'YYYY-MM-DD').endOf('week').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '2050-01-01 00:00:00.000'
let copy = JSON.parse(JSON.stringify(item))
copy.key = copy.key + '1'
@@ -539,8 +564,14 @@
options.push(item)
options.push(copy)
} else if (item.type === 'daterange') {
- let _startval = item.value && item.value[0] ? item.value[0] + ' 00:00:00.000' : '1970-01-01 00:00:00.000'
- let _endval = item.value && item.value[1] ? moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000' : '2050-01-01 00:00:00.000'
+ let _startval = '1970-01-01 00:00:00.000'
+ let _endval = '2050-01-01 00:00:00.000'
+
+ if (item.value) {
+ let val = item.value.split(',')
+ _startval = val[0] + ' 00:00:00.000'
+ _endval = moment(val[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
+ }
let copy = JSON.parse(JSON.stringify(item))
copy.key = copy.key + '1'
@@ -550,10 +581,6 @@
options.push(item)
options.push(copy)
- } else if (item.type === 'multiselect') {
- item.value = item.value ? item.value.join(',') : item.value
-
- options.push(item)
} else if (item.type === 'text' || item.type === 'select') {
item.key.split(',').forEach(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
let cell = JSON.parse(JSON.stringify(item))
@@ -593,6 +620,10 @@
if (search.type === 'group') {
options.push({
+ key: search.field,
+ value: '0'
+ })
+ options.push({
key: search.datefield,
value: '0'
})
@@ -620,33 +651,6 @@
})
return options
- }
-
- /**
- * @description 鎷兼帴鎼滅储鏉′欢datamanage
- * @param {Array} searches 鎼滅储鏉′欢
- * @return {String} searchText 鎷兼帴缁撴灉
- */
- static jointsearchkey (searches) {
- if (!searches || searches.length === 0) return ''
- let searchText = ''
- searches.forEach(item => {
- if (!item.value) return
- searchText += (searchText !== '' ? ' AND ' : '')
- if (item.type === 'text') {
- let options = item.key.split(',').map(op => {
- // equal鏃朵笉娣诲姞%
- let str = item.op === 'equal' ? '' : '%'
- return op + ' ' + item.op + ' \'' + str + item.value + str + '\''
- })
- searchText += '(' + options.join(' OR ') + ')'
- } else if (item.type === 'date') {
- searchText += '(' + item.key + ' ' + item.op + ' \'' + item.value + '\')'
- } else {
- searchText += '(' + item.key + ' ' + item.op + ' \'' + item.value + '\')'
- }
- })
- return searchText
}
/**
--
Gitblit v1.8.0