From c834537aadb80baad341eaf26ec6d88d41b5f7c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 一月 2021 21:25:09 +0800
Subject: [PATCH] 2021-01-14
---
src/utils/utils.js | 259 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 172 insertions(+), 87 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 4deb649..f97d965 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -48,6 +48,7 @@
for (let i = 0; i < 6; i++) {
name.push(_options.substr(Math.floor(Math.random() * 26), 1))
}
+ name.splice(3, 0, new Date().getTime())
return name.join('')
}
@@ -131,12 +132,15 @@
{key: 'sys.', reg: /(^|\s)sys\./ig},
{key: 'kill', reg: /(^|\s)kill\s/ig}
]
-
+
if (type === 'customscript') {
chars = chars.filter(char => !['insert', 'delete', 'update', 'set', 'if', 'exec'].includes(char.key))
}
let error = ''
+
+ sql = sql.replace(/sys\.fn_sqlvarbasetostr\(HashBytes\('MD5'/ig, '') // 璺宠繃MD5鍔犲瘑
+
chars.forEach(char => {
if (!error && char.reg.test(sql)) {
error = char.key
@@ -165,7 +169,7 @@
value = value.replace(/%/ig, ' mpercent ')
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
- value = value.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
+ value = value.replace(/@db@/ig, window.GLOB.externalDatabase)
}
// encode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛�
value = window.btoa(window.encodeURIComponent(value))
@@ -236,7 +240,7 @@
value = value.replace(/%/ig, ' mpercent ')
// 澶栬仈鏁版嵁搴撴浛鎹�
if (window.GLOB.externalDatabase !== null) {
- value = value.replace(/@db@/ig, `[${window.GLOB.externalDatabase}]..`)
+ value = value.replace(/@db@/ig, window.GLOB.externalDatabase)
}
let encodesql = (val) => {
@@ -252,11 +256,21 @@
return window.btoa(_value)
}
+ let len = value.length
// 娉細LText 涓� LText1 椤哄簭棰犲��
- return {
- LText: encodesql(value.substring(5000, 10000)),
- LText1: encodesql(value.substring(0, 5000)),
- LText2: encodesql(value.substring(10000))
+ if (len > 1000) {
+ let limit = Math.floor(len / 3)
+ return {
+ LText1: encodesql(value.substring(0, limit)),
+ LText: encodesql(value.substring(limit, limit * 2)),
+ LText2: encodesql(value.substring(limit * 2))
+ }
+ } else {
+ return {
+ LText1: '',
+ LText: encodesql(value),
+ LText2: ''
+ }
}
}
@@ -430,7 +444,7 @@
newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : ''
newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : ''
- } else if (item.type === 'text') {
+ } else if (item.type === 'text' || item.type === 'select') {
item.key.split(',').forEach(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
newsearches[field] = item.value
})
@@ -463,17 +477,13 @@
if (item.forbid || !item.value || (item.type === 'multiselect' && item.value.length === 0)) return
searchText += (searchText !== '' ? ' AND ' : '')
- if (item.type === 'text') {
+ if (item.type === 'text' || item.type === 'select') { // 缁煎悎鎼滅储锛屾枃鏈垨涓嬫媺锛屾墍鏈夊瓧娈垫嫾鎺�
let str = item.match === '=' ? '' : '%'
- let fields = item.key.split(',').map(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
+ let fields = item.key.split(',').map(field => {
return field + ' ' + item.match + ' \'' + str + item.value + str + '\''
})
searchText += '(' + fields.join(' OR ') + ')'
- } else if (item.type === 'select') {
- let str = item.match === '=' ? '' : '%'
-
- searchText += item.key + ' ' + item.match + ' \'' + str + item.value + str + '\''
} else if (item.type === 'multiselect') {
searchText += `'${item.value}' ` + item.match + ' \'%\'+' + item.key + '+\'%\''
@@ -514,7 +524,7 @@
}
/**
- * @description 鎷兼帴鎼滅储鏉′欢main
+ * @description 鑾峰彇鎼滅储鐢ㄤ簬姝ｅ垯鏇挎崲
* @param {Array} searches 鎼滅储鏉′欢
* @return {String} searchText 鎷兼帴缁撴灉
*/
@@ -528,9 +538,7 @@
key: search.key,
match: search.match,
type: search.type,
- label: search.label,
- value: search.value,
- required: search.required
+ value: search.value
}
if (fieldmap.has(item.key)) {
@@ -587,12 +595,63 @@
item.value = item.value ? item.value.join(',') : item.value
options.push(item)
- } else if (item.type === 'text') {
+ } else if (item.type === 'text' || item.type === 'select') {
item.key.split(',').forEach(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
let cell = JSON.parse(JSON.stringify(item))
cell.key = field
+ options.push(cell)
+ })
+ } else {
+ options.push(item)
+ }
+ })
+
+ return options
+ }
+
+ /**
+ * @description 鑾峰彇鎼滅储鐢ㄤ簬姝ｅ垯鏇挎崲
+ * @param {Array} searches 鎼滅储鏉′欢
+ * @return {String} searchText 鎷兼帴缁撴灉
+ */
+ static getRegOptions (searches) {
+ if (!searches || searches.length === 0) return []
+
+ let options = []
+ let fieldmap = new Map()
+ searches.forEach(search => {
+ let item = {
+ key: search.field,
+ value: '0'
+ }
+
+ if (fieldmap.has(item.key)) {
+ item.key = item.key + '1'
+ }
+
+ fieldmap.set(item.key, true)
+
+ if (search.type === 'group') {
+ options.push({
+ key: search.datefield,
+ value: '0'
+ })
+ if (search.transfer === 'true') {
options.push(item)
+ }
+ } else if (['datemonth', 'dateweek', 'daterange'].includes(search.type)) {
+ options.push(item)
+ options.push({
+ key: item.key + '1',
+ value: '0'
+ })
+ } else if (search.type === 'text' || search.type === 'select') {
+ item.key.split(',').forEach(field => {
+ let cell = JSON.parse(JSON.stringify(item))
+ cell.key = field
+
+ options.push(cell)
})
} else {
options.push(item)
@@ -640,7 +699,7 @@
if (process.env.NODE_ENV === 'production') {
baseurl = document.location.origin + '/' + window.GLOB.service
} else {
- baseurl = window.GLOB.location + window.GLOB.service
+ baseurl = window.GLOB.location + '/' + window.GLOB.service
}
let realurl = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
@@ -965,7 +1024,7 @@
${_sqlBottom}
`
fsql = fsql.replace(/\n\s{8}/ig, '\n')
- console.log(fsql)
+ console.info(fsql)
}
} else { // s_sDataDictb_excelIn 浜戠瀵嗛挜楠岃瘉鍙傛暟
_sql = `
@@ -996,11 +1055,11 @@
* @return {String} type 鎵ц绫诲瀷
* @return {String} table 琛ㄥ悕
*/
- static getSysDefaultSql (btn, setting, formdata, param, data, logcolumns, tab) {
+ static getSysDefaultSql (btn, setting, formdata, param, data, columns, tab) {
let primaryId = param.ID
let BID = param.BID
let verify = btn.verify || {}
- let _formFieldValue = {}
+ let datavars = {} // 澹版槑鐨勫彉閲忥紝琛ㄥ崟鍙婃樉绀哄垪
let _actionType = null
let appkey = window.GLOB.appkey || ''
let sessionUid = localStorage.getItem('SessionUid') || ''
@@ -1044,7 +1103,8 @@
let _sql = ''
let _initvars = [] // 宸茶祴鍊煎瓧娈甸泦
- let _initfields = []
+ let _initFormfields = []
+ let _initColfields = []
let _declarefields = []
// 鑾峰彇瀛楁閿�煎
@@ -1055,8 +1115,8 @@
form.value = form.value.replace(/^(\s*)@bid@(\s*)$/ig, BID)
}
- _formFieldValue[form.key] = form.value
let _key = form.key.toLowerCase()
+ datavars[_key] = form.value
if (!_initvars.includes(_key)) {
_initvars.push(_key)
@@ -1069,9 +1129,9 @@
val = 0
}
}
- _initfields.push(`@${_key}=${val}`)
+ _initFormfields.push(`@${_key}=${val}`)
} else {
- _initfields.push(`@${_key}='${form.value}'`)
+ _initFormfields.push(`@${_key}='${form.value}'`)
}
}
@@ -1094,41 +1154,39 @@
}
})
+ if (data) {
+ Object.keys(data).forEach(key => {
+ data[key.toLowerCase()] = data[key]
+ })
+ }
+
// 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
if (data && btn.Ot !== 'notRequired' && btn.Ot !== 'requiredOnce') {
- _formFieldValue = {...data, ..._formFieldValue}
+ datavars = {...data, ...datavars}
- if (logcolumns && logcolumns.length > 0) {
- logcolumns.forEach(col => {
- let _key = col.field.toLowerCase()
+ const setField = (col) => {
+ if (!col.field) return
+ let _key = col.field.toLowerCase()
- if (!_initvars.includes(_key)) {
- _initvars.push(_key)
+ if (!_initvars.includes(_key)) {
+ let _val = datavars.hasOwnProperty(_key) ? datavars[_key] : ''
- let _val = data.hasOwnProperty(col.field) ? data[col.field] : ''
+ _initvars.push(_key)
+ _initColfields.push(`@${_key}='${_val}'`)
+ }
+
+ if (!_vars.includes(_key)) {
+ _vars.push(_key)
- if (col.type === 'number') {
- if (typeof(_val) !== 'number') {
- _val = parseFloat(_val)
- if (isNaN(_val)) {
- _val = 0
- }
- }
- _initfields.push(`@${_key}=${_val}`)
- } else {
- _initfields.push(`@${_key}='${_val}'`)
- }
- }
-
- if (!_vars.includes(_key)) {
- _vars.push(_key)
-
+ if (col.datatype) {
+ _declarefields.push(`@${_key} ${col.datatype}`)
+ } else {
if (col.fieldlength && col.fieldlength > 2048) {
col.fieldlength = 'max'
}
let _type = `nvarchar(${col.fieldlength || 50})`
-
+
if (col.type === 'number') {
let _length = col.decimal ? col.decimal : 0
_type = `decimal(18,${_length})`
@@ -1137,6 +1195,18 @@
}
_declarefields.push(`@${_key} ${_type}`)
+ }
+ }
+ }
+
+ if (columns && columns.length > 0) {
+ columns.forEach(col => {
+ if (col.type === 'colspan' || col.type === 'old_colspan') {
+ col.subcols.forEach(cell => {
+ setField(cell)
+ })
+ } else {
+ setField(col)
}
})
}
@@ -1151,12 +1221,18 @@
Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50), @UserName nvarchar(50),@FullName nvarchar(50),@ModularDetailCode nvarchar(50)${_declarefields}
`
- // 鍙橀噺璧嬪��
- _initfields = _initfields.join(',')
- if (_initfields) {
+ // 琛ㄥ崟鍙橀噺璧嬪��
+ if (_initFormfields.length > 0) {
_sql += `
-
- select ${_initfields}
+ /* 琛ㄥ崟鍙橀噺璧嬪�� */
+ select ${_initFormfields.join(',')}
+ `
+ }
+ // 鏄剧ず鍒楀彉閲忚祴鍊�
+ if (_initColfields.length > 0) {
+ _sql += `
+ /* 鏄剧ず鍒楀彉閲忚祴鍊� */
+ select ${_initColfields.join(',')}
`
}
@@ -1194,9 +1270,18 @@
// 鍚敤璐︽湡楠岃瘉
if (verify.accountdate === 'true') {
+ let orgcode = `''`
+ let date = `''`
+ if (verify.accountfield && _initvars.includes(verify.accountfield.toLowerCase())) {
+ orgcode = '@' + verify.accountfield
+ }
+ if (verify.voucherdate && _initvars.includes(verify.voucherdate.toLowerCase())) {
+ date = '@' + verify.voucherdate
+ }
+
_sql += `
/* 璐︽湡楠岃瘉 */
- exec s_FIBVoucherDateCheck @ErrorCode=@ErrorCode OUTPUT,@retmsg=@retmsg OUTPUT
+ exec s_FIBVoucherDateCheck @OrgCode=${orgcode},@FIBVoucherDate=${date},@ErrorCode=@ErrorCode OUTPUT,@retmsg=@retmsg OUTPUT
if @ErrorCode!=''
GOTO aaa
`
@@ -1277,23 +1362,26 @@
let keys = formdata.map(item => item.key.toLowerCase()) // 琛ㄥ崟瀛楁
verify.billcodes.forEach(item => {
- if (!keys.includes(item.field.toLowerCase())) return // 琛ㄥ崟涓笉鍚崟鍙风敓鎴愬瓧娈�
+ let _key = item.field.toLowerCase()
+ let _linkKey = item.linkField ? item.linkField.toLowerCase() : ''
+
+ if (!keys.includes(_key)) return // 琛ㄥ崟涓笉鍚崟鍙风敓鎴愬瓧娈�
let _ModularDetailCode = ''
let _lpline = ''
if (item.TypeCharOne === 'Lp') {
- if (item.linkField === 'BID' && BID) { // 鏇挎崲bid
+ if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
_lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@BID@,48)`
} else {
- _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${item.linkField},48)`
+ _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${_linkKey},48)`
}
_ModularDetailCode = '@ModularDetailCode'
} else if (item.TypeCharOne === 'BN') {
let _val = ''
- if (item.linkField === 'BID' && BID) { // 鏇挎崲bid
+ if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
_val = BID
- } else if (data && data.hasOwnProperty(item.linkField)) {
- _val = data[item.linkField]
+ } else if (data && data.hasOwnProperty(_linkKey)) {
+ _val = data[_linkKey]
}
_ModularDetailCode = `'${item.TypeCharOne + _val}'`
} else {
@@ -1301,7 +1389,6 @@
}
let _declare = ''
- let _key = item.field.toLowerCase()
if (!_vars.includes(_key)) {
_declare = `Declare @${_key} nvarchar(50)`
@@ -1334,12 +1421,6 @@
// 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧愶紝澶氳鎷兼帴鏃朵笉鍙敤
if (formdata && verify.uniques && verify.uniques.length > 0 && btn.Ot !== 'requiredOnce') {
- let hasBid = false // 妫�楠岃〃鍗曞強鍒楀瓧娈典腑鏄惁鏈塨id
- let _keys_ = Object.keys(_formFieldValue).map(key => key.toLowerCase())
- if (_keys_.includes('bid')) {
- hasBid = true
- }
-
verify.uniques.forEach(item => {
let _fieldValue = [] // 琛ㄥ崟閿�煎field=value
let _value = [] // 琛ㄥ崟鍊硷紝鐢ㄤ簬閿欒鎻愮ず
@@ -1347,20 +1428,22 @@
let arr = [] // 楠岃瘉涓婚敭
item.field.split(',').forEach((_field, index) => {
- let _fval = `'${_formFieldValue[_field]}'`
+ let _key = _field.toLowerCase()
+ let _val = datavars[_key] !== undefined ? datavars[_key] : ''
+ let _fval = `'${_val}'`
- if (_field.toLowerCase() === 'bid' && !hasBid) { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
+ if (_key === 'bid' && !datavars.bid) { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
_fval = '@BID@'
}
- if (_field.toLowerCase() === 'bid' && tab && tab.foreignKey) {
+ if (_key === 'bid' && tab && tab.foreignKey) {
arr.push(tab.foreignKey.toLowerCase())
_fieldValue.push(`${tab.foreignKey}=${_fval}`)
} else {
- arr.push(_field.toLowerCase())
- _fieldValue.push(`${_field}=${_fval}`)
+ arr.push(_key)
+ _fieldValue.push(`${_key}=${_fval}`)
}
- _value.push(`${_labels[index] || ''}锛�${_formFieldValue[_field] || ''}`)
+ _value.push(`${_labels[index] || ''}锛�${_val || ''}`)
})
let _verifyType = ''
@@ -1427,7 +1510,7 @@
_sql += `
/* 鍒涘缓鍑瘉 */
exec s_BVoucher_Create
- @Bill ='${data[_voucher.linkField]}',
+ @Bill ='${data[_voucher.linkField.toLowerCase()]}',
@BVoucherType ='${_voucher.BVoucherType}',
@VoucherTypeOne ='${_voucher.VoucherTypeOne}',
@VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
@@ -1452,9 +1535,10 @@
formdata.forEach(item => {
if (item.writein === false) return
+ let _key = item.key.toLowerCase()
- keys.push(item.key.toLowerCase())
- values.push('@' + item.key)
+ keys.push(_key)
+ values.push('@' + _key)
})
if (!keys.includes(primaryKey.toLowerCase())) {
@@ -1475,13 +1559,13 @@
}
if (!keys.includes('bid')) {
if (tab && tab.foreignKey && !keys.includes(tab.foreignKey.toLowerCase())) {
- keys.push(tab.foreignKey)
+ keys.push(tab.foreignKey.toLowerCase())
} else {
keys.push('bid')
}
values.push('@BID@')
} else if (tab && tab.foreignKey && !keys.includes(tab.foreignKey.toLowerCase())) {
- keys.push(tab.foreignKey)
+ keys.push(tab.foreignKey.toLowerCase())
values.push('@BID@')
}
@@ -1497,9 +1581,10 @@
formdata.forEach(item => {
if (item.writein === false) return
+ let _key = item.key.toLowerCase()
- _arr.push(item.key.toLowerCase())
- _form.push(item.key + '=@' + item.key)
+ _arr.push(_key)
+ _form.push(_key + '=@' + _key)
})
if (_actionType === 'audit') {
@@ -1564,10 +1649,10 @@
} else if (_actionType === 'delete') { // 鐗╃悊鍒犻櫎
let _msg = ''
- if (data && logcolumns && logcolumns.length > 0) {
+ if (data && columns && columns.length > 0) {
let _index = 0
- logcolumns.forEach(col => {
- if (col.Hide !== 'true' && _index < 4) {
+ columns.forEach(col => {
+ if (col.Hide !== 'true' && col.type !== 'colspan' && col.type !== 'old_colspan' && _index < 4) {
_msg += col.label + '=' + data[col.field] + ','
_index++
}
@@ -1609,7 +1694,7 @@
if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
_sql = _sql.replace(/\n\s{8}/ig, '\n')
- console.log(_sql)
+ console.info(_sql)
}
return _sql
--
Gitblit v1.8.0