@pisell/pisellos 2.1.75 → 2.1.77

package/dist/modules/Date/index.js

@@ -85,6 +85,14 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setDateRange",
     value: function setDateRange(dateRange) {
+      var _this2 = this;
+      // 如果 dateRange 传入的日期里没有 resource，但是本地有的，要尝试补充下
+      dateRange.forEach(function (item) {
+        var _item$resource;
+        if (!((_item$resource = item.resource) !== null && _item$resource !== void 0 && _item$resource.length)) {
+          item.resource = _this2.getResourcesListByDate(item.date);
+        }
+      });
       this.store.dateRange = dateRange;
     }
   }, {
@@ -157,10 +165,10 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           return n.date === item.date;
         });
         if (currentItemIndex !== -1) {
-          var _item$resource, _currentItem$resource3;
+          var _item$resource2, _currentItem$resource3;
           var currentItem = currentDateList[currentItemIndex];
           // 看那一天的数据有没有相同的，把不同的资源合并进去即可
-          var newResource = (_item$resource = item.resource) === null || _item$resource === void 0 ? void 0 : _item$resource.filter(function (n) {
+          var newResource = (_item$resource2 = item.resource) === null || _item$resource2 === void 0 ? void 0 : _item$resource2.filter(function (n) {
             var _currentItem$resource2;
             return !((_currentItem$resource2 = currentItem.resource) !== null && _currentItem$resource2 !== void 0 && _currentItem$resource2.some(function (m) {
               return m.id === n.id;
@@ -168,8 +176,8 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           });
           // 如果有相同的资源，则使用 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) {
+            var _item$resource3;
+            var newResource = (_item$resource3 = item.resource) === null || _item$resource3 === void 0 ? void 0 : _item$resource3.find(function (m) {
               return m.id === n.id;
             });
             if (newResource) {
@@ -261,7 +269,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "correctResourceTimeSlots",
     value: function correctResourceTimeSlots(resourcesData) {
-      var _this2 = this;
+      var _this3 = this;
       return resourcesData.map(function (resource) {
         // 检查资源是否有 times 数组和 start_time
         if (!resource.times || !Array.isArray(resource.times) || !resource.start_time) {
@@ -284,7 +292,7 @@ export var DateModule = /*#__PURE__*/function (_BaseModule) {
           // 如果 start_at 早于资源的 start_time，需要修正
           if (startAt.isBefore(resourceStartTime)) {
             // 将 start_time 向上取整到下一个10分钟整数
-            var roundedStartTime = _this2.roundUpToNext10Minutes(resourceStartTime);
+            var roundedStartTime = _this3.roundUpToNext10Minutes(resourceStartTime);
             var roundedStartTimeDayjs = dayjs(roundedStartTime);
             console.log("[DateModule] \u4FEE\u6B63\u65F6\u95F4\u6BB5\u5F00\u59CB\u65F6\u95F4: ".concat(timeSlot.start_at, " -> ").concat(roundedStartTime, " (\u8D44\u6E90ID: ").concat(resource.id, ", \u539F\u59CBstart_time: ").concat(resource.start_time, ")"));
 

package/dist/solution/BookingByStep/index.js

@@ -2135,6 +2135,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           }
         });
       }
+
+      // 如果依然 resources 空的，则证明他是切换日期了，此时直接从 date 模块里取
+      if (resources.length === 0) {
+        resources.push.apply(resources, _toConsumableArray(this.store.date.getResourcesListByDate(dateRange[0].date) || []));
+      }
       var resourcesMap = getResourcesMap(resources);
       var duration = 0;
       // duration = 不同账号的最长时间
@@ -2214,12 +2219,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var _item$_resourceOrigin;
           return ((_item$_resourceOrigin = item._resourceOrigin) === null || _item$_resourceOrigin === void 0 ? void 0 : _item$_resourceOrigin[0].id) === firstResource;
         }).length;
-        if (sameResourceLength !== items.length) {
+        if (sameResourceLength === items.length) {
           return 1;
         }
-        return items.reduce(function (total, item) {
-          return total + (getCapacityInfoByCartItem(item).currentCapacity || 0);
-        }, 0);
+        // 找出单个购物车里最大的需求 capacity 即可
+        return Math.max.apply(Math, _toConsumableArray(items.map(function (item) {
+          return getCapacityInfoByCartItem(item).currentCapacity || 1;
+        })));
+        // return items.reduce((total, item) => {
+        //   return total + (getCapacityInfoByCartItem(item).currentCapacity || 0);
+        // }, 0);
       };
 
       // 如果是多个人预约，去要求出几个 holder 下最大的商品需求容量capacity
@@ -2387,9 +2396,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 if (sameResourceLength !== items.length) {
                   return 1;
                 }
-                return items.reduce(function (total, item) {
-                  return total + (getCapacityInfoByCartItem(item).currentCapacity || 0);
-                }, 0);
+                // 找出单个购物车里最大的需求 capacity 即可
+                return Math.max.apply(Math, _toConsumableArray(items.map(function (item) {
+                  return getCapacityInfoByCartItem(item).currentCapacity || 1;
+                })));
               }; // 如果是多个预约，去要求出几个 holder 下最大的需求容量capacity
               maxCapacity = 1;
               if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
@@ -3152,6 +3162,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 itemsByResourceType[resourceCode] = [];
               }
               // 避免重复添加同一个商品
+              // 如果之前添加过的依赖相同资源的跟我现在是同一个 holder，也不需要重复添加
+              if (itemsByResourceType[resourceCode].find(function (item) {
+                return item.holder_id === cartItem.holder_id;
+              })) {
+                return;
+              }
               if (!itemsByResourceType[resourceCode].find(function (item) {
                 return item._id === cartItem._id;
               })) {
@@ -4274,6 +4290,13 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                                 }
                               }
                             });
+                            // 可能存在 renderList 没有的情况，则需要判断 resource.optional_resource 和 resource.default_resource 是否存在那个资源，如果不存在也打上 onlyComputed 的标记
+                            currentResourcesList.forEach(function (item) {
+                              var _resource$optional_re, _resource$default_res;
+                              if (!((_resource$optional_re = resource.optional_resource) !== null && _resource$optional_re !== void 0 && _resource$optional_re.includes(item.id)) && !((_resource$default_res = resource.default_resource) !== null && _resource$default_res !== void 0 && _resource$default_res.includes(item.id))) {
+                                item.onlyComputed = true;
+                              }
+                            });
                             // currentResourcesList 排序，onlyComputed 的资源排在前面先计算
                             currentResourcesList.sort(function (a, b) {
                               return a.onlyComputed ? -1 : 1;

package/lib/modules/Date/index.js

@@ -64,6 +64,12 @@ var DateModule = class extends import_BaseModule.BaseModule {
     }
   }
   setDateRange(dateRange) {
+    dateRange.forEach((item) => {
+      var _a;
+      if (!((_a = item.resource) == null ? void 0 : _a.length)) {
+        item.resource = this.getResourcesListByDate(item.date);
+      }
+    });
     this.store.dateRange = dateRange;
   }
   getDateRange() {

package/lib/solution/BookingByStep/index.js

@@ -1461,6 +1461,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         }
       });
     }
