From 4366981fbe7d406e90487fd94450fab6eb31120d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 八月 2023 17:19:35 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/api/index.js | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 9ce1f21..3cd4414 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -7,6 +7,7 @@
import moment from 'moment'
import Utils from '@/utils/utils.js'
+import MKEmitter from '@/utils/events.js'
import CacheUtils from './cacheutils'
window.GLOB.IndexDB = null
@@ -334,21 +335,21 @@
CacheUtils.delIndexDBCacheConfig(date, type)
}
- writeCacheConfig (menuid, data) {
+ writeCacheConfig (menuid, data, BID = '', id = '') {
if (!menuid) return
let date = moment().format('YYYY-MM-DD HH:mm:ss')
let _data = data ? JSON.stringify(data) : ''
let userid = sessionStorage.getItem('UserID') || ''
- CacheUtils.writeCacheInIndexDB({menuid: md5(menuid + userid), CreateDate: date, LongParam: _data})
+ CacheUtils.writeCacheInIndexDB({menuid: md5(menuid + userid + BID + id), BID: BID, id: id, CreateDate: date, LongParam: _data})
}
- getLCacheConfig (menuid, minutes) {
+ getLCacheConfig (menuid, minutes, BID = '', id = '') {
return new Promise((resolve, reject) => {
let limit = minutes ? moment().subtract(minutes, 'minutes').format('YYYY-MM-DD HH:mm:ss') : ''
let userid = sessionStorage.getItem('UserID') || ''
- CacheUtils.getIndexDBCacheConfig(md5(menuid + userid)).then(res => {
+ CacheUtils.getIndexDBCacheConfig(md5(menuid + userid + BID + id)).then(res => {
if (res && res.LongParam) {
resolve({data: JSON.parse(res.LongParam), valid: !limit || res.CreateDate > limit})
} else {
@@ -410,6 +411,11 @@
modifydate: msg.createDate
}
+ if (window.GLOB.initVersion && sessionStorage.getItem('visitorUserID')) {
+ param.userid = sessionStorage.getItem('visitorUserID')
+ param.LoginUID = sessionStorage.getItem('visitorLoginUID')
+ }
+
param.TypeCharOne = ''
param.typename = ''
@@ -452,6 +458,7 @@
let clear = false
let _appkey = window.GLOB.appkey.substr(-10)
let reg = new RegExp(_appkey + '$', 'i')
+ let reHome = list.includes('home_page_id')
list.forEach(mid => {
if (reg.test(mid)) {
@@ -463,6 +470,10 @@
}
CacheUtils.delIndexDBConfig(list)
this.delCacheConfig('all')
+
+ if (reHome) {
+ MKEmitter.emit('reloadMenuView', 'home_page_id')
+ }
}
CacheUtils.updateIndexDBversion({version: res.app_version || '1.00', createDate: curTime})
@@ -659,7 +670,7 @@
if (window.GLOB.CacheMap.has(_param)) {
return Promise.resolve(window.GLOB.CacheMap.get(_param))
} else {
- return Promise.resolve({ErrCode: 'S', ErrMesg: '', LongParam: '', message: '', status: false})
+ return Promise.resolve({ErrCode: 'S', LongParam: '', message: '', status: false})
}
}
@@ -763,7 +774,7 @@
token = JSON.parse(window.decodeURIComponent(window.atob(token)))
} catch (e) {
token = null
- _resolve({status: false, ErrCode: 'E', message: '鎺ュ彛淇℃伅瑙ｆ瀽澶辫触锛�', ErrMesg: 'token_error'})
+ _resolve({status: false, ErrCode: 'token_error', message: '鎺ュ彛淇℃伅瑙ｆ瀽澶辫触锛�'})
}
if (!token) return
@@ -866,7 +877,7 @@
param.appkey = window.GLOB.appkey || ''
if (param.$token === '') {
- return Promise.resolve({status: false, ErrCode: 'E', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�', ErrMesg: 'token_error'})
+ return Promise.resolve({status: false, ErrCode: 'token_error', message: '鎺ュ彛鍦板潃灏氭湭璁剧疆锛�'})
} else if (param.$token) {
return new Promise(resolve => this.visitOuterSystem(param, resolve))
}
--
Gitblit v1.8.0