@pisell/pisellos 0.0.64 → 0.0.66

package/dist/solution/BookingByStep/index.d.ts

@@ -44,9 +44,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         collection?: number | string[];
         schedule_ids?: number[];
     }): Promise<any>;
-    loadProductByScheduleDate({ date, product_ids, }: {
+    loadProductByScheduleDate({ date, product_ids, category_ids, }: {
         date: string;
         product_ids?: number[];
+        category_ids?: number[];
     }): Promise<any>;
     loadAllSchedule(): Promise<void>;
     loadScheduleAvailableDate({ startDate, endDate, custom_page_id, }: {

package/dist/solution/BookingByStep/index.js

@@ -243,11 +243,11 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProductByScheduleDate",
     value: function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
-        var date, product_ids, scheduleList, scheduleIds;
+        var date, product_ids, _ref2$category_ids, category_ids, scheduleList, scheduleIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              date = _ref2.date, product_ids = _ref2.product_ids;
+              date = _ref2.date, product_ids = _ref2.product_ids, _ref2$category_ids = _ref2.category_ids, category_ids = _ref2$category_ids === void 0 ? [] : _ref2$category_ids;
               scheduleList = this.store.schedule.getAvailabilityScheduleDateList(); // 缓存下这次选择的结果，如果是先选日期再选 duration 类商品，后面用得到
               this.setDateRange([{
                 date: date,
@@ -268,7 +268,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               _context3.next = 6;
               return this.loadProducts({
                 schedule_ids: scheduleIds,
-                product_ids: product_ids
+                product_ids: product_ids,
+                category_ids: category_ids
               });
             case 6:
               return _context3.abrupt("return", _context3.sent);
@@ -1504,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.d.ts

@@ -44,9 +44,10 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         collection?: number | string[];
         schedule_ids?: number[];
     }): Promise<any>;
-    loadProductByScheduleDate({ date, product_ids, }: {
+    loadProductByScheduleDate({ date, product_ids, category_ids, }: {
         date: string;
         product_ids?: number[];
+        category_ids?: number[];
     }): Promise<any>;
     loadAllSchedule(): Promise<void>;
     loadScheduleAvailableDate({ startDate, endDate, custom_page_id, }: {

package/lib/solution/BookingByStep/index.js

@@ -187,7 +187,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   async loadProductByScheduleDate({
     date,
-    product_ids
+    product_ids,
+    category_ids = []
   }) {
     const scheduleList = this.store.schedule.getAvailabilityScheduleDateList();
     this.setDateRange([
@@ -195,7 +196,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       { date, status: "available", week: "", weekNum: 0 }
     ]);
     const scheduleIds = scheduleList.filter((n) => n.date === date).flatMap((n) => n.schedule_id);
-    return await this.loadProducts({ schedule_ids: scheduleIds, product_ids });
+    return await this.loadProducts({ schedule_ids: scheduleIds, product_ids, category_ids });
   }
   // 加载当前店铺下所有 schedule
   async loadAllSchedule() {
@@ -912,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": "0.0.64",
+  "version": "0.0.66",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",