@pisell/private-materials 6.11.672 → 6.11.673

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

@@ -168,8 +168,8 @@ const finalizeCandidateWithoutResourceStep = function() {
 }();
 const refreshAvailabilityTimes = function() {
 	var _ref5 = require_asyncToGenerator._asyncToGenerator(function* (context, module, options = {}) {
-		var _context$getModuleDat2, _ref4;
-		const { durationOverride, startTimeOverride, selectionIntent = "restore" } = options;
+		var _previousTimeData$sel, _context$getModuleDat2, _ref4;
+		const { durationOverride, startTimeOverride, selectionIntent = "restore", selectionOrigin: selectionOriginOverride } = options;
 		const availability = context.services.availability;
 		const allowUnavailable = context.services.allowUnavailableBookingSelection === true;
 		const posDurationAvailability = isPosDurationAvailabilityContext(context);
@@ -180,6 +180,7 @@ const refreshAvailabilityTimes = function() {
 		const selectedDate = context.draft.booking.startDate.format("YYYY-MM-DD");
 		const requestId = Date.now() + Math.random();
 		const previousTimeData = context.getModuleData(module.key);
+		const availabilitySelectionOrigin = selectionOriginOverride || ((previousTimeData === null || previousTimeData === void 0 ? void 0 : previousTimeData.availabilitySelectionOrigin) === "user" && ((_previousTimeData$sel = previousTimeData.selectedCandidate) === null || _previousTimeData$sel === void 0 ? void 0 : _previousTimeData$sel.date) === selectedDate ? "user" : "automatic");
 		const posCustomTimeHydrationKey = posCustomTimeAvailability && draftRequestedDuration && draftRequestedStartTime ? `${selectedDate}|${draftRequestedStartTime}|${draftRequestedDuration}` : void 0;
 		const product = context.draft.productData;
 		const effectiveSelectionIntent = require_posCustomTime.resolvePosFlexibleDurationRequestIntent({
@@ -198,7 +199,8 @@ const refreshAvailabilityTimes = function() {
 			requestId,
 			timeSlots: [],
 			posCustomTimeHydrationKey,
-			posCustomTimeSelectionIntent: effectiveSelectionIntent === "restore" ? void 0 : effectiveSelectionIntent
+			posCustomTimeSelectionIntent: effectiveSelectionIntent === "restore" ? void 0 : effectiveSelectionIntent,
+			availabilitySelectionOrigin
 		});
 		const group = (yield availability.getProductTimeRanges(availability.contextId, require_objectSpread2._objectSpread2({
 			productIds: [availability.productId],
@@ -251,7 +253,8 @@ const refreshAvailabilityTimes = function() {
 				selectedCandidate: void 0,
 				slotStepMinutes: group === null || group === void 0 ? void 0 : group.slotStepMinutes,
 				posCustomTimeHydrationKey,
-				posCustomTimeSelectionIntent: effectiveSelectionIntent === "restore" ? void 0 : effectiveSelectionIntent
+				posCustomTimeSelectionIntent: effectiveSelectionIntent === "restore" ? void 0 : effectiveSelectionIntent,
+				availabilitySelectionOrigin
 			});
 			return;
 		}
@@ -306,13 +309,22 @@ const refreshAvailabilityTimes = function() {
 		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;
 		const fallbackCandidate = shouldPreserveRequestedPosStart ? void 0 : selectableCandidates[0];
 		const preferPosFlexiblePreset = posDurationAvailability && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) && !customSelectionIntent && context.services.selectionFlowMode !== "edit" && (selectionIntent === "fallback" || !existingCandidate || existingCandidate.date !== selectedDate);
-		const initialCandidate = posDurationAvailability && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? require_posCustomTime.resolvePosFlexibleDurationInitialCandidate({
+		const preferredCandidate = posDurationAvailability && require_posCustomTime.isFlexibleDurationValue(product === null || product === void 0 ? void 0 : product.duration) ? require_posCustomTime.resolvePosFlexibleDurationInitialCandidate({
 			presetCandidates: displayCandidates,
 			restoredCandidate,
 			fallbackCandidate,
 			preferPreset: preferPosFlexiblePreset,
 			allowRestoredFallback: fallbackSelectionIntent
 		}) : restoredCandidate || fallbackCandidate;
+		const initialCandidate = require_posCustomTime.resolveAvailabilityInitialCandidate({
+			preferredCandidate,
+			normallySelectableCandidates,
+			normalFallbackCandidate: displayCandidates.find((candidate) => isAvailabilityCandidateSelectable(candidate)) || normallySelectableCandidates[0],
+			unavailableFallbackCandidates: displayCandidates.length > 0 ? displayCandidates : times,
+			allowUnavailableSelection: allowUnavailable,
+			preserveUnavailablePreferredCandidate: context.services.selectionFlowMode === "edit" || availabilitySelectionOrigin === "user"
+		});
+		const nextAvailabilitySelectionOrigin = availabilitySelectionOrigin === "user" && preferredCandidate && initialCandidate && String(preferredCandidate.key) === String(initialCandidate.key) ? "user" : "automatic";
 		context.setModuleData(module.key, {
 			requestId,
 			slotStepMinutes: group === null || group === void 0 ? void 0 : group.slotStepMinutes,
@@ -327,7 +339,8 @@ const refreshAvailabilityTimes = function() {
 			})),
 			selectedCandidate: initialCandidate,
 			posCustomTimeHydrationKey,
-			posCustomTimeSelectionIntent: effectiveSelectionIntent === "restore" ? void 0 : effectiveSelectionIntent
+			posCustomTimeSelectionIntent: effectiveSelectionIntent === "restore" ? void 0 : effectiveSelectionIntent,
+			availabilitySelectionOrigin: nextAvailabilitySelectionOrigin
 		});
 		const shouldWriteInitialCandidate = Boolean(initialCandidate) && (posCustomTimeAvailability || !existingCandidate || initialCandidate.key !== existingCandidate.key);
 		if (initialCandidate && shouldWriteInitialCandidate) {
@@ -546,7 +559,10 @@ const TimeFlowModuleComponent = ({ context, module, registerHandle }) => {
 	const durationProps = runtime.durationProps;
 	const applyAvailabilityCandidate = (candidate) => {
 		if (!availabilityData) return;
-		context.setModuleData(module.key, require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, availabilityData), {}, { selectedCandidate: candidate }));
+		context.setModuleData(module.key, require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, availabilityData), {}, {
+			selectedCandidate: candidate,
+			availabilitySelectionOrigin: "user"
+		}));
 		if (!candidate) return;
 		const startAt = (0, dayjs.default)(candidate.startAt);
 		const endAt = (0, dayjs.default)(candidate.endAt);
@@ -721,7 +737,8 @@ const TimeFlowModuleComponent = ({ context, module, registerHandle }) => {
 					refreshAvailabilityTimes(context, module, {
 						durationOverride: duration,
 						startTimeOverride: nextStartTime,
-						selectionIntent: "custom"
+						selectionIntent: "custom",
+						selectionOrigin: "user"
 					}).then(() => context.setModuleStatus(module.key, "ready")).catch((error) => context.setModuleStatus(module.key, "error", error instanceof Error ? error.message : String(error), error));
 				}
 			}), /* @__PURE__ */ react.default.createElement("div", { style: { fontWeight: 500 } }, require_i18n.selectionFlowText("pisell2.text.duration")), /* @__PURE__ */ react.default.createElement(require_index.default, require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, durationProps), options.durationProps), {}, {
@@ -748,7 +765,8 @@ const TimeFlowModuleComponent = ({ context, module, registerHandle }) => {
 					refreshAvailabilityTimes(context, module, {
 						durationOverride: nextDuration,
 						startTimeOverride: startTime,
-						selectionIntent: "custom"
+						selectionIntent: "custom",
+						selectionOrigin: "user"
 					}).then(() => context.setModuleStatus(module.key, "ready")).catch((error) => context.setModuleStatus(module.key, "error", error instanceof Error ? error.message : String(error), error));
 				}
 			})));

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

