From 7b0dbecd1d6155d26ec67be0a47a16264c738c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 09 五月 2023 14:48:10 +0800
Subject: [PATCH] 2023-05-09
---
src/utils/utils.js | 130 +++++++++++++++++++++----------------------
1 files changed, 63 insertions(+), 67 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 09aede5..58e7ba8 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -856,10 +856,9 @@
* @description 鑾峰彇excel瀵煎叆鍙傛暟
* @return {Object} item 鎸夐挳淇℃伅
* @return {Array} data excel鏁版嵁
- * @return {Object} dict 瀛楀吀椤�
* @return {String} BID 涓婄骇Id
*/
-export function getExcelInSql (item, data, dict, BID, primaryId) {
+export function getExcelInSql (item, data, BID, primaryId) {
let btn = item.verify
let keys = ['delete', 'drop', 'insert', 'truncate', 'update']
let userName = sessionStorage.getItem('User_Name') || ''
@@ -956,64 +955,68 @@
let val = item[col.Column] !== undefined ? item[col.Column] : ''
let _colindex = cols[cindex] || (cindex + 1)
- let _position = (_topline + lindex + 1) + dict['main.excel.line'] + ' ' + _colindex + dict['main.excel.column'] + ' '
+ let _position = (_topline + lindex + 1) + '琛� ' + _colindex + '鍒� '
if (/^Nvarchar/ig.test(col.type)) {
if (typeof(val) === 'number') {
val = val.toString()
}
- val = val.replace(/(^\s*$)|\t*|\v*|'*/ig, '')
+ if (/'/.test(val)) {
+ val = val.replace(/'/ig, '"')
+ }
+
+ val = val.replace(/(^\s*$)|\t*|\v*/ig, '')
if (!val && col.required === 'true') { // 蹇呭～鏍￠獙
- errors.push(_position + dict['main.excel.content.emptyerror'])
+ errors.push(_position + '鍐呭涓嶅彲涓虹┖')
} else if (col.limit && val.length > col.limit) { // 闀垮害鏍￠獙
- errors.push(_position + dict['main.excel.content.maxlimit'])
+ errors.push(_position + '鍐呭瓒呴暱')
} else { // 鍏抽敭瀛楁牎楠�
keys.forEach(key => {
let _patten = new RegExp('(^' + key + '\\s+)|(\\s+' + key + '\\s+)', 'ig')
if (_patten.test(val)) {
- errors.push(_position + dict['main.excel.includekey'] + key)
+ errors.push(_position + '鍚湁鍏抽敭瀛�' + key)
}
})
}
} else if (/^int/ig.test(col.type)) {
if (!val && val !== 0) {
- errors.push(_position + dict['main.excel.content.emptyerror'])
+ errors.push(_position + '鍐呭涓嶅彲涓虹┖')
} else {
let _val = val + ''
if (!/^(([^0][0-9]+|0)$)|^(([1-9]+)$)/.test(_val)) { // 妫�楠屾槸鍚︿负鏁存暟
- errors.push(_position + dict['main.excel.content.interror'])
+ errors.push(_position + '鍐呭搴斾负鏁存暟')
} else if ((col.min || col.min === 0) && val < col.min) { // 鏈�灏忓�兼楠�
- errors.push(_position + dict['main.excel.content.limitmin'])
+ errors.push(_position + '灏忎簬鏈�灏忓��')
} else if ((col.max || col.max === 0) && val > col.max) { // 鏈�澶у�兼楠�
- errors.push(_position + dict['main.excel.content.limitmax'])
+ errors.push(_position + '澶т簬鏈�澶у��')
}
}
} else if (/^Decimal/ig.test(col.type)) {
if (!val && val !== 0) {
- errors.push(_position + dict['main.excel.content.emptyerror'])
+ errors.push(_position + '鍐呭涓嶅彲涓虹┖')
} else {
let _val = val + ''
let _vals = _val.split('.')
if (!/^(([^0][0-9]+|0)\.([0-9]+)$)|^(([^0][0-9]+|0)$)|^(([1-9]+)\.([0-9]+)$)|^(([1-9]+)$)/.test(_val)) { // 妫�楠屾槸鍚︿负娴偣鏁�
- errors.push(_position + dict['main.excel.content.floaterror'])
+ errors.push(_position + '鍐呭搴斾负娴偣鏁�')
} else if (_vals[0].length > 18) { // 妫�楠屾暣鏁颁綅
- errors.push(_position + dict['main.excel.content.floatIntover'])
+ errors.push(_position + '鏁存暟浣嶈秴鍑鸿寖鍥�')
} else if (_vals[1] && _vals[1].length > col.limit) { // 鏈�灏忓�兼楠�
- errors.push(_position + dict['main.excel.content.floatPointover'])
+ errors.push(_position + '灏忔暟浣嶈秴鍑鸿寖鍥�')
} else if ((col.min || col.min === 0) && val < col.min) { // 鏈�灏忓�兼楠�
- errors.push(_position + dict['main.excel.content.limitmin'])
+ errors.push(_position + '灏忎簬鏈�灏忓��')
} else if ((col.max || col.max === 0) && val > col.max) { // 鏈�澶у�兼楠�
- errors.push(_position + dict['main.excel.content.limitmax'])
+ errors.push(_position + '澶т簬鏈�澶у��')
}
}
} else if (col.type === 'date') {
if (typeof(val) === 'number') {
if (val > 2958465 || val <= 0) { // 鏃堕棿杩囧ぇ鎴栧皬浜庣瓑浜�0
- errors.push(_position + dict['main.excel.content.date.over'])
+ errors.push(_position + '鏃堕棿涓鸿礋鍊兼垨澶ぇ')
} else { // 鏃堕棿鏍煎紡鍖�
if (val < 60) { // 1900-2-29锛宔xcel涓瓨鍦紝瀹為檯涓嶅瓨鍦�
val++
@@ -1023,12 +1026,12 @@
} else if (typeof(val) === 'string') {
val = val.replace(/(^\s*$)|\t*|\v*/ig, '')
if (!val && col.required === 'true') { // 鏃堕棿蹇呭～鏍￠獙
- errors.push(_position + dict['main.excel.content.emptyerror'])
+ errors.push(_position + '鍐呭涓嶅彲涓虹┖')
} else if (val && !/^[1-9][0-9]{3}/.test(val)) { // 鏃堕棿姝ｅ垯鏍￠獙
- errors.push(_position + dict['main.excel.content.date.formatError'])
+ errors.push(_position + '鏃堕棿鏍煎紡閿欒')
}
} else { // 鏃堕棿鏍煎紡閿欒
- errors.push(_position + dict['main.excel.content.date.formatError'])
+ errors.push(_position + '鏃堕棿鏍煎紡閿欒')
}
}
@@ -1067,14 +1070,14 @@
let _uniquesql = ''
if (btn.uniques && btn.uniques.length > 0) {
btn.uniques.forEach(unique => {
- if (unique.status === 'false') return
+ if (unique.status === 'false' || !unique.verifyType) return
let _fields = unique.field.split(',')
let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
let _afields = _fields.map(_field => `a.${_field}`)
_fields_ = _fields_.join(' and ')
- if (unique.verifyType !== 'physical') {
+ if (unique.verifyType === 'logic' || unique.verifyType === 'logic_temp') {
_fields_ += ' and b.deleted=0'
}
@@ -1089,14 +1092,14 @@
goto aaa
end
- Set @tbid=''
+ ${unique.verifyType.indexOf('temp') === -1 ? `Set @tbid=''
Select top 1 @tbid=${_afields.join('+\' \'+')} from @${sheet} a Inner join ${sheet} b on ${_fields_}
If @tbid!=''
Begin
select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 涓庡凡鏈夋暟鎹噸澶�'
goto aaa
- end
+ end` : ''}
`
})
}
@@ -1288,14 +1291,14 @@
let _uniquesql = ''
if (btn.uniques && btn.uniques.length > 0) {
btn.uniques.forEach(unique => {
- if (unique.status === 'false') return
+ if (unique.status === 'false' || !unique.verifyType) return
let _fields = unique.field.split(',')
let _fields_ = _fields.map(_field => `a.${_field}=b.${_field}`)
let _afields = _fields.map(_field => `a.${_field}`)
_fields_ = _fields_.join(' and ')
- if (unique.verifyType !== 'physical') {
+ if (unique.verifyType === 'logic' || unique.verifyType === 'logic_temp') {
_fields_ += ' and b.deleted=0'
}
@@ -1310,14 +1313,14 @@
goto aaa
end
- Set @tbid=''
+ ${unique.verifyType.indexOf('temp') === -1 ? `Set @tbid=''
Select top 1 @tbid=${_afields.join('+\' \'+')} from @${sheet} a Inner join ${sheet} b on ${_fields_}
If @tbid!=''
Begin
select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 涓庡凡鏈夋暟鎹噸澶�'
goto aaa
- end
+ end` : ''}
`
})
}
@@ -1470,17 +1473,20 @@
if (!_initvars.includes(_key)) {
_initvars.push(_key)
+ let val = form.value
if (form.type === 'number' || form.type === 'rate') {
- let val = form.value
if (isNaN(val)) {
val = 0
}
_initFormfields.push(`@${_key}=${val}`)
} else if (['date', 'datemonth'].includes(form.type)) {
- _initFormfields.push(`@${_key}='${form.value || '1949-10-01'}'`)
+ _initFormfields.push(`@${_key}='${val || '1949-10-01'}'`)
} else {
- _initFormfields.push(`@${_key}='${form.value}'`)
+ if (/'/.test(val)) {
+ val = val.replace(/'/ig, '"')
+ }
+ _initFormfields.push(`@${_key}='${val}'`)
}
}
@@ -1505,15 +1511,16 @@
}
})
+ let _data = {}
if (data) {
Object.keys(data).forEach(key => {
- data[key.toLowerCase()] = data[key]
+ _data[key.toLowerCase()] = data[key]
})
}
// 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
if (data && btn.Ot !== 'notRequired' && columns && columns.length > 0) {
- datavars = {...data, ...datavars}
+ datavars = {..._data, ...datavars}
const setField = (col) => {
if (!col.field) return
@@ -1524,6 +1531,10 @@
if (col.datatype && /^date/ig.test(col.datatype) && !_val) {
_val = '1949-10-01'
+ }
+
+ if (/'/.test(_val)) {
+ _val = _val.replace(/'/ig, '"')
}
_initvars.push(_key)
@@ -1571,7 +1582,7 @@
_declarefields = ',' + _declarefields
}
_sql = `/* 绯荤粺鐢熸垚 */
- Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50),@ModularDetailCode nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@bid nvarchar(50)${_declarefields}
+ Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50),@ModularDetailCode nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100),@mk_deleted int,@bid nvarchar(50)${_declarefields}
`
let userName = sessionStorage.getItem('User_Name') || ''
@@ -1594,7 +1605,7 @@
// 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
_sql += `
/* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
- select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @bid='${BID}', @BillCode='', @ModularDetailCode=''
+ select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @RoleID='${RoleID}', @mk_departmentcode='${departmentcode}', @mk_organization='${organization}', @mk_user_type='${mk_user_type}', @mk_nation='${nation}', @mk_province='${province}', @mk_city='${city}', @mk_district='${district}', @mk_address='${address}', @mk_deleted=1, @bid='${BID}', @BillCode='', @ModularDetailCode=''
`
// 琛ㄥ崟鍙橀噺璧嬪��
@@ -1708,7 +1719,7 @@
/* 澶辨晥楠岃瘉 */
select @tbid='', @ErrorCode='',@retmsg=''
select @tbid='X' from ${datasource} right join (select ID from dbo.SplitComma(@ID@)) sp
- on tb.id =sp.id where tb.id is null
+ on tb.${primaryKey} =sp.id where tb.${primaryKey} is null
If @tbid!=''
Begin
@@ -1782,8 +1793,8 @@
let _val = ''
if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
_val = BID
- } else if (data && data.hasOwnProperty(_linkKey)) {
- _val = data[_linkKey]
+ } else if (_data.hasOwnProperty(_linkKey)) {
+ _val = _data[_linkKey]
}
_ModularDetailCode = `'${item.TypeCharOne + _val}'`
} else {
@@ -1912,7 +1923,7 @@
_sql += `
/* 鍒涘缓鍑瘉 */
exec s_BVoucher_Create
- @Bill ='${data[_voucher.linkField.toLowerCase()]}',
+ @Bill ='${_data[_voucher.linkField.toLowerCase()]}',
@BVoucherType ='${_voucher.BVoucherType}',
@VoucherTypeOne ='${_voucher.VoucherTypeOne}',
@VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
@@ -2067,7 +2078,7 @@
_sql += `
/* 榛樿sql */
- update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuser=@username,modifystaff=@fullname,modifyuserid=@userid@ where ${primaryKey}${_ID};`
+ update ${btn.sql} set deleted=@mk_deleted,modifydate=getdate(),modifyuser=@username,modifystaff=@fullname,modifyuserid=@userid@ where ${primaryKey}${_ID};`
} else if (_actionType === 'delete') { // 鐗╃悊鍒犻櫎
let _msg = ''
@@ -2254,36 +2265,21 @@
*/
export function setGLOBFuncs () {
window.GLOB.funcs = []
- if (!window.GLOB.WebSql && !window.GLOB.IndexDB) {
+ if (!window.GLOB.IndexDB) {
return
}
- if (window.GLOB.WebSql) {
- window.GLOB.WebSql.transaction(tx => {
- tx.executeSql("SELECT * FROM FUNCS", [], (tx, results) => {
- let rows = results.rows
- if (!rows || rows.length === 0) return
- for (let i = 0; i < rows.length; i++) {
- window.GLOB.funcs.push({
- func_code: rows[i].func_code,
- key_sql: window.decodeURIComponent(window.atob(rows[i].key_sql))
- })
- }
+ let objectStore = window.GLOB.IndexDB.transaction('funcs').objectStore('funcs')
+
+ objectStore.openCursor().onsuccess = (event) => {
+ let cursor = event.target.result
+
+ if (cursor) {
+ window.GLOB.funcs.push({
+ func_code: cursor.value.func_code,
+ key_sql: window.decodeURIComponent(window.atob(cursor.value.key_sql))
})
- })
- } else {
- let objectStore = window.GLOB.IndexDB.transaction('funcs').objectStore('funcs')
-
- objectStore.openCursor().onsuccess = (event) => {
- let cursor = event.target.result
-
- if (cursor) {
- window.GLOB.funcs.push({
- func_code: cursor.value.func_code,
- key_sql: window.decodeURIComponent(window.atob(cursor.value.key_sql))
- })
- cursor.continue()
- }
+ cursor.continue()
}
}
}
--
Gitblit v1.8.0