@pisell/pisellos 0.0.72 → 0.0.73

package/dist/solution/BookingByStep/index.js

@@ -1209,7 +1209,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   currentCount: recordCount + (currentCapacity || 0),
                   resourcesUseableMap: resourcesUseableMap
                 });
-                if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false) {
+                // 如果仅仅是因为子资源容量不够，不应该标记子资源是被占用的情况
+                if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
                   resourcesUseableMap[m.id] = res.usable;
                 }
                 return res.usable;
@@ -1389,7 +1390,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 currentCount: recordCount + (capacity || 0),
                 resourcesUseableMap: resourcesUseableMap
               });
-              if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[n.id]) !== false) {
+              // 如果只是因为子资源容量不够，而不是子资源被预约导致没时间片，不应该标记子资源为不可用，从而影响组合资源的情况
+              if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[n.id]) !== false && res.reason !== 'capacityOnly') {
                 resourcesUseableMap[n.id] = res.usable;
               }
               return res.usable;
@@ -1860,7 +1862,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               currentCount: 1,
               resourcesUseableMap: resourcesUseableMap
             });
-            if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false) {
+            if ((resourcesUseableMap === null || resourcesUseableMap === void 0 ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== 'capacityOnly') {
               resourcesUseableMap[m.id] = res.usable;
             }
             if (res.usable && res.remainingCapacity >= count) {

package/dist/solution/BookingByStep/utils/resources.d.ts

@@ -38,6 +38,7 @@ export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, curren
     capacity: boolean;
     usable: boolean;
     remainingCapacity: number;
+    reason: string;
 };
 /**
  * @title: 获取商品下绑定的资源列表

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

@@ -113,7 +113,8 @@ var checkCapacity = function checkCapacity(_ref) {
   if (currentCount > resource.capacity) {
     return {
       status: false,
-      capacity: resource.capacity
+      capacity: resource.capacity,
+      reason: 'capacityOnly'
     };
   }
   var conflict = (event_list || []).filter(function (d) {
@@ -179,7 +180,9 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
     afterToDay: false,
     capacity: false,
     usable: false,
-    remainingCapacity: 0 // 剩余容量
+    remainingCapacity: 0,
+    // 剩余容量
+    reason: ''
   };
   // 最早可预约时间为 当前日期之后并且提前量之后
   var earliest = dayjs();
@@ -204,6 +207,7 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
       }
     });
   }
+  status.reason = checkCapacityResult.reason || '';
   if (!checkCapacityResult.status) {
     return status;
   }

package/lib/solution/BookingByStep/index.js

@@ -661,7 +661,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 currentCount: recordCount + (currentCapacity || 0),
                 resourcesUseableMap
               });
-              if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false) {
+              if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
                 resourcesUseableMap[m.id] = res.usable;
               }
               return res.usable;
@@ -820,7 +820,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             currentCount: recordCount + (capacity || 0),
             resourcesUseableMap
           });
-          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[n.id]) !== false) {
+          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[n.id]) !== false && res.reason !== "capacityOnly") {
             resourcesUseableMap[n.id] = res.usable;
           }
           return res.usable;
@@ -1231,7 +1231,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             currentCount: 1,
             resourcesUseableMap
           });
-          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false) {
+          if ((resourcesUseableMap == null ? void 0 : resourcesUseableMap[m.id]) !== false && res.reason !== "capacityOnly") {
             resourcesUseableMap[m.id] = res.usable;
           }
           if (res.usable && res.remainingCapacity >= count) {

package/lib/solution/BookingByStep/utils/resources.d.ts

@@ -38,6 +38,7 @@ export declare const getIsUsableByTimeItem: ({ timeSlice, time, resource, curren
     capacity: boolean;
     usable: boolean;
     remainingCapacity: number;
+    reason: string;
 };
 /**
  * @title: 获取商品下绑定的资源列表

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

@@ -85,7 +85,8 @@ var checkCapacity = ({
   if (currentCount > resource.capacity) {
     return {
       status: false,
-      capacity: resource.capacity
+      capacity: resource.capacity,
+      reason: "capacityOnly"
     };
   }
   let conflict = (event_list || []).filter((d) => {
@@ -133,8 +134,9 @@ var getIsUsableByTimeItem = ({
     afterToDay: false,
     capacity: false,
     usable: false,
-    remainingCapacity: 0
+    remainingCapacity: 0,
     // 剩余容量
+    reason: ""
   };
   let earliest = (0, import_dayjs.default)();
   if (!checkAfterToDay(timeSlice.start_at, earliest)) {
@@ -155,6 +157,7 @@ var getIsUsableByTimeItem = ({
       }
     });
   }
+  status.reason = checkCapacityResult.reason || "";
   if (!checkCapacityResult.status) {
     return status;
   }

package/package.json

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