@pisell/pisellos 2.2.298 → 2.2.299

package/dist/modules/ResourcePlanner/planner.js

@@ -1060,6 +1060,9 @@ export function getProductTimeRanges(projection) {
       return group.required !== false;
     });
     var operatingRanges = buildOperatingRanges(projection, dateRange);
+    var operatingEndAt = dateRange.startDate === dateRange.endDate && operatingRanges.length > 0 ? formatDateTime(Math.max.apply(Math, _toConsumableArray(operatingRanges.map(function (range) {
+      return range.end;
+    }))), projection.meta.timezone, fixedOffsetMinutes) : undefined;
     var resourceRanges = requiredGroups.length ? requiredGroups.map(function (group) {
       return buildGroupWorkingRanges({
         projection: projection,
@@ -1127,13 +1130,16 @@ export function getProductTimeRanges(projection) {
         ranges.push(createDurationTimeRange(product, start, durationMinutes, projection, fixedOffsetMinutes));
       });
     }
-    return {
+    return _objectSpread(_objectSpread({
       productId: product.id,
       title: product.title,
       kind: product.kind,
-      slotStepMinutes: slotStepMinutes,
+      slotStepMinutes: slotStepMinutes
+    }, operatingEndAt ? {
+      operatingEndAt: operatingEndAt
+    } : {}), {}, {
       ranges: dedupeProductRanges(ranges)
-    };
+    });
   });
 }
 function aggregateMatchedCells(productId, requirementGroupId, resourceId, candidateRange, indexedCells) {

package/dist/modules/ResourcePlanner/types.d.ts

@@ -213,6 +213,8 @@ export interface ProductTimeRangeGroup {
     title?: string;
     kind: AvailabilityProductKind;
     slotStepMinutes?: number;
+    /** 单日查询对应营业窗口的最终结束时刻，不受资源排班是否为空影响。 */
+    operatingEndAt?: string;
     ranges: ProductTimeRange[];
 }
 export interface AvailabilityAssignment extends AvailabilityAbsoluteRange {

package/dist/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 4 | 3 | 5;
+        weekNum: 0 | 2 | 3 | 1 | 5 | 6 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,46 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.ITEM_REWARD_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "PromotionAdapter", {
-  enumerable: true,
-  get: function () {
-    return _adapter.PromotionAdapter;
-  }
-});
-Object.defineProperty(exports, "PromotionEvaluator", {
-  enumerable: true,
-  get: function () {
-    return _evaluator.PromotionEvaluator;
-  }
-});
-Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
-  enumerable: true,
-  get: function () {
-    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
-  }
-});
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function () {
-    return _adapter.default;
-  }
-});
-var _evaluator = require("./evaluator");
-var _adapter = _interopRequireWildcard(require("./adapter"));
-var _examples = require("./examples");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+"use strict";

package/lib/modules/ResourcePlanner/planner.js

@@ -950,6 +950,7 @@ function getProductTimeRanges(projection, request = {}, runtimeOptions = {}) {
     }
     const requiredGroups = (product.requirementGroups || []).filter(group => group.required !== false);
     const operatingRanges = buildOperatingRanges(projection, dateRange);
+    const operatingEndAt = dateRange.startDate === dateRange.endDate && operatingRanges.length > 0 ? formatDateTime(Math.max(...operatingRanges.map(range => range.end)), projection.meta.timezone, fixedOffsetMinutes) : undefined;
     const resourceRanges = requiredGroups.length ? requiredGroups.map(group => buildGroupWorkingRanges({
       projection,
       product,
@@ -1016,6 +1017,9 @@ function getProductTimeRanges(projection, request = {}, runtimeOptions = {}) {
       title: product.title,
       kind: product.kind,
       slotStepMinutes,
+      ...(operatingEndAt ? {
+        operatingEndAt
+      } : {}),
       ranges: dedupeProductRanges(ranges)
     };
   });

package/lib/modules/ResourcePlanner/types.d.ts

@@ -213,6 +213,8 @@ export interface ProductTimeRangeGroup {
     title?: string;
     kind: AvailabilityProductKind;
     slotStepMinutes?: number;
+    /** 单日查询对应营业窗口的最终结束时刻，不受资源排班是否为空影响。 */
+    operatingEndAt?: string;
     ranges: ProductTimeRange[];
 }
 export interface AvailabilityAssignment extends AvailabilityAbsoluteRange {

package/lib/solution/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 4 | 3 | 5;
+        weekNum: 0 | 2 | 3 | 1 | 5 | 6 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

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