From 0519dcda8b6fb2914987f8d4d58e1d14bcf98dc3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 30 六月 2023 14:33:06 +0800
Subject: [PATCH] 2023-06-30
---
src/index.js | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/index.js b/src/index.js
index 6f54818..04c69e3 100644
--- a/src/index.js
+++ b/src/index.js
@@ -45,8 +45,6 @@
}
sessionStorage.removeItem('isEditState')
-sessionStorage.setItem('role_id', sessionStorage.getItem('localRole_id') || '')
-sessionStorage.setItem('dataM', sessionStorage.getItem('localDataM') || '')
// 鏂扮郴缁熸枃浠剁疆浜巃dmin涓� ../options.json , { cache: 'no-cache'}
@@ -76,6 +74,7 @@
GLOB.nginx = config.nginx + '' === 'true'
GLOB.WXAppID = config.WXAppID || ''
GLOB.WXminiAppID = config.WXminiAppID || ''
+ GLOB.WXNotice = config.WXNotice + '' === 'true'
GLOB.accessToken = {}
GLOB.mkHS = false
@@ -138,6 +137,7 @@
if (options.sysType === 'cloud') { // cloud涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�,浜戠appkey涓虹郴缁熻缃�
GLOB.appkey = options.cakey
+ GLOB.WXNotice = false
} else if (options.sysType === 'SSO') { // sso涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�
GLOB.appkey = config.appkey
} else if (options.sysType === 'local') { // 涓氬姟绯荤粺
@@ -148,6 +148,10 @@
systemApi = systemApi.replace(/index.html.*/ig, 'webapi/dostars')
} else if (!/webapi\/dostars$/ig.test(systemApi)) {
systemApi = systemApi.replace(/\/?$/, '/webapi/dostars')
+ }
+
+ if (/^https/.test(window.location.protocol) && /^http:/.test(systemApi) && !GLOB.transfer) {
+ systemApi = systemApi.replace(/^http:/, 'https:')
}
GLOB.mainSystemApi = systemApi
@@ -195,6 +199,11 @@
}
}
+ // 涓嶄娇鐢ㄧ櫨鍙剁獥鎵撳紑鑿滃崟鏃讹紝鍘绘帀鍚堝苟鏍囪
+ if (GLOB.navBar !== 'shutter') {
+ localStorage.removeItem('collapse')
+ }
+
document.body.className = className
if (/^https/.test(window.location.protocol)) { // https杞崲
@@ -217,11 +226,11 @@
GLOB.baseurl = document.location.origin + '/' + GLOB.service
GLOB.linkurl = GLOB.baseurl + 'index.html'
} else {
- GLOB.linkurl = ''
GLOB.location = config.host
GLOB.service = config.service
GLOB.host = config.host.replace(/http(s)?:\/\//ig, '') + (config.service ? '_' + config.service.replace(/\//ig, '') : '')
GLOB.baseurl = GLOB.location + '/' + GLOB.service
+ GLOB.linkurl = GLOB.baseurl + 'index.html'
}
let mark = sessionStorage.getItem('system_mark')
@@ -290,6 +299,7 @@
})
window.GLOB.CacheMap = new Map() // 缂撳瓨閰嶇疆淇℃伅
+ window.GLOB.CacheVoucher = new Map() // 缂撳瓨鍑瘉淇℃伅
window.GLOB.UserCacheMap = new Map() // 缂撳瓨鐢ㄦ埛鑷畾涔夎缃�
window.GLOB.CacheData = new Map() // 瀛樺偍閫変腑鏁版嵁
--
Gitblit v1.8.0