From 131bc212f0cfe964c9a38bbe6178aca4f4a16677 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 17:50:30 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/utils/utils-datamanage.js | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index eef1007..5b82a9a 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -69,6 +69,12 @@
} else {
param.$token = setting.exInterface || ''
}
+ } else if (setting.sysInterface === 'custom') {
+ if (window.GLOB.systemType === 'production') {
+ param.rduri = setting.proInterface
+ } else {
+ param.rduri = setting.interface
+ }
} else {
if (window.GLOB.systemType === 'production' && setting.proInterface) {
param.rduri = setting.proInterface
@@ -278,9 +284,9 @@
param.menuname = setting.$name
}
- param.custom_script = Utils.formatOptions(_customScript)
- param.LText = Utils.formatOptions(LText)
- param.DateCount = Utils.formatOptions(DateCount)
+ param.custom_script = Utils.formatOptions(_customScript, param.exec_type)
+ param.LText = Utils.formatOptions(LText, param.exec_type)
+ param.DateCount = Utils.formatOptions(DateCount, param.exec_type)
if (setting.sub_field) {
param.sub_name = setting.subdata
@@ -301,10 +307,6 @@
param.s_debug_type = 'Y'
}
- if (window.GLOB.forcedUpdate) {
- param.s_version_up = 'true'
- }
-
if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
@@ -312,6 +314,8 @@
if (setting.tableName === 's_custom_script' && window.GLOB.mainSystemApi) {
param.rduri = window.GLOB.mainSystemApi
}
+ } else if (window.GLOB.forcedUpdate) {
+ param.s_version_up = 'true'
}
return param
@@ -516,7 +520,6 @@
/**
* @description 鐢熸垚sPC_Get_structured_data璇锋眰鍙傛暟
- * 1銆佹妸澶ф帴鍙PC_Get_structured_data鐨刲text鎷嗘垚涓変唤锛岀涓�娈碉細@LText1锛岀浜屾@LText锛岀涓夋@LText2
*/
export function getStructuredParams (params, config, BID) {
let LText_field = []
@@ -564,8 +567,6 @@
let param = {
func: 'sPC_Get_structured_data',
- LText: _LText.join(' union all '),
- LText_field: LText_field.join(' union all '),
BID: BID,
username: sessionStorage.getItem('User_Name') || '',
fullName: sessionStorage.getItem('Full_Name') || ''
@@ -575,12 +576,13 @@
param.menuname = config.MenuName
}
- let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
-
- param.LText1 = LText1
- param.LText = LText
- param.LText2 = LText2
- param.LText_field = Utils.formatOptions(param.LText_field)
+ param.exec_type = 'y'
+ param.LText = Utils.formatOptions(_LText.join(' union all '))
+ param.custom_script = Utils.formatOptions(LText_field.join(' union all '))
+ // param.LText1 = LText1
+ // param.LText = LText
+ // param.LText2 = LText2
+ // param.LText_field = Utils.formatOptions(param.LText_field)
if (config.cacheUseful === 'true') {
param.time_type = config.timeUnit
@@ -592,7 +594,7 @@
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt('', param.timestamp)
return param
}
\ No newline at end of file
--
Gitblit v1.8.0