From 32973f90869ff466401759c23681fc06fa65c71a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 六月 2025 23:06:50 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/index.js | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/index.js b/src/index.js
index be6ef97..a1b3e25 100644
--- a/src/index.js
+++ b/src/index.js
@@ -95,10 +95,10 @@
GLOB.externalDatabase = null
}
- if (config.probation && /^20\d{2}-\d{2}-\d{2}$/.test(config.probation) && new Date(config.probation).getTime() > new Date().getTime()) {
+ if (config.probation && /^[1-9]\d{3}-\d{2}-\d{2}$/.test(config.probation) && new Date(config.probation).getTime() > new Date().getTime()) {
GLOB.probation = true
}
- if (config.forcedUpdate && /^20\d{2}-\d{2}-\d{2}$/.test(config.forcedUpdate) && new Date(config.forcedUpdate).getTime() > new Date().getTime()) {
+ if (config.forcedUpdate && /^[1-9]\d{3}-\d{2}-\d{2}$/.test(config.forcedUpdate) && new Date(config.forcedUpdate).getTime() > new Date().getTime()) {
GLOB.forcedUpdate = true
}
@@ -221,7 +221,7 @@
GLOB.appkey = config.mainkey
}
- let lang = localStorage.getItem(window.location.href.split('#')[0] + 'lang') || GLOB.defLang || 'zh-CN'
+ let lang = sessionStorage.getItem('lang') || localStorage.getItem(window.location.href.split('#')[0] + 'lang') || GLOB.defLang || 'zh-CN'
sessionStorage.setItem('lang', lang)
GLOB.sysSign = GLOB.service + 'admin/' + lang + '/'
@@ -243,10 +243,14 @@
GLOB.mainlogo = _systemMsg.mainlogo
GLOB.doclogo = _systemMsg.doclogo
GLOB.webSite = _systemMsg.webSite
+ GLOB.prolType = _systemMsg.prolType || ''
+ GLOB.prolCont = _systemMsg.prolCont || ''
GLOB.style = _systemMsg.style || 'bg_black_style_blue'
GLOB.showline = _systemMsg.showline || ''
GLOB.navBar = _systemMsg.navBar || 'shutter'
GLOB.appVersion = _systemMsg.app_version || ''
+ GLOB.loginOtop = _systemMsg.loginOtop || ''
+ GLOB.loginOleft = _systemMsg.loginOleft || ''
sessionStorage.setItem('appname', _systemMsg.appname || '')
let levels = [30, 10, 20, 40, 50, 60, 70, 80, 90, 100]
@@ -285,7 +289,7 @@
document.title = GLOB.platTitle || ''
- if (config.filter === 'true' || (/^20\d{2}-\d{2}-\d{2}$/.test(config.filter) && new Date(config.filter).getTime() + 86400000 >= new Date().getTime())) {
+ if (config.filter === 'true' || (/^[1-9]\d{3}-\d{2}-\d{2}$/.test(config.filter) && new Date(config.filter).getTime() + 86400000 >= new Date().getTime())) {
GLOB.filter = true
}
@@ -389,12 +393,16 @@
value: GLOB.debugger
})
} else if (GLOB.sysType === 'cloud') {
- Object.defineProperty(GLOB, 'debugger', {
- writable: false,
- value: GLOB.debugger
- })
-
- GLOB.breakpoint = false
+ if (sessionStorage.getItem('cloudRun') === 'debug') {
+ GLOB.debugger = true
+ } else {
+ Object.defineProperty(GLOB, 'debugger', {
+ writable: false,
+ value: GLOB.debugger
+ })
+
+ GLOB.breakpoint = false
+ }
} else {
if (sessionStorage.getItem('breakpoint')) {
GLOB.debugger = true
@@ -417,7 +425,7 @@
window.GLOB.SyncData = new Map() // 瀛樺偍鍚屾鏌ヨ鏁版嵁
window.GLOB.mkThdMenus = new Map() // 涓夌骇鑿滃崟
- if (lang === 'zh-CN' || !/#\/(login|main|billprint|docprint|tab|iframe|view|ssologin)/.test(window.location.href)) { // 寮�鍙戜娇鐢ㄤ腑鏂�
+ if (lang === 'zh-CN' || !/#\/(login|main|billprint|docprint|tab\/|iframe|view|ssologin)/.test(window.location.href)) { // 寮�鍙戜娇鐢ㄤ腑鏂�
ReactDOM.render(
<ConfigProvider locale={zhCN}>
<Route/>
--
Gitblit v1.8.0