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 | 53 ++++++++++-------------------------------------------
1 files changed, 10 insertions(+), 43 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index f97d965..3b1788f 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -183,45 +183,6 @@
}
/**
- * @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
- }
-
- /**
* @description sPC_TableData_InUpDe sql鍔犲瘑
* @return {String} value
*/
@@ -1055,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 || {}
@@ -1109,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)
@@ -1689,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