@pisell/pisellos 2.0.25 → 2.0.27

package/dist/solution/BookingByStep/index.js

@@ -37,6 +37,7 @@ import { getResourcesMap } from "../../modules/Resource/utils";
 import { cloneDeep } from 'lodash-es';
 import { calcCalendarDataByScheduleResult, calcMinTimeMaxTimeBySchedules, getAllSortedDateRanges } from "../../modules/Schedule/utils";
 import { disableAllDates, disableDatesBeforeOneDay, generateMonthDates, handleAvailableDateByResource } from "../../modules/Date/utils";
+import { calculateResourceAvailableTime, findFastestAvailableResource } from "./utils/timeslots";
 export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(BookingByStepImpl, _BaseModule);
   var _super = _createSuper(BookingByStepImpl);
@@ -1806,6 +1807,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
         //   .format("HH:mm");
         // 根据 start_time 和 end_time 去匹配资源
         var targetResource = null;
+        var targetResourceTime = 0;
         var _iterator3 = _createForOfIteratorHelper(resources),
           _step3;
         try {
@@ -1848,8 +1850,14 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                 }
                 return res.usable;
               });
-              if (canUseTime && !n.onlyComputed) {
+              var currentResourceIdleTime = calculateResourceAvailableTime({
+                resource: n,
+                timeSlots: timeSlots,
+                currentCapacity: totalCapacity + (capacity || 0)
+              });
+              if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime) {
                 targetResource = n;
+                targetResourceTime = currentResourceIdleTime;
                 return 1; // break
               }
             },
@@ -2047,7 +2055,12 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
               })) {
                 return;
               }
-              var targetResource = targetRenderList[0];
+              var fastestResource = findFastestAvailableResource({
+                resources: targetRenderList,
+                currentCapacity: currentCapacity,
+                countMap: selectResourcesMap
+              });
+              var targetResource = fastestResource || targetRenderList[0];
               targetResource.capacity = currentCapacity;
               // 在这里处理 children 的数据
               checkSubResourcesCapacity(targetResource);

package/dist/solution/BookingByStep/utils/timeslots.d.ts

@@ -0,0 +1,25 @@
+import { ResourceItem, TimeSliceItem } from "./resources";
+/**
+ * 计算资源在指定时间段内的总可用时间（以分钟为单位）
+ * @param resource 需要计算可用时间的资源
+ * @param timeSlots 要检查可用性的时间段
+ * @param currentCapacity 当前预约所需的容量
+ * @returns 总可用时间（分钟）
+ */
+export declare function calculateResourceAvailableTime({ resource, timeSlots, currentCapacity, }: {
+    resource: ResourceItem;
+    timeSlots: TimeSliceItem;
+    currentCapacity?: number;
+}): number;
+/**
+ * 查找最快可用的资源，如果有多个资源在相同时间点可用，则选择空闲时间最长的资源
+ * @param resources 资源列表
+ * @param currentCapacity 当前预约所需的容量
+ * @param countMap 已预约数量映射
+ * @returns 最快可用的资源
+ */
+export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, }: {
+    resources: ResourceItem[];
+    currentCapacity?: number;
+    countMap?: Record<number, number>;
+}): ResourceItem | null;

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

