From b987be8dd8b6bc1fa01810daa1e1a60e58a3c921 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 九月 2020 17:24:36 +0800
Subject: [PATCH] 2020-09-04
---
src/tabviews/calendar/index.jsx | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/calendar/index.jsx b/src/tabviews/calendar/index.jsx
index bf539b6..320c737 100644
--- a/src/tabviews/calendar/index.jsx
+++ b/src/tabviews/calendar/index.jsx
@@ -150,6 +150,18 @@
return item
})
+ // 鏁寸悊鏁版嵁婧愯嚜瀹氫箟鑴氭湰
+ let _customScript = ''
+ config.scripts && config.scripts.forEach(script => {
+ if (script.status !== 'false') {
+ _customScript += `
+ ${script.sql}
+ `
+ }
+ })
+
+ config.setting.customScript = _customScript
+
this.setState({
BID: param && param.BID ? param.BID : '',
loadingview: false,
@@ -286,7 +298,7 @@
let _search = Utils.joinMainSearchkey(search)
_search = _search ? 'where ' + _search : ''
-
+
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
@@ -352,6 +364,10 @@
param.custom_script = param.custom_script.replace(item.reg, item.value)
})
+ param.custom_script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000) select @ErrorCode='',@retmsg =''
+ ${param.custom_script}
+ `
+
if (LText) {
LText += `
aaa:
@@ -380,7 +396,7 @@
param.DateCount = ''
if (this.props.menuType === 'HS') { // 浜戠鏁版嵁楠岃瘉
- param.open_key = Utils.encrypt(param.secretkey, param.timestamp, true)
+ param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
return param
--
Gitblit v1.8.0