@pisell/pisellos 3.0.81 → 3.0.83

package/dist/solution/BookingByStep/index.js

@@ -1808,7 +1808,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 timeSlots: timeSlots,
                 currentCapacity: totalCapacity + (capacity || 0)
               });
-              if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime) {
+              if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime && n.capacity >= (capacity || 0)) {
                 targetResource = n;
                 targetResourceTime = currentResourceIdleTime;
                 return 1; // break
@@ -2203,6 +2203,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 计算容量的辅助函数
       var calculateCapacityFromCartItems = function calculateCapacityFromCartItems(items) {
         var _items$0$_resourceOri;
+        if (items.length === 0) return 0;
         // 还需要增加一个判断，maxCapacity 必须是我单个人里选择的资源只有同一种的情况下才可以累加，否则单个账号都是 1
         var firstResource = (_items$0$_resourceOri = items[0]._resourceOrigin) === null || _items$0$_resourceOri === void 0 ? void 0 : _items$0$_resourceOri[0].id;
         var sameResourceLength = items.filter(function (item) {
@@ -2377,6 +2378,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               // 计算容量的辅助函数
               calculateCapacityFromCartItems = function calculateCapacityFromCartItems(items) {
                 var _items$0$_resourceOri2;
+                if (items.length === 0) return 0;
                 // 还需要增加一个判断，maxCapacity 必须是我单个人里选择的资源只有同一种的情况下才可以累加，否则单个账号都是 1
                 var firstResource = (_items$0$_resourceOri2 = items[0]._resourceOrigin) === null || _items$0$_resourceOri2 === void 0 ? void 0 : _items$0$_resourceOri2[0].id;
                 var sameResourceLength = items.filter(function (item) {
@@ -2554,8 +2556,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   _step3;
                 try {
                   for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                    var _time$event_list;
                     var time = _step3.value;
-                    var _iterator4 = _createForOfIteratorHelper(time.event_list || []),
+                    var blockedTimes = (_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.filter(function (event) {
+                      return event.type !== 'schedule_event';
+                    });
+                    var _iterator4 = _createForOfIteratorHelper(blockedTimes || []),
                       _step4;
                     try {
                       for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {

package/dist/solution/BookingByStep/utils/resources.js

@@ -349,7 +349,8 @@ export var getResourcesByProduct = function getResourcesByProduct(resourcesMap,
           return dayjs(current.end_at).isAfter(dayjs(latest.end_at)) ? current : latest;
         }, d.times[0]);
         // TODO,在这拉时间切片出来，如果可用 timeSlots.length > 1 才可以被选择
-        return dayjs(latestTime.end_at).isAfter(dayjs());
+        // 当前资源的配置容量需要大于当前需求的 capacity
+        return dayjs(latestTime.end_at).isAfter(dayjs()) && d.capacity >= capacity;
       });
       item.form_id = form_id;
       acc.push(item);

package/lib/solution/BookingByStep/index.js

@@ -1180,7 +1180,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           timeSlots,
           currentCapacity: totalCapacity + (capacity || 0)
         });
-        if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime) {
+        if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime && n.capacity >= (capacity || 0)) {
           targetResource = n;
           targetResourceTime = currentResourceIdleTime;
           break;
@@ -1532,6 +1532,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const calculateCapacityFromCartItems = (items) => {
       var _a2;
+      if (items.length === 0)
+        return 0;
       const firstResource = (_a2 = items[0]._resourceOrigin) == null ? void 0 : _a2[0].id;
       const sameResourceLength = items.filter((item) => {
         var _a3;
@@ -1665,6 +1667,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     const calculateCapacityFromCartItems = (items) => {
       var _a2;
+      if (items.length === 0)
+        return 0;
       const firstResource = (_a2 = items[0]._resourceOrigin) == null ? void 0 : _a2[0].id;
       const sameResourceLength = items.filter((item) => {
         var _a3;
@@ -1769,10 +1773,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               currentStartTime: currentStartTime2,
               times
             }) {
+              var _a4;
               const currentStart = (0, import_dayjs.default)(currentStartTime2);
               let earliestBlockStart;
               for (const time of times || []) {
-                for (const event of time.event_list || []) {
+                const blockedTimes = (_a4 = time.event_list) == null ? void 0 : _a4.filter((event) => event.type !== "schedule_event");
+                for (const event of blockedTimes || []) {
                   const eventStart = (0, import_dayjs.default)(event.start_at);
                   const eventEnd = (0, import_dayjs.default)(event.end_at);
                   if (eventStart.isBefore(currentStart) && eventEnd.isAfter(currentStart)) {

package/lib/solution/BookingByStep/utils/resources.js

@@ -298,7 +298,7 @@ var getResourcesByProduct = (resourcesMap, resources, selectedResources, capacit
         const latestTime = d.times.reduce((latest, current) => {
           return (0, import_dayjs.default)(current.end_at).isAfter((0, import_dayjs.default)(latest.end_at)) ? current : latest;
         }, d.times[0]);
-        return (0, import_dayjs.default)(latestTime.end_at).isAfter((0, import_dayjs.default)());
+        return (0, import_dayjs.default)(latestTime.end_at).isAfter((0, import_dayjs.default)()) && d.capacity >= capacity;
       });
       item.form_id = form_id;
       acc.push(item);

package/package.json

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