@pisell/pisellos 2.0.6 → 2.0.7

package/dist/solution/BookingByStep/index.js

@@ -1505,12 +1505,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
             var allCartItems = cloneDeep(_this8.store.cart.getItems());
             // 如果没有传递 timeSlots，代表是第一种资源，则直接拿商品的 duration，到资源列表里找一个公共可用的
             var selectedResources = [];
+            var _resources = cloneDeep(((_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.product_resource) === null || _item$_productOrigin8 === void 0 ? void 0 : _item$_productOrigin8.resources) || []);
+            var currentResourcesRenderList = [];
+            _resources.forEach(function (n) {
+              var _n$renderList;
+              if ((_n$renderList = n.renderList) !== null && _n$renderList !== void 0 && _n$renderList.length) {
+                currentResourcesRenderList.push.apply(currentResourcesRenderList, _toConsumableArray(n.renderList || []));
+              }
+            });
+            var _resourcesMap = getResourcesMap(currentResourcesRenderList);
             if (item.holder_id) {
-              selectedResources = getOthersSelectedResources(allCartItems, item.holder_id, resourcesMap);
+              selectedResources = getOthersSelectedResources(allCartItems, item.holder_id, _resourcesMap);
             } else {
-              selectedResources = getOthersCartSelectedResources(allCartItems, item._id, resourcesMap);
+              selectedResources = getOthersCartSelectedResources(allCartItems, item._id, _resourcesMap);
             }
-            var productResources = getResourcesByProduct(resourcesMap, ((_item$_productOrigin8 = item._productOrigin) === null || _item$_productOrigin8 === void 0 || (_item$_productOrigin8 = _item$_productOrigin8.product_resource) === null || _item$_productOrigin8 === void 0 ? void 0 : _item$_productOrigin8.resources) || [], selectedResources, currentCapacity);
+            var productResources = getResourcesByProduct(_resourcesMap, cloneDeep(_resources), selectedResources, currentCapacity);
             // 自动选择 productResources 中对应 resources_code 的资源
             var targetRenderList = (_productResources$fin = productResources.find(function (n) {
               return n.code === resources_code;

package/lib/solution/BookingByStep/index.js

@@ -913,22 +913,31 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         } else {
           const allCartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
           let selectedResources = [];
+          const resources2 = (0, import_lodash_es.cloneDeep)(((_k = (_j = item._productOrigin) == null ? void 0 : _j.product_resource) == null ? void 0 : _k.resources) || []);
+          const currentResourcesRenderList = [];
+          resources2.forEach((n) => {
+            var _a3;
+            if ((_a3 = n.renderList) == null ? void 0 : _a3.length) {
+              currentResourcesRenderList.push(...n.renderList || []);
+            }
+          });
+          const resourcesMap2 = (0, import_utils.getResourcesMap)(currentResourcesRenderList);
           if (item.holder_id) {
             selectedResources = (0, import_resources.getOthersSelectedResources)(
               allCartItems,
               item.holder_id,
-              resourcesMap
+              resourcesMap2
             );
           } else {
             selectedResources = (0, import_resources.getOthersCartSelectedResources)(
               allCartItems,
               item._id,
-              resourcesMap
+              resourcesMap2
             );
           }
           const productResources = (0, import_resources.getResourcesByProduct)(
-            resourcesMap,
-            ((_k = (_j = item._productOrigin) == null ? void 0 : _j.product_resource) == null ? void 0 : _k.resources) || [],
+            resourcesMap2,
+            (0, import_lodash_es.cloneDeep)(resources2),
             selectedResources,
             currentCapacity
           );

package/package.json

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