@pisell/pisellos 0.0.113 → 0.0.114

package/dist/modules/Schedule/types.d.ts

@@ -7,6 +7,7 @@ export interface ScheduleState {
 export type ScheduleAvailabilityDateItem = {
     date: string;
     schedule_id: number[];
+    product_ids: number[];
 };
 export interface ScheduleModuleAPI {
 }

package/dist/solution/BookingByStep/index.js

@@ -271,7 +271,8 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadProductByScheduleDate",
     value: function () {
       var _loadProductByScheduleDate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
-        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, scheduleIds, otherProductsIds, allProductIds;
+        var _product_ids;
+        var date, _ref2$product_ids, product_ids, _ref2$category_ids, category_ids, scheduleList, scheduleIds, _schedule$product_ids, schedule, otherProductsIds, allProductIds;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -294,21 +295,31 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 return n.schedule_id;
               }).filter(function (n) {
                 return n !== null && n !== undefined;
-              }); // 尝试去拿schedule 里的 other_product_ids 和 product_ids 拼在一起去重
+              }); // 如果外面没传 product_ids，尝试从对应 schedule 里拿 product_ids
+              if (!((_product_ids = product_ids) !== null && _product_ids !== void 0 && _product_ids.length)) {
+                schedule = scheduleList.find(function (n) {
+                  return n.date === date;
+                });
+                if (schedule && (_schedule$product_ids = schedule.product_ids) !== null && _schedule$product_ids !== void 0 && _schedule$product_ids.length) {
+                  product_ids = schedule.product_ids;
+                }
+              }
+
+              // 尝试去拿schedule 里的 other_product_ids 和 product_ids 拼在一起去重
               otherProductsIds = this.store.schedule.getOtherProductsIds() || [];
               allProductIds = [].concat(_toConsumableArray(product_ids), _toConsumableArray(otherProductsIds)).filter(function (n, index, self) {
                 return self.indexOf(n) === index;
               });
-              _context3.next = 8;
+              _context3.next = 9;
               return this.loadProducts({
                 schedule_ids: scheduleIds,
                 product_ids: allProductIds,
                 category_ids: category_ids,
                 schedule_date: date
               });
-            case 8:
-              return _context3.abrupt("return", _context3.sent);
             case 9:
+              return _context3.abrupt("return", _context3.sent);
+            case 10:
             case "end":
               return _context3.stop();
           }

package/lib/modules/Schedule/types.d.ts

@@ -7,6 +7,7 @@ export interface ScheduleState {
 export type ScheduleAvailabilityDateItem = {
     date: string;
     schedule_id: number[];
+    product_ids: number[];
 };
 export interface ScheduleModuleAPI {
 }

package/lib/solution/BookingByStep/index.js

@@ -215,12 +215,19 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     product_ids = [],
     category_ids = []
   }) {
+    var _a;
     const scheduleList = this.store.schedule.getAvailabilityScheduleDateList();
     this.setDateRange([
       { date, status: "available", week: "", weekNum: 0 },
       { date, status: "available", week: "", weekNum: 0 }
     ]);
     const scheduleIds = scheduleList.filter((n) => n.date === date).flatMap((n) => n.schedule_id).filter((n) => n !== null && n !== void 0);
+    if (!(product_ids == null ? void 0 : product_ids.length)) {
+      const schedule = scheduleList.find((n) => n.date === date);
+      if (schedule && ((_a = schedule.product_ids) == null ? void 0 : _a.length)) {
+        product_ids = schedule.product_ids;
+      }
+    }
     const otherProductsIds = this.store.schedule.getOtherProductsIds() || [];
     const allProductIds = [...product_ids, ...otherProductsIds].filter((n, index, self) => self.indexOf(n) === index);
     return await this.loadProducts({

package/package.json

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