From 4b18ab4bf4eff4383bd85beb76564dc6aeb1df86 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 一月 2021 19:11:26 +0800
Subject: [PATCH] 2021-01-26
---
src/utils/utils.js | 65 +++++++++-----------------------
1 files changed, 18 insertions(+), 47 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index cca9ea7..3b1788f 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))
@@ -176,45 +180,6 @@
value = window.btoa(value)
return value
- }
-
- /**
- * @description 瑙ｅ瘑
- * @return {String} value
- */
- static UnformatOptions (value) {
- if (!value) return ''
- let salt = 'minKe' // 鐩愬��
- let _value = ''
-
- try {
- try {
- _value = JSON.parse(window.decodeURIComponent(window.atob(value)))
- } catch {
- _value = ''
- }
-
- if (!_value) {
- _value = window.atob(value)
- _value = _value.replace(salt, '')
- _value = window.decodeURIComponent(window.atob(_value))
-
- _value = _value.replace(/\smpercent\s/g, '%')
-
- formatKeys.forEach(item => {
- let reg = new RegExp(item.value, 'g')
- _value = _value.replace(reg, ' ' + item.key + ' ')
- })
-
- _value = _value.replace(/\s\n\s/ig, '\n')
- _value = _value.replace(/(^\s+|\s+$)/ig, '')
- }
- } catch {
- console.warn('UnFormat Failure')
- _value = ''
- }
-
- return _value
}
/**
@@ -236,7 +201,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) => {
@@ -695,7 +660,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
@@ -1051,7 +1016,7 @@
* @return {String} type 鎵ц绫诲瀷
* @return {String} table 琛ㄥ悕
*/
- static getSysDefaultSql (btn, setting, formdata, param, data, columns, tab) {
+ static getSysDefaultSql (btn, setting, formdata, param, data, columns, tab, retmsg) {
let primaryId = param.ID
let BID = param.BID
let verify = btn.verify || {}
@@ -1105,7 +1070,7 @@
// 鑾峰彇瀛楁閿�煎
formdata && formdata.forEach(form => {
- if (form.type === 'text') { // 鐗规畩瀛楁鏇挎崲
+ if (form.type === 'text' && form.value) { // 鐗规畩瀛楁鏇挎崲
form.value = form.value.replace(/^(\s*)@appkey@(\s*)$/ig, appkey)
form.value = form.value.replace(/^(\s*)@SessionUid@(\s*)$/ig, sessionUid)
form.value = form.value.replace(/^(\s*)@bid@(\s*)$/ig, BID)
@@ -1685,8 +1650,14 @@
_sql += _backCustomScript
}
- _sql += `
- aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+ if (retmsg) {
+ _sql += `
+ aaa: if @ErrorCode!=''
+ insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@`
+ } else {
+ _sql += `
+ aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
+ }
if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
_sql = _sql.replace(/\n\s{8}/ig, '\n')
--
Gitblit v1.8.0