+    if (resources.length === 0) {
+      resources.push(...this.store.date.getResourcesListByDate(dateRange[0].date) || []);
+    }
     const resourcesMap = (0, import_utils2.getResourcesMap)(resources);
     let duration = 0;
     const accountList = this.store.accountList.getAccounts();
@@ -1535,12 +1538,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         var _a3;
         return ((_a3 = item._resourceOrigin) == null ? void 0 : _a3[0].id) === firstResource;
       }).length;
-      if (sameResourceLength !== items.length) {
+      if (sameResourceLength === items.length) {
         return 1;
       }
-      return items.reduce((total, item) => {
-        return total + ((0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 0);
-      }, 0);
+      return Math.max(...items.map((item) => (0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 1));
     };
     let maxCapacity = 1;
     if (cartItems == null ? void 0 : cartItems[0].holder_id) {
@@ -1673,9 +1674,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       if (sameResourceLength !== items.length) {
         return 1;
       }
-      return items.reduce((total, item) => {
-        return total + ((0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 0);
-      }, 0);
+      return Math.max(...items.map((item) => (0, import_capacity.getCapacityInfoByCartItem)(item).currentCapacity || 1));
     };
     let maxCapacity = 1;
     if (cartItems == null ? void 0 : cartItems[0].holder_id) {
@@ -2264,6 +2263,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             if (!itemsByResourceType[resourceCode]) {
               itemsByResourceType[resourceCode] = [];
             }
+            if (itemsByResourceType[resourceCode].find((item) => item.holder_id === cartItem.holder_id)) {
+              return;
+            }
             if (!itemsByResourceType[resourceCode].find((item) => item._id === cartItem._id)) {
               itemsByResourceType[resourceCode].push(cartItem);
             }
@@ -2992,6 +2994,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 }
               }
             });
+            currentResourcesList.forEach((item2) => {
+              var _a3, _b2;
+              if (!((_a3 = resource.optional_resource) == null ? void 0 : _a3.includes(item2.id)) && !((_b2 = resource.default_resource) == null ? void 0 : _b2.includes(item2.id))) {
+                item2.onlyComputed = true;
+              }
+            });
             currentResourcesList.sort((a, b) => {
               return a.onlyComputed ? -1 : 1;
             });

package/package.json

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