From 465be8b618c1fb139d56ed779ff6f4dbc8d89b89 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 八月 2023 15:47:14 +0800
Subject: [PATCH] 2023-08-04
---
src/api/index.js | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 78eaa0d..b8c6aba 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -463,10 +463,10 @@
*/
getCloudConfig (param) {
param.lang = param.lang || sessionStorage.getItem('lang') || ''
- param.appkey = window.GLOB.appkey || ''
+ param.appkey = param.appkey || window.GLOB.appkey || ''
param.SessionUid = localStorage.getItem('SessionUid') || ''
- param.userid = sessionStorage.getItem('CloudUserID') || ''
- param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
+ param.userid = param.userid || sessionStorage.getItem('CloudUserID') || ''
+ param.LoginUID = param.LoginUID || sessionStorage.getItem('CloudLoginUID') || ''
param = this.encryptParam(param)
@@ -517,7 +517,7 @@
param.appkey = param.appkey || window.GLOB.appkey
let url = '/webapi/dostars'
- if (sessionStorage.getItem('isEditState') === 'true' && options.cloudServiceApi) { // 缂栬緫鐘舵�侊紝涓斿瓨鍦ㄤ簯绔湴鍧�
+ if (window.GLOB.mkHS && options.cloudServiceApi) { // HS涓嬶紝涓斿瓨鍦ㄤ簯绔湴鍧�
url = options.cloudServiceApi
param.userid = sessionStorage.getItem('CloudUserID') || ''
param.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
@@ -549,7 +549,7 @@
param.appkey = param.appkey || window.GLOB.appkey || ''
let url = '/webapi/dostars'
- if (sessionStorage.getItem('isEditState') === 'true') { // 缂栬緫鐘舵�侊紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
+ if (window.GLOB.mkHS) { // HS涓嬶紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠
if (options.cloudServiceApi) { // 瀛樺湪浜戠鍦板潃鏃讹紝浣跨敤浜戠绯荤粺鍙傛暟
url = options.cloudServiceApi
param.userid = sessionStorage.getItem('CloudUserID') || ''
@@ -838,14 +838,9 @@
return new Promise(resolve => this.visitOuterSystem(param, resolve))
}
- if (['sPC_Get_TableData', 'sPC_Get_TableData_debug', 'sPC_TableData_InUpDe', 'sPC_TableData_InUpDe_debug', 'sPC_Get_structured_data'].includes(param.func)) {
- if (window.GLOB.mkHS) {
- param.username = sessionStorage.getItem('CloudUserName') || ''
- param.fullname = sessionStorage.getItem('CloudFullName') || ''
- } else {
- param.username = sessionStorage.getItem('User_Name') || ''
- param.fullname = sessionStorage.getItem('Full_Name') || ''
- }
+ if (['sPC_TableData_InUpDe', 'sPC_TableData_InUpDe_debug'].includes(param.func)) {
+ param.username = sessionStorage.getItem('User_Name') || ''
+ param.fullname = sessionStorage.getItem('Full_Name') || ''
}
let login = false
--
Gitblit v1.8.0