@pisell/pisellos 2.0.26 → 2.0.27

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

@@ -19,79 +19,63 @@ export function calculateResourceAvailableTime(_ref) {
     return dayjs(time.start_at).isSame(dayjs(timeSlots.start_at), 'day');
   });
   if (matchingTimes.length === 0) return 0;
-  var totalAvailableMinutes = 0;
+
+  // 计算所有时间段与目标时间槽的重叠部分
+  var overlaps = [];
   var _iterator = _createForOfIteratorHelper(matchingTimes),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _time$event_list;
       var time = _step.value;
       // 计算实际重叠的时间段
       var overlapStart = dayjs(time.start_at).isAfter(dayjs(timeSlots.start_at)) ? dayjs(time.start_at) : dayjs(timeSlots.start_at);
       var overlapEnd = dayjs(time.end_at).isBefore(dayjs(timeSlots.end_at)) ? dayjs(time.end_at) : dayjs(timeSlots.end_at);
 
-      // 如果没有预约事件，整个重叠时间段都是可用的
-      if (!((_time$event_list = time.event_list) !== null && _time$event_list !== void 0 && _time$event_list.length)) {
-        totalAvailableMinutes += overlapEnd.diff(overlapStart, 'minute');
-        continue;
-      }
-
-      // 处理时间段内的每个预约事件
-      var currentTime = overlapStart;
-      var _iterator2 = _createForOfIteratorHelper(time.event_list),
-        _step2;
-      try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var event = _step2.value;
-          var eventStart = dayjs(event.start_at);
-          var eventEnd = dayjs(event.end_at);
-
-          // 如果事件在当前时间之前，跳过
-          if (eventEnd.isBefore(currentTime)) continue;
-
-          // 如果事件开始时间在重叠结束时间之后，可以添加剩余时间
-          if (eventStart.isAfter(overlapEnd)) {
-            totalAvailableMinutes += overlapEnd.diff(currentTime, 'minute');
-            break;
-          }
-
-          // 如果事件开始时间在当前时间之后，添加事件开始前的时间
-          if (eventStart.isAfter(currentTime)) {
-            totalAvailableMinutes += eventStart.diff(currentTime, 'minute');
-          }
-
-          // 对于单个预约类型，整个事件时间都是不可用的
-          if (resource.resourceType === 'single') {
-            currentTime = eventEnd;
-            continue;
-          }
-
-          // 对于多个预约类型，检查容量
-          if (resource.resourceType === 'multiple') {
-            var remainingCapacity = (resource.capacity || 0) - (event.pax || 0);
-            if (remainingCapacity >= currentCapacity) {
-              // 如果剩余容量足够，这个时间段仍然是可用的
-              totalAvailableMinutes += eventEnd.diff(eventStart, 'minute');
-            }
-            currentTime = eventEnd;
-          }
-        }
-
-        // 添加最后一个事件之后的剩余时间
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
-      }
-      if (currentTime.isBefore(overlapEnd)) {
-        totalAvailableMinutes += overlapEnd.diff(currentTime, 'minute');
+      // 只有当重叠时间段有效时才添加
+      if (overlapStart.isBefore(overlapEnd)) {
+        overlaps.push({
+          start: overlapStart,
+          end: overlapEnd
+        });
       }
     }
+
+    // 合并重叠的时间段，计算并集
   } catch (err) {
     _iterator.e(err);
   } finally {
     _iterator.f();
   }
+  if (overlaps.length === 0) return 0;
+
+  // 按开始时间排序
+  overlaps.sort(function (a, b) {
+    return a.start.diff(b.start);
+  });
+
+  // 合并重叠的时间段
+  var merged = [];
+  var current = overlaps[0];
+  for (var i = 1; i < overlaps.length; i++) {
+    var next = overlaps[i];
+
+    // 如果当前时间段与下一个时间段重叠或相邻，则合并
+    if (current.end.isSameOrAfter(next.start)) {
+      current.end = current.end.isAfter(next.end) ? current.end : next.end;
+    } else {
+      // 不重叠，添加当前时间段到结果中，开始处理下一个
+      merged.push(current);
+      current = next;
+    }
+  }
+  merged.push(current);
+
+  // 计算所有合并后时间段的总时长
+  var totalAvailableMinutes = 0;
+  for (var _i = 0, _merged = merged; _i < _merged.length; _i++) {
+    var segment = _merged[_i];
+    totalAvailableMinutes += segment.end.diff(segment.start, 'minute');
+  }
   return totalAvailableMinutes;
 }
 
