@pisell/pisellos 3.0.22 → 3.0.24

package/dist/modules/Date/utils.js

@@ -209,7 +209,18 @@ export var handleAvailableDatesByRules = function handleAvailableDatesByRules(da
     var disabledDate = _objectSpread(_objectSpread({}, date), {}, {
       status: 'unavailable'
     });
-
+    var hasScheduleConfig = rules.find(function (n) {
+      var _n$schedule;
+      return (_n$schedule = n.schedule) === null || _n$schedule === void 0 ? void 0 : _n$schedule.length;
+    });
+    // 如果外面穿了 schedule，但是这个时候scheduleMap为空，则设置为不可用
+    // 这种情况为，商品设置了 5.1-5.31 可用，资源设置了 5.1-6.30 可用，session 类商品详情弹窗里里看到的6 月以后的日期都应该是不可用的
+    if (Object.keys(scheduleMap).length === 0 && hasScheduleConfig) {
+      return _objectSpread(_objectSpread({}, date), {}, {
+        color: '',
+        status: 'unavailable'
+      });
+    }
     // 根据日程判断日期是否可用
     if (Object.keys(scheduleMap).length) {
       var schedule = scheduleMap[date.date];

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

@@ -205,6 +205,10 @@ export var getIsUsableByTimeItem = function getIsUsableByTimeItem(_ref2) {
         canBookingForOngoing = true;
       }
     }
+  } else if (type === 'ongoing' && (ongoing === null || ongoing === void 0 ? void 0 : ongoing.type) === 'before_end') {
+    if (dayjs(timeSlice.end_at).isAfter(earliest)) {
+      canBookingForOngoing = true;
+    }
   } else {
     if (unit) {
       earliest = earliest.add(unit, unit_type);

package/lib/modules/Date/utils.js

@@ -155,6 +155,13 @@ var handleAvailableDatesByRules = (dates, rules) => {
   newDates = newDates.map((date) => {
     var _a;
     const disabledDate = { ...date, status: "unavailable" };
+    const hasScheduleConfig = rules.find((n) => {
+      var _a2;
+      return (_a2 = n.schedule) == null ? void 0 : _a2.length;
+    });
+    if (Object.keys(scheduleMap).length === 0 && hasScheduleConfig) {
+      return { ...date, color: "", status: "unavailable" };
+    }
     if (Object.keys(scheduleMap).length) {
       const schedule = scheduleMap[date.date];
       if (!schedule || (schedule == null ? void 0 : schedule.isExcluded)) {

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

@@ -149,6 +149,10 @@ var getIsUsableByTimeItem = ({
         canBookingForOngoing = true;
       }
     }
+  } else if (type === "ongoing" && (ongoing == null ? void 0 : ongoing.type) === "before_end") {
+    if ((0, import_dayjs.default)(timeSlice.end_at).isAfter(earliest)) {
+      canBookingForOngoing = true;
+    }
   } else {
     if (unit) {
       earliest = earliest.add(unit, unit_type);

package/package.json

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