From 8137ac074ce6370e4b46295e7acf9c7870ef82d2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 17 二月 2023 22:19:23 +0800
Subject: [PATCH] 2023-02-17
---
src/utils/utils-datamanage.js | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index eaff3d9..59bca43 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -64,9 +64,17 @@
param.rduri = setting.interface
}
} else {
- if (setting.sysInterface === 'true' && window.GLOB.mainSystemApi) {
- param.rduri = window.GLOB.mainSystemApi
- } else if (setting.sysInterface !== 'true') {
+ if (setting.sysInterface === 'true') {
+ if (window.GLOB.mainSystemApi) {
+ param.rduri = window.GLOB.mainSystemApi
+ }
+ } else if (setting.sysInterface === 'external') {
+ if (window.GLOB.systemType === 'production') {
+ param.$token = setting.exProInterface || ''
+ } else {
+ param.$token = setting.exInterface || ''
+ }
+ } else {
if (window.GLOB.systemType === 'production' && setting.proInterface) {
param.rduri = setting.proInterface
} else {
@@ -137,8 +145,8 @@
_customScript = _customScript.replace(/\$sum@/ig, '/*')
_customScript = _customScript.replace(/@sum\$/ig, '*/')
- _dataresource = _dataresource.replace(/@ID@/ig, `''`)
- _customScript = _customScript.replace(/@ID@/ig, `''`)
+ // _dataresource = _dataresource.replace(/@ID@/ig, `''`)
+ // _customScript = _customScript.replace(/@ID@/ig, `''`)
_dataresource = _dataresource.replace(/@BID@/ig, `'${BID || ''}'`)
_customScript = _customScript.replace(/@BID@/ig, `'${BID || ''}'`)
_dataresource = _dataresource.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
@@ -268,6 +276,13 @@
// param.sub_name = 'sub_data'
// param.sub_field = 'BID,friend_text,icon,Initials'
+ if (setting.sub_field) {
+ param.sub_name = setting.subdata
+ param.tabid = setting.primaryKey || ''
+ param.parid = setting.subBID || ''
+ param.sub_field = setting.sub_field
+ }
+
// exec_type: 'y' 瑙ｇ爜瀛楁锛歀Text銆丩Text1銆丩Text2銆乧ustom_script銆丏ateCount
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
@@ -340,8 +355,8 @@
_customScript = _customScript.replace(/\$select@/ig, '/*')
_customScript = _customScript.replace(/@select\$/ig, '*/')
- _dataresource = _dataresource.replace(/@ID@/ig, `''`)
- _customScript = _customScript.replace(/@ID@/ig, `''`)
+ // _dataresource = _dataresource.replace(/@ID@/ig, `''`)
+ // _customScript = _customScript.replace(/@ID@/ig, `''`)
_dataresource = _dataresource.replace(/@BID@/ig, `'${BID || ''}'`)
_customScript = _customScript.replace(/@BID@/ig, `'${BID || ''}'`)
_dataresource = _dataresource.replace(/@LoginUID@/ig, `'${sessionStorage.getItem('LoginUID') || ''}'`)
@@ -725,7 +740,7 @@
* @description 鐢熸垚鍗曚釜缁勪欢sPC_Get_structured_data璇锋眰鍙傛暟
*/
export function getStructDefaultParam (component, searchlist, first) {
- const { columns, setting, dataName, format } = component
+ const { columns, setting, dataName, format, uuid } = component
let arr_field = columns.map(col => col.field)
let _dataresource = setting.dataresource
@@ -791,6 +806,7 @@
}
return {
+ uuid: uuid,
name: dataName,
$name: setting.$name,
columns: columns,
--
Gitblit v1.8.0