@@ -65,6 +65,21 @@ const resolvePosCustomTimeCandidate = (params) => {
 	}
 	return params.restoredDraftCandidate || params.restoredExistingCandidate || params.fallbackCandidate;
 };
+/**
+* Availability 刷新后，优先保留仍然正常可用的原候选。只有编辑态或用户
+* 明确选择过时间时，才允许已满候选继续压过后续正常候选。若当天已经
+* 没有正常候选，POS 仍可保留一个不可用候选进入人工处理流程。
+*/
+const resolveAvailabilityInitialCandidate = (params) => {
+	var _params$unavailableFa;
+	const preferredCandidate = params.preferredCandidate;
+	const refreshedPreferredCandidate = preferredCandidate ? params.normallySelectableCandidates.find((candidate) => String(candidate.key) === String(preferredCandidate.key)) : void 0;
+	if (refreshedPreferredCandidate) return refreshedPreferredCandidate;
+	if (preferredCandidate && params.preserveUnavailablePreferredCandidate === true) return preferredCandidate;
+	if (params.normalFallbackCandidate) return params.normalFallbackCandidate;
+	if (params.allowUnavailableSelection !== true) return void 0;
+	return preferredCandidate || ((_params$unavailableFa = params.unavailableFallbackCandidates) === null || _params$unavailableFa === void 0 ? void 0 : _params$unavailableFa[0]);
+};
 const getSessionPresetCandidates = (candidates) => candidates.filter((candidate) => candidate.source === "session_schedule");
 const getPosFlexibleDurationPresetCandidates = (candidates, requestedCustomRange, customSelectionIntent = false, preserveRequestedRange = false) => {
 	if (!requestedCustomRange) return [...candidates];
@@ -84,6 +99,7 @@ exports.getPosFlexibleDurationPresetCandidates = getPosFlexibleDurationPresetCan
 exports.getSessionPresetCandidates = getSessionPresetCandidates;
 exports.isFlexibleDurationValue = isFlexibleDurationValue;
 exports.isSameAvailabilityCandidateRange = isSameAvailabilityCandidateRange;
+exports.resolveAvailabilityInitialCandidate = resolveAvailabilityInitialCandidate;
 exports.resolvePosCustomTimeBaseMinutes = resolvePosCustomTimeBaseMinutes;
 exports.resolvePosCustomTimeCandidate = resolvePosCustomTimeCandidate;
 exports.resolvePosCustomTimeDefaultDurationMinutes = resolvePosCustomTimeDefaultDurationMinutes;

package/package.json

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

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

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