From d3e3e32f62955e7ac7983bde70924daaacab5dc1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 九月 2020 13:33:37 +0800
Subject: [PATCH] 2020-09-08
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 63686e9..4429f0e 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -526,7 +526,7 @@
func: 'sPC_Get_TableData',
obj_name: 'data',
arr_field: arr_field,
- custom_script: setting.customScript || '',
+ custom_script: setting.customScript,
default_sql: setting.default || 'true'
}
@@ -540,20 +540,6 @@
}
let _dataresource = setting.dataresource
-
- if (/\s/.test(_dataresource)) {
- _dataresource = '(' + _dataresource + ') tb'
- }
-
- if (this.props.dataManager) { // 鏁版嵁鏉冮檺
- _dataresource = _dataresource.replace(/\$@/ig, '/*')
- _dataresource = _dataresource.replace(/@\$/ig, '*/')
- param.custom_script = param.custom_script.replace(/\$@/ig, '/*')
- param.custom_script = param.custom_script.replace(/@\$/ig, '*/')
- } else {
- _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
- param.custom_script = param.custom_script.replace(/@\$|\$@/ig, '')
- }
let regoptions = null
if (setting.queryType === 'statistics' || param.custom_script) {
@@ -611,10 +597,15 @@
insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
`
}
-
- param.custom_script = Utils.formatOptions(param.custom_script)
}
+ // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
+ if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
+ param.custom_script && console.log(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${param.custom_script}`)
+ LText && console.log(LText)
+ }
+
+ param.custom_script = Utils.formatOptions(param.custom_script)
param.LText = Utils.formatOptions(LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
--
Gitblit v1.8.0