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 | 184 ++++++++++++++++++++++++++++++++-------------
1 files changed, 131 insertions(+), 53 deletions(-)
diff --git a/src/index.js b/src/index.js
index 6645ba6..c9d0634 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,5 +1,8 @@
import React from 'react'
import ReactDOM from 'react-dom'
+import { ConfigProvider } from 'antd'
+import zhCN from 'antd/es/locale/zh_CN'
+
import Route from './router'
import md5 from 'md5'
import * as serviceWorker from './serviceWorker'
@@ -9,22 +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)
+
}
-const render = Component => {
- ReactDOM.render(
- <Component/>,
- document.getElementById('root')
- )
-}
+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())
@@ -41,6 +59,8 @@
}
}
+ config.keepPwd = config.keepPwd || config.keepPassword
+
let GLOB = {}
GLOB.appId = config.appId || ''
GLOB.lineColor = config.lineColor || ''
@@ -48,13 +68,14 @@
GLOB.probation = false
GLOB.watermark = config.watermark + '' !== 'false'
GLOB.transfer = config.transfer + '' === 'true'
- GLOB.keepKey = config.keepPassword + '' !== 'false'
- GLOB.nginx = config.nginx + '' === 'true'
+ GLOB.keepKey = config.keepPwd + '' !== 'false'
+ GLOB.vispwd = config.keepPwd + '' !== 'invisible'
GLOB.WXAppID = config.WXAppID || ''
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.accessToken = {}
GLOB.mkHS = false
GLOB.debugger = false
GLOB.dataFormat = false
@@ -62,6 +83,13 @@
GLOB.navBar = 'shutter' // 榛樿涓虹櫨鍙剁獥
GLOB.style = 'bg_black_style_blue'
GLOB.defLang = ''
+
+ if (config.WXApps) {
+ config.WXApps = config.WXApps.filter(app => app.appId && app.appName && ['public', 'miniProgram', 'merchant'].includes(app.appType))
+ if (config.WXApps.length) {
+ GLOB.WXApps = config.WXApps
+ }
+ }
if (langs[config.defaultLang]) {
GLOB.defLang = config.defaultLang
@@ -103,16 +131,20 @@
GLOB.systemType = 'production'
} else if (GLOB.sysType === 'local') {
GLOB.probation = true
- GLOB.debugger = true
+ // GLOB.debugger = true
GLOB.systemType = ''
GLOB.upStatus = config.updateStatus + '' !== 'false'
- // GLOB.mainSystemApi = 'https://cloud.positecgroup.com/webapi/dostars'
+ GLOB.mainSystemApi = 'https://cloud.positecgroup.com/webapi/dostars'
- 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'
+ 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'
+ // }
if (GLOB.watermark) {
GLOB.dataFormat = true
@@ -151,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涓嬩笉鎵撳嵃鑴氭湰
@@ -163,10 +199,47 @@
if (GLOB.cloudServiceApi) {
GLOB.mainSystemApi = GLOB.cloudServiceApi
}
+
+ if (config.systemRun === 'backend') {
+ config.systemRun = '' // hs 涓嶄娇鐢ㄥ悗绔浛鎹�
+ GLOB.backend = true
+ }
}
- let _href = window.location.href.split('#')[0]
- let _systemMsg = localStorage.getItem(_href + 'system')
+ if (process.env.NODE_ENV === 'production') { // 鐢ㄤ簬鏍￠獙鏄惁瀛樺湪寮�鍙戞潈闄�
+ let _service = window.location.href.replace(/\/admin(.*)/ig, '').replace(new RegExp(document.location.origin + '/?', 'ig'), '')
+ GLOB.service = _service ? _service + '/' : ''
+ 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
+ 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'
+ GLOB.dataFormat = false
+ }
+
+ let mark = sessionStorage.getItem('system_mark')
+ let _mark = `sys_${GLOB.service.replace('/', '') || 'service'}`
+ if (mark && mark !== _mark) {
+ sessionStorage.clear()
+ }
+ sessionStorage.setItem('system_mark', _mark)
+
+ if (config.mainkey && GLOB.sysType !== 'cloud' && config.mainkey !== options.cakey) {
+ GLOB.localkey = GLOB.appkey
+ GLOB.appkey = config.mainkey
+ }
+
+ let lang = localStorage.getItem(window.location.href.split('#')[0] + 'lang') || GLOB.defLang || 'zh-CN'
+ sessionStorage.setItem('lang', lang)
+
+ GLOB.sysSign = GLOB.service + 'admin/' + lang + '/'
+
+ let _systemMsg = localStorage.getItem(GLOB.sysSign + 'system')
let className = 'mk-blue-black'
if (_systemMsg) {
@@ -216,7 +289,7 @@
document.body.className = className
- if (/^https/.test(window.location.protocol)) { // https杞崲
+ if (/^https/.test(window.location.protocol) || (process.env.NODE_ENV !== 'production' && /^https/.test(config.host))) { // https杞崲
let meta = document.createElement('meta')
meta.content = 'upgrade-insecure-requests'
meta.httpEquiv = 'Content-Security-Policy'
@@ -229,38 +302,12 @@
GLOB.filter = true
}
- if (process.env.NODE_ENV === 'production') { // 鐢ㄤ簬鏍￠獙鏄惁瀛樺湪寮�鍙戞潈闄�
- let _service = window.location.href.replace(/\/admin(.*)/ig, '').replace(new RegExp(document.location.origin + '/?', 'ig'), '')
- GLOB.service = _service ? _service + '/' : ''
- GLOB.host = window.location.host + (_service ? '_' + _service : '')
- GLOB.baseurl = document.location.origin + '/' + GLOB.service
- GLOB.linkurl = GLOB.baseurl + 'index.html'
- } else {
- 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'
- GLOB.dataFormat = false
-
- let mark = sessionStorage.getItem('system_mark')
- let _mark = `sys_${GLOB.service.replace('/', '') || 'service'}`
- if (mark && mark !== _mark) {
- sessionStorage.clear()
- }
- sessionStorage.setItem('system_mark', _mark)
+ if (lang !== 'zh-CN') {
+ GLOB.WXNotice = false
}
- if (config.mainkey && GLOB.sysType !== 'cloud' && config.mainkey !== options.cakey) {
- GLOB.localkey = GLOB.appkey
- GLOB.appkey = config.mainkey
- }
-
- let lang = localStorage.getItem(_href + 'lang') || GLOB.defLang || 'zh-CN'
- sessionStorage.setItem('lang', lang)
-
- if (localStorage.getItem(_href + 'files') === md5(_href + 'files')) {
- let d = localStorage.getItem(_href + 'filesDate')
+ if (localStorage.getItem(GLOB.sysSign + 'files') === md5(GLOB.sysSign + 'files')) {
+ let d = localStorage.getItem(GLOB.sysSign + 'filesDate')
GLOB.storeFiles = true
GLOB.storeDate = Math.ceil((new Date(d).getTime() - new Date().getTime()) / 86400000)
@@ -286,8 +333,8 @@
GLOB.dict = {}
- if (localStorage.getItem(_href + 'js_trans')) {
- let js_trans = JSON.parse(localStorage.getItem(_href + 'js_trans'))
+ if (localStorage.getItem(GLOB.sysSign + 'js_trans')) {
+ let js_trans = JSON.parse(localStorage.getItem(GLOB.sysSign + 'js_trans'))
js_trans.forEach(item => {
if (lang !== item.lang) return
@@ -335,7 +382,26 @@
GLOB.memberLevel = 0
}
- if (GLOB.sysType === 'cloud') {
+ if (config.systemRun === 'backend') {
+ 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')
+ GLOB.debugger = false
+
+ Object.defineProperty(GLOB, 'debugger', {
+ writable: false,
+ value: GLOB.debugger
+ })
+ } else if (GLOB.sysType === 'cloud') {
Object.defineProperty(GLOB, 'debugger', {
writable: false,
value: GLOB.debugger
@@ -364,7 +430,19 @@
window.GLOB.SyncData = new Map() // 瀛樺偍鍚屾鏌ヨ鏁版嵁
window.GLOB.mkThdMenus = new Map() // 涓夌骇鑿滃崟
- render(Route)
+ if (lang === 'zh-CN' || !/#\/(login|main|billprint|docprint|tab|iframe|view|ssologin)/.test(window.location.href)) { // 寮�鍙戜娇鐢ㄤ腑鏂�
+ ReactDOM.render(
+ <ConfigProvider locale={zhCN}>
+ <Route/>
+ </ConfigProvider>,
+ document.getElementById('root')
+ )
+ } else {
+ ReactDOM.render(
+ <Route/>,
+ document.getElementById('root')
+ )
+ }
})
serviceWorker.unregister()
--
Gitblit v1.8.0