@pisell/core 1.0.26 → 1.0.28

package/es/request/cache.js

@@ -124,20 +124,26 @@ var getCache = /*#__PURE__*/function () {
         case 0:
           _getConfig3 = getConfig(), storage = _getConfig3.storage; // 如果 当前时间 - 数据缓存时间 小于 超时时间, 则数据正常.
           if (!(cache.type === 'memory')) {
-            _context2.next = 6;
+            _context2.next = 8;
             break;
           }
-          if (!getIsEffectiveTime(CACHES[key].time)) {
+          if (CACHES[key]) {
             _context2.next = 4;
             break;
           }
-          return _context2.abrupt("return", CACHES[key].data);
+          return _context2.abrupt("return", null);
         case 4:
-          _context2.next = 21;
-          break;
+          if (!getIsEffectiveTime(CACHES[key].time)) {
+            _context2.next = 6;
+            break;
+          }
+          return _context2.abrupt("return", CACHES[key].data);
         case 6:
+          _context2.next = 23;
+          break;
+        case 8:
           if (!(cache.type === 'storage')) {
-            _context2.next = 13;
+            _context2.next = 15;
             break;
           }
           storageDetail = storage.getStorage(key) || "";
@@ -145,35 +151,35 @@ var getCache = /*#__PURE__*/function () {
             storageDetail = JSON.parse(storageDetail);
           }
           if (!getIsEffectiveTime(storageDetail.time)) {
-            _context2.next = 11;
+            _context2.next = 13;
             break;
           }
           return _context2.abrupt("return", (_storageDetail = storageDetail) === null || _storageDetail === void 0 ? void 0 : _storageDetail.data);
-        case 11:
-          _context2.next = 21;
-          break;
         case 13:
+          _context2.next = 23;
+          break;
+        case 15:
           if (!(cache.type === 'indexDB')) {
-            _context2.next = 21;
+            _context2.next = 23;
             break;
           }
           app = getApp();
           if (!app.dbManager) {
-            _context2.next = 21;
+            _context2.next = 23;
             break;
           }
-          _context2.next = 18;
+          _context2.next = 20;
           return app.dbManager.get('requests', key);
-        case 18:
+        case 20:
           indexDBDetail = _context2.sent;
           if (!indexDBDetail) {
-            _context2.next = 21;
+            _context2.next = 23;
             break;
           }
           return _context2.abrupt("return", indexDBDetail === null || indexDBDetail === void 0 ? void 0 : indexDBDetail.data);
-        case 21:
+        case 23:
           return _context2.abrupt("return", null);
-        case 22:
+        case 24:
         case "end":
           return _context2.stop();
       }
@@ -251,7 +257,10 @@ export var getCacheData = /*#__PURE__*/function () {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export var setCacheData = function setCacheData(url, data, res, cache) {
+export var setCacheData = function setCacheData(url, data, res) {
+  var cache = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
+    type: 'memory'
+  };
   // 创建缓存key
   var _key = createCacheKey(url, data, cache);
   setCache(_key, res, cache);
@@ -269,37 +278,44 @@ export var setCacheData = function setCacheData(url, data, res, cache) {
  */
 export var cacheFn = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(props, fn) {
-    var url, data, config, _data, _config$cache;
+    var url, data, config, cache, _data, _config$cache;
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           url = props.url, data = props.data, config = props.config;
-          if (!(config !== null && config !== void 0 && config.cache)) {
-            _context4.next = 8;
+          if (!(config !== null && config !== void 0 && config.cache || config !== null && config !== void 0 && config.useCache)) {
+            _context4.next = 10;
             break;
           }
-          _context4.next = 4;
-          return getCacheData(url, data, config.cache);
-        case 4:
+          cache = config.cache;
+          if (config.useCache) {
+            cache = {
+              type: 'memory'
+            };
+          }
+          // 获取缓存数据
+          _context4.next = 6;
+          return getCacheData(url, data, cache);
+        case 6:
           _data = _context4.sent;
           if (!_data) {
-            _context4.next = 8;
+            _context4.next = 10;
             break;
           }
           // 如果开启更新缓存执行函数
           if ((_config$cache = config.cache) !== null && _config$cache !== void 0 && _config$cache.updateCache) {
             fn(_objectSpread(_objectSpread({}, props), {}, {
               config: _objectSpread(_objectSpread({}, props.config), {}, {
-                cache: _objectSpread(_objectSpread({}, props.config.cache), {}, {
+                cache: _objectSpread(_objectSpread({}, cache), {}, {
                   updateCache: false
                 })
               })
             }));
           }
           return _context4.abrupt("return", _data);
-        case 8:
+        case 10:
           return _context4.abrupt("return", fn(props));
-        case 9:
+        case 11:
         case "end":
           return _context4.stop();
       }

package/es/request/utils.js

@@ -128,7 +128,7 @@ export var requestCallback = function requestCallback(resData) {
     if (codeFn) {
       if ((res === null || res === void 0 ? void 0 : res.code) === 200) {
         // 需要缓存的进行缓存数据
-        if (config !== null && config !== void 0 && config.cache) {
+        if (config !== null && config !== void 0 && config.useCache || config !== null && config !== void 0 && config.cache) {
           var _config$cacheUpdateCh;
           setCacheData(props.url, props.data, res, config === null || config === void 0 ? void 0 : config.cache);
           config === null || config === void 0 || (_config$cacheUpdateCh = config.cacheUpdateChange) === null || _config$cacheUpdateCh === void 0 || _config$cacheUpdateCh.call(config, res);