@@ -113,11 +97,11 @@ export function findFastestAvailableResource(_ref2) {
   var fastestResources = [];
 
   // 遍历所有资源，找到最快可用的时间点
-  var _iterator3 = _createForOfIteratorHelper(resources),
-    _step3;
+  var _iterator2 = _createForOfIteratorHelper(resources),
+    _step2;
   try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var _resource = _step3.value;
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var _resource = _step2.value;
       // 获取资源当天的时间段
       var todayTimes = _resource.times.filter(function (time) {
         return dayjs(time.start_at).isSame(currentTime, 'day');
@@ -130,11 +114,11 @@ export function findFastestAvailableResource(_ref2) {
       });
 
       // 找到第一个可用的时间段
-      var _iterator4 = _createForOfIteratorHelper(todayTimes),
-        _step4;
+      var _iterator3 = _createForOfIteratorHelper(todayTimes),
+        _step3;
       try {
         var _loop = function _loop() {
-            var time = _step4.value;
+            var time = _step3.value;
             var startTime = dayjs(time.start_at);
 
             // 如果开始时间在当前时间之前，跳过
@@ -142,9 +126,9 @@ export function findFastestAvailableResource(_ref2) {
 
             // 检查这个时间段是否可用
             if (_resource.resourceType === 'single') {
-              var _time$event_list2;
+              var _time$event_list;
               // 单个预约类型：检查是否有预约
-              var hasBooking = (_time$event_list2 = time.event_list) === null || _time$event_list2 === void 0 ? void 0 : _time$event_list2.some(function (event) {
+              var hasBooking = (_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.some(function (event) {
                 return dayjs(event.start_at).isSame(startTime);
               });
               if (!hasBooking) {
@@ -158,10 +142,10 @@ export function findFastestAvailableResource(_ref2) {
                 return 1; // break
               }
             } else {
-              var _time$event_list3;
+              var _time$event_list2;
               // 多个预约类型：检查容量
               var totalCapacity = _resource.capacity || 0;
-              var usedCapacity = ((_time$event_list3 = time.event_list) === null || _time$event_list3 === void 0 ? void 0 : _time$event_list3.reduce(function (sum, event) {
+              var usedCapacity = ((_time$event_list2 = time.event_list) === null || _time$event_list2 === void 0 ? void 0 : _time$event_list2.reduce(function (sum, event) {
                 return dayjs(event.start_at).isSame(startTime) ? sum + (event.pax || 0) : sum;
               }, 0)) || 0;
               var remainingCapacity = totalCapacity - usedCapacity;
@@ -178,23 +162,23 @@ export function findFastestAvailableResource(_ref2) {
             }
           },
           _ret;
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
           _ret = _loop();
           if (_ret === 0) continue;
           if (_ret === 1) break;
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator4.f();
+        _iterator3.f();
       }
     }
 
     // 如果没有找到可用资源，返回null
   } catch (err) {
-    _iterator3.e(err);
+    _iterator2.e(err);
   } finally {
-    _iterator3.f();
+    _iterator2.f();
   }
   if (!fastestTime || fastestResources.length === 0) return null;
 
@@ -204,8 +188,8 @@ export function findFastestAvailableResource(_ref2) {
   // 如果有多个最快可用的资源，比较它们的空闲时间
   var maxIdleTime = 0;
   var selectedResource = null;
-  for (var _i = 0, _fastestResources = fastestResources; _i < _fastestResources.length; _i++) {
-    var resource = _fastestResources[_i];
+  for (var _i2 = 0, _fastestResources = fastestResources; _i2 < _fastestResources.length; _i2++) {
+    var resource = _fastestResources[_i2];
     var idleTime = calculateResourceAvailableTime({
       resource: resource,
       timeSlots: {

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

@@ -39,49 +39,38 @@ function calculateResourceAvailableTime({
   timeSlots,
   currentCapacity = 1
 }) {
-  var _a;
   const matchingTimes = resource.times.filter((time) => {
     return (0, import_dayjs.default)(time.start_at).isSame((0, import_dayjs.default)(timeSlots.start_at), "day");
   });
   if (matchingTimes.length === 0)
     return 0;
-  let totalAvailableMinutes = 0;
+  const overlaps = [];
   for (const time of matchingTimes) {
     const overlapStart = (0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlots.start_at)) ? (0, import_dayjs.default)(time.start_at) : (0, import_dayjs.default)(timeSlots.start_at);
     const overlapEnd = (0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlots.end_at)) ? (0, import_dayjs.default)(time.end_at) : (0, import_dayjs.default)(timeSlots.end_at);
-    if (!((_a = time.event_list) == null ? void 0 : _a.length)) {
-      totalAvailableMinutes += overlapEnd.diff(overlapStart, "minute");
-      continue;
+    if (overlapStart.isBefore(overlapEnd)) {
+      overlaps.push({ start: overlapStart, end: overlapEnd });
     }
-    let currentTime = overlapStart;
-    for (const event of time.event_list) {
-      const eventStart = (0, import_dayjs.default)(event.start_at);
-      const eventEnd = (0, import_dayjs.default)(event.end_at);
-      if (eventEnd.isBefore(currentTime))
-        continue;
-      if (eventStart.isAfter(overlapEnd)) {
-        totalAvailableMinutes += overlapEnd.diff(currentTime, "minute");
-        break;
-      }
-      if (eventStart.isAfter(currentTime)) {
-        totalAvailableMinutes += eventStart.diff(currentTime, "minute");
-      }
-      if (resource.resourceType === "single") {
-        currentTime = eventEnd;
-        continue;
-      }
-      if (resource.resourceType === "multiple") {
-        const remainingCapacity = (resource.capacity || 0) - (event.pax || 0);
-        if (remainingCapacity >= currentCapacity) {
-          totalAvailableMinutes += eventEnd.diff(eventStart, "minute");
-        }
-        currentTime = eventEnd;
-      }
-    }
-    if (currentTime.isBefore(overlapEnd)) {
-      totalAvailableMinutes += overlapEnd.diff(currentTime, "minute");
+  }
+  if (overlaps.length === 0)
+    return 0;
+  overlaps.sort((a, b) => a.start.diff(b.start));
+  const merged = [];
+  let current = overlaps[0];
+  for (let i = 1; i < overlaps.length; i++) {
+    const next = overlaps[i];
+    if (current.end.isSameOrAfter(next.start)) {
+      current.end = current.end.isAfter(next.end) ? current.end : next.end;
+    } else {
+      merged.push(current);
+      current = next;
     }
   }
+  merged.push(current);
+  let totalAvailableMinutes = 0;
+  for (const segment of merged) {
+    totalAvailableMinutes += segment.end.diff(segment.start, "minute");
+  }
   return totalAvailableMinutes;
 }
 function findFastestAvailableResource({

package/package.json

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