From ae7f00b753b89ba2d157a53c716662080a3cc171 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期六, 29 七月 2023 12:05:39 +0800 Subject: [PATCH] Merge branch 'develop' --- src/api/index.js | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 1d2ed22..c30b55b 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -42,6 +42,7 @@ Modal.destroyAll() Modal.error({ title: response.data.message, + okText: '鐭ラ亾浜�', onOk: () => { window.GLOB.$error = false sessionStorage.clear() @@ -324,22 +325,23 @@ } delCacheConfig (type = '') { - let date = moment().subtract(7, 'days').format('YYYY-MM-DD') + let date = moment().subtract(7, 'days').format('YYYY-MM-DD HH:mm:ss') CacheUtils.delIndexDBCacheConfig(date, type) } writeCacheConfig (menuid, data) { if (!menuid) return - let date = moment().format('YYYY-MM-DD') + let date = moment().format('YYYY-MM-DD HH:mm:ss') let _data = data ? JSON.stringify(data) : '' CacheUtils.writeCacheInIndexDB({menuid, CreateDate: date, LongParam: _data}) } - getLCacheConfig (menuid) { + getLCacheConfig (menuid, minutes) { return new Promise((resolve, reject) => { if (window.GLOB.IndexDB) { - CacheUtils.getIndexDBCacheConfig(menuid).then(res => { + let limit = minutes ? moment().subtract(minutes, 'minutes').format('YYYY-MM-DD HH:mm:ss') : '' + CacheUtils.getIndexDBCacheConfig(menuid, limit).then(res => { if (res && res.LongParam) { let _data = JSON.parse(res.LongParam) if (_data.length === 0) { @@ -416,7 +418,7 @@ if (list.length > 0) { let clear = false let _appkey = window.GLOB.appkey.substr(-10) - let reg = new RegExp(_appkey + '$', 'ig') + let reg = new RegExp(_appkey + '$', 'i') list.forEach(mid => { if (reg.test(mid)) { @@ -427,6 +429,7 @@ list = '' } CacheUtils.delIndexDBConfig(list) + this.delCacheConfig('all') } CacheUtils.updateIndexDBversion({version: res.app_version || '1.00', createDate: curTime}) @@ -543,7 +546,7 @@ param.lang = param.lang || sessionStorage.getItem('lang') || '' param.SessionUid = localStorage.getItem('SessionUid') || '' param.LoginUID = sessionStorage.getItem('LoginUID') || '' - param.appkey = window.GLOB.appkey || '' + param.appkey = param.appkey || window.GLOB.appkey || '' let url = '/webapi/dostars' if (sessionStorage.getItem('isEditState') === 'true') { // 缂栬緫鐘舵�侊紝鍗曠偣鐧诲綍鏈嶅姟鍣ㄤ负浜戠 -- Gitblit v1.8.0