From e0f1f05b7567a7bfd29fd5ad54e4b2222ddfcb94 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 三月 2020 20:19:06 +0800
Subject: [PATCH] 2020-03-26
---
src/utils/utils.js | 493 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 439 insertions(+), 54 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 6b0a8e6..6a5c97a 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -1,5 +1,6 @@
import moment from 'moment'
import md5 from 'md5'
+import options from '@/store/options.js'
const service = window.GLOB.service ? (/\/$/.test(window.GLOB.service) ? window.GLOB.service : window.GLOB.service + '/') : ''
@@ -193,7 +194,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') : ''
@@ -288,6 +291,12 @@
newsearches[item.key] = item.value
}
})
+
+ Object.keys(newsearches).forEach(key => {
+ if (!newsearches[key]) {
+ delete newsearches[key]
+ }
+ })
return newsearches
}
@@ -317,12 +326,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'
@@ -355,6 +360,7 @@
searchText += '(' + item.key + ' ' + item.match + ' \'' + item.value + '\')'
}
})
+
return searchText
}
@@ -391,6 +397,7 @@
*/
static getrealurl (url) {
if (!url) return ''
+
let baseurl = ''
if (process.env.NODE_ENV === 'production') {
baseurl = document.location.origin + '/' + service
@@ -402,6 +409,24 @@
// }
let realurl = url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
return realurl
+ }
+
+ /**
+ * @description 鑾峰彇浜戠鍥剧墖鐪熷疄璺緞
+ * @return {String} url 鍥剧墖璺緞
+ */
+ static getcloudurl (url) {
+ if (!url) return ''
+
+ let baseurl = ''
+
+ if (options.cloudServiceApi) {
+ baseurl = options.cloudServiceApi.replace(/webapi(.*)$/, '')
+ } else {
+ baseurl = document.location.origin + '/' + service
+ }
+
+ return url.match(/^http/) || url.match(/^\/\//) ? url : baseurl + url
}
/**
@@ -441,6 +466,160 @@
}
/**
+ * @description 鑾峰彇excel瀵煎叆鍙傛暟
+ * @return {String} btn 鎸夐挳
+ * @return {String} data excel鏁版嵁
+ */
+ static getExcelInSql (item, data, dict) {
+ let btn = item.verify
+ let keys = ['delete', 'drop', 'insert', 'truncate', 'update']
+
+ let errors = []
+ let _topline = btn.range || 0
+ let upId = this.getuuid()
+ let _Ltext = data.map((item, lindex) => {
+ let vals = btn.columns.map((col, cindex) => {
+ let val = item[col.Column] !== undefined ? item[col.Column] : ''
+ let _position = (_topline + lindex + 1) + dict['main.excel.line'] + ' ' + (cindex + 1) + dict['main.excel.column'] + ' '
+
+ if (/^Nvarchar/ig.test(col.type)) {
+ if (typeof(val) === 'number') {
+ val = val.toString()
+ }
+
+ val = val.replace(/(^\s*$)|\t*|\v*/ig, '')
+
+ if (!val && col.required === 'true') { // 蹇呭～鏍￠獙
+ let _error = _position + dict['main.excel.content.emptyerror']
+ errors.push(_error)
+ } else if (val.length > col.limit) { // 闀垮害鏍￠獙
+ let _error = _position + dict['main.excel.content.maxlimit']
+ errors.push(_error)
+ } else { // 鍏抽敭瀛楁牎楠�
+ keys.forEach(key => {
+ let _patten = new RegExp('(^' + key + '\\s+)|(\\s+' + key + '\\s+)', 'ig')
+ if (_patten.test(val)) {
+ let _error = _position + dict['main.excel.includekey'] + key
+ errors.push(_error)
+ }
+ })
+ }
+ } else if (/^int/ig.test(col.type)) {
+ if (!val) {
+ let _error = _position + dict['main.excel.content.emptyerror']
+ errors.push(_error)
+ } else {
+ let _val = val + ''
+
+ if (!/^(([^0][0-9]+|0)$)|^(([1-9]+)$)/.test(_val)) { // 妫�楠屾槸鍚︿负鏁存暟
+ let _error = _position + dict['main.excel.content.interror']
+ errors.push(_error)
+ } else if ((col.min || col.min === 0) && val < col.min) { // 鏈�灏忓�兼楠�
+ let _error = _position + dict['main.excel.content.limitmin']
+ errors.push(_error)
+ } else if ((col.max || col.max === 0) && val > col.max) { // 鏈�澶у�兼楠�
+ let _error = _position + dict['main.excel.content.limitmax']
+ errors.push(_error)
+ }
+ }
+ } else if (/^Decimal/ig.test(col.type)) {
+ if (!val) {
+ let _error = _position + dict['main.excel.content.emptyerror']
+ errors.push(_error)
+ } 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)) { // 妫�楠屾槸鍚︿负娴偣鏁�
+ let _error = _position + dict['main.excel.content.floaterror']
+ errors.push(_error)
+ } else if (_vals[0].length > 18) { // 妫�楠屾暣鏁颁綅
+ let _error = _position + dict['main.excel.content.floatIntover']
+ errors.push(_error)
+ } else if (_vals[1] && _vals[1].length > col.limit) { // 鏈�灏忓�兼楠�
+ let _error = _position + dict['main.excel.content.floatPointover']
+ errors.push(_error)
+ } else if ((col.min || col.min === 0) && val < col.min) { // 鏈�灏忓�兼楠�
+ let _error = _position + dict['main.excel.content.limitmin']
+ errors.push(_error)
+ } else if ((col.max || col.max === 0) && val > col.max) { // 鏈�澶у�兼楠�
+ let _error = _position + dict['main.excel.content.limitmax']
+ errors.push(_error)
+ }
+ }
+ }
+
+ return `'${val}' as ${col.Column}`
+ })
+
+ let _lineIndex = '0000' + (lindex + 1) + '0'
+ _lineIndex = _lineIndex.substring(_lineIndex.length - 6)
+
+ vals.push(`'${upId + _lineIndex}' as jskey`)
+
+ return `Select ${vals.join(',')}`
+ })
+
+ _Ltext = _Ltext.join(' Union all ')
+
+ let _sql = ''
+
+ if (item.intertype === 'inner' && !item.innerFunc) {
+ let declarefields = []
+ let fields = []
+
+ btn.columns.forEach(col => {
+ declarefields.push(`${col.Column} ${col.type}`)
+ fields.push(col.Column)
+ })
+
+ fields = fields.join(',')
+
+ let _insert = ''
+
+ if (btn.default !== 'false') {
+ _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}
+ `
+ })
+ }
+
+ _sql = `declare @${item.sheet} table (${declarefields.join(',')},jskey nvarchar(50) )
+ Declare @UserName nvarchar(50),@FullName nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000)
+
+ Select @ErrorCode='', @retmsg=''
+
+ select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID@
+
+ Insert into @${item.sheet} (${fields},jskey)
+ ${_Ltext}
+ ${_insert}
+ Delete @${item.sheet}
+
+ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+
+ } else {
+ _sql = _Ltext
+ }
+
+ console.log(_sql)
+ return {
+ sql: _sql,
+ errors: errors.join('; ')
+ }
+ }
+
+ /**
* @description 浣跨敤绯荤粺鍑芥暟鏃讹紙sPC_TableData_InUpDe 锛夛紝鐢熸垚sql璇彞
* @return {String} type 鎵ц绫诲瀷
* @return {String} table 琛ㄥ悕
@@ -452,17 +631,17 @@
let _formFieldValue = {}
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
// 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']
// 涓婚敭瀛楁
let primaryKey = setting.primaryKey || 'id'
// 绯荤粺鍙橀噺澹版槑涓庤缃垵濮嬪��
- let _sql = `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)
+ let _sql = `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)
`
// let _initvars = ['ID', 'BID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey'] // 宸茶祴鍊煎瓧娈甸泦
- let _initvars = ['id', 'bid', 'loginuid', 'sessionuid', 'userid', 'appkey'] // 宸茶祴鍊煎瓧娈甸泦
+ let _initvars = [] // 宸茶祴鍊煎瓧娈甸泦
let _initfields = []
let _declarefields = []
@@ -474,7 +653,12 @@
if (!_initvars.includes(_key)) {
_initvars.push(_key)
- _initfields.push(`@${_key}='${form.value}'`)
+
+ if (form.type === 'number' && typeof(form.value) === 'number') {
+ _initfields.push(`@${_key}=${form.value}`)
+ } else {
+ _initfields.push(`@${_key}='${form.value}'`)
+ }
}
if (!_vars.includes(_key)) {
@@ -505,7 +689,12 @@
_initvars.push(_key)
let _val = data.hasOwnProperty(col.field) ? data[col.field] : ''
- _initfields.push(`@${_key}='${_val}'`)
+
+ if (col.type === 'number' && typeof(_val) === 'number') {
+ _initfields.push(`@${_key}=${_val}`)
+ } else {
+ _initfields.push(`@${_key}='${_val}'`)
+ }
}
if (!_vars.includes(_key)) {
@@ -514,7 +703,7 @@
let _type = `nvarchar(${col.fieldlength || 50})`
if (col.type === 'number') {
- let _length = (col.decimal || col.decimal === 0) ? col.decimal : 18
+ let _length = col.decimal ? col.decimal : 0
_type = `decimal(18,${_length})`
} else if (col.type === 'picture' || col.type === 'textarea') {
_type = `nvarchar(${col.fieldlength || 512})`
@@ -540,11 +729,6 @@
`
}
- // 娣诲姞鏃朵富閿负绌�
- if (btn.sqlType === 'insert') {
- primaryId = ''
- }
-
// 鍘婚櫎绂佺敤鐨勯獙璇�
if (verify.contrasts) {
verify.contrasts = verify.contrasts.filter(item => item.status !== 'false')
@@ -562,8 +746,16 @@
verify.scripts = verify.scripts.filter(item => item.status !== 'false')
}
- // 鍒濆鍖栧嚟璇佸瓧娈�
- _sql += `select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg=''
+ 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='',@UserName='${userName}', @FullName='${fullName}'
`
// 鍚敤璐︽湡楠岃瘉
@@ -605,13 +797,26 @@
// 鍞竴鎬ч獙璇侊紝蹇呴』瀛樺湪琛ㄥ崟锛堣〃鍗曞瓨鍦ㄦ椂锛屼富閿潎涓哄崟鍊硷級,蹇呴』濉啓鏁版嵁婧�
if (formdata && verify.uniques && verify.uniques.length > 0) {
+ 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 = [] // 琛ㄥ崟鍊硷紝鐢ㄤ簬閿欒鎻愮ず
let _labels = item.fieldlabel.split(',') // 琛ㄥ崟鎻愮ず鏂囧瓧
item.field.split(',').forEach((_field, index) => {
- _fieldValue.push(`${_field}='${_formFieldValue[_field]}'`)
+ let _fval = `'${_formFieldValue[_field]}'`
+ // if (['id', 'bid', 'loginuid', 'sessionuid', 'userid', 'appkey'].includes(_field.toLowerCase())) {
+ // _fval = '@' + _field + '@'
+ // }
+ if (_field.toLowerCase() === 'bid' && !hasBid) { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
+ _fval = '@BID@'
+ }
+ _fieldValue.push(`${_field}=${_fval}`)
_value.push(`${_labels[index] || ''}锛�${_formFieldValue[_field] || ''}`)
})
@@ -649,16 +854,24 @@
if (verify.billcodes && verify.billcodes.length > 0) {
verify.billcodes.forEach(item => {
let _ModularDetailCode = ''
- if (item.TypeCharOne === 'Lp' || item.TypeCharOne === 'BN') {
+ let _lpline = ''
+ if (item.TypeCharOne === 'Lp') {
+ if (item.linkField === 'BID' && BID) { // 鏇挎崲bid
+ _lpline = `set @ModularDetailCode= 'Lp'+ right('${btn.uuid}'+@BID@,48)`
+ } else {
+ _lpline = `set @ModularDetailCode= 'Lp'+ right('${btn.uuid}'+@${item.linkField},48)`
+ }
+ _ModularDetailCode = '@ModularDetailCode'
+ } else if (item.TypeCharOne === 'BN') {
let _val = ''
if (item.linkField === 'BID' && BID) { // 鏇挎崲bid
_val = BID
} else if (data && data.hasOwnProperty(item.linkField)) {
_val = data[item.linkField]
}
- _ModularDetailCode = item.TypeCharOne + _val
+ _ModularDetailCode = `'${item.TypeCharOne + _val}'`
} else {
- _ModularDetailCode = item.ModularDetailCode
+ _ModularDetailCode = `'${item.ModularDetailCode}'`
}
let _declare = ''
@@ -670,9 +883,10 @@
}
_sql += `${_declare}
- select @BillCode='', @${_key}=''
+ select @BillCode='', @${_key}='', @ModularDetailCode=''
+ ${_lpline}
exec s_get_BillCode
- @ModularDetailCode='${_ModularDetailCode}',
+ @ModularDetailCode=${_ModularDetailCode},
@Type=${item.Type},
@TypeCharOne='${item.TypeCharOne}',
@TypeCharTwo ='${item.TypeCharTwo}',
@@ -686,13 +900,13 @@
})
}
- let _updateconfig = ''
+ let hasvoucher = false
// 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
if (verify.voucher && verify.voucher.enabled && data) {
let _voucher = verify.voucher
- _updateconfig = ',BVoucher=@BVoucher,FIBVoucherDate=@FIBVoucherDate,FiYear=@FiYear'
+ hasvoucher = true
_sql += `exec s_BVoucher_Create
@Bill ='${data[_voucher.linkField]}',
@@ -710,36 +924,63 @@
`
}
- // 鐢ㄤ簬鍙栫敤鎴蜂俊鎭�
- 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 (btn.OpenType === 'pop' && btn.sqlType === 'insert' && verify.default !== 'false') {
+ if (_actionType === 'insert') {
let keys = []
let values = []
+
formdata.forEach(item => {
if (item.type === 'funcvar') {
- keys.push(item.key)
+ keys.push(item.key.toLowerCase())
values.push('@' + item.key)
} else if (item.type === 'number') {
- keys.push(item.key)
+ keys.push(item.key.toLowerCase())
values.push(item.value)
} else {
- keys.push(item.key)
+ keys.push(item.key.toLowerCase())
values.push('\'' + item.value + '\'')
}
})
+ if (!keys.includes(primaryKey)) {
+ keys.push(primaryKey)
+ values.push('\'' + primaryId + '\'')
+ }
+ if (!keys.includes('createuserid')) {
+ keys.push('createuserid')
+ values.push('@userid@')
+ }
+ if (!keys.includes('createuser')) {
+ keys.push('createuser')
+ values.push('@username')
+ }
+ if (!keys.includes('createstaff')) {
+ keys.push('createstaff')
+ values.push('@fullname')
+ }
+ if (!keys.includes('bid')) {
+ keys.push('bid')
+ values.push('@BID@')
+ }
+
keys = keys.join(',')
values = values.join(',')
- _sql += _user
- _sql += `insert into ${btn.sql} (${keys},createuserid,CreateUser,CreateStaff,BID) select ${values},@userid@,@username,@fullname,@BID@;`
- } else if (btn.OpenType === 'pop' && btn.sqlType === 'update' && verify.default !== 'false') {
+ _sql += `insert into ${btn.sql} (${keys}) select ${values};`
+ } else if (_actionType === 'update') {
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') {
@@ -748,11 +989,31 @@
_form.push(item.key + '=\'' + item.value + '\'')
}
})
+
+ if (!_arr.includes('modifydate')) {
+ _form.push('modifydate=getdate()')
+ }
+ if (!_arr.includes('modifyuserid')) {
+ _form.push('modifyuserid=@userid@')
+ }
+ if (hasvoucher) {
+ if (!_arr.includes('bvoucher')) {
+ _form.push('BVoucher=@BVoucher')
+ }
+ if (!_arr.includes('fibvoucherdate')) {
+ _form.push('FIBVoucherDate=@FIBVoucherDate')
+ }
+ if (!_arr.includes('fiyear')) {
+ _form.push('FiYear=@FiYear')
+ }
+ }
+
_form = _form.join(',')
- _sql += `update ${btn.sql} set ${_form},modifydate=getdate(),modifyuserid=@userid@${_updateconfig} where ${primaryKey}=@${primaryKeyName};`
- } else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'LogicDelete' && verify.default !== 'false') { // 閫昏緫鍒犻櫎
+ _sql += `update ${btn.sql} set ${_form} where ${primaryKey}=@${primaryKeyName};`
+ } else if (_actionType === 'LogicDelete') { // 閫昏緫鍒犻櫎
_sql += `update ${btn.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid@ where ${primaryKey}=@${primaryKeyName};`
- } else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'delete' && verify.default !== 'false') { // 鐗╃悊鍒犻櫎
+
+ } else if (_actionType === 'delete') { // 鐗╃悊鍒犻櫎
let _msg = ''
if (data && logcolumns && logcolumns.length > 0) {
let _index = 0
@@ -763,7 +1024,6 @@
}
})
}
- _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};`
}
@@ -798,15 +1058,20 @@
static getTableFunc (param, menu, config) {
let form = ''
let formParam = ''
+ let _vars = ['bid', 'pageindex', 'pagesize', 'ordercol', 'ordertype', 'exceltype', 'septmenuno', 'lang', 'debug', 'loginuid', 'sessionuid', 'userid', 'errorcode', 'retmsg']
let _columns = []
let primaryKey = config.setting.primaryKey || 'ID'
+
+ if (!_vars.includes(primaryKey.toLowerCase())) {
+ _vars.push(primaryKey.toLowerCase())
+ formParam = `mchr13k@${primaryKey} nvarchar(50)='',`
+ }
if (config.search && config.search.length > 0) {
let _fields = new Map()
config.search.forEach(item => {
if (item.field) {
let type = ''
- let _f = item.field
if (item.type.match(/date/ig)) {
type = 'datetime=null'
@@ -814,12 +1079,19 @@
type = 'nvarchar(50)=\'\''
}
- if (_fields.has(item.field)) {
- _f = _f + '1'
- }
+ item.field.split(',').forEach(cell => {
+ let _f = cell
+ if (_fields.has(cell)) {
+ _f = _f + '1'
+ }
+
+ _fields.set(cell, true)
- _fields.set(item.field, true)
- formParam = formParam + `mchr13k@${_f} ${type},`
+ if (!_vars.includes(_f.toLowerCase())) {
+ _vars.push(_f.toLowerCase())
+ formParam = formParam + `mchr13k@${_f} ${type},`
+ }
+ })
}
})
}
@@ -840,8 +1112,8 @@
let Ltext = `create proc ${param.innerFunc}
( /*${menu.MenuName}*/
- @BID nvarchar(50)='',
- @${primaryKey} nvarchar(50)='',${formParam}
+ @appkey nvarchar(50)='',
+ @BID nvarchar(50)='',${formParam}
@PageIndex nvarchar(50)='',
@PageSize nvarchar(50)='',
@OrderCol nvarchar(50)='',
@@ -926,8 +1198,14 @@
static getfunc (param, btn, menu, config) {
let form = ''
let formParam = ''
+ let _vars = ['bid', 'septmenuno', 'lang', 'debug', 'loginuid', 'sessionuid', 'userid', 'errorcode', 'retmsg']
let columns = config.columns
let primaryKey = config.setting.primaryKey || 'ID'
+
+ if (!_vars.includes(primaryKey.toLowerCase())) {
+ _vars.push(primaryKey.toLowerCase())
+ formParam = `mchr13k@${primaryKey} nvarchar(50)='',`
+ }
if (param.fields && param.fields.length > 0) {
let _fields = []
@@ -941,7 +1219,11 @@
} else {
type = 'nvarchar(50)=\'\''
}
- formParam = formParam + `mchr13k@${item.field} ${type},`
+
+ if (!_vars.includes(item.field.toLowerCase())) {
+ _vars.push(item.field.toLowerCase())
+ formParam = formParam + `mchr13k@${item.field} ${type},`
+ }
_fields.push(item.field)
}
@@ -988,10 +1270,16 @@
`
}
+ // 鎵撳嵃鑷畾涔夋ā鏉垮瓧娈垫彁绀�
+ let _printRemark = ''
+ if (btn.funcType === 'print') {
+ _printRemark = '/* 鑷畾涔夋暟鎹墦鍗版ā鏉挎椂锛岃浣跨敤TemplateID瀛楁 */'
+ }
+
let Ltext = `create proc ${param.funcName}
( /*${menu.MenuName} ${btn.label}*/
- @BID nvarchar(50)='',
- @${primaryKey} nvarchar(50)='',${formParam}
+ @appkey nvarchar(50)='',
+ @BID nvarchar(50)='',${formParam}
@sEPTMenuNo nvarchar(50)='${param.menuNo}',
@lang nvarchar(50)='',
@debug nvarchar(50)='',
@@ -1011,7 +1299,7 @@
/*浜嬪姟鎿嶄綔*/
BEGIN TRAN
/*鍏蜂綋涓氬姟鎿嶄綔*/
-
+ ${_printRemark}
/*
select top 10 * from sProcExcep order by id desc
@@ -1063,4 +1351,101 @@
return Ltext
}
+
+ /**
+ * @description 鍒涘缓瀵煎叆瀛樺偍杩囩▼
+ * @return {String}
+ */
+ static getexcelInfunc (param, btn, menu) {
+ let _verify = btn.verify
+
+ let declarefields = []
+ let fields = []
+
+ _verify.columns.forEach(col => {
+ declarefields.push(`${col.Column} ${col.type}`)
+ fields.push(col.Column)
+ })
+
+ fields = fields.join(',')
+
+ let _sql = `declare @${btn.sheet} table (${declarefields.join(',')},jskey nvarchar(50))
+ Declare @UserName nvarchar(50),@FullName nvarchar(50)
+
+ select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID
+
+ Insert into @${btn.sheet} (${fields},jskey)
+
+ exec s_KeyWords_Replace
+ @LText=@LText, @BID=@BID,@LoginUID=@LoginUID,@SessionUid=@SessionUid,@UserID=@UserID,@ID=@ID
+
+ Insert into ${btn.sheet} (${fields},createuserid,createuser,createstaff,bid)
+ Select ${fields},@userid,@username,@fullname,@BID From @${btn.sheet}
+
+ Delete @${btn.sheet}`
+
+ 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)='',
+ @UserID nvarchar(50),
+ @ErrorCode nvarchar(50) out,
+ @retmsg nvarchar(4000) out
+ )
+ as
+ begin
+ declare @BegindateTest datetime,@EnddateTest datetime
+ select @BegindateTest=getdate()
+ set @ErrorCode=''
+ set @retmsg=''
+ BEGIN TRY
+ /*浜嬪姟鎿嶄綔*/
+ BEGIN TRAN
+ /*鍏蜂綋涓氬姟鎿嶄綔*/
+
+ /*
+ ${_sql}
+ */
+
+ COMMIT TRAN
+ SET NOCOUNT ON
+ RETURN
+ END TRY
+ BEGIN CATCH
+ /*閿欒澶勭悊*/
+ ROLLBACK TRAN
+ DECLARE @ErrorMessage NVARCHAR(4000);
+ DECLARE @ErrorSeverity INT;
+ DECLARE @ErrorState INT;
+
+ /*鎶婅嚜瀹氫箟鐨勫弸濂界殑閿欒淇℃伅鎻愮ず鍔犱笂*/
+ set @ErrorCode=cast(ERROR_NUMBER() as nvarchar(50))
+ SET @retmsg=ERROR_MESSAGE();
+ SELECT @ErrorMessage=ERROR_MESSAGE(),
+ @ErrorSeverity=ERROR_SEVERITY(),
+ @ErrorState=ERROR_STATE();
+
+ RAISERROR(@ErrorMessage, /*-- Message text.*/
+ @ErrorSeverity, /*-- Severity.*/
+ @ErrorState /*-- State.*/
+ );
+ END CATCH
+
+ GOTO_RETURN:
+ ROLLBACK TRAN
+
+ END`
+
+ Ltext = Ltext.replace(/\n\s{4}/ig, 'mchr13k')
+
+ return Ltext
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0