From 24842b40de5cd60700bf69dfd38a0332f5431e36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:55:07 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/index.js | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/index.js b/src/index.js
index ac00e9a..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
}
@@ -118,20 +118,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'
if (config.style_appkey) {
GLOB.style_appkey = config.style_appkey
}
-
- // 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'
- }
+
+ // 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
@@ -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,6 +243,8 @@
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'
@@ -278,7 +280,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'
@@ -287,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
}
@@ -423,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