@pisell/pisellos 3.0.23 → 3.0.25

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/modules/Schedule/utils.js

@@ -716,7 +716,7 @@ export function getAllSortedDateRanges(schedules) {
   }
 
   // 按照开始时间和时长排序
-  return allDateRanges.sort(function (a, b) {
+  var sortedDateRanges = allDateRanges.sort(function (a, b) {
     // 首先按开始时间排序
     var startTimeCompare = dayjs(a.start).valueOf() - dayjs(b.start).valueOf();
     if (startTimeCompare !== 0) return startTimeCompare;
@@ -726,4 +726,13 @@ export function getAllSortedDateRanges(schedules) {
     var durationB = dayjs(b.end).valueOf() - dayjs(b.start).valueOf();
     return durationA - durationB;
   });
+
+  // 排序完了，还需要做个去重，如果有开始时间结束时间完全一致的，则只保留一个
+  // 需要使用 dayjs 的 isSame 方法来判断
+  var uniqueDateRanges = sortedDateRanges.filter(function (range, index, self) {
+    return index === self.findIndex(function (t) {
+      return dayjs(t.start).isSame(dayjs(range.start)) && dayjs(t.end).isSame(dayjs(range.end));
+    });
+  });
+  return uniqueDateRanges;
 }

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/modules/Schedule/utils.js

@@ -573,7 +573,7 @@ function getAllSortedDateRanges(schedules) {
     console.log("No dateRanges found in schedules:", schedules);
     return [];
   }
-  return allDateRanges.sort((a, b) => {
+  let sortedDateRanges = allDateRanges.sort((a, b) => {
     const startTimeCompare = (0, import_dayjs.default)(a.start).valueOf() - (0, import_dayjs.default)(b.start).valueOf();
     if (startTimeCompare !== 0)
       return startTimeCompare;
@@ -581,6 +581,10 @@ function getAllSortedDateRanges(schedules) {
     const durationB = (0, import_dayjs.default)(b.end).valueOf() - (0, import_dayjs.default)(b.start).valueOf();
     return durationA - durationB;
   });
+  const uniqueDateRanges = sortedDateRanges.filter(
+    (range, index, self) => index === self.findIndex((t) => (0, import_dayjs.default)(t.start).isSame((0, import_dayjs.default)(range.start)) && (0, import_dayjs.default)(t.end).isSame((0, import_dayjs.default)(range.end)))
+  );
+  return uniqueDateRanges;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/package.json

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