From e657b7ed2c047af4b54cbc26e5ac66cb7656dbb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 12 十月 2022 12:13:05 +0800
Subject: [PATCH] 2022-10-12
---
src/api/index.js | 134 ++++++++++++++++++++++++++++----------------
1 files changed, 86 insertions(+), 48 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index c5353f8..4189263 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -10,16 +10,19 @@
window.GLOB.WebSql = null
window.GLOB.IndexDB = null
-const systemMenuKeys = `1581067625930haged11ieaivpavv77k,1581734956310scks442ul2d955g9tu5,1583991994144ndddg0bhh0is6shi0v1,1583979633842550imkchl4qt4qppsiv,1578900109100np8aqd0a77q3na46oas,16044812935562g807p3p12huk8kokmb,
+const systemMenuKeys = `1581067625930haged11ieaivpavv77k,1581734956310scks442ul2d955g9tu5,1583991994144ndddg0bhh0is6shi0v1,1583979633842550imkchl4qt4qppsiv,1578900109100np8aqd0a77q3na46oas,
1585192949946f3et2ts8tn82krmumdf,15855615451212m12ip23vpcm79kloro,1587005717541lov40vg61q7l1rbveon,1590458676585agbbr63t6ihighg2i1g,1602315375262ikd33ii0nii34pt861o,1582771068837vsv54a089lgp45migbg,
1582777675954ifu05upurs465omoth7,158294809668898cklbv6c5bou8e1fpu,1584676379094iktph45fb8imhg96bql,1584695125339vo5g7iqgfn01qmrd6s2,1584699661372vhmpp9dn9foo0eob722,15848421131551gg04ie8sitsd3f7467,
- 1589782279158ngr675kk3oksin35sul,1589788042787ffdt9hle4s45k9r1nvs,15900310928174dro07ihfckghpb5h13,1594095599055qicg2eb642v5qglhnuo,1599613340050c8nu6rbst9d4emnnbsq,1577972969199lei1g0qkvlh4tkc908m,
+ 1589782279158ngr675kk3oksin35sul,1589788042787ffdt9hle4s45k9r1nvs,1594095599055qicg2eb642v5qglhnuo,1577972969199lei1g0qkvlh4tkc908m,16044812935562g807p3p12huk8kokmb,
1578479100252lfbp29v1kafk4s4q4ig,1577971621421tg4v0i1ur8873k7e0ob,1577929944419lgc5h3hepum765e2k7u,1588493493409k9guqp067d31lu7blsv,15827879285193g85m3i2uprektpgmpf`
+let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
+let db = `mkdb${service}`
+
if (window.openDatabase) {
- CacheUtils.openWebSql(options.sysType)
+ CacheUtils.openWebSql(db)
} else if (window.indexedDB) {
- CacheUtils.openIndexDB(options.sysType)
+ CacheUtils.openIndexDB(db)
}
axios.defaults.crossDomain = true
@@ -374,20 +377,38 @@
let app_datetime = sessionStorage.getItem('app_datetime')
if (sys_datetime && app_datetime) {
let seconds = Math.floor((new Date().getTime() - app_datetime) / 1000)
- curTime = moment(sys_datetime, 'YYYY-MM-DD HH:mm:ss').add(seconds, 'seconds').format('YYYY-MM-DD HH:mm:ss') + '.000'
+ let _curTime = moment(sys_datetime, 'YYYY-MM-DD HH:mm:ss').add(seconds, 'seconds').format('YYYY-MM-DD HH:mm:ss') + '.000'
+ if (/^\d{4}-\d{2}-\d{2}/.test(_curTime)) {
+ curTime = _curTime
+ }
}
if (window.GLOB.WebSql) {
return new Promise((resolve, reject) => {
CacheUtils.getWebSqlVersion().then(msg => {
- let modifydate = msg.createDate || curTime
- if (modifydate.indexOf('Invalid date') > -1) {
- modifydate = curTime
- }
-
let param = {
func: 's_get_app_version',
- modifydate
+ modifydate: msg.createDate
+ }
+
+ param.TypeCharOne = ''
+ param.typename = ''
+
+ if (!msg.createDate && !msg.menuids) {
+ CacheUtils.updateWebSqlversion('1.00', curTime)
+ resolve()
+ return
+ } else if (!msg.createDate) {
+ msg.createDate = curTime
+ param.menuids = window.btoa(msg.menuids)
+ } else if (msg.menuids) {
+ let d = localStorage.getItem(db)
+
+ if (!d || curTime.indexOf(d) === -1) {
+ param.menuids = window.btoa(msg.menuids)
+ }
+
+ localStorage.setItem(db, curTime.substr(0, 10))
}
this.getSystemConfig(param).then(res => {
@@ -395,29 +416,28 @@
reject()
return
}
- let clear = false
- let version = '1.00'
-
- if (res.menu_data && res.menu_data.length > 0) {
- res.menu_data.forEach(mid => {
+
+ let list = res.menu_data || []
+
+ if (res.menu_del) {
+ list.push(...res.menu_del)
+ }
+
+ if (list.length > 0) {
+ let clear = false
+ list.forEach(mid => {
if (systemMenuKeys.indexOf(mid.menuid) > -1) {
clear = true
}
})
-
+ let keys = list.map(mid => `'${mid.menuid}'`).join(',')
if (clear) {
- CacheUtils.clearWebSqlConfig()
- } else {
- let keys = res.menu_data.map(mid => `'${mid.menuid}'`).join(',')
- CacheUtils.delWebSqlConfig(keys)
+ keys = ''
}
+ CacheUtils.delWebSqlConfig(keys)
}
-
- if (msg.version) {
- CacheUtils.updateWebSqlTime(curTime)
- } else {
- CacheUtils.createWebSqlversion(version, curTime)
- }
+
+ CacheUtils.updateWebSqlversion(res.app_version || '1.00', curTime)
resolve()
})
@@ -428,13 +448,29 @@
} else {
return new Promise((resolve, reject) => {
CacheUtils.getIndexDBVersion().then(msg => {
- let modifydate = msg.createDate || curTime
- if (modifydate.indexOf('Invalid date') > -1) {
- modifydate = curTime
- }
let param = {
func: 's_get_app_version',
- modifydate
+ modifydate: msg.createDate
+ }
+
+ param.TypeCharOne = ''
+ param.typename = ''
+
+ if (!msg.createDate && !msg.menuids) {
+ CacheUtils.updateIndexDBversion({version: '1.00', createDate: curTime})
+ resolve()
+ return
+ } else if (!msg.createDate) {
+ msg.createDate = curTime
+ param.menuids = window.btoa(msg.menuids)
+ } else if (msg.menuids) {
+ let d = localStorage.getItem(db)
+
+ if (!d || curTime.indexOf(d) === -1) {
+ param.menuids = window.btoa(msg.menuids)
+ }
+
+ localStorage.setItem(db, curTime.substr(0, 10))
}
this.getSystemConfig(param).then(res => {
@@ -442,25 +478,28 @@
reject()
return
}
- let clear = false
- let version = '1.00'
- if (res.menu_data && res.menu_data.length > 0) {
- res.menu_data.forEach(mid => {
+ let list = res.menu_data || []
+
+ if (res.menu_del) {
+ list.push(...res.menu_del)
+ }
+
+ if (list.length > 0) {
+ let clear = false
+ list.forEach(mid => {
if (systemMenuKeys.indexOf(mid.menuid) > -1) {
clear = true
}
})
-
+ let keys = list.map(mid => mid.menuid)
if (clear) {
- CacheUtils.clearIndexDBConfig()
- } else {
- let keys = res.menu_data.map(mid => `'${mid.menuid}'`)
- CacheUtils.delIndexDBConfig(keys)
+ keys = ''
}
+ CacheUtils.delIndexDBConfig(keys)
}
- CacheUtils.updateIndexDBversion({version: version, createDate: curTime})
+ CacheUtils.updateIndexDBversion({version: res.app_version || '1.00', createDate: curTime})
resolve()
})
@@ -475,12 +514,11 @@
* @description 鏇存柊绯荤粺鐗堟湰淇℃伅锛屾竻绌洪厤缃俊鎭�
*/
updateAppVersion () {
- let curTime = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
- CacheUtils.clearWebSqlConfig()
- CacheUtils.updateWebSqlversion('1.00', curTime)
- CacheUtils.clearIndexDBConfig()
- CacheUtils.updateIndexDBversion({version: '1.00', createDate: curTime})
- CacheUtils.clearFuncs(options.sysType)
+ CacheUtils.delWebSqlConfig()
+ CacheUtils.updateWebSqlversion()
+ CacheUtils.delIndexDBConfig()
+ CacheUtils.updateIndexDBversion()
+ CacheUtils.clearFuncs()
}
/**
--
Gitblit v1.8.0