From c8804ceb1fe2dea76f9949c5ea04423876ee2c81 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 六月 2024 14:02:47 +0800
Subject: [PATCH] 2024-06-28
---
src/index.js | 105 +++++++++++++++++++++++++++++++---------------------
1 files changed, 63 insertions(+), 42 deletions(-)
diff --git a/src/index.js b/src/index.js
index 6645ba6..b1f8d21 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'
@@ -17,13 +20,6 @@
}
return uuid.join('')
})())
-}
-
-const render = Component => {
- ReactDOM.render(
- <Component/>,
- document.getElementById('root')
- )
}
fetch('../options.json')
@@ -62,6 +58,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'].includes(app.appType))
+ if (config.WXApps.length) {
+ GLOB.WXApps = config.WXApps
+ }
+ }
if (langs[config.defaultLang]) {
GLOB.defLang = config.defaultLang
@@ -165,8 +168,39 @@
}
}
- 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'
+ } 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) {
@@ -229,38 +263,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 +294,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
@@ -364,7 +372,20 @@
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