@pisell/pisellos 3.0.33 → 3.0.34

package/dist/solution/BookingByStep/index.js

@@ -1255,7 +1255,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             var _item$_origin$resourc;
             var resources = (_item$_origin$resourc = item._origin.resources) === null || _item$_origin$resourc === void 0 ? void 0 : _item$_origin$resourc.filter(function (m) {
               // 检查当前资源是否与目标资源的任何资源匹配
-              return !targetCartItem._origin.resources.some(function (targetRes) {
+              // 目标资源，应该只取跟当前 m.form_id 相同的资源
+              var sameFormIdResources = targetCartItem._origin.resources.filter(function (n) {
+                return n.form_id === m.form_id;
+              });
+              if (!(sameFormIdResources !== null && sameFormIdResources !== void 0 && sameFormIdResources.length)) {
+                return true;
+              }
+              return !sameFormIdResources.some(function (targetRes) {
                 // 如果新更新进来的资源不是单个预约，其实就不需要检测了资源重叠了，但是需要检测资源 capacity 是否足够
                 if (targetRes.resourceType !== 'single') {
                   var _item$_productOrigin2;
@@ -1269,10 +1276,10 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   var originResource = allOriginResources.find(function (n) {
                     return n.id === targetRes.id;
                   });
-                  if (currentResourcesCapacityMap[targetRes.id] + _currentCapacity > (originResource === null || originResource === void 0 ? void 0 : originResource.capacity)) {
+                  if (currentResourcesCapacityMap[m.id] + _currentCapacity > (originResource === null || originResource === void 0 ? void 0 : originResource.capacity)) {
                     return true;
                   }
-                  currentResourcesCapacityMap[targetRes.id] += _currentCapacity;
+                  currentResourcesCapacityMap[m.id] += _currentCapacity;
                   return false;
                 }
                 if (item.holder_id !== (targetCartItem === null || targetCartItem === void 0 ? void 0 : targetCartItem.holder_id)) {

package/lib/solution/BookingByStep/index.js

@@ -641,7 +641,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         var _a2;
         if (item._id !== targetCartItem._id) {
           const resources = (_a2 = item._origin.resources) == null ? void 0 : _a2.filter((m) => {
-            return !targetCartItem._origin.resources.some((targetRes) => {
+            const sameFormIdResources = targetCartItem._origin.resources.filter((n) => n.form_id === m.form_id);
+            if (!(sameFormIdResources == null ? void 0 : sameFormIdResources.length)) {
+              return true;
+            }
+            return !sameFormIdResources.some((targetRes) => {
               var _a3, _b, _c;
               if (targetRes.resourceType !== "single") {
                 const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
@@ -654,10 +658,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 const originResource = allOriginResources.find(
                   (n) => n.id === targetRes.id
                 );
-                if (currentResourcesCapacityMap[targetRes.id] + currentCapacity > (originResource == null ? void 0 : originResource.capacity)) {
+                if (currentResourcesCapacityMap[m.id] + currentCapacity > (originResource == null ? void 0 : originResource.capacity)) {
                   return true;
                 }
-                currentResourcesCapacityMap[targetRes.id] += currentCapacity;
+                currentResourcesCapacityMap[m.id] += currentCapacity;
                 return false;
               }
               if (item.holder_id !== (targetCartItem == null ? void 0 : targetCartItem.holder_id)) {

package/package.json

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