From ca788834ea15d6dd43bf0923757ca1d46d00ebc4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 七月 2021 23:17:26 +0800
Subject: [PATCH] 2021-07-12
---
src/utils/utils.js | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 8be2c14..09de0d1 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -500,6 +500,10 @@
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 if (item.type === 'range') {
+ let val = item.value.split(',')
+
+ searchText += '(' + item.key + ' >= \'' + val[0] + '\' AND ' + item.key + ' < \'' + val[1] + '\')'
} else {
searchText += '(' + item.key + ' ' + item.match + ' \'' + item.value + '\')'
}
@@ -762,14 +766,21 @@
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
let city = sessionStorage.getItem('city') || ''
+ let _sheet = item.sheet
if (sessionStorage.getItem('isEditState') === 'true') {
userName = sessionStorage.getItem('CloudUserName') || ''
fullName = sessionStorage.getItem('CloudFullName') || ''
}
- let database = item.sheet.match(/(.*)\.(.*)\./ig) || ''
- let sheet = item.sheet.replace(/(.*)\.(.*)\./ig, '')
+ if (window.GLOB.externalDatabase !== null) {
+ _sheet = _sheet.replace(/@db@/ig, window.GLOB.externalDatabase)
+ }
+
+ let database = _sheet.match(/(.*)\.(.*)\./ig)
+ let sheet = _sheet.replace(/(.*)\.(.*)\./ig, '')
+
+ database = database ? (database[0] || '') : ''
let getuuid = () => {
let uuid = []
@@ -829,7 +840,7 @@
val = val.toString()
}
- val = val.replace(/(^\s*$)|\t*|\v*/ig, '')
+ val = val.replace(/(^\s*$)|\t*|\v*|'*/ig, '')
if (!val && col.required === 'true') { // 蹇呭～鏍￠獙
errors.push(_position + dict['main.excel.content.emptyerror'])
--
Gitblit v1.8.0