From 62e2946d9029a40b4406a39275c7863dccbbeadf Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 19 二月 2024 18:21:59 +0800
Subject: [PATCH] 2024-02-19
---
src/utils/utils-custom.js | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index b426415..8926d01 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -1058,7 +1058,7 @@
searchText.push('(' + item.key + ' >= \'' + val[0] + '\' AND ' + item.key + ' < \'' + val[1] + '\')')
} else if (item.type === 'range') {
let val = item.value.split(',')
- searchText.push('(' + item.key + ' >= ' + (val[0] || -999999) + ' AND ' + item.key + ' <= ' + (val[1] || 999999) + ')')
+ searchText.push('(' + item.key + ' >= ' + (val[0] || -999999) + ' AND ' + item.key + ' < ' + (val[1] || 999999) + ')')
} else if (item.type === 'datemonth') {
if (item.match === '=') {
searchText.push('(' + item.key + ' = \'' + item.value + '\')')
@@ -1186,39 +1186,43 @@
let _usefulFields = []
searches.forEach(item => {
- if (!item.field) return
+ let key = item.key || item.field
+
+ if (!key) return
if (item.type === 'group') {
- _usefulFields.push(item.field)
- _usefulFields.push(item.datefield)
- _usefulFields.push(item.datefield + '1')
+ _usefulFields.push(key)
+ if (item.datefield) {
+ _usefulFields.push(item.datefield)
+ _usefulFields.push(item.datefield + '1')
+ }
} else if (item.type === 'dateweek') {
- _usefulFields.push(item.field)
- _usefulFields.push(item.field + '1')
+ _usefulFields.push(key)
+ _usefulFields.push(key + '1')
} else if (item.type === 'datemonth') {
if (item.match === '=') {
- _usefulFields.push(item.field)
+ _usefulFields.push(key)
} else {
- _usefulFields.push(item.field)
- _usefulFields.push(item.field + '1')
+ _usefulFields.push(key)
+ _usefulFields.push(key + '1')
}
} else if (item.type === 'range') {
- _usefulFields.push(item.field)
- _usefulFields.push(item.field + '1')
+ _usefulFields.push(key)
+ _usefulFields.push(key + '1')
} else if (item.type === 'daterange') {
- let _skey = item.field
- let _ekey = item.field + '1'
+ let _skey = key
+ let _ekey = key + '1'
- if (/,/.test(item.field)) {
- _skey = item.field.split(',')[0]
- _ekey = item.field.split(',')[1]
+ if (/,/.test(key)) {
+ _skey = key.split(',')[0]
+ _ekey = key.split(',')[1]
}
_usefulFields.push(_skey)
_usefulFields.push(_ekey)
- } else if (item.type === 'date' && _usefulFields.includes(item.field)) {
- _usefulFields.push(item.field + '1')
+ } else if (item.type === 'date' && _usefulFields.includes(key)) {
+ _usefulFields.push(key + '1')
} else {
- _usefulFields.push(item.field)
+ _usefulFields.push(key)
}
})
--
Gitblit v1.8.0