From ac1d52c46ff9019fcc93cf3d5e7ab17cf850824e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 八月 2023 16:05:24 +0800
Subject: [PATCH] 2023-08-10
---
src/api/index.js | 46 ++++++++++++++++------------------------------
1 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index c30b55b..6d70710 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -339,23 +339,14 @@
getLCacheConfig (menuid, minutes) {
return new Promise((resolve, reject) => {
- if (window.GLOB.IndexDB) {
- let limit = minutes ? moment().subtract(minutes, 'minutes').format('YYYY-MM-DD HH:mm:ss') : ''
- CacheUtils.getIndexDBCacheConfig(menuid, limit).then(res => {
- if (res && res.LongParam) {
- let _data = JSON.parse(res.LongParam)
- if (_data.length === 0) {
- resolve()
- } else {
- resolve(_data)
- }
- } else {
- resolve()
- }
- })
- } else {
- resolve()
- }
+ let limit = minutes ? moment().subtract(minutes, 'minutes').format('YYYY-MM-DD HH:mm:ss') : ''
+ CacheUtils.getIndexDBCacheConfig(menuid).then(res => {
+ if (res && res.LongParam) {
+ resolve({data: JSON.parse(res.LongParam), valid: !limit || res.CreateDate > limit})
+ } else {
+ resolve({data: null, valid: false})
+ }
+ })
})
}
@@ -463,10 +454,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 +508,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 +540,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 +829,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 (sessionStorage.getItem('isEditState') === 'true') {
- 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