From d33d00cafeea2c4f980ea3af268d9260269edcc1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 25 一月 2021 18:24:20 +0800
Subject: [PATCH] 2021-01-25
---
src/tabviews/zshare/actionList/normalbutton/index.jsx | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index c9e83ba..e54527b 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -724,8 +724,19 @@
Api.directRequest(url, btn.method, param).then(res => {
if (typeof(res) !== 'object' || Array.isArray(res)) {
- this.execError({ErrCode: 'E', message: '鏈煡鐨勮繑鍥炵粨鏋滐紒'})
- _resolve()
+ let error = '鏈煡鐨勮繑鍥炵粨鏋滐紒'
+
+ if (typeof(res) === 'string') {
+ error = res.replace(/'/ig, '"')
+ }
+
+ let result = {
+ mk_api_key: mkey,
+ $ErrCode: 'E',
+ $ErrMesg: error
+ }
+
+ this.customCallbackRequest(params, result, _resolve)
} else {
res.mk_api_key = mkey
this.customCallbackRequest(params, res, _resolve)
@@ -743,6 +754,16 @@
const { btn } = this.props
let lines = []
let pre = btn.callbackType === 'script' ? '@' : ''
+
+ let errSql = ''
+ if (result.$ErrCode === 'E') {
+ errSql = `
+ set @ErrorCode='E'
+ set @retmsg='${result.$ErrMesg}'
+ `
+ delete result.$ErrCode
+ delete result.$ErrMesg
+ }
let getDefaultSql = (obj, tb, bid, level) => {
let keys = []
@@ -810,8 +831,11 @@
param.BID = this.props.BID
}
- let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
- let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
+ let _prevCustomScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000)
+ Select @ErrorCode='',@retmsg=''
+ ${errSql}
+ `
+ let _backCustomScript = ''
btn.verify.cbScripts.forEach(script => {
if (script.status === 'false') return
--
Gitblit v1.8.0