@@ -0,0 +1,209 @@
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import dayjs from "dayjs";
+/**
+ * 计算资源在指定时间段内的总可用时间（以分钟为单位）
+ * @param resource 需要计算可用时间的资源
+ * @param timeSlots 要检查可用性的时间段
+ * @param currentCapacity 当前预约所需的容量
+ * @returns 总可用时间（分钟）
+ */
+export function calculateResourceAvailableTime(_ref) {
+  var resource = _ref.resource,
+    timeSlots = _ref.timeSlots,
+    _ref$currentCapacity = _ref.currentCapacity,
+    currentCapacity = _ref$currentCapacity === void 0 ? 1 : _ref$currentCapacity;
+  // 过滤出与给定日期相同的资源时间
+  var matchingTimes = resource.times.filter(function (time) {
+    return dayjs(time.start_at).isSame(dayjs(timeSlots.start_at), 'day');
+  });
+  if (matchingTimes.length === 0) return 0;
+
+  // 计算所有时间段与目标时间槽的重叠部分
+  var overlaps = [];
+  var _iterator = _createForOfIteratorHelper(matchingTimes),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      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 (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;
+}
+
+/**
+ * 查找最快可用的资源，如果有多个资源在相同时间点可用，则选择空闲时间最长的资源
+ * @param resources 资源列表
+ * @param currentCapacity 当前预约所需的容量
+ * @param countMap 已预约数量映射
+ * @returns 最快可用的资源
+ */
+export function findFastestAvailableResource(_ref2) {
+  var resources = _ref2.resources,
+    _ref2$currentCapacity = _ref2.currentCapacity,
+    currentCapacity = _ref2$currentCapacity === void 0 ? 1 : _ref2$currentCapacity,
+    _ref2$countMap = _ref2.countMap,
+    countMap = _ref2$countMap === void 0 ? {} : _ref2$countMap;
+  var currentTime = dayjs();
+  var fastestTime = null;
+  var fastestResources = [];
+
+  // 遍历所有资源，找到最快可用的时间点
+  var _iterator2 = _createForOfIteratorHelper(resources),
+    _step2;
+  try {
+    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');
+      });
+      if (todayTimes.length === 0) continue;
+
+      // 按开始时间排序
+      todayTimes.sort(function (a, b) {
+        return dayjs(a.start_at).diff(dayjs(b.start_at));
+      });
+
+      // 找到第一个可用的时间段
+      var _iterator3 = _createForOfIteratorHelper(todayTimes),
+        _step3;
+      try {
+        var _loop = function _loop() {
+            var time = _step3.value;
+            var startTime = dayjs(time.start_at);
+
+            // 如果开始时间在当前时间之前，跳过
+            if (startTime.isBefore(currentTime)) return 0; // continue
+
+            // 检查这个时间段是否可用
+            if (_resource.resourceType === 'single') {
+              var _time$event_list;
+              // 单个预约类型：检查是否有预约
+              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) {
+                if (!fastestTime || startTime.isSame(fastestTime)) {
+                  fastestTime = startTime;
+                  fastestResources.push(_resource);
+                } else if (startTime.isBefore(fastestTime)) {
+                  fastestTime = startTime;
+                  fastestResources = [_resource];
+                }
+                return 1; // break
+              }
+            } else {
+              var _time$event_list2;
+              // 多个预约类型：检查容量
+              var totalCapacity = _resource.capacity || 0;
+              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;
+              if (remainingCapacity >= (countMap[_resource.id] || 0) + currentCapacity) {
+                if (!fastestTime || startTime.isSame(fastestTime)) {
+                  fastestTime = startTime;
+                  fastestResources.push(_resource);
+                } else if (startTime.isBefore(fastestTime)) {
+                  fastestTime = startTime;
+                  fastestResources = [_resource];
+                }
+                return 1; // break
+              }
+            }
+          },
+          _ret;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          _ret = _loop();
+          if (_ret === 0) continue;
+          if (_ret === 1) break;
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+    }
+
+    // 如果没有找到可用资源，返回null
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  if (!fastestTime || fastestResources.length === 0) return null;
+
+  // 如果只有一个最快可用的资源，直接返回
+  if (fastestResources.length === 1) return fastestResources[0];
+
+  // 如果有多个最快可用的资源，比较它们的空闲时间
+  var maxIdleTime = 0;
+  var selectedResource = null;
+  for (var _i2 = 0, _fastestResources = fastestResources; _i2 < _fastestResources.length; _i2++) {
+    var resource = _fastestResources[_i2];
+    var idleTime = calculateResourceAvailableTime({
+      resource: resource,
+      timeSlots: {
+        start_time: fastestTime.format('HH:mm'),
+        end_time: fastestTime.format('HH:mm'),
+        start_at: fastestTime,
+        end_at: fastestTime
+      },
+      currentCapacity: (countMap[resource.id] || 0) + currentCapacity
+    });
+    if (idleTime > maxIdleTime) {
+      maxIdleTime = idleTime;
+      selectedResource = resource;
+    }
+  }
+  return selectedResource;
+}

package/lib/solution/BookingByStep/index.js

@@ -43,6 +43,7 @@ var import_utils = require("../../modules/Resource/utils");
 var import_lodash_es = require("lodash-es");
 var import_utils2 = require("../../modules/Schedule/utils");
 var import_utils3 = require("../../modules/Date/utils");
+var import_timeslots = require("./utils/timeslots");
 import_dayjs.default.extend(import_isSameOrBefore.default);
 import_dayjs.default.extend(import_isSameOrAfter.default);
 var BookingByStepImpl = class extends import_BaseModule.BaseModule {
@@ -1170,6 +1171,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }, {});
     if (timeSlots) {
       let targetResource = null;
+      let targetResourceTime = 0;
       for (const n of resources) {
         const mTimes = n.times.filter((n2) => {
           return !(0, import_dayjs.default)(n2.start_at).isAfter((0, import_dayjs.default)(timeSlots.start_at)) && !(0, import_dayjs.default)(n2.end_at).isBefore((0, import_dayjs.default)(timeSlots.end_at));
@@ -1199,8 +1201,14 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           }
           return res.usable;
         });
-        if (canUseTime && !n.onlyComputed) {
+        const currentResourceIdleTime = (0, import_timeslots.calculateResourceAvailableTime)({
+          resource: n,
+          timeSlots,
+          currentCapacity: totalCapacity + (capacity || 0)
+        });
+        if (canUseTime && !n.onlyComputed && currentResourceIdleTime > targetResourceTime) {
           targetResource = n;
+          targetResourceTime = currentResourceIdleTime;
           break;
         }
       }
@@ -1382,7 +1390,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
             )) {
               return;
             }
