From 4adb8b8868aeed1f5f3b89ae269a7724c6b451ad Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 11 八月 2023 16:58:31 +0800
Subject: [PATCH] 2023-08-11
---
src/index.js | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/index.js b/src/index.js
index d9eb39e..b798947 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,21 +8,7 @@
import options, { styles } from '@/store/options.js'
import '@/assets/css/main.scss'
import '@/assets/css/action.scss'
-// import '@/assets/css/minkeicon.css'
import '@/assets/css/viewstyle.scss'
-
-if (window.location.href.indexOf('#/design') > -1) { // 缂栬緫椤甸潰鍒锋柊鏃讹紝璺宠浆鑷充富椤�
- window.location.replace(window.location.href.replace(/design/ig, 'main'))
-}
-
-options.sysType = window.atob(options.sysType.replace('$mk', ''))
-options.caId = window.atob(options.caId.replace('$mk', ''))
-options.cakey = window.atob(options.cakey.replace('$mk', ''))
-options.cdomain = window.atob(options.cdomain.replace('$mk', ''))
-
-if (options.cdomain && options.sysType !== 'cloud') {
- options.cloudServiceApi = options.cdomain + '/webapi/dostars'
-}
if (!localStorage.getItem('SessionUid')) {
localStorage.setItem('SessionUid', (() => {
@@ -43,12 +29,6 @@
document.getElementById('root')
)
}
-
-sessionStorage.removeItem('isEditState')
-sessionStorage.setItem('role_id', sessionStorage.getItem('localRole_id') || '')
-sessionStorage.setItem('dataM', sessionStorage.getItem('localDataM') || '')
-
-// 鏂扮郴缁熸枃浠剁疆浜巃dmin涓� ../options.json , { cache: 'no-cache'}
fetch('../options.json')
.then(response => response.json())
@@ -76,8 +56,15 @@
GLOB.nginx = config.nginx + '' === 'true'
GLOB.WXAppID = config.WXAppID || ''
GLOB.WXminiAppID = config.WXminiAppID || ''
+ GLOB.WXNotice = config.WXNotice + '' === 'true'
GLOB.accessToken = {}
GLOB.mkHS = false
+ GLOB.navBar = 'shutter' // 榛樿涓虹櫨鍙剁獥
+
+ GLOB.sysType = options.sysType
+ if (GLOB.sysType !== 'cloud') {
+ GLOB.cloudServiceApi = options.cdomain + '/webapi/dostars'
+ }
if (sessionStorage.getItem('externalDatabase')) {
GLOB.externalDatabase = `[${sessionStorage.getItem('externalDatabase')}]..`
@@ -88,7 +75,7 @@
}
// 鍙湁涓氬姟绯荤粺鎵嶅彲浠ヨ缃负姝ｅ紡绯荤粺
- if (options.sysType === 'local' && (config.systemType === 'official' || config.systemType === 'production')) {
+ if (GLOB.sysType === 'local' && (config.systemType === 'official' || config.systemType === 'production')) {
GLOB.systemType = 'production'
if (config.probation && /^20\d{2}-\d{2}-\d{2}$/.test(config.probation) && new Date(config.probation).getTime() > new Date().getTime()) {
GLOB.probation = true
@@ -104,7 +91,7 @@
document.getElementById('root').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">姝ｅ紡绯荤粺涓嶅彲浣跨敤 http://cloud.mk9h.cn 鍋氫负鍗曠偣鍦板潃锛岃鑱旂郴绠＄悊鍛橈紒</div>'
return
}
- } else if (options.sysType === 'local') {
+ } else if (GLOB.sysType === 'local') {
GLOB.probation = true
GLOB.systemType = ''
@@ -123,24 +110,26 @@
GLOB.mainSystemApi = ''
}
- GLOB.debugger = options.sysType === 'local' && GLOB.systemType !== 'production'
+ GLOB.debugger = GLOB.sysType === 'local' && GLOB.systemType !== 'production'
if (/#\/hs$/.test(window.location.href)) { // hs涓嬩笉鎵撳嵃鑴氭湰
GLOB.debugger = false
}
- if (options.sysType !== 'cloud') {
+ if (GLOB.sysType !== 'cloud') {
if (config.appkey === options.cakey) {
document.getElementById('root').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">涓嶅彲浣跨敤浜戠appkey锛岃鑱旂郴绠＄悊鍛橈紒</div>'
return
}
}
- if (options.sysType === 'cloud') { // cloud涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�,浜戠appkey涓虹郴缁熻缃�
+ if (GLOB.sysType === 'cloud') { // cloud涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�,浜戠appkey涓虹郴缁熻缃�
GLOB.appkey = options.cakey
- } else if (options.sysType === 'SSO') { // sso涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�
+ GLOB.appId = options.caId
+ GLOB.WXNotice = false
+ } else if (GLOB.sysType === 'SSO') { // sso涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�
GLOB.appkey = config.appkey
- } else if (options.sysType === 'local') { // 涓氬姟绯荤粺
+ } else if (GLOB.sysType === 'local') { // 涓氬姟绯荤粺
GLOB.appkey = config.appkey
if (GLOB.systemType === 'production') {
let systemApi = config.mainSystemApi
@@ -149,16 +138,17 @@
} 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
}
}
let _href = window.location.href.split('#')[0]
-
let _systemMsg = localStorage.getItem(_href + 'system')
-
- GLOB.navBar = 'shutter' // 榛樿涓虹櫨鍙剁獥
let className = 'mk-blue-black'
if (_systemMsg) {
@@ -222,11 +212,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')
@@ -289,6 +279,14 @@
writable: false,
value: GLOB.linkurl
})
+ Object.defineProperty(GLOB, 'sysType', {
+ writable: false,
+ value: GLOB.sysType
+ })
+ Object.defineProperty(GLOB, 'cloudServiceApi', {
+ writable: false,
+ value: GLOB.cloudServiceApi || ''
+ })
Object.defineProperty(window, 'GLOB', {
writable: false,
value: GLOB
@@ -298,6 +296,8 @@
window.GLOB.CacheVoucher = new Map() // 缂撳瓨鍑瘉淇℃伅
window.GLOB.UserCacheMap = new Map() // 缂撳瓨鐢ㄦ埛鑷畾涔夎缃�
window.GLOB.CacheData = new Map() // 瀛樺偍閫変腑鏁版嵁
+ window.GLOB.SearchBox = new Map() // 瀛樺偍鎼滅储鏉′欢
+ window.GLOB.SyncData = new Map() // 瀛樺偍鍚屾鏌ヨ鏁版嵁
render(Route)
})
--
Gitblit v1.8.0