From 390c5026c78d2be9dca4357041f4a0ec8ac3668f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 04 二月 2020 13:57:31 +0800
Subject: [PATCH] 2020-02-04
---
src/utils/utils.js | 104 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 64 insertions(+), 40 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index ff237b6..3a83691 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -166,25 +166,11 @@
value = value.replace(/%/ig, 'mpercent')
value = value.replace(/(^\s|\s$)/ig, '')
- // value = value.replace(/>/ig, 'greateror')
- // .replace(/</ig, 'lessor')
- // .replace(/!=/ig, 'noequal')
- // .replace(/=/ig, 'equal')
- // .replace(/,/ig, 'comma')
- // .replace(/>=/ig, 'greaterorequal')
- // .replace(/<=/ig, 'lessorequal')
- // .replace(/@/ig, 'matk')
- // .replace(/\(/ig, 'mlbrktsk')
- // .replace(/\)/ig, 'mrbrktsk')
- // .replace(/\*/ig, 'mastrsk')
- // .replace(/'/ig, 'mqotek')
- // .replace(/\s/ig, 'mspace')
-
// 1銆乪ncode缂栫爜锛堜腑鏂囧瓧绗﹁秴鍑篵ase64鍔犲瘑鑼冨洿锛夛紝2銆乥ase64鍔犲瘑
value = window.btoa(window.encodeURIComponent(value))
- // 闅忔満鎻掑叆瀛楃
- let index = Math.floor(Math.random() * value.length)
+ // 鎻掑叆瀛楃
+ let index = Math.floor(value.length / 2)
value = value.slice(0, index) + salt + value.slice(index)
// base64鍔犲瘑
@@ -419,10 +405,20 @@
}
/**
- * @description 鑾峰彇涓嬫媺鎼滅储鏌ヨsql
+ * @description 鑾峰彇涓嬫媺鎼滅储鏌ヨ鏉′欢
* @return {String} item 鎼滅储鏉′欢淇℃伅
*/
- static getSelectQuerySql (item) {
+ static getSelectQueryOptions (item) {
+ let arrfield = [item.valueField, item.valueText]
+
+ if (item.type === 'link') {
+ arrfield.push(item.linkField)
+ } else if (item.type === 'select' && item.linkSubField && item.linkSubField.length > 0) {
+ arrfield.push(...item.linkSubField)
+ }
+
+ arrfield = Array.from(new Set(arrfield))
+
let _datasource = item.dataSource
let sql = ''
@@ -430,21 +426,18 @@
_datasource = '(' + _datasource + ') tb'
}
- if (item.type === 'link') {
- sql = 'select ' + item.valueField + ',' + item.valueText + ',' + item.linkField + ' from ' + _datasource
- } else {
- let _linkSubField = '' // 涓嬫媺鑿滃崟鍏宠仈琛ㄥ崟
- if (item.linkSubField && item.linkSubField.length > 0) {
- _linkSubField = ',' + item.linkSubField.join(',')
- }
- sql = 'select ' + item.valueField + ',' + item.valueText + _linkSubField + ' from ' + _datasource
- }
+ arrfield = arrfield.join(',')
if (item.orderBy) {
- sql = sql + ' order by ' + item.orderBy + ' ' + item.orderType
+ sql = 'select distinct ' + arrfield + ',' + item.orderBy + ' as orderfield from ' + _datasource + ' order by orderfield ' + item.orderType
+ } else {
+ sql = 'select distinct ' + arrfield + ' from ' + _datasource
}
- return sql
+ return {
+ sql: sql,
+ field: arrfield
+ }
}
/**
@@ -466,8 +459,17 @@
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)
- Select @BVoucher='',@FIBVoucherDate='',@FiYear=''
+ let _sql = `Declare @tbid nvarchar(50),@ErrorCode nvarchar(50),@retmsg nvarchar(4000),@BillCode nvarchar(50),@BVoucher nvarchar(50),@FIBVoucherDate nvarchar(50), @FiYear nvarchar(50)
+ `
+ if (verify && verify.scripts && verify.scripts.length > 0 && formdata) {
+ let _formfields = formdata.filter(form => !['tbid', 'ErrorCode', 'retmsg', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear'].includes(form.key))
+ _formfields = _formfields.map(form => `@${form.key} nvarchar(50)`)
+ _formfields = _formfields.join(',')
+ _sql += `${_formfields}
+ `
+ }
+
+ _sql += `Select @BVoucher='',@FIBVoucherDate='',@FiYear=''
`
if (verify && verify.accountdate === 'true') { // 鍚敤璐︽湡楠岃瘉
@@ -555,14 +557,21 @@
})
}
- if (verify && verify.billcodes.length > 0) {
+ if (verify && verify.billcodes.length > 0) { // 鍗曞彿鐢熸垚
verify.billcodes.forEach(item => {
let _ModularDetailCode = ''
if (item.TypeCharOne === 'Lp' || item.TypeCharOne === 'BN') {
- _ModularDetailCode = item.TypeCharOne + item.linkField
+ 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
} else {
_ModularDetailCode = item.ModularDetailCode
}
+
_sql += `Declare @${item.field} nvarchar(50)
select @BillCode='', @${item.field}=''
exec s_get_BillCode
@@ -582,7 +591,7 @@
let _updateconfig = ''
- if (verify && verify.voucher && verify.voucher.enabled) { // 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
+ if (verify && verify.voucher && verify.voucher.enabled && data) { // 鍑瘉-鏄剧ず鍒椾腑閫夊彇,蹇呴』閫夎
let _voucher = verify.voucher
_updateconfig = ',BVoucher=@BVoucher,FIBVoucherDate=@FIBVoucherDate,FiYear=@FiYear'
@@ -607,7 +616,10 @@
let keys = []
let values = []
formdata.forEach(item => {
- if (item.type === 'number') {
+ if (item.type === 'funcvar') {
+ keys.push(item.key)
+ values.push('@' + item.key)
+ } else if (item.type === 'number') {
keys.push(item.key)
values.push(item.value)
} else {
@@ -615,16 +627,19 @@
values.push('\'' + item.value + '\'')
}
})
+
keys = keys.join(',')
values = values.join(',')
_sql += `declare @UserName nvarchar(50),@FullName nvarchar(50)
select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID
`
- _sql += `insert into ${btn.sql} (${keys},createuserid,CreateUser,CreateStaff,BID) select ${values},@BID,@userid,@username,@fullname`
+ _sql += `insert into ${btn.sql} (${keys},createuserid,CreateUser,CreateStaff,BID) select ${values},@userid,@username,@fullname,@BID`
} else if (btn.OpenType === 'pop' && btn.sqlType === 'update') {
let _form = []
formdata.forEach(item => {
- if (item.type === 'number') {
+ 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 + '\'')
@@ -637,9 +652,18 @@
} else if ((btn.OpenType === 'prompt' || btn.OpenType === 'exec') && btn.sqlType === 'delete') { // 鐗╃悊鍒犻櫎
_sql += `insert into snote (remark,createuserid) select '鍒犻櫎琛�:${btn.sql} 鏁版嵁: ${primaryKey}='+@${primaryKey},@userid delete ${btn.sql} where ${primaryKey}=@${primaryKey}`
}
- _sql += `
- aaa:
- select @ErrorCode as ErrorCode,@retmsg as retmsg
+
+ if (verify && verify.scripts && verify.scripts.length > 0) {
+ let _scripts = ''
+ verify.scripts.forEach(item => {
+ _scripts += `${item.sql}
+ `
+ })
+ _sql += `
+ ${_scripts}`
+ }
+
+ _sql += `aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg
`
console.log(_sql)
return _sql
--
Gitblit v1.8.0