@pisell/pisellos 2.2.94 → 2.2.95

package/lib/solution/Sales/index.js

@@ -147,17 +147,20 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
    * - n = booking 数量
    * - s = 时间片数量
    */
-  getTimelineHighlights(bookingList = []) {
+  getTimelineHighlights(bookingList = [], startDateTime, endDateTime) {
     const bucketMinutes = this.getTimelineBucketMinutes();
     const bucketMs = bucketMinutes * 60 * 1e3;
-    const { startAt, endExclusiveAt } = this.getTimelineRangeByOperatingBoundary();
+    const customStartAt = startDateTime ? (0, import_dayjs.default)(startDateTime) : (0, import_dayjs.default)("");
+    const customEndExclusiveAt = endDateTime ? (0, import_dayjs.default)(endDateTime) : (0, import_dayjs.default)("");
+    const hasValidCustomRange = customStartAt.isValid() && customEndExclusiveAt.isValid();
+    const { startAt, endExclusiveAt } = hasValidCustomRange ? { startAt: customStartAt, endExclusiveAt: customEndExclusiveAt } : this.getTimelineRangeByOperatingBoundary();
     const startAtMs = startAt.valueOf();
     const endExclusiveAtMs = endExclusiveAt.valueOf();
     if (!startAt.isValid() || !endExclusiveAt.isValid() || endExclusiveAtMs <= startAtMs)
-      return {};
+      return [];
     const slotCount = Math.ceil((endExclusiveAtMs - startAtMs) / bucketMs);
     if (slotCount <= 0)
-      return {};
+      return [];
     const diff = new Int32Array(slotCount + 1);
     for (let i = 0; i < bookingList.length; i++) {
       const booking = bookingList[i];
@@ -179,12 +182,11 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       diff[startIdx] += 1;
       diff[endIdx + 1] -= 1;
     }
-    const timeline = {};
+    const timeline = [];
     let runningCount = 0;
     for (let i = 0; i < slotCount; i++) {
       runningCount += diff[i];
-      const label = startAt.add(i * bucketMinutes, "minute").format("HH:mm");
-      timeline[label] = runningCount;
+      timeline.push(runningCount);
     }
     return timeline;
   }
@@ -247,6 +249,37 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     });
     if (dayScopedBookings.length === 0)
       return [];
+    const appendNextStartGroupIfNeeded = (selectedBookings) => {
+      if (selectedBookings.length === 0)
+        return selectedBookings;
+      const shouldAppendNextGroup = selectedBookings.some(
+        (booking) => booking.status === "reserved" || booking.status === "occupied"
+      );
+      if (!shouldAppendNextGroup)
+        return selectedBookings;
+      const selectedStartValues = new Set(
+        selectedBookings.map((booking) => this.toBookingDateTime(booking.start_date, booking.start_time)).filter((startAt) => startAt.isValid()).map((startAt) => startAt.valueOf())
+      );
+      const futureCandidates = dayScopedBookings.filter((booking) => {
+        const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
+        if (!startAt.isValid())
+          return false;
+        return startAt.isAfter(current) && !selectedStartValues.has(startAt.valueOf());
+      });
+      if (futureCandidates.length === 0)
+        return selectedBookings;
+      const nextStartAt = this.toBookingDateTime(
+        futureCandidates[0].start_date,
+        futureCandidates[0].start_time
+      ).valueOf();
+      const nextStartGroup = futureCandidates.filter((booking) => {
+        const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
+        return startAt.isValid() && startAt.valueOf() === nextStartAt;
+      });
+      if (nextStartGroup.length === 0)
+        return selectedBookings;
+      return [...selectedBookings, ...nextStartGroup];
+    };
     const activeBookings = dayScopedBookings.filter((booking) => {
       const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
       const endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
@@ -255,22 +288,23 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       return this.isSameOrAfter(current, startAt) && this.isSameOrBefore(current, endAt);
     });
     if (activeBookings.length > 0)
-      return activeBookings;
+      return appendNextStartGroupIfNeeded(activeBookings);
     const timeoutOccupied = dayScopedBookings.filter(
       (booking) => booking.status === "occupied" && booking.isTimeout
     );
     if (timeoutOccupied.length > 0)
