From 22c9b94be213ff93064d7c463d82344023ffab1c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 八月 2023 10:35:29 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/api/index.js |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index ad7ba0a..8249ff9 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -346,20 +346,15 @@
     return new Promise((resolve, reject) => {
       if (window.GLOB.IndexDB) {
         let limit = minutes ? moment().subtract(minutes, 'minutes').format('YYYY-MM-DD HH:mm:ss') : ''
-        CacheUtils.getIndexDBCacheConfig(menuid, limit).then(res => {
+        CacheUtils.getIndexDBCacheConfig(menuid).then(res => {
           if (res && res.LongParam) {
-            let _data = JSON.parse(res.LongParam)
-            if (_data.length === 0) {
-              resolve()
-            } else {
-              resolve(_data)
-            }
+            resolve({data: JSON.parse(res.LongParam), valid: !limit || res.CreateDate > limit})
           } else {
-            resolve()
+            resolve({data: null, valid: false})
           }
         })
       } else {
-        resolve()
+        resolve({data: null, valid: false})
       }
     })
   }

--
Gitblit v1.8.0