From c78051cc51032d4e29d35ca356d11d77a473eced Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 09 八月 2021 18:20:08 +0800
Subject: [PATCH] 2021-08-09
---
src/utils/utils.js | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 8be2c14..93d0120 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 = []
@@ -815,6 +826,11 @@
// 鎺у埗鍙版墦鍗版暟鎹�
let conLtext = []
+ let cols = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
+ for (let i = 0; i < 26; i++) {
+ cols.push('A' + cols[i])
+ }
+
let _Ltext = data.map((item, lindex) => {
let vals = []
let convals = []
@@ -822,14 +838,15 @@
if (col.import === 'false') return
let val = item[col.Column] !== undefined ? item[col.Column] : ''
- let _position = (_topline + lindex + 1) + dict['main.excel.line'] + ' ' + (cindex + 1) + dict['main.excel.column'] + ' '
+ let _colindex = cols[cindex] || (cindex + 1)
+ let _position = (_topline + lindex + 1) + dict['main.excel.line'] + ' ' + _colindex + dict['main.excel.column'] + ' '
if (/^Nvarchar/ig.test(col.type)) {
if (typeof(val) === 'number') {
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'])
@@ -1794,7 +1811,6 @@
}
}
}
-
}
/**
--
Gitblit v1.8.0