@pisell/private-materials 6.12.197 → 6.12.198

package/lib/pro/skuDetailModal/flow/modules/date/availabilityWindow.js

@@ -0,0 +1,74 @@
+const require_runtime = require("../../../../../_virtual/_rolldown/runtime.js");
+let dayjs = require("dayjs");
+dayjs = require_runtime.__toESM(dayjs);
+//#region src/pro/skuDetailModal/flow/modules/date/availabilityWindow.ts
+const AVAILABILITY_RANGE_EDGE_DAYS = 7;
+const AVAILABILITY_RANGE_PRELOAD_DAYS = 28;
+const MAX_AVAILABILITY_RANGE_DAYS = 90;
+const normalizeRange = (range) => {
+	const start = (0, dayjs.default)(range.startDate);
+	const end = (0, dayjs.default)(range.endDate);
+	if (!start.isValid() || !end.isValid()) return null;
+	return start.isAfter(end, "day") ? {
+		startDate: end.format("YYYY-MM-DD"),
+		endDate: start.format("YYYY-MM-DD")
+	} : {
+		startDate: start.format("YYYY-MM-DD"),
+		endDate: end.format("YYYY-MM-DD")
+	};
+};
+const resolveAvailabilityDatesCoverage = (dates) => {
+	const normalizedDates = (dates || []).map((item) => (0, dayjs.default)(item === null || item === void 0 ? void 0 : item.date)).filter((date) => date.isValid()).sort((left, right) => left.valueOf() - right.valueOf());
+	if (normalizedDates.length === 0) return null;
+	return {
+		startDate: normalizedDates[0].format("YYYY-MM-DD"),
+		endDate: normalizedDates[normalizedDates.length - 1].format("YYYY-MM-DD")
+	};
+};
+const inclusiveDays = (range) => (0, dayjs.default)(range.endDate).diff((0, dayjs.default)(range.startDate), "day") + 1;
+/**
+* 日历只在接近当前缓存边缘时向外扩展。能与现有覆盖合并且不超过 UBS
+* 90 天上限时优先扩展；跨度更大时围绕用户正在查看的范围移动窗口。
+*/
+const resolveSlidingAvailabilityDateRange = (params) => {
+	const visibleRange = normalizeRange(params.visibleRange);
+	const coverage = resolveAvailabilityDatesCoverage(params.availabilityDates);
+	if (!visibleRange || !coverage) return null;
+	const visibleStart = (0, dayjs.default)(visibleRange.startDate);
+	const visibleEnd = (0, dayjs.default)(visibleRange.endDate);
+	const coverageStart = (0, dayjs.default)(coverage.startDate);
+	const coverageEnd = (0, dayjs.default)(coverage.endDate);
+	const beforeStart = visibleStart.isBefore(coverageStart, "day");
+	const nearEnd = visibleEnd.isAfter(coverageEnd.subtract(AVAILABILITY_RANGE_EDGE_DAYS, "day"), "day");
+	if (!beforeStart && !nearEnd) return null;
+	const browsingForward = !beforeStart;
+	const requestedStart = browsingForward ? coverageStart : visibleStart.subtract(AVAILABILITY_RANGE_PRELOAD_DAYS, "day");
+	const requestedEnd = browsingForward ? visibleEnd.add(AVAILABILITY_RANGE_PRELOAD_DAYS, "day") : coverageEnd;
+	const mergedRange = normalizeRange({
+		startDate: requestedStart.format("YYYY-MM-DD"),
+		endDate: requestedEnd.format("YYYY-MM-DD")
+	});
+	if (inclusiveDays(mergedRange) <= MAX_AVAILABILITY_RANGE_DAYS) return mergedRange;
+	if (browsingForward) {
+		const endDate = requestedEnd;
+		return {
+			startDate: endDate.subtract(MAX_AVAILABILITY_RANGE_DAYS - 1, "day").format("YYYY-MM-DD"),
+			endDate: endDate.format("YYYY-MM-DD")
+		};
+	}
+	const startDate = requestedStart;
+	return {
+		startDate: startDate.format("YYYY-MM-DD"),
+		endDate: startDate.add(MAX_AVAILABILITY_RANGE_DAYS - 1, "day").format("YYYY-MM-DD")
+	};
+};
+const mergeAvailabilityDates = (previousDates, nextDates) => {
+	const byDate = /* @__PURE__ */ new Map();
+	[...previousDates || [], ...nextDates].forEach((item) => {
+		if (typeof (item === null || item === void 0 ? void 0 : item.date) === "string" && (0, dayjs.default)(item.date).isValid()) byDate.set(item.date, item);
+	});
+	return Array.from(byDate.values()).sort((left, right) => (0, dayjs.default)(left.date).valueOf() - (0, dayjs.default)(right.date).valueOf());
+};
+//#endregion
+exports.mergeAvailabilityDates = mergeAvailabilityDates;
+exports.resolveSlidingAvailabilityDateRange = resolveSlidingAvailabilityDateRange;

package/lib/pro/skuDetailModal/flow/modules/date/index.js