-            const targetResource = targetRenderList[0];
+            const fastestResource = (0, import_timeslots.findFastestAvailableResource)({
+              resources: targetRenderList,
+              currentCapacity,
+              countMap: selectResourcesMap
+            });
+            const targetResource = fastestResource || targetRenderList[0];
             targetResource.capacity = currentCapacity;
             (0, import_resources.checkSubResourcesCapacity)(targetResource);
             if (!selectResourcesMap[targetResource.id]) {

package/lib/solution/BookingByStep/utils/timeslots.d.ts

@@ -0,0 +1,25 @@
+import { ResourceItem, TimeSliceItem } from "./resources";
+/**
+ * 计算资源在指定时间段内的总可用时间（以分钟为单位）
+ * @param resource 需要计算可用时间的资源
+ * @param timeSlots 要检查可用性的时间段
+ * @param currentCapacity 当前预约所需的容量
+ * @returns 总可用时间（分钟）
+ */
+export declare function calculateResourceAvailableTime({ resource, timeSlots, currentCapacity, }: {
+    resource: ResourceItem;
+    timeSlots: TimeSliceItem;
+    currentCapacity?: number;
+}): number;
+/**
+ * 查找最快可用的资源，如果有多个资源在相同时间点可用，则选择空闲时间最长的资源
+ * @param resources 资源列表
+ * @param currentCapacity 当前预约所需的容量
+ * @param countMap 已预约数量映射
+ * @returns 最快可用的资源
+ */
+export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, }: {
+    resources: ResourceItem[];
+    currentCapacity?: number;
+    countMap?: Record<number, number>;
+}): ResourceItem | null;

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

@@ -0,0 +1,159 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/solution/BookingByStep/utils/timeslots.ts
+var timeslots_exports = {};
+__export(timeslots_exports, {
+  calculateResourceAvailableTime: () => calculateResourceAvailableTime,
+  findFastestAvailableResource: () => findFastestAvailableResource
+});
+module.exports = __toCommonJS(timeslots_exports);
+var import_dayjs = __toESM(require("dayjs"));
+function calculateResourceAvailableTime({
+  resource,
+  timeSlots,
+  currentCapacity = 1
+}) {
+  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;
+  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 (overlapStart.isBefore(overlapEnd)) {
+      overlaps.push({ start: overlapStart, end: overlapEnd });
+    }
+  }
+  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({
+  resources,
+  currentCapacity = 1,
+  countMap = {}
+}) {
+  var _a, _b;
+  const currentTime = (0, import_dayjs.default)();
+  let fastestTime = null;
+  let fastestResources = [];
+  for (const resource of resources) {
+    const todayTimes = resource.times.filter((time) => {
+      return (0, import_dayjs.default)(time.start_at).isSame(currentTime, "day");
+    });
+    if (todayTimes.length === 0)
+      continue;
+    todayTimes.sort((a, b) => {
+      return (0, import_dayjs.default)(a.start_at).diff((0, import_dayjs.default)(b.start_at));
+    });
+    for (const time of todayTimes) {
+      const startTime = (0, import_dayjs.default)(time.start_at);
+      if (startTime.isBefore(currentTime))
+        continue;
+      if (resource.resourceType === "single") {
+        const hasBooking = (_a = time.event_list) == null ? void 0 : _a.some((event) => {
+          return (0, import_dayjs.default)(event.start_at).isSame(startTime);
+        });
+        if (!hasBooking) {
+          if (!fastestTime || startTime.isSame(fastestTime)) {
+            fastestTime = startTime;
+            fastestResources.push(resource);
+          } else if (startTime.isBefore(fastestTime)) {
+            fastestTime = startTime;
+            fastestResources = [resource];
+          }
+          break;
+        }
+      } else {
+        const totalCapacity = resource.capacity || 0;
+        const usedCapacity = ((_b = time.event_list) == null ? void 0 : _b.reduce((sum, event) => {
+          return (0, import_dayjs.default)(event.start_at).isSame(startTime) ? sum + (event.pax || 0) : sum;
+        }, 0)) || 0;
+        const remainingCapacity = totalCapacity - usedCapacity;
+        if (remainingCapacity >= (countMap[resource.id] || 0) + currentCapacity) {
+          if (!fastestTime || startTime.isSame(fastestTime)) {
+            fastestTime = startTime;
+            fastestResources.push(resource);
+          } else if (startTime.isBefore(fastestTime)) {
+            fastestTime = startTime;
+            fastestResources = [resource];
+          }
+          break;
+        }
+      }
+    }
+  }
+  if (!fastestTime || fastestResources.length === 0)
+    return null;
+  if (fastestResources.length === 1)
+    return fastestResources[0];
+  let maxIdleTime = 0;
+  let selectedResource = null;
+  for (const resource of fastestResources) {
+    const idleTime = calculateResourceAvailableTime({
+      resource,
+      timeSlots: {
+        start_time: fastestTime.format("HH:mm"),
+        end_time: fastestTime.format("HH:mm"),
+        start_at: fastestTime,
+        end_at: fastestTime
+      },
+      currentCapacity: (countMap[resource.id] || 0) + currentCapacity
+    });
+    if (idleTime > maxIdleTime) {
+      maxIdleTime = idleTime;
+      selectedResource = resource;
+    }
+  }
+  return selectedResource;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  calculateResourceAvailableTime,
+  findFastestAvailableResource
+});

package/package.json

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