-      return timeoutOccupied;
+      return appendNextStartGroupIfNeeded(timeoutOccupied);
     const upcoming = dayScopedBookings.filter((booking) => {
       const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
       return startAt.isValid() && startAt.isAfter(current) && startAt.isSame(current, "day");
     });
     if (upcoming.length > 0) {
       const firstStartAt = this.toBookingDateTime(upcoming[0].start_date, upcoming[0].start_time).valueOf();
-      return upcoming.filter((booking) => {
+      const upcomingStartGroup = upcoming.filter((booking) => {
         const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
         return startAt.valueOf() === firstStartAt;
       });
+      return appendNextStartGroupIfNeeded(upcomingStartGroup);
     }
     const fallback = dayScopedBookings[dayScopedBookings.length - 1];
     return fallback ? [fallback] : [];
@@ -289,17 +323,39 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
     const endAt = this.toBookingDateTime(booking.end_date, booking.end_time);
     const startAt = this.toBookingDateTime(booking.start_date, booking.start_time);
     const isTimeout = bookingStatus === "occupied" && endAt.isValid() && current.isAfter(endAt);
+    const timeoutTime = isTimeout ? current.diff(endAt, "minute") : void 0;
+    const progressPercent = (() => {
+      if (bookingStatus !== "occupied")
+        return 0;
+      if (!startAt.isValid() || !endAt.isValid())
+        return 0;
+      const totalMinutes = endAt.diff(startAt, "minute");
+      if (totalMinutes <= 0)
+        return 0;
+      const elapsedMinutes = current.diff(startAt, "minute");
+      if (elapsedMinutes <= 0)
+        return 0;
+      if (elapsedMinutes >= totalMinutes)
+        return 100;
+      return Math.floor(elapsedMinutes / totalMinutes * 100);
+    })();
     let reservedStatus;
+    let lateTime;
     if (bookingStatus === "reserved" && startAt.isValid() && endAt.isValid()) {
       if (current.isBefore(startAt))
         reservedStatus = "not_arrived";
-      if (current.isAfter(endAt))
+      if (current.isAfter(endAt)) {
         reservedStatus = "late";
+        lateTime = current.diff(startAt, "minute");
+      }
     }
     return {
       ...booking,
       status: bookingStatus,
       isTimeout,
+      timeoutTime,
+      progressPercent,
+      lateTime,
       reserved_status: reservedStatus
     };
   }
@@ -315,7 +371,6 @@ var SalesImpl = class extends import_BaseModule.BaseModule {
       { osServer: true, isShopApi: true }
     );
     const resourceList = ((_a = resourceResponse == null ? void 0 : resourceResponse.data) == null ? void 0 : _a.list) ?? [];
-    console.log(1111, currentTime, resourceList, bookingList);
     if (!Array.isArray(resourceList) || resourceList.length === 0)
       return [];
     const normalizedBookings = bookingList.map((booking) => this.normalizeMatchedBooking(current, booking)).filter((booking) => Boolean(booking)).sort((left, right) => {

package/lib/solution/Sales/types.d.ts

@@ -21,15 +21,16 @@ export type SalesReservedStatus = 'not_arrived' | 'late' | undefined;
 export interface SalesResourceMatchedBooking extends Omit<BookingData, 'status'> {
     status: SalesBookingStatus;
     isTimeout: boolean;
+    timeoutTime?: number;
+    progressPercent?: number;
+    lateTime?: number;
     reserved_status: SalesReservedStatus;
 }
 export interface SalesResourceBookingItem extends Omit<ResourceData, 'bookings'> {
     resource_id: ResourceId;
     bookings: SalesResourceMatchedBooking[];
 }
-export interface SalesTimelineHighlights {
-    [time: string]: number;
-}
+export type SalesTimelineHighlights = number[];
 /**
  * Sales 解决方案状态
  *
@@ -61,5 +62,5 @@ export interface SalesModuleAPI {
     /** 获取资源维度的预约占用列表 */
     getResourceBookingList: (currentTime: string, bookingList: BookingData[]) => Promise<SalesResourceBookingItem[]>;
     /** 获取时间轴每个时间片的预约数量 */
-    getTimelineHighlights: (bookingList: BookingData[]) => SalesTimelineHighlights;
+    getTimelineHighlights: (bookingList: BookingData[], startDateTime?: string, endDateTime?: string) => SalesTimelineHighlights;
 }

package/lib/types/index.d.ts

@@ -52,6 +52,7 @@ export interface PisellCore {
     validateContext: (config: ModuleContextConfig) => boolean;
     serverOptions?: ServerOptions;
     server?: any;
+    setContext: (ctx: Partial<BusinessContext>) => void;
 }
 /**
  * 业务上下文接口
@@ -59,6 +60,7 @@ export interface PisellCore {
 export interface BusinessContext {
     userId?: string;
     companyId?: string;
+    locale?: string;
     [key: string]: any;
 }
 /**

package/package.json

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