@@ -11,6 +11,7 @@ const require_utils$2 = require("../../../../../components/eventBooking/componen
 const require_autoResolution = require("../autoResolution.js");
 const require_index$1 = require("../../../../../components/eventBooking/components/bookingAvailabilityCalendar/index.js");
 const require_MultiDayTimeSelect = require("../../../../multiDayTimeSelect/MultiDayTimeSelect.js");
+const require_availabilityWindow = require("./availabilityWindow.js");
 let dayjs = require("dayjs");
 dayjs = require_runtime.__toESM(dayjs);
 let react = require("react");
@@ -19,7 +20,7 @@ let antd = require("antd");
 let _pisell_utils = require("@pisell/utils");
 //#region src/pro/skuDetailModal/flow/modules/date/index.tsx
 const refreshAvailabilityDates = function() {
-	var _ref = require_asyncToGenerator._asyncToGenerator(function* (context, module) {
+	var _ref = require_asyncToGenerator._asyncToGenerator(function* (context, module, requestedDateRange) {
 		const availability = context.services.availability;
 		const allowUnavailable = context.services.allowUnavailableBookingSelection === true;
 		const previousData = context.getModuleData(module.key);
@@ -27,11 +28,13 @@ const refreshAvailabilityDates = function() {
 		context.setModuleData(module.key, {
 			requestVersion,
 			status: "loading",
-			hasResolvedInitialDate: previousData === null || previousData === void 0 ? void 0 : previousData.hasResolvedInitialDate
+			hasResolvedInitialDate: previousData === null || previousData === void 0 ? void 0 : previousData.hasResolvedInitialDate,
+			availabilityDates: previousData === null || previousData === void 0 ? void 0 : previousData.availabilityDates
 		});
 		context.setModuleStatus(module.key, "loading");
 		try {
 			var _context$getModuleDat;
+			if (requestedDateRange && availability.ensureDateRange) yield availability.ensureDateRange(requestedDateRange);
 			const result = yield availability.queryBookingAvailability(availability.contextId, {
 				target: "date",
 				productIds: [availability.productId],
@@ -39,7 +42,8 @@ const refreshAvailabilityDates = function() {
 			});
 			if (((_context$getModuleDat = context.getModuleData(module.key)) === null || _context$getModuleDat === void 0 ? void 0 : _context$getModuleDat.requestVersion) !== requestVersion) return;
 			const group = result.data.find((item) => String(item === null || item === void 0 ? void 0 : item.productId) === String(availability.productId));
-			const availabilityDates = Array.isArray(group === null || group === void 0 ? void 0 : group.dates) ? group.dates : [];
+			const queriedAvailabilityDates = Array.isArray(group === null || group === void 0 ? void 0 : group.dates) ? group.dates : [];
+			const availabilityDates = requestedDateRange ? require_availabilityWindow.mergeAvailabilityDates(previousData === null || previousData === void 0 ? void 0 : previousData.availabilityDates, queriedAvailabilityDates) : queriedAvailabilityDates;
 			const hasResolvedInitialDate = Boolean(previousData === null || previousData === void 0 ? void 0 : previousData.hasResolvedInitialDate);
 			context.setModuleData(module.key, {
 				requestVersion,
@@ -72,13 +76,15 @@ const refreshAvailabilityDates = function() {
 			context.setModuleData(module.key, {
 				requestVersion,
 				status: "error",
-				error
+				error,
+				availabilityDates: previousData === null || previousData === void 0 ? void 0 : previousData.availabilityDates,
+				hasResolvedInitialDate: previousData === null || previousData === void 0 ? void 0 : previousData.hasResolvedInitialDate
 			});
 			context.setModuleStatus(module.key, "error", message, error);
 			throw error;
 		}
 	});
-	return function refreshAvailabilityDates(_x, _x2) {
+	return function refreshAvailabilityDates(_x, _x2, _x3) {
 		return _ref.apply(this, arguments);
 	};
 }();
@@ -142,7 +148,7 @@ const hydrateProductDataForDate = function() {
 		context.setModuleStatus(module.key, "loading");
 		return promise;
 	});
-	return function hydrateProductDataForDate(_x3, _x4, _x5) {
+	return function hydrateProductDataForDate(_x4, _x5, _x6) {
 		return _ref2.apply(this, arguments);
 	};
 }();
@@ -158,7 +164,7 @@ const awaitLatestDateHydration = function() {
 		}
 		if ((data === null || data === void 0 ? void 0 : data.status) === "error") throw data.error instanceof Error ? data.error : new Error(require_i18n.selectionFlowText("pisell2.text.sku.detail.modal.validation.date.refresh.failed"));
 	});
-	return function awaitLatestDateHydration(_x6, _x7) {
+	return function awaitLatestDateHydration(_x7, _x8) {
 		return _ref3.apply(this, arguments);
 	};
 }();
@@ -294,7 +300,7 @@ const DateFlowModuleComponent = ({ context, module, registerHandle }) => {
 		});
 	}
 	if (availability) {
-		if ((availabilityData === null || availabilityData === void 0 ? void 0 : availabilityData.status) === "loading" || !(availabilityData === null || availabilityData === void 0 ? void 0 : availabilityData.availabilityDates)) return /* @__PURE__ */ react.default.createElement(require_LoadingPanel.default, null);
+		if (!(availabilityData === null || availabilityData === void 0 ? void 0 : availabilityData.availabilityDates)) return /* @__PURE__ */ react.default.createElement(require_LoadingPanel.default, null);
 		if (availabilityData.status === "error") {
 			var _context$moduleState$2;
 			return /* @__PURE__ */ react.default.createElement(antd.Alert, {
@@ -309,6 +315,15 @@ const DateFlowModuleComponent = ({ context, module, registerHandle }) => {
 			availabilityDates: availabilityData.availabilityDates,
 			currentDate: (startDate || (0, dayjs.default)()).format("YYYY-MM-DD"),
 			onCurrentDateChange: () => void 0,
+			onVisibleDateRangeChange: (visibleRange) => {
+				if (!availability.ensureDateRange) return;
+				const requestedDateRange = require_availabilityWindow.resolveSlidingAvailabilityDateRange({
+					availabilityDates: availabilityData.availabilityDates,
+					visibleRange
+				});
+				if (!requestedDateRange) return;
+				refreshAvailabilityDates(context, module, requestedDateRange).catch(() => void 0);
+			},
 			onDateChange: (value) => {
 				const nextDate = (0, dayjs.default)(value);
 				updateDates(nextDate, nextDate, ["booking.startDate", "booking.endDate"]);
@@ -379,7 +394,7 @@ const dateFlowModule = {
 				yield awaitLatestDateHydration(context, module.key);
 			}
 		});
-		return function refresh(_x8, _x9) {
+		return function refresh(_x9, _x10) {
 			return _ref4.apply(this, arguments);
 		};
 	}(),

package/lib/pro/skuDetailModal/flow/modules/time/index.js

@@ -64,6 +64,10 @@ const isAvailabilityDateReadyForTime = (context) => {
 * 部分响应可能出现 available/limited 但 maxPartySize 为 0 的组合，
 * 普通端必须按已售罄处理；POS 显式开启超售时仍允许恢复和选择。
 */
+const isAvailabilityCandidateSelectable = (candidate, allowUnavailable = false) => {
+	if (allowUnavailable) return true;
+	return (!candidate.status || candidate.status === "available" || candidate.status === "limited") && !(typeof candidate.maxPartySize === "number" && candidate.maxPartySize <= 0);
+};
 const normalizeDurationMinutesValue = (value) => {
 	if (typeof value === "number") return Number.isFinite(value) && value > 0 ? value : null;
 	if (typeof value === "string") {
@@ -171,16 +175,30 @@ const refreshAvailabilityTimes = function() {
 		const posDurationAvailability = isPosDurationAvailabilityContext(context);
 		const posSessionAvailability = isPosSessionAvailabilityContext(context);
 		const posCustomTimeAvailability = posDurationAvailability || posSessionAvailability;
-		const requestedDuration = getAvailabilityDurationOverride(context, durationOverride);
-		const requestedStartTime = getAvailabilityStartTimeOverride(context, startTimeOverride);
+		const draftRequestedDuration = getAvailabilityDurationOverride(context, durationOverride);
+		const draftRequestedStartTime = getAvailabilityStartTimeOverride(context, startTimeOverride);
 		const selectedDate = context.draft.booking.startDate.format("YYYY-MM-DD");
 		const requestId = Date.now() + Math.random();
 		const previousTimeData = context.getModuleData(module.key);
-		const posCustomTimeHydrationKey = posCustomTimeAvailability && requestedDuration && requestedStartTime ? `${selectedDate}|${requestedStartTime}|${requestedDuration}` : void 0;
+		const posCustomTimeHydrationKey = posCustomTimeAvailability && draftRequestedDuration && draftRequestedStartTime ? `${selectedDate}|${draftRequestedStartTime}|${draftRequestedDuration}` : void 0;
+		const product = context.draft.productData;
+		const effectiveSelectionIntent = require_posCustomTime.resolvePosFlexibleDurationRequestIntent({
+			selectionIntent,
+			previousSelectionIntent: previousTimeData === null || previousTimeData === void 0 ? void 0 : previousTimeData.posCustomTimeSelectionIntent,
+			hydrationKey: posCustomTimeHydrationKey,
+			previousHydrationKey: previousTimeData === null || previousTimeData === void 0 ? void 0 : previousTimeData.posCustomTimeHydrationKey
+		});
+		const suppressFlexiblePresetOverride = posDurationAvailability && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) && !require_posCustomTime.shouldApplyPosFlexibleDurationOverride({
+			selectionIntent: effectiveSelectionIntent,
+			isEditMode: context.services.selectionFlowMode === "edit"
+		});
+		const requestedDuration = suppressFlexiblePresetOverride ? void 0 : draftRequestedDuration;
+		const requestedStartTime = suppressFlexiblePresetOverride ? void 0 : draftRequestedStartTime;
 		context.setModuleData(module.key, {
 			requestId,
 			timeSlots: [],
-			posCustomTimeHydrationKey
+			posCustomTimeHydrationKey,
+			posCustomTimeSelectionIntent: effectiveSelectionIntent === "restore" ? void 0 : effectiveSelectionIntent
 		});
 		const group = (yield availability.getProductTimeRanges(availability.contextId, require_objectSpread2._objectSpread2({
 			productIds: [availability.productId],
@@ -191,16 +209,15 @@ const refreshAvailabilityTimes = function() {
 			partySize: require_availabilityModel.resolveSelectionFlowQueryPartySize(context.draft, availability.partySize)
 		}, requestedDuration ? require_objectSpread2._objectSpread2({ durationMinutesByProductId: { [String(availability.productId)]: requestedDuration } }, requestedStartTime ? { durationStartTimesByProductId: { [String(availability.productId)]: [requestedStartTime] } } : {}) : {}))).find((item) => String(item.productId) === String(availability.productId));
 		const candidates = (group === null || group === void 0 ? void 0 : group.ranges) || [];
-		const product = context.draft.productData;
-		if (posDurationAvailability && selectionIntent === "restore" && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration)) {
+		if (posDurationAvailability && effectiveSelectionIntent === "restore" && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) && candidates.length === 0) {
 			var _context$hostContext, _moduleOptions$slice, _context$draft$bookin2, _normalizeDurationMin3;
 			const moduleOptions = require_index$1.getModuleOptions(module);
 			const configuredSlice = (_context$hostContext = context.hostContext) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.bookingConfig) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.config) === null || _context$hostContext === void 0 || (_context$hostContext = _context$hostContext.basic) === null || _context$hostContext === void 0 ? void 0 : _context$hostContext.service_time;
 			const fallbackSlice = (_moduleOptions$slice = moduleOptions.slice) !== null && _moduleOptions$slice !== void 0 ? _moduleOptions$slice : typeof configuredSlice === "object" ? configuredSlice === null || configuredSlice === void 0 ? void 0 : configuredSlice.value : configuredSlice;
-			const baseDurationMinutes = require_posCustomTime.resolvePosCustomTimeBaseMinutes(group === null || group === void 0 ? void 0 : group.slotStepMinutes, fallbackSlice);
+			const baseDurationMinutes = require_posCustomTime.resolvePosCustomTimeBaseMinutes(getProductDurationMinutes(context), group === null || group === void 0 ? void 0 : group.slotStepMinutes, fallbackSlice);
 			const resetForSelectedDate = require_posCustomTime.shouldResetPosFlexibleTimeForDate((_context$draft$bookin2 = context.draft.booking.selectedCandidate) !== null && _context$draft$bookin2 !== void 0 ? _context$draft$bookin2 : previousTimeData === null || previousTimeData === void 0 ? void 0 : previousTimeData.selectedCandidate, selectedDate);
 			const nextStartTime = require_posCustomTime.resolvePosCustomTimeDefaultStartTime(resetForSelectedDate ? null : context.draft.booking.startTime, baseDurationMinutes);
-			const nextDuration = require_posCustomTime.resolvePosCustomTimeDefaultDurationMinutes(resetForSelectedDate ? product === null || product === void 0 ? void 0 : product.duration : (_normalizeDurationMin3 = normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _normalizeDurationMin3 !== void 0 ? _normalizeDurationMin3 : context.draft.booking.duration, baseDurationMinutes, context.services.selectionFlowMode === "edit" ? void 0 : require_posCustomTime.resolvePosFlexibleBusinessDurationMinutes(nextStartTime, (group === null || group === void 0 ? void 0 : group.operatingEndAt) ? (0, dayjs.default)(group.operatingEndAt).format("HH:mm") : void 0));
+			const nextDuration = require_posCustomTime.resolvePosCustomTimeDefaultDurationMinutes(resetForSelectedDate ? product === null || product === void 0 ? void 0 : product.duration : (_normalizeDurationMin3 = normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _normalizeDurationMin3 !== void 0 ? _normalizeDurationMin3 : context.draft.booking.duration, baseDurationMinutes);
 			const changedFields = [];
 			if (nextStartTime !== context.draft.booking.startTime) changedFields.push("booking.startTime");
 			if (nextDuration !== context.draft.booking.duration) changedFields.push("booking.duration");
@@ -233,7 +250,8 @@ const refreshAvailabilityTimes = function() {
 				timeSlots: [],
 				selectedCandidate: void 0,
 				slotStepMinutes: group === null || group === void 0 ? void 0 : group.slotStepMinutes,
-				posCustomTimeHydrationKey
+				posCustomTimeHydrationKey,
+				posCustomTimeSelectionIntent: effectiveSelectionIntent === "restore" ? void 0 : effectiveSelectionIntent
 			});
 			return;
 		}
@@ -249,14 +267,14 @@ const refreshAvailabilityTimes = function() {
 		const existingCandidate = context.draft.booking.selectedCandidate;
 		const draftStartTime = normalizeStartTimeValue(context.draft.booking.startTime);
 		const draftEndTime = normalizeStartTimeValue(context.draft.booking.endTime);
-		const requestedPosStartTime = requestedStartTime || draftStartTime;
-		const requestedPosDuration = (_ref4 = requestedDuration !== null && requestedDuration !== void 0 ? requestedDuration : normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _ref4 !== void 0 ? _ref4 : getDraftRangeDurationMinutes(context);
-		const restoredDraftCandidate = draftStartTime ? times.find((candidate) => require_availabilityModel.isAvailabilityCandidateSelectable(candidate, allowUnavailable) && (posSessionAvailability ? require_posCustomTime.isSameAvailabilityCandidateRange(candidate, {
+		const requestedPosStartTime = suppressFlexiblePresetOverride ? requestedStartTime : requestedStartTime || draftStartTime;
+		const requestedPosDuration = suppressFlexiblePresetOverride ? requestedDuration : (_ref4 = requestedDuration !== null && requestedDuration !== void 0 ? requestedDuration : normalizeDurationMinutesValue(context.draft.booking.duration)) !== null && _ref4 !== void 0 ? _ref4 : getDraftRangeDurationMinutes(context);
+		const restoredDraftCandidate = draftStartTime ? times.find((candidate) => isAvailabilityCandidateSelectable(candidate, allowUnavailable) && (posSessionAvailability ? require_posCustomTime.isSameAvailabilityCandidateRange(candidate, {
 			date: selectedDate,
 			startTime: draftStartTime,
 			durationMinutes: requestedPosDuration
 		}) : isSameCandidateStart(candidate, selectedDate, draftStartTime) && (posDurationAvailability || normalizeStartTimeValue(candidate.endTime) === draftEndTime))) : void 0;
-		const restoredExistingCandidate = existingCandidate ? times.find((candidate) => require_availabilityModel.isAvailabilityCandidateSelectable(candidate, allowUnavailable) && (candidate.key === existingCandidate.key || (posSessionAvailability ? candidate.source === existingCandidate.source && require_posCustomTime.isSameAvailabilityCandidateRange(candidate, {
+		const restoredExistingCandidate = existingCandidate ? times.find((candidate) => isAvailabilityCandidateSelectable(candidate, allowUnavailable) && (candidate.key === existingCandidate.key || (posSessionAvailability ? candidate.source === existingCandidate.source && require_posCustomTime.isSameAvailabilityCandidateRange(candidate, {
 			date: existingCandidate.date,
 			startTime: normalizeStartTimeValue(existingCandidate.startTime),
 			durationMinutes: require_posCustomTime.getAvailabilityCandidateDurationMinutes(existingCandidate)
@@ -266,15 +284,15 @@ const refreshAvailabilityTimes = function() {
 			startTime: requestedPosStartTime,
 			durationMinutes: requestedPosDuration
 		}) : isSameCandidateStart(candidate, selectedDate, requestedPosStartTime)) : void 0;
-		const customSelectionIntent = posCustomTimeAvailability && selectionIntent === "custom";
-		const fallbackSelectionIntent = posCustomTimeAvailability && selectionIntent === "fallback";
+		const customSelectionIntent = posCustomTimeAvailability && effectiveSelectionIntent === "custom";
+		const fallbackSelectionIntent = posCustomTimeAvailability && effectiveSelectionIntent === "fallback";
 		const requestedCustomRange = requestedPosStartTime && requestedPosDuration ? {
 			date: selectedDate,
 			startTime: requestedPosStartTime,
 			durationMinutes: requestedPosDuration
 		} : void 0;
 		const restoredCandidate = require_posCustomTime.resolvePosCustomTimeCandidate({
-			candidates: times.filter((candidate) => require_availabilityModel.isAvailabilityCandidateSelectable(candidate, allowUnavailable)),
+			candidates: times.filter((candidate) => isAvailabilityCandidateSelectable(candidate, allowUnavailable)),
 			customSelectionIntent,
 			fallbackSelectionIntent,
 			requestedCustomRange: customSelectionIntent || fallbackSelectionIntent ? requestedCustomRange : void 0,
@@ -282,7 +300,7 @@ const refreshAvailabilityTimes = function() {
 			restoredExistingCandidate,
 			fallbackCandidate: fallbackOsCandidate
 		});
-		const normallySelectableCandidates = times.filter((candidate) => require_availabilityModel.isAvailabilityCandidateSelectable(candidate));
+		const normallySelectableCandidates = times.filter((candidate) => isAvailabilityCandidateSelectable(candidate));
 		const selectableCandidates = normallySelectableCandidates.length > 0 || !allowUnavailable ? normallySelectableCandidates : times;
 		const shouldPreserveRequestedPosStart = posCustomTimeAvailability && Boolean(requestedPosStartTime && requestedPosDuration);
 		const displayCandidates = posSessionAvailability ? require_posCustomTime.getSessionPresetCandidates(times) : posDurationAvailability && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? require_posCustomTime.getPosFlexibleDurationPresetCandidates(times, requestedCustomRange, customSelectionIntent, Boolean(!customSelectionIntent && existingCandidate && existingCandidate.date === selectedDate && (previousTimeData === null || previousTimeData === void 0 ? void 0 : previousTimeData.timeSlots.some((slot) => String(slot.id) === String(existingCandidate.key))))) : times;
@@ -293,7 +311,7 @@ const refreshAvailabilityTimes = function() {
 			restoredCandidate,
 			fallbackCandidate,
 			preferPreset: preferPosFlexiblePreset,
-			minimumPresetStartAt: preferPosFlexiblePreset ? (0, dayjs.default)().toISOString() : void 0
+			allowRestoredFallback: fallbackSelectionIntent
 		}) : restoredCandidate || fallbackCandidate;
 		context.setModuleData(module.key, {
 			requestId,
@@ -308,7 +326,8 @@ const refreshAvailabilityTimes = function() {
 				candidate
 			})),
 			selectedCandidate: initialCandidate,
-			posCustomTimeHydrationKey
+			posCustomTimeHydrationKey,
+			posCustomTimeSelectionIntent: effectiveSelectionIntent === "restore" ? void 0 : effectiveSelectionIntent
 		});
 		const shouldWriteInitialCandidate = Boolean(initialCandidate) && (posCustomTimeAvailability || !existingCandidate || initialCandidate.key !== existingCandidate.key);
 		if (initialCandidate && shouldWriteInitialCandidate) {
@@ -666,7 +685,7 @@ const TimeFlowModuleComponent = ({ context, module, registerHandle }) => {
 			});
 			const selectedCandidate = availabilityData === null || availabilityData === void 0 ? void 0 : availabilityData.selectedCandidate;
 			const posStartTimeSlice = usePosSessionAvailability ? availabilityData === null || availabilityData === void 0 ? void 0 : availabilityData.slotStepMinutes : (_availabilityData$slo = availabilityData === null || availabilityData === void 0 ? void 0 : availabilityData.slotStepMinutes) !== null && _availabilityData$slo !== void 0 ? _availabilityData$slo : slice;
-			selectedCandidate && context.services.allowUnavailableBookingSelection === true && require_availabilityModel.isAvailabilityCandidateSelectable(selectedCandidate);
+			selectedCandidate && context.services.allowUnavailableBookingSelection === true && isAvailabilityCandidateSelectable(selectedCandidate);
 			const showCandidateCards = require_posCustomTime.shouldShowPosCustomTimeCandidateCards({
 				isSessionAvailability: usePosSessionAvailability,
 				isDurationAvailability: usePosDurationAvailability,

package/lib/pro/skuDetailModal/flow/modules/time/posCustomTime.js

@@ -1,8 +1,13 @@
 const require_runtime = require("../../../../../_virtual/_rolldown/runtime.js");
-const require_availabilityModel = require("../../availabilityModel.js");
 let dayjs = require("dayjs");
 dayjs = require_runtime.__toESM(dayjs);
 //#region src/pro/skuDetailModal/flow/modules/time/posCustomTime.ts
+const resolvePosFlexibleDurationRequestIntent = (params) => {
+	if (params.selectionIntent !== "restore") return params.selectionIntent;
+	if (params.hydrationKey && params.hydrationKey === params.previousHydrationKey && params.previousSelectionIntent) return params.previousSelectionIntent;
+	return "restore";
+};
+const shouldApplyPosFlexibleDurationOverride = (params) => params.isEditMode || params.selectionIntent !== "restore";
 const isFlexibleDurationValue = (value) => {
 	if (typeof value === "string") {
 		const text = value.trim().toLowerCase();
@@ -31,24 +36,9 @@ const resolvePosCustomTimeDefaultStartTime = (currentValue, sliceMinutes, now) =
 	const minutes = alignedMinute % 60;
 	return `${String(hours).padStart(2, "0")}:${String(minutes).padStart(2, "0")}`;
 };
-const resolvePosFlexibleBusinessDurationMinutes = (startTime, closingTime) => {
-	const toMinuteOfDay = (value) => {
-		if (typeof value !== "string") return null;
-		const matched = value.trim().match(/^([01]\d|2[0-3]):([0-5]\d)(?::[0-5]\d)?$/);
-		if (!matched) return null;
-		return Number(matched[1]) * 60 + Number(matched[2]);
-	};
-	const startMinute = toMinuteOfDay(startTime);
-	const closingMinute = toMinuteOfDay(closingTime);
-	if (startMinute === null || closingMinute === null) return null;
-	const duration = closingMinute > startMinute ? closingMinute - startMinute : closingMinute < startMinute ? closingMinute + 1440 - startMinute : 0;
-	return duration > 0 ? duration : null;
-};
 const shouldResetPosFlexibleTimeForDate = (candidate, selectedDate) => Boolean(candidate && candidate.date !== selectedDate);
-const resolvePosCustomTimeDefaultDurationMinutes = (currentValue, baseDurationMinutes, flexibleDefaultMinutes) => {
+const resolvePosCustomTimeDefaultDurationMinutes = (currentValue, baseDurationMinutes) => {
 	if (isFlexibleDurationValue(currentValue)) {
-		const flexibleMinutes = Number(flexibleDefaultMinutes);
-		if (Number.isFinite(flexibleMinutes) && flexibleMinutes > 0) return Math.max(1, Math.floor(flexibleMinutes));
 		if (typeof currentValue === "string") {
 			const flexibleMatch = currentValue.trim().toLowerCase().match(/^flexible_(\d+(?:\.\d+)?)$/);
 			if (flexibleMatch) return Math.max(1, Math.floor(Number(flexibleMatch[1])));
@@ -82,14 +72,10 @@ const getPosFlexibleDurationPresetCandidates = (candidates, requestedCustomRange
 	return candidates.filter((candidate) => !isSameAvailabilityCandidateRange(candidate, requestedCustomRange));
 };
 const resolvePosFlexibleDurationInitialCandidate = (params) => {
-	const minimumPresetStartAt = params.minimumPresetStartAt === void 0 ? null : (0, dayjs.default)(params.minimumPresetStartAt);
 	const firstAvailablePreset = params.presetCandidates.find((candidate) => {
-		if (!require_availabilityModel.isAvailabilityCandidateSelectable(candidate)) return false;
-		if (!(minimumPresetStartAt === null || minimumPresetStartAt === void 0 ? void 0 : minimumPresetStartAt.isValid())) return true;
-		const candidateStartAt = (0, dayjs.default)(candidate.startAt);
-		return candidateStartAt.isValid() && !candidateStartAt.isBefore(minimumPresetStartAt);
+		return (!candidate.status || candidate.status === "available" || candidate.status === "limited") && !(typeof candidate.maxPartySize === "number" && candidate.maxPartySize <= 0);
 	});
-	if (params.preferPreset && firstAvailablePreset) return firstAvailablePreset;
+	if (params.preferPreset) return firstAvailablePreset || (params.allowRestoredFallback ? params.restoredCandidate : void 0);
 	return params.restoredCandidate || params.fallbackCandidate;
 };
 //#endregion
@@ -102,7 +88,8 @@ exports.resolvePosCustomTimeBaseMinutes = resolvePosCustomTimeBaseMinutes;
 exports.resolvePosCustomTimeCandidate = resolvePosCustomTimeCandidate;
 exports.resolvePosCustomTimeDefaultDurationMinutes = resolvePosCustomTimeDefaultDurationMinutes;
 exports.resolvePosCustomTimeDefaultStartTime = resolvePosCustomTimeDefaultStartTime;
-exports.resolvePosFlexibleBusinessDurationMinutes = resolvePosFlexibleBusinessDurationMinutes;
 exports.resolvePosFlexibleDurationInitialCandidate = resolvePosFlexibleDurationInitialCandidate;
+exports.resolvePosFlexibleDurationRequestIntent = resolvePosFlexibleDurationRequestIntent;
+exports.shouldApplyPosFlexibleDurationOverride = shouldApplyPosFlexibleDurationOverride;
 exports.shouldResetPosFlexibleTimeForDate = shouldResetPosFlexibleTimeForDate;
 exports.shouldShowPosCustomTimeCandidateCards = shouldShowPosCustomTimeCandidateCards;

package/lib/pro/skuDetailModal/flow/posAutoResolution.js

@@ -24,7 +24,11 @@ const getPosAutoResolutionDraftKey = (draft) => {
 	});
 };
 const shouldDirectlyConfirmPosSelectionFlow = ({ eligible, status, currentStepIndex }) => eligible && status === "resolved" && currentStepIndex === 0;
+const shouldPreparePosSelectionFlowOnConfirm = ({ eligible, currentStepIndex, abandoned }) => eligible && currentStepIndex === 0 && !abandoned;
+const isCurrentPosAutoResolutionRun = ({ expectedRunId, currentRunId, expectedOpenTaskId, currentOpenTaskId, expectedDraftKey, currentDraftKey, abandoned, currentStepIndex }) => expectedRunId === currentRunId && expectedOpenTaskId === currentOpenTaskId && expectedDraftKey === currentDraftKey && !abandoned && currentStepIndex === 0;
 //#endregion
 exports.getPosAutoResolutionDraftKey = getPosAutoResolutionDraftKey;
+exports.isCurrentPosAutoResolutionRun = isCurrentPosAutoResolutionRun;
 exports.isPosCreateAutoResolutionCandidate = isPosCreateAutoResolutionCandidate;
 exports.shouldDirectlyConfirmPosSelectionFlow = shouldDirectlyConfirmPosSelectionFlow;
+exports.shouldPreparePosSelectionFlowOnConfirm = shouldPreparePosSelectionFlowOnConfirm;

package/lib/pro/skuDetailModal/flow/registry.d.ts

@@ -35,7 +35,7 @@ declare const flowModuleRegistry: {
     Component: _$react.FC<FlowModuleProps<string>>;
     initializeWhileInactive: true;
     hardRequires: ("productData" | "booking.selectedCandidate")[];
-    refreshOn: ("productData" | "skuValue" | "quantity" | "booking.customerId" | "booking.duration" | "booking.selectedCandidate")[];
+    refreshOn: ("productData" | "quantity" | "skuValue" | "booking.customerId" | "booking.duration" | "booking.selectedCandidate")[];
     isApplicable: (context: _$_pisell_materials_src0.SelectionFlowContextValue<SelectionFlowDraft, SelectionFlowDraftUpdate, SelectionDraftField, string, SelectionFlowServices, unknown>) => boolean;
     canInitialize: (context: _$_pisell_materials_src0.SelectionFlowContextValue<SelectionFlowDraft, SelectionFlowDraftUpdate, SelectionDraftField, string, SelectionFlowServices, unknown>) => boolean;
     refresh: (context: SelectionFlowContextValue<string>, module: CompiledSelectionFlowModuleConfig<string>) => Promise<void>;
@@ -52,7 +52,7 @@ declare const flowModuleRegistry: {
     Component: _$react.FC<FlowModuleProps<string>>;
     provides: "booking.capacity"[];
     hardRequires: "productData"[];
-    refreshOn: ("productData" | "skuValue" | "quantity")[];
+    refreshOn: ("productData" | "quantity" | "skuValue")[];
     isApplicable: (context: _$_pisell_materials_src0.SelectionFlowContextValue<SelectionFlowDraft, SelectionFlowDraftUpdate, SelectionDraftField, "capacity", SelectionFlowServices, unknown>) => boolean;
     canInitialize: () => true;
     refresh: (context: _$_pisell_materials_src0.SelectionFlowContextValue<SelectionFlowDraft, SelectionFlowDraftUpdate, SelectionDraftField, "capacity", SelectionFlowServices, unknown>, module: _$_pisell_materials_src0.CompiledSelectionFlowModuleConfig<"capacity">) => void;

package/lib/pro/skuDetailModal/flow/types.d.ts

@@ -163,6 +163,14 @@ interface SelectionFlowAvailabilityService {
   contextId: string;
   productId: number | string;
   partySize: number;
+  /**
+   * 日历浏览超出当前投影时，按新的可视日期窗口准备一个 Availability context。
+   * Host 负责复用已覆盖该范围的 context，并保留仍可能被当前选择引用的旧 context。
+   */
+  ensureDateRange?: (dateRange: {
+    startDate: string;
+    endDate: string;
+  }) => Promise<void>;
   getProductTimeRanges: (contextId: string, request: Record<string, unknown>) => Promise<Array<{
     productId: number | string;
     title?: string;

package/lib/pro/skuDetailModal/index.js

@@ -140,7 +140,7 @@ const resolveInitialAvailabilityCandidate = (source, startDate, endDate, startTi
 	if (endDate && candidateEndDate && candidateEndDate !== endDate.format("YYYY-MM-DD")) return;
 	return rawCandidate;
 };
-const PcActionButtons = ({ isCreateMode, isRemoveDisabled, isShowManualPriceChange, isShowNote, isShowRemove, confirmLabel, isConfirmDisabled = false, isManualPriceChangeDisabled = false, hidePrimaryActions = false, onCancel, onRemove, onManualPriceChange, onOpenNote, onConfirm }) => {
+const PcActionButtons = ({ isCreateMode, isRemoveDisabled, isShowManualPriceChange, isShowNote, isShowRemove, confirmLabel, isConfirmDisabled = false, isConfirmLoading = false, isManualPriceChangeDisabled = false, hidePrimaryActions = false, onCancel, onRemove, onManualPriceChange, onOpenNote, onConfirm }) => {
 	const auxiliaryActions = [isShowNote ? /* @__PURE__ */ react.default.createElement(_pisell_materials.Button, {
 		key: "note",
 		type: "default",
@@ -172,6 +172,7 @@ const PcActionButtons = ({ isCreateMode, isRemoveDisabled, isShowManualPriceChan
 		type: "primary",
 		size: "large",
 		disabled: isConfirmDisabled,
+		loading: isConfirmLoading,
 		onClick: onConfirm,
 		className: "sku-detail-side-actions-btn sku-detail-side-actions-confirm-btn"
 	}, /* @__PURE__ */ react.default.createElement("span", { className: "sku-detail-content-footer-confirm-btn-text" }, confirmLabel))) : null);
@@ -247,8 +248,10 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 	const [selectionFlowProcedureSteps, setSelectionFlowProcedureSteps] = (0, react.useState)(null);
 	const [compiledSelectionFlowSteps, setCompiledSelectionFlowSteps] = (0, react.useState)(null);
 	const [posAutoResolutionStatus, setPosAutoResolutionStatus] = (0, react.useState)("idle");
+	const [posAutoResolutionConfirmPending, setPosAutoResolutionConfirmPending] = (0, react.useState)(false);
 	const posAutoResolutionRunRef = (0, react.useRef)(0);
 	const posAutoResolutionAbandonedRef = (0, react.useRef)(false);
+	const posAutoResolutionConfirmPendingRunRef = (0, react.useRef)(null);
 	const [effectiveSelectionFlowSteps, setEffectiveSelectionFlowSteps] = (0, react.useState)(void 0);
 	const [skuDetailConfig, setSkuDetailConfig] = (0, react.useState)({
 		isShowProductSummary: false,
@@ -810,6 +813,8 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 				latestSelectionFlowDraftRef.current = null;
 				posAutoResolutionRunRef.current += 1;
 				posAutoResolutionAbandonedRef.current = false;
+				posAutoResolutionConfirmPendingRunRef.current = null;
+				setPosAutoResolutionConfirmPending(false);
 				setPosAutoResolutionStatus("idle");
 				setEffectiveSelectionFlowSteps(void 0);
 				setNoteModalOpen(false);
@@ -1321,6 +1326,8 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		latestSelectionFlowDraftRef.current = null;
 		posAutoResolutionRunRef.current += 1;
 		posAutoResolutionAbandonedRef.current = false;
+		posAutoResolutionConfirmPendingRunRef.current = null;
+		setPosAutoResolutionConfirmPending(false);
 		setPosAutoResolutionStatus("idle");
 		setCurrentStep(0);
 		lateQuantityReviewStepIndexRef.current = null;
@@ -1332,6 +1339,8 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 		lateQuantityReviewStepIndexRef.current = null;
 		lateQuantityRevalidationTaskRef.current = null;
 		posAutoResolutionRunRef.current += 1;
+		posAutoResolutionConfirmPendingRunRef.current = null;
+		setPosAutoResolutionConfirmPending(false);
 		setOpen(false);
 		setDetailLoading(false);
 		setNoteModalOpen(false);
@@ -1351,20 +1360,48 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 				var _snapshot$currentStep;
 				const flow = selectionFlowRef.current;
 				if (!flow) return false;
-				if (canDirectlyConfirmPosSelectionFlow) {
+				const currentFlowStepIndex = flow.getState().currentStepIndex;
+				if (require_posAutoResolution.shouldPreparePosSelectionFlowOnConfirm({
+					eligible: isPosCreateAutoResolutionEligible,
+					currentStepIndex: currentFlowStepIndex,
+					abandoned: posAutoResolutionAbandonedRef.current
+				})) {
+					if (posAutoResolutionConfirmPendingRunRef.current !== null) return false;
 					const openTaskId = openTaskIdRef.current;
 					const draftKey = require_posAutoResolution.getPosAutoResolutionDraftKey(flow.getState().draft);
 					const runId = posAutoResolutionRunRef.current + 1;
 					posAutoResolutionRunRef.current = runId;
-					const result = yield flow.prepareSteps({ fromStepIndex: 1 });
-					if (posAutoResolutionRunRef.current !== runId || openTaskIdRef.current !== openTaskId || posAutoResolutionAbandonedRef.current || require_posAutoResolution.getPosAutoResolutionDraftKey(flow.getState().draft) !== draftKey) return false;
-					if (!result.prepared || result.cancelled) {
-						setPosAutoResolutionStatus("retained");
-						return false;
+					posAutoResolutionConfirmPendingRunRef.current = runId;
+					setPosAutoResolutionConfirmPending(true);
+					setPosAutoResolutionStatus("checking");
+					try {
+						const result = yield flow.prepareSteps({ fromStepIndex: 1 });
+						if (!require_posAutoResolution.isCurrentPosAutoResolutionRun({
+							expectedRunId: runId,
+							currentRunId: posAutoResolutionRunRef.current,
+							expectedOpenTaskId: openTaskId,
+							currentOpenTaskId: openTaskIdRef.current,
+							expectedDraftKey: draftKey,
+							currentDraftKey: require_posAutoResolution.getPosAutoResolutionDraftKey(flow.getState().draft),
+							abandoned: posAutoResolutionAbandonedRef.current,
+							currentStepIndex: flow.getState().currentStepIndex
+						}) || result.cancelled) return false;
+						if (!result.prepared) {
+							posAutoResolutionAbandonedRef.current = true;
+							posAutoResolutionRunRef.current += 1;
+							setPosAutoResolutionStatus("retained");
+							return (yield flow.next()) || false;
+						}
+						setPosAutoResolutionStatus("resolved");
+						const completed = yield flow.complete();
+						if (!completed && openTaskIdRef.current === openTaskId && posAutoResolutionRunRef.current === runId) setPosAutoResolutionStatus("retained");
+						return completed;
+					} finally {
+						if (posAutoResolutionConfirmPendingRunRef.current === runId) {
+							posAutoResolutionConfirmPendingRunRef.current = null;
+							setPosAutoResolutionConfirmPending(false);
+						}
 					}
-					const completed = yield flow.complete();
-					if (!completed && openTaskIdRef.current === openTaskId && posAutoResolutionRunRef.current === runId) setPosAutoResolutionStatus("retained");
-					return completed;
 				}
 				if (isPosCreateAutoResolutionEligible) {
 					posAutoResolutionAbandonedRef.current = true;
@@ -1781,8 +1818,9 @@ const SkuDetailModal = ({ onConfirm, onRemove, onClose, variant }, ref) => {
 			isShowNote: !!(skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.isShowNote),
 			isShowRemove: (skuDetailConfig === null || skuDetailConfig === void 0 ? void 0 : skuDetailConfig.isShowRemove) !== false,
 			confirmLabel: pcConfirmButtonText,
+			isConfirmLoading: posAutoResolutionConfirmPending,
 			isManualPriceChangeDisabled: !canOpenManualPriceChange,
-			isConfirmDisabled: hasReachedBookingPriceStep && (selectionFlowBookingPricePending || selectionFlowBookingPriceError),
+			isConfirmDisabled: posAutoResolutionConfirmPending || hasReachedBookingPriceStep && (selectionFlowBookingPricePending || selectionFlowBookingPriceError),
 			onCancel: handleCancel,
 			onRemove: handleRemove,
 			onManualPriceChange: handleManualPriceChange,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.197",
+  "version": "6.12.198",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -70,8 +70,8 @@
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.3",
-    "@pisell/materials": "6.12.55",
     "@pisell/utils": "3.0.4",
+    "@pisell/materials": "6.12.55",
     "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.10"
   },

package/es/private-materials/lowcode/authmodal/meta.d.ts

@@ -1 +0,0 @@
-export { };