From f1a4a2e83a5a3a3f8636c0d85a3a02471c5b07e7 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 05 三月 2025 15:39:52 +0800 Subject: [PATCH] Merge branch 'positec' into dms --- src/index.js | 50 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 43 insertions(+), 7 deletions(-) diff --git a/src/index.js b/src/index.js index c9f7720..c9d0634 100644 --- a/src/index.js +++ b/src/index.js @@ -12,15 +12,37 @@ import '@/assets/css/viewstyle.scss' if (!localStorage.getItem('SessionUid')) { - localStorage.setItem('SessionUid', (() => { + let sid = (() => { let uuid = [] let _options = '0123456789abcdefghigklmnopqrstuv' for (let i = 0; i < 32; i++) { uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1)) } return uuid.join('') - })()) + })() + + if (/_mk_sid=[0-9a-z]{32}/.test(document.cookie)) { + sid = document.cookie.match(/_mk_sid=[0-9a-z]{32}/)[0].split('=')[1] + } else { + document.cookie = '_mk_sid=' + sid + } + + localStorage.setItem('SessionUid', sid) + } + +sessionStorage.setItem('UserID', localStorage.getItem('UserID') || '') +sessionStorage.setItem('LoginUID', localStorage.getItem('LoginUID') || '') +sessionStorage.setItem('User_Name', localStorage.getItem('User_Name') || '') +sessionStorage.setItem('Full_Name', localStorage.getItem('Full_Name') || '') +sessionStorage.setItem('avatar', localStorage.getItem('avatar') || '') +sessionStorage.setItem('dataM', localStorage.getItem('dataM') || '') +sessionStorage.setItem('localDataM', localStorage.getItem('localDataM') || '') +sessionStorage.setItem('debug', localStorage.getItem('debug') || '') +sessionStorage.setItem('role_id', localStorage.getItem('role_id') || '') +sessionStorage.setItem('departmentcode', localStorage.getItem('departmentcode') || '') +sessionStorage.setItem('organization', localStorage.getItem('organization') || '') +sessionStorage.setItem('mk_user_type', localStorage.getItem('mk_user_type') || '') fetch('../options.json') .then(response => response.json()) @@ -52,6 +74,7 @@ GLOB.WXminiAppID = config.WXminiAppID || '' GLOB.WXMerchID = config.WXMerchID || '' GLOB.WXNotice = config.WXNotice + '' === 'true' + GLOB.SysNotice = config.SysNotice + '' === 'true' GLOB.execType = config.execType === 'x' ? 'x' : '' GLOB.mkHS = false GLOB.debugger = false @@ -114,6 +137,10 @@ GLOB.mainSystemApi = 'https://cloud.positecgroup.com/webapi/dostars' + if (config.style_appkey) { + GLOB.style_appkey = config.style_appkey + } + // GLOB.mainSystemApi = 'https://sso.mk9h.cn/cloud/webapi/dostars' // if (!/^https/.test(window.location.protocol)) { // https杞崲 // GLOB.mainSystemApi = 'http://sso.mk9h.cn/cloud/webapi/dostars' @@ -156,6 +183,10 @@ GLOB.mainSystemApi = systemApi } + + if (config.errorLog === 'true' && /#\/(login|main|billprint|docprint|tab|iframe|view|ssologin)/.test(window.location.href)) { + GLOB.errorLog = true + } } if (/#\/hs$/.test(window.location.href)) { // hs涓嬩笉鎵撳嵃鑴氭湰 @@ -181,6 +212,7 @@ GLOB.host = window.location.host + (_service ? '_' + _service : '') GLOB.baseurl = document.location.origin + '/' + GLOB.service GLOB.linkurl = GLOB.baseurl + 'index.html' + GLOB.location = document.location.origin } else { GLOB.location = config.host GLOB.service = config.service @@ -351,11 +383,15 @@ } if (config.systemRun === 'backend') { - GLOB.debugger = false - Object.defineProperty(window, 'backend', { - writable: false, - value: true - }) + if (sessionStorage.getItem('systemRun') === 'front') { + GLOB.debugger = true + } else { + GLOB.debugger = false + Object.defineProperty(window, 'backend', { + writable: false, + value: true + }) + } } if (config.debugger === 'forbid') { sessionStorage.removeItem('breakpoint') -- Gitblit v1.8.0