From 5c871f18eaa04ba1013b758f57e6f85b42cf932a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 20 七月 2020 23:01:53 +0800
Subject: [PATCH] 2020-07-20
---
public/options.json | 8 +
src/index.js | 232 ++++++++++++++++++++++++---------------------
/dev/null | 8 -
public/index.html | 1
public/README.txt | 4
src/views/mobdesign/index.jsx | 1
6 files changed, 135 insertions(+), 119 deletions(-)
diff --git a/public/options.txt b/public/README.txt
similarity index 85%
rename from public/options.txt
rename to public/README.txt
index e03b129..1dcfbce 100644
--- a/public/options.txt
+++ b/public/README.txt
@@ -1,6 +1,8 @@
+-----options.json-------
+
appId -- 浜戠鐢熸垚鐨勫簲鐢↖D
appkey -- 浜戠鐢熸垚鐨勫簲鐢ㄥ瘑閽�
mainSystemApi -- sso绯荤粺鐨勬帴鍙ｈ矾寰勶紝娉細涓氬姟绯荤粺闇�瑕佸～鍐欙紝涓斿�间负閫氱敤鎺ュ彛鐨勫畬鏁磋矾寰�
systemType -- 鍒ゆ柇涓氬姟绯荤粺涓烘祴璇� (绌�) 鎴栨寮� (production) 锛屾寮忕郴缁熷紑鍙戞潈闄愬彧鍚湁绯荤粺鍗囩骇绛夐檺瀹氬姛鑳�
-lineColor -- 鍒嗗壊绾块鑹�
+lineColor -- 鐧诲綍椤靛垎鍓茬嚎棰滆壊
filter -- 椤甸潰婊ら暅锛屽�间负'true'鏃讹紝椤甸潰鏄剧ず涓洪粦鐧借壊
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 2c9d2b6..a5b86ee 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
- <script src="%PUBLIC_URL%/options.js"></script>
<title></title>
</head>
<body>
diff --git a/public/options.js b/public/options.js
deleted file mode 100644
index 6d4ba86..0000000
--- a/public/options.js
+++ /dev/null
@@ -1,8 +0,0 @@
-window.GLOB = {
- appId: '201912040924165801464FF1788654BC5AC73',
- appkey: '20191106103859640976D6E924E464D029CF0',
- mainSystemApi: 'http://cloud.mk9h.cn/webapi/dostars',
- systemType: '',
- lineColor: '',
- filter: 'false'
-}
\ No newline at end of file
diff --git a/public/options.json b/public/options.json
new file mode 100644
index 0000000..a918828
--- /dev/null
+++ b/public/options.json
@@ -0,0 +1,8 @@
+{
+ "appId": "201912040924165801464FF1788654BC5AC73",
+ "appkey": "20191106103859640976D6E924E464D029CF0",
+ "mainSystemApi": "http://cloud.mk9h.cn/webapi/dostars",
+ "systemType": "",
+ "lineColor": "",
+ "filter": "false"
+}
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index 2cf54ad..dfcf434 100644
--- a/src/index.js
+++ b/src/index.js
@@ -32,116 +32,130 @@
)
}
-window.GLOB = window.GLOB || {}
-
-// 鍙湁涓氬姟绯荤粺鎵嶅彲浠ヨ缃负姝ｅ紡绯荤粺
-if (options.sysType === 'local' && (window.GLOB.systemType === 'official' || window.GLOB.systemType === 'production')) {
- window.GLOB.systemType = 'production'
-} else {
- window.GLOB.systemType = ''
-}
-
-if (options.sysType === 'cloud') { // cloud涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�,浜戠appkey涓虹郴缁熻缃�
- window.GLOB.appkey = options.cakey
- window.GLOB.mainSystemApi = ''
-} else if (options.sysType === 'SSO') { // sso涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�
- window.GLOB.mainSystemApi = ''
- if (window.GLOB.appkey === options.cakey) {
- window.GLOB.appkey = ''
- console.warn('鍗曠偣绯荤粺appkey涓嶅彲涓庝簯绔浉鍚�')
- }
-} else if (options.sysType === 'local') { // 涓氬姟绯荤粺
- if (window.GLOB.appkey === options.cakey) {
- window.GLOB.appkey = ''
- console.warn('涓氬姟绯荤粺appkey涓嶅彲涓庝簯绔浉鍚�')
- }
- if (window.GLOB.mainSystemApi) {
- let systemApi = window.GLOB.mainSystemApi
-
- if (/^(http|https):\/\//ig.test(systemApi)) {
- let _systemApi = /^(http|https):\/\/[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62}|(:[0-9]{1,4}))+\.?/ig.exec(systemApi)
-
- systemApi = _systemApi ? _systemApi[0] : ''
- } else {
- systemApi = ''
- }
-
- // 涓氬姟绯荤粺杩炴帴浜戠鏃讹紝鏍煎紡鍖栧鐞�
- if (systemApi && systemApi === /^(http|https):\/\/[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62}|(:[0-9]{1,4}))+\.?/ig.exec(options.cloudServiceApi)[0]) {
- window.GLOB.dataFormat = true
- }
-
- if (systemApi) {
- systemApi = systemApi + '/webapi/dostars'
- }
-
- window.GLOB.mainSystemApi = systemApi
- }
-}
-
-let _systemMsg = localStorage.getItem(window.location.href.split('#')[0] + 'system')
-
-if (_systemMsg) {
- try {
- _systemMsg = JSON.parse(window.decodeURIComponent(window.atob(_systemMsg)))
-
- window.GLOB.platTitle = _systemMsg.platTitle
- window.GLOB.platName = _systemMsg.platName
- window.GLOB.favicon = _systemMsg.favicon
- window.GLOB.loginlogo = _systemMsg.loginlogo
- window.GLOB.copyRight = _systemMsg.copyRight
- window.GLOB.ICP = _systemMsg.ICP
- window.GLOB.bgImage = _systemMsg.bgImage
- window.GLOB.mainlogo = _systemMsg.mainlogo
- window.GLOB.doclogo = _systemMsg.doclogo
- window.GLOB.webSite = _systemMsg.webSite
- window.GLOB.style = _systemMsg.style
-
- if (window.GLOB.favicon) {
- let link = document.querySelector("link[rel*='icon']") || document.createElement('link')
- link.type = 'image/x-icon'
- link.rel = 'shortcut icon'
- link.href = window.GLOB.favicon
- document.getElementsByTagName('head')[0].appendChild(link)
- }
- } catch {
- console.warn('Parse Failure')
- }
-}
-
-document.title = window.GLOB.platTitle || ''
-
-if (window.GLOB.filter === 'true') {
- let html = document.getElementsByTagName('html')[0]
-
- if (html) {
- html.style.filter = 'grayscale(100%)'
- }
-}
-
-if (process.env.NODE_ENV === 'production') { // 鐢ㄤ簬鏍￠獙鏄惁瀛樺湪寮�鍙戞潈闄�
- let _service = window.location.href.replace(/\/index.html(.*)|\/#(.*)/ig, '').replace(new RegExp(document.location.origin + '/?', 'ig'), '')
- window.GLOB.linkurl = window.location.href.split('#')[0]
- if (!/index.html/ig.test(window.GLOB.linkurl)) {
- window.GLOB.linkurl = window.GLOB.linkurl + 'index.html'
- }
- window.GLOB.service = _service ? _service + '/' : ''
-} else {
- window.GLOB.linkurl = ''
- window.GLOB.location = 'http://qingqiumarket.cn/'
- window.GLOB.service = 'mkwms/'
-}
-
-const option = {
- white: 'mk-white'
-}
-
-if (window.GLOB.style && option[window.GLOB.style]) {
- document.getElementById('root').className = option[window.GLOB.style]
-}
-
sessionStorage.removeItem('isEditState')
-render(Route)
+fetch(`./${process.env.NODE_ENV === 'production' ? 'build/' : ''}options.json`)
+ .then(response => response.json())
+ .catch(() => {
+ console.warn('绯荤粺閰嶇疆淇℃伅鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛橈紒')
+ })
+ .then(config => {
+ if (!config) return
+
+ window.GLOB = {}
+ window.GLOB.appId = config.appId || ''
+ window.GLOB.lineColor = config.lineColor || ''
+ window.GLOB.filter = config.filter || ''
+
+ // 鍙湁涓氬姟绯荤粺鎵嶅彲浠ヨ缃负姝ｅ紡绯荤粺
+ if (options.sysType === 'local' && (config.systemType === 'official' || config.systemType === 'production')) {
+ window.GLOB.systemType = 'production'
+ } else {
+ window.GLOB.systemType = ''
+ }
+
+ if (options.sysType === 'cloud') { // cloud涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�,浜戠appkey涓虹郴缁熻缃�
+ window.GLOB.appkey = options.cakey
+ window.GLOB.mainSystemApi = ''
+ } else if (options.sysType === 'SSO') { // sso涓嶅彲璁剧疆鍗曠偣鏈嶅姟鍣ㄥ湴鍧�
+ window.GLOB.mainSystemApi = ''
+ if (config.appkey === options.cakey) {
+ window.GLOB.appkey = ''
+ console.warn('鍗曠偣绯荤粺appkey涓嶅彲涓庝簯绔浉鍚�')
+ }
+ } else if (options.sysType === 'local') { // 涓氬姟绯荤粺
+ if (config.appkey === options.cakey) {
+ window.GLOB.appkey = ''
+ console.warn('涓氬姟绯荤粺appkey涓嶅彲涓庝簯绔浉鍚�')
+ } else {
+ window.GLOB.appkey = config.appkey
+ }
+ if (config.mainSystemApi) {
+ let systemApi = config.mainSystemApi
+
+ if (/^(http|https):\/\//ig.test(systemApi)) {
+ let _systemApi = /^(http|https):\/\/[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62}|(:[0-9]{1,4}))+\.?/ig.exec(systemApi)
+
+ systemApi = _systemApi ? _systemApi[0] : ''
+ } else {
+ systemApi = ''
+ }
+
+ // 涓氬姟绯荤粺杩炴帴浜戠鏃讹紝鏍煎紡鍖栧鐞�
+ if (systemApi && systemApi === /^(http|https):\/\/[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62}|(:[0-9]{1,4}))+\.?/ig.exec(options.cloudServiceApi)[0]) {
+ window.GLOB.dataFormat = true
+ }
+
+ if (systemApi) {
+ systemApi = systemApi + '/webapi/dostars'
+ }
+
+ window.GLOB.mainSystemApi = systemApi
+ }
+ }
+
+ let _systemMsg = localStorage.getItem(window.location.href.split('#')[0] + 'system')
+
+ if (_systemMsg) {
+ try {
+ _systemMsg = JSON.parse(window.decodeURIComponent(window.atob(_systemMsg)))
+
+ window.GLOB.platTitle = _systemMsg.platTitle
+ window.GLOB.platName = _systemMsg.platName
+ window.GLOB.favicon = _systemMsg.favicon
+ window.GLOB.loginlogo = _systemMsg.loginlogo
+ window.GLOB.copyRight = _systemMsg.copyRight
+ window.GLOB.ICP = _systemMsg.ICP
+ window.GLOB.bgImage = _systemMsg.bgImage
+ window.GLOB.mainlogo = _systemMsg.mainlogo
+ window.GLOB.doclogo = _systemMsg.doclogo
+ window.GLOB.webSite = _systemMsg.webSite
+ window.GLOB.style = _systemMsg.style
+
+ if (window.GLOB.favicon) {
+ let link = document.querySelector("link[rel*='icon']") || document.createElement('link')
+ link.type = 'image/x-icon'
+ link.rel = 'shortcut icon'
+ link.href = window.GLOB.favicon
+ document.getElementsByTagName('head')[0].appendChild(link)
+ }
+ } catch {
+ console.warn('Parse Failure')
+ }
+ }
+
+ document.title = window.GLOB.platTitle || ''
+
+ if (window.GLOB.filter === 'true') {
+ let html = document.getElementsByTagName('html')[0]
+
+ if (html) {
+ html.style.filter = 'grayscale(100%)'
+ }
+ }
+
+ if (process.env.NODE_ENV === 'production') { // 鐢ㄤ簬鏍￠獙鏄惁瀛樺湪寮�鍙戞潈闄�
+ let _service = window.location.href.replace(/\/index.html(.*)|\/#(.*)/ig, '').replace(new RegExp(document.location.origin + '/?', 'ig'), '')
+ window.GLOB.linkurl = window.location.href.split('#')[0]
+ if (!/index.html/ig.test(window.GLOB.linkurl)) {
+ window.GLOB.linkurl = window.GLOB.linkurl + 'index.html'
+ }
+ window.GLOB.service = _service ? _service + '/' : ''
+ } else {
+ window.GLOB.linkurl = ''
+ window.GLOB.location = 'http://qingqiumarket.cn/'
+ window.GLOB.service = 'mkwms/'
+ }
+
+ const option = {
+ white: 'mk-white'
+ }
+
+ if (window.GLOB.style && option[window.GLOB.style]) {
+ document.getElementById('root').className = option[window.GLOB.style]
+ }
+
+ render(Route)
+ })
serviceWorker.unregister()
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index bf5cf99..b63b496 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -52,6 +52,7 @@
}
triggerSave = () => {
+ // const { config } = this.state
this.setState({
saveIng: true
})
--
Gitblit v1.8.0