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 |   51 ++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/index.js b/src/index.js
index 6fd215a..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,16 +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'
+      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
@@ -166,6 +170,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涓嬩笉鎵撳嵃鑴氭湰
@@ -191,6 +199,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
@@ -212,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 + '/'
@@ -234,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]
@@ -267,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'
@@ -276,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
     }
 
@@ -380,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
@@ -408,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