From 51a60b5cb00fdeaf9e42c29341242460bf2154e8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 18 九月 2020 09:37:22 +0800
Subject: [PATCH] 2020-09-18
---
src/utils/utils-datamanage.js | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index d20a826..3aac834 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -6,7 +6,6 @@
/**
* @description 鏁版嵁婧愬悕绉帮紝鐢ㄤ簬缁熶竴鏌ヨ
* @param {Object} setting 鏁版嵁婧愯缃�
- * @param {String} customScript 鑷畾涔夎剼鏈�
* @param {String} arrFields 鏌ヨ瀛楁
* @param {Array} search 鎼滅储鏉′欢
* @param {String} orderBy 鎺掑簭鏂瑰紡
@@ -17,11 +16,11 @@
* @param {Boolean} dataManager 鏁版嵁鏉冮檺
* @return {Object} param
*/
- static getQueryDataParams (setting, customScript, arrFields, search = [], orderBy = '', pageIndex = 1, pageSize = 10, BID, menuType, dataManager) {
+ static getQueryDataParams (setting, arrFields, search = [], orderBy = '', pageIndex = 1, pageSize = 10, BID, menuType, dataManager) {
let param = null
if (setting.interType === 'system' || (setting.interType === 'inner' && !setting.innerFunc)) {
- param = this.getDefaultQueryParam(setting, customScript, arrFields, search, orderBy, pageIndex, pageSize, menuType)
+ param = this.getDefaultQueryParam(setting, arrFields, search, orderBy, pageIndex, pageSize, menuType)
} else {
param = this.getCustomQueryParam(setting, search, orderBy, pageIndex, pageSize, menuType)
}
@@ -80,7 +79,7 @@
/**
* @description 鑾峰彇绯荤粺瀛樺偍杩囩▼ sPC_Get_TableData 鐨勫弬鏁�
*/
- static getDefaultQueryParam (setting, customScript, arrFields, search, orderBy, pageIndex, pageSize, menuType) {
+ static getDefaultQueryParam (setting, arrFields, search, orderBy, pageIndex, pageSize, menuType) {
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
@@ -89,7 +88,13 @@
}
let _dataresource = setting.dataresource
- let _customScript = customScript
+ let _customScript = ''
+
+ if (setting.customScript) {
+ _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000) select @ErrorCode='',@retmsg =''
+ ${setting.customScript}
+ `
+ }
let regoptions = null
if (setting.queryType === 'statistics' || _customScript) {
@@ -168,12 +173,12 @@
param.custom_script = Utils.formatOptions(_customScript)
param.LText = Utils.formatOptions(LText)
- param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+ param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
param.DateCount = Utils.formatOptions(DateCount)
if (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