From 6b680ace26dc95031a1b7a3e33f8785c112f787d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 20 四月 2020 18:32:01 +0800
Subject: [PATCH] 2020-04-20
---
src/utils/utils.js | 576 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 378 insertions(+), 198 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 9edfb85..2a4bd06 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -51,131 +51,126 @@
}
/**
+ * @description sql璇硶楠岃瘉
+ * @return {String} sql sql璇彞
+ * @return {String} type 楠岃瘉绫诲瀷
+ */
+ static verifySql (sql, type) {
+ if (!sql) return ''
+ let chars = [
+ {key: 'create', reg: /(^|\s)create\s/ig},
+ {key: 'insert', reg: /(^|\s)insert\s/ig},
+ {key: 'delete', reg: /(^|\s)delete\s/ig},
+ {key: 'update', reg: /(^|\s)update\s/ig},
+ {key: 'set', reg: /(^|\s)set\s/ig},
+ {key: 'drop', reg: /(^|\s)drop\s/ig},
+ {key: 'alter', reg: /(^|\s)alter\s/ig},
+ {key: 'truncate', reg: /(^|\s)truncate\s/ig},
+ {key: 'if', reg: /(^|\s)if\s/ig},
+ {key: 'exec', reg: /exec/ig},
+ {key: 'OBJECT', reg: /object/ig},
+ {key: 'sys.', reg: /sys\./ig},
+ {key: 'kill', reg: /kill/ig}
+ ]
+
+ if (type === 'customscript') {
+ chars = chars.map(char => !['insert', 'delete', 'update', 'set', 'if', 'exec'].includes(char.key))
+ }
+
+ let error = ''
+ chars.forEach(char => {
+ if (!error && char.reg.test(sql)) {
+ error = char.key
+ }
+ })
+
+ return error
+ }
+
+ /**
* @description sql鍔犲瘑
* @return {String} value
*/
- static formatOptions (value) {
+ static formatOptions (value, isUnFormat = false) {
if (!value) return ''
let salt = 'minKe' // 鐩愬��
// 鍏抽敭瀛楄浆鎹㈣鍒�
- let format = [{
- key: 'select',
- value: ' msltk '
- }, {
- key: 'from',
- value: ' mfrmk '
- }, {
- key: 'where',
- value: ' mwhrk '
- }, {
- key: 'order by',
- value: ' modbk '
- }, {
- key: 'asc',
- value: ' modack '
- }, {
- key: 'desc',
- value: ' moddesk '
- }, {
- key: 'top',
- value: ' mtpk '
- }, {
- key: 'like',
- value: ' mlkk '
- }, {
- key: 'not like',
- value: ' mnlkk '
- }, {
- key: 'between',
- value: ' mbtnk '
- }, {
- key: 'and',
- value: ' madk '
- }, {
- key: 'insert',
- value: ' mistk '
- }, {
- key: 'into',
- value: ' mitk '
- }, {
- key: 'update',
- value: ' muptk '
- }, {
- key: 'delete',
- value: ' mdelk '
- }, {
- key: 'begin',
- value: ' mbgink '
- }, {
- key: 'end',
- value: ' medk '
- }, {
- key: 'if',
- value: ' mefk '
- }, {
- key: 'while',
- value: ' mwilk '
- }, {
- key: 'create',
- value: ' mcrtk '
- }, {
- key: 'alter',
- value: ' matek '
- }, {
- key: 'len',
- value: ' mlnk '
- }, {
- key: 'left',
- value: ' mlftk '
- }, {
- key: 'right',
- value: ' mritk '
- }, {
- key: 'union',
- value: ' munok '
- }, {
- key: 'varchar',
- value: ' mvcrk '
- }, {
- key: 'getdate',
- value: ' mgtdtk '
- }, {
- key: 'TRY',
- value: ' mtryonek '
- }, {
- key: 'TRAN',
- value: ' mtrnk '
- }, {
- key: 'goto',
- value: ' mgtk '
- }, {
- key: 'set',
- value: ' mstk '
- }, {
- key: 'ROLLBACK',
- value: ' mrlbkk '
- }]
+ let format = [
+ { key: 'select', value: ' msltk ' },
+ { key: 'from', value: ' mfrmk ' },
+ { key: 'where', value: ' mwhrk ' },
+ { key: 'order by', value: ' modbk ' },
+ { key: 'asc', value: ' modack ' },
+ { key: 'desc', value: ' moddesk ' },
+ { key: 'top', value: ' mtpk ' },
+ { key: 'like', value: ' mlkk ' },
+ { key: 'not like', value: ' mnlkk ' },
+ { key: 'between', value: ' mbtnk ' },
+ { key: 'and', value: ' madk ' },
+ { key: 'insert', value: ' mistk ' },
+ { key: 'into', value: ' mitk ' },
+ { key: 'update', value: ' muptk ' },
+ { key: 'delete', value: ' mdelk ' },
+ { key: 'begin', value: ' mbgink ' },
+ { key: 'end', value: ' medk ' },
+ { key: 'if', value: ' mefk ' },
+ { key: 'while', value: ' mwilk ' },
+ { key: 'create', value: ' mcrtk ' },
+ { key: 'alter', value: ' matek ' },
+ { key: 'len', value: ' mlnk ' },
+ { key: 'left', value: ' mlftk ' },
+ { key: 'right', value: ' mritk ' },
+ { key: 'union', value: ' munok ' },
+ { key: 'varchar', value: ' mvcrk ' },
+ { key: 'getdate', value: ' mgtdtk ' },
+ { key: 'TRY', value: ' mtryonek ' },
+ { key: 'TRAN', value: ' mtrnk ' },
+ { key: 'goto', value: ' mgtk ' },
+ { key: 'set', value: ' mstk ' },
+ { key: 'ROLLBACK', value: ' mrlbkk ' }
+ ]
- // 鏇挎崲鍏抽敭瀛�
- format.forEach(item => {
- let reg = new RegExp('(^|\\s)' + item.key + '(\\s|$)', 'ig')
- value = value.replace(reg, item.value)
- })
+ if (!isUnFormat) { // 鍔犲瘑
+ value = value.replace(/\n/ig, ' \n ')
+ // 鏇挎崲鍏抽敭瀛�
+ format.forEach(item => {
+ let reg = new RegExp('(^|\\s)' + item.key + '(\\s|$)', 'ig')
+ value = value.replace(reg, item.value)
+ })
+
+ // 1銆佹浛鎹�%绗︼紙鏁版嵁搴撲腑瑙ｆ瀽鍚巗ql鎶ラ敊锛�
+ value = value.replace(/%/ig, ' mpercent ')
- // 1銆佹浛鎹�%绗︼紙鏁版嵁搴撲腑瑙ｆ瀽鍚巗ql鎶ラ敊锛夛紝2銆佸幓闄ゆ敹灏惧浣欑┖鏍�
- value = value.replace(/%/ig, 'mpercent')
- value = value.replace(/(^\s|\s$)/ig, '')
+ // 1銆乪ncode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛夛紝2銆乥ase64鍔犲瘑
+ value = window.btoa(window.encodeURIComponent(value))
+
+ // 鎻掑叆瀛楃
+ let index = Math.floor(value.length / 2)
+ value = value.slice(0, index) + salt + value.slice(index)
+
+ // base64鍔犲瘑
+ value = window.btoa(value)
+ } else { // 瑙ｅ瘑
+ try {
+ value = window.atob(value)
+ value = value.replace(salt, '')
+ value = window.decodeURIComponent(window.atob(value))
- // 1銆乪ncode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛夛紝2銆乥ase64鍔犲瘑
- value = window.btoa(window.encodeURIComponent(value))
+ value = value.replace(/\smpercent\s/g, '%')
- // 鎻掑叆瀛楃
- let index = Math.floor(value.length / 2)
- value = value.slice(0, index) + salt + value.slice(index)
+ format.forEach(item => {
+ let reg = new RegExp(item.value, 'g')
+ value = value.replace(reg, ' ' + item.key + ' ')
+ })
- // base64鍔犲瘑
- value = window.btoa(value)
+ value = value.replace(/\s\n\s/ig, '\n')
+ value = value.replace(/(^\s+|\s+$)/ig, '')
+ } catch {
+ console.warn('UnFormat Failure')
+ value = ''
+ }
+ }
return value
}
@@ -194,7 +189,9 @@
key: search.field,
match: search.match,
type: search.type,
- value: search.initval
+ label: search.label,
+ value: search.initval,
+ required: search.required === 'true'
}
if (item.type === 'date') {
item.value = item.value ? moment().subtract(item.value, 'days').format('YYYY-MM-DD') : ''
@@ -289,6 +286,12 @@
newsearches[item.key] = item.value
}
})
+
+ Object.keys(newsearches).forEach(key => {
+ if (!newsearches[key]) {
+ delete newsearches[key]
+ }
+ })
return newsearches
}
@@ -318,12 +321,8 @@
searchText += item.key + ' ' + item.match + ' \'' + str + item.value + str + '\''
} else if (item.type === 'multiselect') {
- let str = item.match === '=' ? '' : '%'
- let options = item.value.map(val => {
- return item.key + ' ' + item.match + ' \'' + str + val + str + '\''
- })
- searchText += '(' + options.join(' OR ') + ')'
+ searchText += `'${item.value}' ` + item.match + ' \'%\'+' + item.key + '+\'%\''
} else if (item.type === 'date') {
let _val = item.value
let timetail = ' 00:00:00.000'
@@ -356,6 +355,7 @@
searchText += '(' + item.key + ' ' + item.match + ' \'' + item.value + '\')'
}
})
+
return searchText
}
@@ -472,6 +472,31 @@
let errors = []
let _topline = btn.range || 0
let upId = this.getuuid()
+
+ let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
+ let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
+ let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
+
+ if (btn.scripts) {
+ btn.scripts.forEach(script => {
+ if (script.status === 'false') return
+
+ if (script.position === 'init') {
+ _initCustomScript += `
+ ${script.sql}
+ `
+ } else if (script.position === 'front') {
+ _prevCustomScript += `
+ ${script.sql}
+ `
+ } else {
+ _backCustomScript += `
+ ${script.sql}
+ `
+ }
+ })
+ }
+
let _Ltext = data.map((item, lindex) => {
let vals = btn.columns.map((col, cindex) => {
let val = item[col.Column] !== undefined ? item[col.Column] : ''
@@ -500,7 +525,7 @@
})
}
} else if (/^int/ig.test(col.type)) {
- if (!val) {
+ if (!val && val !== 0) {
let _error = _position + dict['main.excel.content.emptyerror']
errors.push(_error)
} else {
@@ -518,7 +543,7 @@
}
}
} else if (/^Decimal/ig.test(col.type)) {
- if (!val) {
+ if (!val && val !== 0) {
let _error = _position + dict['main.excel.content.emptyerror']
errors.push(_error)
} else {
@@ -560,6 +585,48 @@
let _sql = ''
if (item.intertype === 'inner' && !item.innerFunc) {
+ let _uniquesql = ''
+ if (btn.uniques && btn.uniques.length > 0) {
+ btn.uniques.forEach(unique => {
+ if (unique.status === 'false') return
+
+ let _fields = unique.field.split(',')
+ let _fields_ = _fields.map(_field => {
+ return `a.${_field}=b.${_field}`
+ })
+ _fields_ = _fields_.join(' and ')
+
+ if (unique.verifyType !== 'physical') {
+ _fields_ += ' and b.deleted=0'
+ }
+
+ _uniquesql += `
+ Set @tbid=''
+ Select top 1 @tbid=${_fields.join('+\' \'+')} from (select 1 as n,${unique.field} from @${item.sheet} ) a group by ${unique.field} having sum(n)>1
+
+ If @tbid!=''
+ Begin
+ select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 閲嶅'
+ goto aaa
+ end
+
+ Set @tbid=''
+ Select top 1 @tbid=${_fields.join('+\' \'+')} from @${item.sheet} a
+ Inner join ${item.sheet} b on ${_fields_}
+
+ If @tbid!=''
+ Begin
+ select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 涓庡凡鏈夋暟鎹噸澶�'
+ goto aaa
+ end
+ `
+ })
+
+ if (_uniquesql) {
+ _uniquesql = 'Declare @tbid Nvarchar(512)' + _uniquesql
+ }
+ }
+
let declarefields = []
let fields = []
@@ -572,21 +639,19 @@
let _insert = ''
+ if (_prevCustomScript) {
+ _insert += _prevCustomScript
+ }
+
if (btn.default !== 'false') {
- _insert = `
+ _insert += `
Insert into ${item.sheet} (${fields},createuserid,createuser,createstaff,bid)
Select ${fields},@userid@,@username,@fullname,@BID@ From @${item.sheet}
`
}
- if (btn.scripts && btn.scripts.length > 0) {
- btn.scripts.forEach(script => {
- if (script.status === 'false') return
-
- _insert += `
- ${script.sql}
- `
- })
+ if (_backCustomScript) {
+ _insert += _backCustomScript
}
_sql = `declare @${item.sheet} table (${declarefields.join(',')},jskey nvarchar(50) )
@@ -595,9 +660,10 @@
Select @ErrorCode='', @retmsg=''
select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID@
-
+ ${_initCustomScript}
Insert into @${item.sheet} (${fields},jskey)
${_Ltext}
+ ${_uniquesql}
${_insert}
Delete @${item.sheet}
@@ -619,14 +685,43 @@
* @return {String} type 鎵ц绫诲瀷
* @return {String} table 琛ㄥ悕
*/
- static getSysDefaultSql (btn, setting, formdata, param, data, logcolumns) {
+ static getSysDefaultSql (btn, setting, formdata, param, data, logcolumns, tab) {
let primaryId = param.ID
let BID = param.BID
let verify = btn.verify || {}
let _formFieldValue = {}
+ let _actionType = null
+
+ if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
+ _actionType = btn.sqlType
+ }
+
+ let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
+ let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
+ let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
+
+ if (verify.scripts) {
+ verify.scripts.forEach(item => {
+ if (item.status === 'false') return
+
+ if (item.position === 'init') {
+ _initCustomScript += `
+ ${item.sql}
+ `
+ } else if (item.position === 'front') {
+ _prevCustomScript += `
+ ${item.sql}
+ `
+ } else {
+ _backCustomScript += `
+ ${item.sql}
+ `
+ }
+ })
+ }
+
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
// let _vars = ['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'UserName', 'FullName', 'ID', 'BID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey']
- // let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'id', 'bid', 'loginuid', 'sessionuid', 'userid', 'appkey']
let _vars = ['tbid', 'errorcode', 'retmsg', 'billcode', 'bvoucher', 'fibvoucherdate', 'fiyear', 'username', 'fullname', 'modulardetailcode']
// 涓婚敭瀛楁
@@ -637,7 +732,6 @@
`
// let _initvars = ['ID', 'BID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey'] // 宸茶祴鍊煎瓧娈甸泦
- // let _initvars = ['id', 'bid', 'loginuid', 'sessionuid', 'userid', 'appkey'] // 宸茶祴鍊煎瓧娈甸泦
let _initvars = [] // 宸茶祴鍊煎瓧娈甸泦
let _initfields = []
let _declarefields = []
@@ -660,6 +754,10 @@
if (!_vars.includes(_key)) {
_vars.push(_key)
+
+ if (form.fieldlen && form.fieldlen > 2048) {
+ form.fieldlen = 'max'
+ }
let _type = `nvarchar(${form.fieldlen})`
@@ -696,6 +794,10 @@
if (!_vars.includes(_key)) {
_vars.push(_key)
+
+ if (col.fieldlength && col.fieldlength > 2048) {
+ col.fieldlength = 'max'
+ }
let _type = `nvarchar(${col.fieldlength || 50})`
@@ -726,11 +828,6 @@
`
}
- // 娣诲姞鏃朵富閿负绌� 鏀逛负鍓嶅彴鐢熸垚
- // if (btn.sqlType === 'insert') {
- // primaryId = ''
- // }
-
// 鍘婚櫎绂佺敤鐨勯獙璇�
if (verify.contrasts) {
verify.contrasts = verify.contrasts.filter(item => item.status !== 'false')
@@ -744,13 +841,22 @@
if (verify.billcodes) {
verify.billcodes = verify.billcodes.filter(item => item.status !== 'false')
}
- if (verify.scripts) {
- verify.scripts = verify.scripts.filter(item => item.status !== 'false')
+
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+
+ if (sessionStorage.getItem('isEditState') === 'true') {
+ userName = sessionStorage.getItem('CloudUserName') || ''
+ fullName = sessionStorage.getItem('CloudFullName') || ''
}
- // 鍒濆鍖栧嚟璇佸瓧娈�
- _sql += `select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg=''
+ // 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
+ _sql += `select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}'
`
+
+ if (_initCustomScript) {
+ _sql += _initCustomScript
+ }
// 鍚敤璐︽湡楠岃瘉
if (verify.accountdate === 'true') {
@@ -801,6 +907,7 @@
let _fieldValue = [] // 琛ㄥ崟閿�煎field=value
let _value = [] // 琛ㄥ崟鍊硷紝鐢ㄤ簬閿欒鎻愮ず
let _labels = item.fieldlabel.split(',') // 琛ㄥ崟鎻愮ず鏂囧瓧
+ let arr = [] // 楠岃瘉涓婚敭
item.field.split(',').forEach((_field, index) => {
let _fval = `'${_formFieldValue[_field]}'`
@@ -810,6 +917,8 @@
if (_field.toLowerCase() === 'bid' && !hasBid) { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
_fval = '@BID@'
}
+ arr.push(_field.toLowerCase())
+
_fieldValue.push(`${_field}=${_fval}`)
_value.push(`${_labels[index] || ''}锛�${_formFieldValue[_field] || ''}`)
})
@@ -819,8 +928,12 @@
_verifyType = ' and deleted=0'
}
+ if (!arr.includes(primaryKey.toLowerCase())) {
+ _fieldValue.push(`${primaryKey} !='${primaryId}'`)
+ }
+
_sql += `select @tbid='', @ErrorCode='',@retmsg=''
- select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')} and ${primaryKey} !='${primaryId}'${_verifyType}
+ select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')}${_verifyType}
If @tbid!=''
Begin
select @ErrorCode='${item.errorCode}',@retmsg='${_value.join(', ')} 宸插瓨鍦�'
@@ -832,7 +945,7 @@
// 鑷畾涔夐獙璇�
if (verify.customverifys && verify.customverifys.length > 0) {
- verify.customverifys.forEach(item => {
+ verify.customverifys.forEach(item => {
_sql += `select @tbid='', @ErrorCode='',@retmsg=''
select top 1 @tbid='X' from (${item.sql}) a
If @tbid ${item.result === 'true' ? '!=' : '='}''
@@ -845,15 +958,16 @@
}
// 鍗曞彿鐢熸垚锛屼娇鐢ㄤ笂绾d锛圔ID锛夋垨鍒楄〃鏁版嵁锛屽０鏄庡彉閲忥紙妫�楠岋級
+ let _billcodesSql = ''
if (verify.billcodes && verify.billcodes.length > 0) {
verify.billcodes.forEach(item => {
let _ModularDetailCode = ''
let _lpline = ''
if (item.TypeCharOne === 'Lp') {
if (item.linkField === 'BID' && BID) { // 鏇挎崲bid
- _lpline = `set @ModularDetailCode= 'Lp'+ right('${btn.uuid}'+@BID@,48)`
+ _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@BID@,48)`
} else {
- _lpline = `set @ModularDetailCode= 'Lp'+ right('${btn.uuid}'+@${item.linkField},48)`
+ _lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${item.linkField},48)`
}
_ModularDetailCode = '@ModularDetailCode'
} else if (item.TypeCharOne === 'BN') {
@@ -876,7 +990,7 @@
_vars.push(_key)
}
- _sql += `${_declare}
+ _billcodesSql += `${_declare}
select @BillCode='', @${_key}='', @ModularDetailCode=''
${_lpline}
exec s_get_BillCode
@@ -892,6 +1006,10 @@
set @${_key}=@BillCode
`
})
+
+ if (_actionType !== 'insertOrUpdate') {
+ _sql += _billcodesSql
+ }
}
let hasvoucher = false
@@ -908,6 +1026,9 @@
@VoucherTypeOne ='${_voucher.VoucherTypeOne}',
@VoucherTypeTwo ='${_voucher.VoucherTypeTwo}',
@Type =${_voucher.Type},
+ @UserID=@UserID@,
+ @Username=@Username,
+ @FullName=@FullName,
@BVoucher =@BVoucher OUTPUT ,
@FIBVoucherDate =@FIBVoucherDate OUTPUT ,
@FiYear =@FiYear OUTPUT ,
@@ -918,38 +1039,20 @@
`
}
- // 鐢ㄤ簬鍙栫敤鎴蜂俊鎭�
- let _user = `select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID@
- `
-
let primaryKeyName = ['id', 'bid', 'loginuid', 'sessionuid', 'userid', 'appkey'].includes(primaryKey.toLowerCase()) ? primaryKey + '@' : primaryKey
- let _actionType = null
-
- if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
- _actionType = btn.sqlType
- }
-
- // 娣诲姞銆佷慨鏀广�侀�昏緫鍒犻櫎銆佺墿鐞嗗垹闄�
- if (_actionType === 'insert') {
+ let _insertsql = ''
+ if (_actionType === 'insert' || _actionType === 'insertOrUpdate') { // 娣诲姞璇彞
let keys = []
let values = []
formdata.forEach(item => {
- if (item.type === 'funcvar') {
- keys.push(item.key.toLowerCase())
- values.push('@' + item.key)
- } else if (item.type === 'number') {
- keys.push(item.key.toLowerCase())
- values.push(item.value)
- } else {
- keys.push(item.key.toLowerCase())
- values.push('\'' + item.value + '\'')
- }
+ keys.push(item.key.toLowerCase())
+ values.push('@' + item.key)
})
- if (!keys.includes(primaryKey)) {
- keys.push(primaryKey)
+ if (!keys.includes(primaryKey.toLowerCase())) {
+ keys.push(primaryKey.toLowerCase())
values.push('\'' + primaryId + '\'')
}
if (!keys.includes('createuserid')) {
@@ -965,28 +1068,30 @@
values.push('@fullname')
}
if (!keys.includes('bid')) {
- keys.push('bid')
+ if (tab && tab.foreignKey && !keys.includes(tab.foreignKey.toLowerCase())) {
+ keys.push(tab.foreignKey)
+ } else {
+ keys.push('bid')
+ }
+ values.push('@BID@')
+ } else if (tab && tab.foreignKey && !keys.includes(tab.foreignKey.toLowerCase())) {
+ keys.push(tab.foreignKey)
values.push('@BID@')
}
keys = keys.join(',')
values = values.join(',')
- _sql += _user
- _sql += `insert into ${btn.sql} (${keys}) select ${values};`
- } else if (_actionType === 'update') {
+ _insertsql = `insert into ${btn.sql} (${keys}) select ${values};`
+ }
+
+ let _updatesql = ''
+ if (_actionType === 'update' || _actionType === 'insertOrUpdate') { // 淇敼璇彞
let _form = []
let _arr = []
formdata.forEach(item => {
_arr.push(item.key.toLowerCase())
-
- if (item.type === 'funcvar') {
- _form.push(item.key + '=@' + item.key)
- } else if (item.type === 'number') {
- _form.push(item.key + '=' + item.value)
- } else {
- _form.push(item.key + '=\'' + item.value + '\'')
- }
+ _form.push(item.key + '=@' + item.key)
})
if (!_arr.includes('modifydate')) {
@@ -1006,9 +1111,19 @@
_form.push('FiYear=@FiYear')
}
}
-
_form = _form.join(',')
- _sql += `update ${btn.sql} set ${_form} where ${primaryKey}=@${primaryKeyName};`
+ _updatesql = `update ${btn.sql} set ${_form} where ${primaryKey}=@${primaryKeyName};`
+ }
+
+ if (_prevCustomScript) {
+ _sql += _prevCustomScript
+ }
+
+ // 娣诲姞銆佷慨鏀广�侀�昏緫鍒犻櫎銆佺墿鐞嗗垹闄�
+ if (_actionType === 'insert') {
+ _sql += _insertsql
+ } else if (_actionType === 'update') {
+ _sql += _updatesql
} else if (_actionType === 'LogicDelete') { // 閫昏緫鍒犻櫎
_sql += `update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid@ where ${primaryKey}=@${primaryKeyName};`
@@ -1023,18 +1138,24 @@
}
})
}
- _sql += _user
- _sql += `insert into snote (remark,createuserid,CreateUser,CreateStaff) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${_msg}${primaryKey}='+@${primaryKeyName},@userid@,@username,@fullname delete ${btn.sql} where ${primaryKey}=@${primaryKeyName};`
+ _sql += `insert into snote (remark,createuserid,CreateUser,CreateStaff) select left('鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${_msg}${primaryKey}='+@${primaryKeyName},200),@userid@,@username,@fullname delete ${btn.sql} where ${primaryKey}=@${primaryKeyName};`
+ } else if (_actionType === 'insertOrUpdate') {
+ _sql += `select @tbid=''
+ select @tbid='X' from ${btn.sql} where ${primaryKey}=@ID@
+ if @tbid=''
+ begin
+ ${_billcodesSql}
+ ${_insertsql}
+ end
+ else
+ begin
+ ${_updatesql}
+ end
+ `
}
- // 鎷兼帴鑷畾涔夎剼鏈�
- if (verify.scripts && verify.scripts.length > 0) {
- let _scripts = ''
- verify.scripts.forEach(item => {
- _scripts += `
- ${item.sql}`
- })
- _sql += `${_scripts}`
+ if (_backCustomScript) {
+ _sql += _backCustomScript
}
_sql += `
@@ -1112,6 +1233,7 @@
let Ltext = `create proc ${param.innerFunc}
( /*${menu.MenuName}*/
+ @appkey nvarchar(50)='',
@BID nvarchar(50)='',${formParam}
@PageIndex nvarchar(50)='',
@PageSize nvarchar(50)='',
@@ -1242,6 +1364,10 @@
update ${param.name} set ${field3},modifydate=getdate(),modifyuserid=@UserID
`
+ } else if (btn.OpenType === 'prompt' || btn.OpenType === 'exec') {
+ form = `
+ update ${param.name} set ModifyDate=getdate(),ModifyUserID=@UserID where ${primaryKey}=@${primaryKey}
+ `
}
if (columns) {
@@ -1269,8 +1395,15 @@
`
}
+ // 鎵撳嵃鑷畾涔夋ā鏉垮瓧娈垫彁绀�
+ let _printRemark = ''
+ if (btn.funcType === 'print') {
+ _printRemark = '/* 鑷畾涔夋暟鎹墦鍗版ā鏉挎椂锛岃浣跨敤TemplateID瀛楁 */'
+ }
+
let Ltext = `create proc ${param.funcName}
( /*${menu.MenuName} ${btn.label}*/
+ @appkey nvarchar(50)='',
@BID nvarchar(50)='',${formParam}
@sEPTMenuNo nvarchar(50)='${param.menuNo}',
@lang nvarchar(50)='',
@@ -1291,7 +1424,7 @@
/*浜嬪姟鎿嶄綔*/
BEGIN TRAN
/*鍏蜂綋涓氬姟鎿嶄綔*/
-
+ ${_printRemark}
/*
select top 10 * from sProcExcep order by id desc
@@ -1351,6 +1484,50 @@
static getexcelInfunc (param, btn, menu) {
let _verify = btn.verify
+ let _uniquesql = ''
+ if (_verify.uniques && _verify.uniques.length > 0) {
+ _verify.uniques.forEach(unique => {
+ if (unique.status === 'false') return
+
+ let _fields = unique.field.split(',')
+ let _fields_ = _fields.map(_field => {
+ return `a.${_field}=b.${_field}`
+ })
+ _fields_ = _fields_.join(' and ')
+
+ if (unique.verifyType !== 'physical') {
+ _fields_ += ' and b.deleted=0'
+ }
+
+ _uniquesql += `
+ Set @tbid=''
+ Select top 1 @tbid=${_fields.join('+\' \'+')} from (select 1 as n,${unique.field} from @${btn.sheet} ) a group by ${unique.field} having sum(n)>1
+
+ If @tbid!=''
+ Begin
+ select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 閲嶅'
+ goto aaa
+ end
+
+ Set @tbid=''
+ Select top 1 @tbid=${_fields.join('+\' \'+')} from @${btn.sheet} a
+ Inner join ${btn.sheet} b on ${_fields_}
+
+ If @tbid!=''
+ Begin
+ select @ErrorCode='${unique.errorCode}',@retmsg=@tbid+' 涓庡凡鏈夋暟鎹噸澶�'
+ goto aaa
+ end
+ `
+ })
+
+ if (_uniquesql) {
+ _uniquesql = `
+ Declare @tbid Nvarchar(512)
+ ${_uniquesql}`
+ }
+ }
+
let declarefields = []
let fields = []
@@ -1370,7 +1547,7 @@
exec s_KeyWords_Replace
@LText=@LText, @BID=@BID,@LoginUID=@LoginUID,@SessionUid=@SessionUid,@UserID=@UserID,@ID=@ID
-
+ ${_uniquesql}
Insert into ${btn.sheet} (${fields},createuserid,createuser,createstaff,bid)
Select ${fields},@userid,@username,@fullname,@BID From @${btn.sheet}
@@ -1378,10 +1555,13 @@
let Ltext = `create proc ${param.funcName}
( /*${menu.MenuName} ${btn.label}*/
+ @appkey nvarchar(50)='',
@ID nvarchar(50)='',
@BID nvarchar(50)='',
@Ltext nvarchar(max)='',
@sEPTMenuNo nvarchar(50)='${param.menuNo}',
+ @secretkey nvarchar(50)='',
+ @timestamp nvarchar(50)='',
@lang nvarchar(50)='',
@LoginUID nvarchar(50)='',
@SessionUid nvarchar(50)='',
--
Gitblit v1.8.0