@pisell/pisellos 0.0.176 → 0.0.178

package/dist/modules/Date/index.js

@@ -93,11 +93,14 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
     key: "getResourceDates",
     value: function () {
       var _getResourceDates = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var _params$query;
-        var currentDateList, currentDateListMap, resourceIds, hasResource, dates;
+        var _params$query, currentDateList, currentDateListMap, resourceIds, hasResource, dates;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              if (!params.useCache) {
+                _context2.next = 7;
+                break;
+              }
               // 发请求之前，做一道检测，看 dateList 里是否有对应日期，且对应日期里是否都有对应 resource_ids 的资源
               currentDateList = this.getDateList() || [];
               currentDateListMap = new Map(currentDateList.map(function (item) {
@@ -112,18 +115,18 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
                 });
               });
               if (!hasResource) {
-                _context2.next = 6;
+                _context2.next = 7;
                 break;
               }
               return _context2.abrupt("return", currentDateList);
-            case 6:
-              _context2.next = 8;
+            case 7:
+              _context2.next = 9;
               return this.getResourceAvailableTimeList(params);
-            case 8:
+            case 9:
               dates = _context2.sent;
               this.setDateList(dates);
               return _context2.abrupt("return", dates);
-            case 11:
+            case 12:
             case "end":
               return _context2.stop();
           }
@@ -151,7 +154,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           return n.date === item.date;
         });
         if (currentItemIndex !== -1) {
-          var _item$resource;
+          var _item$resource, _currentItem$resource3;
           var currentItem = currentDateList[currentItemIndex];
           // 看那一天的数据有没有相同的，把不同的资源合并进去即可
           var newResource = (_item$resource = item.resource) === null || _item$resource === void 0 ? void 0 : _item$resource.filter(function (n) {
@@ -160,6 +163,16 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
               return m.id === n.id;
             }));
           });
+          // 如果有相同的资源，则使用 item 中的新的resource.times，而不是 currentItem 中的
+          (_currentItem$resource3 = currentItem.resource) === null || _currentItem$resource3 === void 0 || _currentItem$resource3.forEach(function (n) {
+            var _item$resource2;
+            var newResource = (_item$resource2 = item.resource) === null || _item$resource2 === void 0 ? void 0 : _item$resource2.find(function (m) {
+              return m.id === n.id;
+            });
+            if (newResource) {
+              n.times = newResource.times;
+            }
+          });
           currentItem.resource = [].concat(_toConsumableArray(currentItem.resource || []), _toConsumableArray(newResource || []));
           currentDateList[currentItemIndex] = currentItem;
         } else {

package/lib/modules/Date/index.js

@@ -70,18 +70,20 @@ var DateModule = class extends import_BaseModule.BaseModule {
   }
   async getResourceDates(params) {
     var _a;
-    const currentDateList = this.getDateList() || [];
-    const currentDateListMap = new Map(
-      currentDateList.map((item) => [item.date, item])
-    );
-    const resourceIds = ((_a = params.query) == null ? void 0 : _a.resource_ids) || [];
-    const hasResource = resourceIds.every((id) => {
-      var _a2;
-      const currentItem = currentDateListMap.get(id.toString());
-      return (_a2 = currentItem == null ? void 0 : currentItem.resource) == null ? void 0 : _a2.some((n) => n.id === id);
-    });
-    if (hasResource) {
-      return currentDateList;
+    if (params.useCache) {
+      const currentDateList = this.getDateList() || [];
+      const currentDateListMap = new Map(
+        currentDateList.map((item) => [item.date, item])
+      );
+      const resourceIds = ((_a = params.query) == null ? void 0 : _a.resource_ids) || [];
+      const hasResource = resourceIds.every((id) => {
+        var _a2;
+        const currentItem = currentDateListMap.get(id.toString());
+        return (_a2 = currentItem == null ? void 0 : currentItem.resource) == null ? void 0 : _a2.some((n) => n.id === id);
+      });
+      if (hasResource) {
+        return currentDateList;
+      }
     }
     const dates = await this.getResourceAvailableTimeList(params);
     this.setDateList(dates);
@@ -93,7 +95,7 @@ var DateModule = class extends import_BaseModule.BaseModule {
   setDateList(dateList) {
     const currentDateList = (0, import_cloneDeep.default)(this.store.dateList) || [];
     dateList.forEach((item) => {
-      var _a;
+      var _a, _b;
       const currentItemIndex = currentDateList.findIndex(
         (n) => n.date === item.date
       );
@@ -105,6 +107,13 @@ var DateModule = class extends import_BaseModule.BaseModule {
             return !((_a2 = currentItem.resource) == null ? void 0 : _a2.some((m) => m.id === n.id));
           }
         );
+        (_b = currentItem.resource) == null ? void 0 : _b.forEach((n) => {
+          var _a2;
+          const newResource2 = (_a2 = item.resource) == null ? void 0 : _a2.find((m) => m.id === n.id);
+          if (newResource2) {
+            n.times = newResource2.times;
+          }
+        });
         currentItem.resource = [
           ...currentItem.resource || [],
           ...newResource || []

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.176",
+  "version": "0.0.178",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",