@pisell/private-materials 6.11.680 → 6.11.681

package/es/plus/salesSdk/adjustTime/components/ChangeTimeControls.js

@@ -1,9 +1,9 @@
 import { _objectSpread2 } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import BookingAvailabilityCalendar from "../../../../components/eventBooking/components/bookingAvailabilityCalendar/index.js";
 import { t } from "../i18n.js";
-import { buildChangeTimeCalendarProps, buildChangeTimeDateRangeProps } from "../utils/changeTime.js";
-import React, { useMemo } from "react";
-import { DatePicker, Iconfont, SelectTime } from "@pisell/materials";
+import { buildChangeTimeCalendarProps, buildChangeTimeDateRangeProps, resolveChangeTimePickerDraft } from "../utils/changeTime.js";
+import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { DatePicker, Iconfont, SelectTime, useToast } from "@pisell/materials";
 import classNames from "classnames";
 import { LocalizationProvider, ThemeProvider, createTheme } from "@pisell/date-picker";
 import { AdapterDayjs } from "@pisell/date-picker/es/AdapterDayjs";
@@ -28,20 +28,37 @@ const datePickerDarkTheme = createTheme({
 	} } } }
 });
 const ChangeTimeControls = ({ visible, value, onChange, rangeMode = "multiDay", showTime = true }) => {
+	const Toast = useToast();
+	const [pickerDraft, setPickerDraft] = useState(value);
+	const pickerOpenRef = useRef(false);
+	useEffect(() => setPickerDraft(value), [value]);
+	const handlePickerOpen = useCallback(() => {
+		pickerOpenRef.current = true;
+	}, []);
+	const handlePickerClose = useCallback(() => {
+		pickerOpenRef.current = false;
+		setPickerDraft(value);
+	}, [value]);
+	const handlePickerDateChange = useCallback((next) => {
+		if (!pickerOpenRef.current || !showTime) return;
+		setPickerDraft((previous) => resolveChangeTimePickerDraft(previous, next));
+	}, [showTime]);
 	const calendarProps = useMemo(() => buildChangeTimeCalendarProps({
 		value,
 		onChange
 	}), [onChange, value]);
 	const dateRangeProps = useMemo(() => buildChangeTimeDateRangeProps({
-		value,
+		value: pickerDraft,
 		mode: rangeMode,
 		showTime,
-		onChange
+		onChange,
+		onValidationError: Toast.error
 	}), [
 		onChange,
 		rangeMode,
 		showTime,
-		value
+		pickerDraft,
+		Toast.error
 	]);
 	return /* @__PURE__ */ React.createElement("section", { className: classNames("pisell-adjust-time__change-time-panel", { "pisell-adjust-time__change-time-panel--visible": visible }) }, /* @__PURE__ */ React.createElement("div", { className: "pisell-adjust-time__change-time-card" }, /* @__PURE__ */ React.createElement("span", { className: "pisell-adjust-time__end-time-label" }, t("pisell2.adjust-time.change-time-new-schedule")), /* @__PURE__ */ React.createElement(BookingAvailabilityCalendar, _objectSpread2(_objectSpread2({}, calendarProps), {}, {
 		showHeader: false,
@@ -50,6 +67,9 @@ const ChangeTimeControls = ({ visible, value, onChange, rangeMode = "multiDay",
 		dateAdapter: AdapterDayjs,
 		adapterLocale: "en"
 	}, /* @__PURE__ */ React.createElement(ThemeProvider, { theme: datePickerDarkTheme }, /* @__PURE__ */ React.createElement(RangePicker, _objectSpread2(_objectSpread2({}, dateRangeProps), {}, {
+		onOpen: handlePickerOpen,
+		onClose: handlePickerClose,
+		onDateChange: handlePickerDateChange,
 		timeInputComponent: SelectTime,
 		timeInputProps: {
 			slice: 15,

package/es/plus/salesSdk/adjustTime/hooks/useAdjustTimeModalController.js

@@ -64,7 +64,7 @@ const resolveOptionalDate = (value) => {
 	const date = value instanceof Date ? value : new Date(value);
 	return Number.isNaN(date.getTime()) ? void 0 : date;
 };
-/** 任何加时结束时间都不能超过店铺/资源允许的业务结束时间。 */
+/** 商品加时和补付超时按营业结束时间截断。 */
 const clampToBusinessEnd = (date, businessEnd) => {
 	return date.getTime() > businessEnd.getTime() ? businessEnd : date;
 };
@@ -88,11 +88,11 @@ const resolveAdjustTimeContext = ({ current, start, end, resourceEndTime, shopCl
 const resolveAdjustTimePolicy = (context, bookingDuration) => {
 	const { current, start, end, businessEnd, resourceEndDate, isFutureBooking, hasBusinessEndConflict } = context;
 	const isCurrentBookingDay = isSameLocalDate(end, current);
+	const isOngoingBooking = start.getTime() <= current.getTime() && current.getTime() < end.getTime();
 	const configuredDuration = Number(bookingDuration);
 	const restartDuration = Number.isFinite(configuredDuration) && configuredDuration > 0 ? configuredDuration : minutesBetween(start, end);
-	const canRestart = isCurrentBookingDay && current.getTime() >= start.getTime() && current.getTime() < businessEnd.getTime();
-	const restartUncappedEnd = canRestart ? addMinutes(current, restartDuration) : end;
-	const restartEnd = canRestart ? clampToBusinessEnd(restartUncappedEnd, businessEnd) : end;
+	const canRestart = isCurrentBookingDay || isFutureBooking || isOngoingBooking;
+	const restartEnd = canRestart ? addMinutes(current, restartDuration) : end;
 	return {
 		start,
 		end,
@@ -110,21 +110,20 @@ const resolveAdjustTimePolicy = (context, bookingDuration) => {
 		canRestart,
 		payOvertimeEnd: isCurrentBookingDay && current.getTime() > end.getTime() ? current : end,
 		restartStart: canRestart ? current : start,
-		restartEnd,
-		restartUncappedEnd
+		restartEnd
 	};
 };
 /**
-* 原预约结束时间已经超过营业结束时间时，除 Manual Add time 外其它模式不可继续加时。
+* 原预约结束时间已经超过营业结束时间时，商品加时和补付超时不可继续加时。
 * 这里仍返回一个可展示的方案，但 valid=false，用于 UI 展示原因和禁用提交。
 */
 const resolveBusinessConflictScenario = (activeAction, start, end, products) => {
 	const productId = isProductAction(activeAction) ? activeAction.slice(8) : void 0;
 	const product = productId ? products.find((item) => String(item.id) === productId) : void 0;
 	return {
-		title: activeAction === "restart" ? t("pisell2.adjust-time.restart") : (product === null || product === void 0 ? void 0 : product.title) || t("pisell2.adjust-time.pay-overtime"),
-		subtitle: activeAction === "restart" ? t("pisell2.adjust-time.restart-subtitle") : isProductAction(activeAction) ? t("pisell2.adjust-time.product-subtitle") : t("pisell2.adjust-time.pay-overtime-subtitle"),
-		icon: activeAction === "restart" ? "⟳" : (product === null || product === void 0 ? void 0 : product.unlimited) ? "Day" : product ? `${Number(product.minMinutes || 0)}m` : "◷",
+		title: (product === null || product === void 0 ? void 0 : product.title) || t("pisell2.adjust-time.pay-overtime"),
+		subtitle: isProductAction(activeAction) ? t("pisell2.adjust-time.product-subtitle") : t("pisell2.adjust-time.pay-overtime-subtitle"),
+		icon: (product === null || product === void 0 ? void 0 : product.unlimited) ? "Day" : product ? `${Number(product.minMinutes || 0)}m` : "◷",
 		newStart: start,
 		newEnd: end,
 		uncappedNewEnd: end,
@@ -140,7 +139,7 @@ const resolveBusinessConflictScenario = (activeAction, start, end, products) =>
 */
 const buildAdjustTimeScenario = ({ activeAction, manualEndDate, changeTimeValue, policy, products }) => {
 	const { start, end, addTimeStart, addTimeBaseEnd, addTimeEndLimit, hasBusinessEndConflict } = policy;
-	if (activeAction !== "manualDuration" && activeAction !== "changeTime" && hasBusinessEndConflict) return resolveBusinessConflictScenario(activeAction, start, end, products);
+	if (activeAction !== "manualDuration" && activeAction !== "changeTime" && activeAction !== "restart" && hasBusinessEndConflict) return resolveBusinessConflictScenario(activeAction, start, end, products);
 	if (activeAction === "changeTime") {
 		const targetMinutes = minutesBetween(changeTimeValue.start, changeTimeValue.end);
 		return {
@@ -160,8 +159,7 @@ const buildAdjustTimeScenario = ({ activeAction, manualEndDate, changeTimeValue,
 		icon: "⟳",
 		newStart: policy.restartStart,
 		newEnd: policy.restartEnd,
-		uncappedNewEnd: policy.restartUncappedEnd,
-		effectiveEndLimit: addTimeEndLimit,
+		uncappedNewEnd: policy.restartEnd,
 		targetMinutes: policy.canRestart ? minutesBetween(policy.restartStart, policy.restartEnd) : 0,
 		valid: policy.canRestart && policy.restartEnd.getTime() > policy.restartStart.getTime()
 	};
@@ -295,7 +293,8 @@ const resolveAdjustTimeHints = ({ activeAction, addedMinutes, policy, scenario,
 	const { businessEnd, hasBusinessEndConflict, resourceEndDate } = policy;
 	const businessEndTime = formatTime(businessEnd);
 	const cappedEffectiveUntilTime = scenario.valid && pricedNewEnd.getTime() < uncappedPricedNewEnd.getTime() ? formatTime(pricedNewEnd) : void 0;
-	const shouldShowEffectiveUntilHint = activeAction === "manualDuration" && pricedNewEnd.getTime() > businessEnd.getTime() || Boolean(cappedEffectiveUntilTime) || Boolean(hasBusinessEndConflict) || Boolean(scenario.unlimited);
+	const isManualBeyondBusinessEnd = activeAction === "manualDuration" && pricedNewEnd.getTime() > businessEnd.getTime();
+	const shouldShowEffectiveUntilHint = activeAction !== "restart" && (isManualBeyondBusinessEnd || Boolean(cappedEffectiveUntilTime) || Boolean(hasBusinessEndConflict) || Boolean(scenario.unlimited));
 	const shouldShowResourceAvailabilityWarning = resourceEndDate ? !shouldShowEffectiveUntilHint && activeAction !== "restart" && activeAction !== "changeTime" && addedMinutes > 0 && resourceEndDate.getTime() < businessEnd.getTime() && pricedNewEnd.getTime() > resourceEndDate.getTime() : false;
 	return {
 		shouldShowEffectiveUntilHint,

package/es/plus/salesSdk/adjustTime/locales.js

@@ -25,6 +25,7 @@ var locales_default = {
 		"pisell2.adjust-time.change-time-date-range": "Select schedule date",
 		"pisell2.adjust-time.start-time": "Start time",
 		"pisell2.adjust-time.end-time": "End time",
+		"pisell2.adjust-time.end-must-be-after-start": "End time must be later than the start time.",
 		"pisell2.adjust-time.edit": "edit",
 		"pisell2.adjust-time.amount-due": "Amount Due",
 		"pisell2.adjust-time.amount-due-with-ticket-count": "Amount Due ({tickets})",
@@ -103,6 +104,7 @@ var locales_default = {
 		"pisell2.adjust-time.change-time-date-range": "选择日程日期",
 		"pisell2.adjust-time.start-time": "开始时间",
 		"pisell2.adjust-time.end-time": "结束时间",
+		"pisell2.adjust-time.end-must-be-after-start": "结束时间必须晚于开始时间",
 		"pisell2.adjust-time.edit": "编辑",
 		"pisell2.adjust-time.amount-due": "应付金额",
 		"pisell2.adjust-time.amount-due-with-ticket-count": "应付金额（{tickets}）",
@@ -181,6 +183,7 @@ var locales_default = {
 		"pisell2.adjust-time.change-time-date-range": "選擇日程日期",
 		"pisell2.adjust-time.start-time": "開始時間",
 		"pisell2.adjust-time.end-time": "結束時間",
+		"pisell2.adjust-time.end-must-be-after-start": "結束時間必須晚於開始時間",
 		"pisell2.adjust-time.edit": "編輯",
 		"pisell2.adjust-time.amount-due": "應付金額",
 		"pisell2.adjust-time.amount-due-with-ticket-count": "應付金額（{tickets}）",
@@ -259,6 +262,7 @@ var locales_default = {
 		"pisell2.adjust-time.change-time-date-range": "スケジュール日を選択",
 		"pisell2.adjust-time.start-time": "開始時間",
 		"pisell2.adjust-time.end-time": "終了時間",
+		"pisell2.adjust-time.end-must-be-after-start": "終了時間は開始時間より後にしてください。",
 		"pisell2.adjust-time.edit": "編集",
 		"pisell2.adjust-time.amount-due": "支払い金額",
 		"pisell2.adjust-time.amount-due-with-ticket-count": "支払い金額（{tickets}）",
@@ -337,6 +341,7 @@ var locales_default = {
 		"pisell2.adjust-time.change-time-date-range": "Selecionar data do agendamento",
 		"pisell2.adjust-time.start-time": "Horário de início",
 		"pisell2.adjust-time.end-time": "Horário de término",
+		"pisell2.adjust-time.end-must-be-after-start": "O horário de término deve ser posterior ao horário de início.",
 		"pisell2.adjust-time.edit": "editar",
 		"pisell2.adjust-time.amount-due": "Valor devido",
 		"pisell2.adjust-time.amount-due-with-ticket-count": "Valor devido ({tickets})",

package/es/plus/salesSdk/adjustTime/utils/changeTime.js

@@ -1,14 +1,21 @@
-import { _objectSpread2 } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import { addMinutes, applyTimeToDate, formatTime, minutesBetween } from "./time.js";
 import dayjs from "dayjs";
+import { locales } from "@pisell/utils";
 //#region src/plus/salesSdk/adjustTime/utils/changeTime.ts
 const DEFAULT_DATE_FORMAT = "YYYY/MM/DD";
 const DEFAULT_DATE_TIME_FORMAT = "YYYY/MM/DD HH:mm";
 const FALLBACK_DURATION_MINUTES = 60;
 const toPickerValue = (value) => [dayjs(value.start), dayjs(value.end)];
-const ensureEndAfterStart = (value) => {
-	if (value.end.getTime() > value.start.getTime()) return value;
-	return _objectSpread2(_objectSpread2({}, value), {}, { end: addMinutes(value.start, FALLBACK_DURATION_MINUTES) });
+/** 在业务组件内联动开始时间，结束时间单独编辑时保留输入，交给 Apply 校验。 */
+const resolveChangeTimePickerDraft = (previous, next) => {
+	var _next$, _next$2;
+	if (!((_next$ = next[0]) === null || _next$ === void 0 ? void 0 : _next$.isValid()) || !((_next$2 = next[1]) === null || _next$2 === void 0 ? void 0 : _next$2.isValid())) return previous;
+	const start = next[0].toDate();
+	const duration = previous.end.getTime() - previous.start.getTime();
+	return {
+		start,
+		end: start.getTime() !== previous.start.getTime() && duration > 0 ? new Date(start.getTime() + duration) : next[1].toDate()
+	};
 };
 const applyDateWithClock = (date, clockSource) => {
 	return applyTimeToDate(date.toDate(), formatTime(clockSource));
@@ -24,8 +31,22 @@ const resolveDefaultChangeTimeValue = (value, minDate = dayjs().startOf("day"))
 	if (!dayjs(value.start).isBefore(minDate, "day")) return value;
 	return moveChangeTimeRangeToDate(value, minDate.format("YYYY-MM-DD"));
 };
-const buildChangeTimeDateRangeProps = ({ value, mode = "multiDay", showTime = true, placeholder, minDate, maxDate, onChange, disabledDate }) => {
+const buildChangeTimeDateRangeProps = ({ value, mode = "multiDay", showTime = true, placeholder, minDate, maxDate, onChange, onValidationError, disabledDate }) => {
 	const resolvedMinDate = minDate || dayjs().startOf("day");
+	const resolveValidNextValue = (nextValue) => {
+		if (!Array.isArray(nextValue) || !nextValue[0] || !nextValue[1]) return;
+		const [nextStartDay, nextEndDay] = nextValue;
+		const endDay = mode === "singleDay" && !showTime ? nextStartDay : nextEndDay;
+		const next = {
+			start: showTime ? nextStartDay.toDate() : applyDateWithClock(nextStartDay, value.start),
+			end: showTime ? endDay.toDate() : applyDateWithClock(endDay, value.end)
+		};
+		if (!(next.end.getTime() > next.start.getTime())) {
+			onValidationError === null || onValidationError === void 0 || onValidationError(locales.getText("pisell2.adjust-time.end-must-be-after-start"));
+			return;
+		}
+		return next;
+	};
 	return {
 		value: toPickerValue(value),
 		placeholder,
@@ -50,14 +71,8 @@ const buildChangeTimeDateRangeProps = ({ value, mode = "multiDay", showTime = tr
 		isHideCustomSelect: true,
 		disabledDate,
 		onChange: (nextValue) => {
-			if (!Array.isArray(nextValue) || !nextValue[0]) return;
-			const [nextStartDay, nextEndDay] = nextValue;
-			const endDay = mode === "singleDay" ? nextStartDay : nextEndDay || nextStartDay;
-			if (!endDay) return;
-			onChange(ensureEndAfterStart({
-				start: showTime ? nextStartDay.toDate() : applyDateWithClock(nextStartDay, value.start),
-				end: showTime ? endDay.toDate() : applyDateWithClock(endDay, value.end)
-			}));
+			const next = resolveValidNextValue(nextValue);
+			if (next) onChange(next);
 		}
 	};
 };
@@ -87,4 +102,4 @@ const buildChangeTimeCalendarProps = ({ value, onChange }) => {
 	};
 };
 //#endregion
-export { buildChangeTimeCalendarProps, buildChangeTimeDateRangeProps, resolveDefaultChangeTimeValue };
+export { buildChangeTimeCalendarProps, buildChangeTimeDateRangeProps, resolveChangeTimePickerDraft, resolveDefaultChangeTimeValue };

package/lib/plus/salesSdk/adjustTime/components/ChangeTimeControls.js

@@ -31,20 +31,37 @@ const datePickerDarkTheme = (0, _pisell_date_picker.createTheme)({
 	} } } }
 });
 const ChangeTimeControls = ({ visible, value, onChange, rangeMode = "multiDay", showTime = true }) => {
+	const Toast = (0, _pisell_materials.useToast)();
+	const [pickerDraft, setPickerDraft] = (0, react.useState)(value);
+	const pickerOpenRef = (0, react.useRef)(false);
+	(0, react.useEffect)(() => setPickerDraft(value), [value]);
+	const handlePickerOpen = (0, react.useCallback)(() => {
+		pickerOpenRef.current = true;
+	}, []);
+	const handlePickerClose = (0, react.useCallback)(() => {
+		pickerOpenRef.current = false;
+		setPickerDraft(value);
+	}, [value]);
+	const handlePickerDateChange = (0, react.useCallback)((next) => {
+		if (!pickerOpenRef.current || !showTime) return;
+		setPickerDraft((previous) => require_changeTime.resolveChangeTimePickerDraft(previous, next));
+	}, [showTime]);
 	const calendarProps = (0, react.useMemo)(() => require_changeTime.buildChangeTimeCalendarProps({
 		value,
 		onChange
 	}), [onChange, value]);
 	const dateRangeProps = (0, react.useMemo)(() => require_changeTime.buildChangeTimeDateRangeProps({
-		value,
+		value: pickerDraft,
 		mode: rangeMode,
 		showTime,
-		onChange
+		onChange,
+		onValidationError: Toast.error
 	}), [
 		onChange,
 		rangeMode,
 		showTime,
-		value
+		pickerDraft,
+		Toast.error
 	]);
 	return /* @__PURE__ */ react.default.createElement("section", { className: (0, classnames.default)("pisell-adjust-time__change-time-panel", { "pisell-adjust-time__change-time-panel--visible": visible }) }, /* @__PURE__ */ react.default.createElement("div", { className: "pisell-adjust-time__change-time-card" }, /* @__PURE__ */ react.default.createElement("span", { className: "pisell-adjust-time__end-time-label" }, require_i18n.t("pisell2.adjust-time.change-time-new-schedule")), /* @__PURE__ */ react.default.createElement(require_index.default, require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, calendarProps), {}, {
 		showHeader: false,
@@ -53,6 +70,9 @@ const ChangeTimeControls = ({ visible, value, onChange, rangeMode = "multiDay",
 		dateAdapter: _pisell_date_picker_es_AdapterDayjs.AdapterDayjs,
 		adapterLocale: "en"
 	}, /* @__PURE__ */ react.default.createElement(_pisell_date_picker.ThemeProvider, { theme: datePickerDarkTheme }, /* @__PURE__ */ react.default.createElement(RangePicker, require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, dateRangeProps), {}, {
+		onOpen: handlePickerOpen,
+		onClose: handlePickerClose,
+		onDateChange: handlePickerDateChange,
 		timeInputComponent: _pisell_materials.SelectTime,
 		timeInputProps: {
 			slice: 15,

package/lib/plus/salesSdk/adjustTime/hooks/useAdjustTimeModalController.js

@@ -65,7 +65,7 @@ const resolveOptionalDate = (value) => {
 	const date = value instanceof Date ? value : new Date(value);
 	return Number.isNaN(date.getTime()) ? void 0 : date;
 };
-/** 任何加时结束时间都不能超过店铺/资源允许的业务结束时间。 */
+/** 商品加时和补付超时按营业结束时间截断。 */
 const clampToBusinessEnd = (date, businessEnd) => {
 	return date.getTime() > businessEnd.getTime() ? businessEnd : date;
 };
@@ -89,11 +89,11 @@ const resolveAdjustTimeContext = ({ current, start, end, resourceEndTime, shopCl
 const resolveAdjustTimePolicy = (context, bookingDuration) => {
 	const { current, start, end, businessEnd, resourceEndDate, isFutureBooking, hasBusinessEndConflict } = context;
 	const isCurrentBookingDay = isSameLocalDate(end, current);
+	const isOngoingBooking = start.getTime() <= current.getTime() && current.getTime() < end.getTime();
 	const configuredDuration = Number(bookingDuration);
 	const restartDuration = Number.isFinite(configuredDuration) && configuredDuration > 0 ? configuredDuration : require_time.minutesBetween(start, end);
-	const canRestart = isCurrentBookingDay && current.getTime() >= start.getTime() && current.getTime() < businessEnd.getTime();
-	const restartUncappedEnd = canRestart ? require_time.addMinutes(current, restartDuration) : end;
-	const restartEnd = canRestart ? clampToBusinessEnd(restartUncappedEnd, businessEnd) : end;
+	const canRestart = isCurrentBookingDay || isFutureBooking || isOngoingBooking;
+	const restartEnd = canRestart ? require_time.addMinutes(current, restartDuration) : end;
 	return {
 		start,
 		end,
@@ -111,21 +111,20 @@ const resolveAdjustTimePolicy = (context, bookingDuration) => {
 		canRestart,
 		payOvertimeEnd: isCurrentBookingDay && current.getTime() > end.getTime() ? current : end,
 		restartStart: canRestart ? current : start,
-		restartEnd,
-		restartUncappedEnd
+		restartEnd
 	};
 };
 /**
-* 原预约结束时间已经超过营业结束时间时，除 Manual Add time 外其它模式不可继续加时。
+* 原预约结束时间已经超过营业结束时间时，商品加时和补付超时不可继续加时。
 * 这里仍返回一个可展示的方案，但 valid=false，用于 UI 展示原因和禁用提交。
 */
 const resolveBusinessConflictScenario = (activeAction, start, end, products) => {
 	const productId = isProductAction(activeAction) ? activeAction.slice(8) : void 0;
 	const product = productId ? products.find((item) => String(item.id) === productId) : void 0;
 	return {
-		title: activeAction === "restart" ? t("pisell2.adjust-time.restart") : (product === null || product === void 0 ? void 0 : product.title) || t("pisell2.adjust-time.pay-overtime"),
-		subtitle: activeAction === "restart" ? t("pisell2.adjust-time.restart-subtitle") : isProductAction(activeAction) ? t("pisell2.adjust-time.product-subtitle") : t("pisell2.adjust-time.pay-overtime-subtitle"),
-		icon: activeAction === "restart" ? "⟳" : (product === null || product === void 0 ? void 0 : product.unlimited) ? "Day" : product ? `${Number(product.minMinutes || 0)}m` : "◷",
+		title: (product === null || product === void 0 ? void 0 : product.title) || t("pisell2.adjust-time.pay-overtime"),
+		subtitle: isProductAction(activeAction) ? t("pisell2.adjust-time.product-subtitle") : t("pisell2.adjust-time.pay-overtime-subtitle"),
+		icon: (product === null || product === void 0 ? void 0 : product.unlimited) ? "Day" : product ? `${Number(product.minMinutes || 0)}m` : "◷",
 		newStart: start,
 		newEnd: end,
 		uncappedNewEnd: end,
@@ -141,7 +140,7 @@ const resolveBusinessConflictScenario = (activeAction, start, end, products) =>
 */
 const buildAdjustTimeScenario = ({ activeAction, manualEndDate, changeTimeValue, policy, products }) => {
 	const { start, end, addTimeStart, addTimeBaseEnd, addTimeEndLimit, hasBusinessEndConflict } = policy;
-	if (activeAction !== "manualDuration" && activeAction !== "changeTime" && hasBusinessEndConflict) return resolveBusinessConflictScenario(activeAction, start, end, products);
+	if (activeAction !== "manualDuration" && activeAction !== "changeTime" && activeAction !== "restart" && hasBusinessEndConflict) return resolveBusinessConflictScenario(activeAction, start, end, products);
 	if (activeAction === "changeTime") {
 		const targetMinutes = require_time.minutesBetween(changeTimeValue.start, changeTimeValue.end);
 		return {
@@ -161,8 +160,7 @@ const buildAdjustTimeScenario = ({ activeAction, manualEndDate, changeTimeValue,
 		icon: "⟳",
 		newStart: policy.restartStart,
 		newEnd: policy.restartEnd,
-		uncappedNewEnd: policy.restartUncappedEnd,
-		effectiveEndLimit: addTimeEndLimit,
+		uncappedNewEnd: policy.restartEnd,
 		targetMinutes: policy.canRestart ? require_time.minutesBetween(policy.restartStart, policy.restartEnd) : 0,
 		valid: policy.canRestart && policy.restartEnd.getTime() > policy.restartStart.getTime()
 	};
@@ -296,7 +294,8 @@ const resolveAdjustTimeHints = ({ activeAction, addedMinutes, policy, scenario,
 	const { businessEnd, hasBusinessEndConflict, resourceEndDate } = policy;
 	const businessEndTime = require_time.formatTime(businessEnd);
 	const cappedEffectiveUntilTime = scenario.valid && pricedNewEnd.getTime() < uncappedPricedNewEnd.getTime() ? require_time.formatTime(pricedNewEnd) : void 0;
-	const shouldShowEffectiveUntilHint = activeAction === "manualDuration" && pricedNewEnd.getTime() > businessEnd.getTime() || Boolean(cappedEffectiveUntilTime) || Boolean(hasBusinessEndConflict) || Boolean(scenario.unlimited);
+	const isManualBeyondBusinessEnd = activeAction === "manualDuration" && pricedNewEnd.getTime() > businessEnd.getTime();
+	const shouldShowEffectiveUntilHint = activeAction !== "restart" && (isManualBeyondBusinessEnd || Boolean(cappedEffectiveUntilTime) || Boolean(hasBusinessEndConflict) || Boolean(scenario.unlimited));
 	const shouldShowResourceAvailabilityWarning = resourceEndDate ? !shouldShowEffectiveUntilHint && activeAction !== "restart" && activeAction !== "changeTime" && addedMinutes > 0 && resourceEndDate.getTime() < businessEnd.getTime() && pricedNewEnd.getTime() > resourceEndDate.getTime() : false;
 	return {
 		shouldShowEffectiveUntilHint,

package/lib/plus/salesSdk/adjustTime/locales.js

@@ -25,6 +25,7 @@ var locales_default = {
 		"pisell2.adjust-time.change-time-date-range": "Select schedule date",
 		"pisell2.adjust-time.start-time": "Start time",
 		"pisell2.adjust-time.end-time": "End time",
+		"pisell2.adjust-time.end-must-be-after-start": "End time must be later than the start time.",
 		"pisell2.adjust-time.edit": "edit",
 		"pisell2.adjust-time.amount-due": "Amount Due",
 		"pisell2.adjust-time.amount-due-with-ticket-count": "Amount Due ({tickets})",
@@ -103,6 +104,7 @@ var locales_default = {
 		"pisell2.adjust-time.change-time-date-range": "选择日程日期",
 		"pisell2.adjust-time.start-time": "开始时间",
 		"pisell2.adjust-time.end-time": "结束时间",
+		"pisell2.adjust-time.end-must-be-after-start": "结束时间必须晚于开始时间",
 		"pisell2.adjust-time.edit": "编辑",
 		"pisell2.adjust-time.amount-due": "应付金额",
 		"pisell2.adjust-time.amount-due-with-ticket-count": "应付金额（{tickets}）",
@@ -181,6 +183,7 @@ var locales_default = {
 		"pisell2.adjust-time.change-time-date-range": "選擇日程日期",
 		"pisell2.adjust-time.start-time": "開始時間",
 		"pisell2.adjust-time.end-time": "結束時間",
+		"pisell2.adjust-time.end-must-be-after-start": "結束時間必須晚於開始時間",
 		"pisell2.adjust-time.edit": "編輯",
 		"pisell2.adjust-time.amount-due": "應付金額",
 		"pisell2.adjust-time.amount-due-with-ticket-count": "應付金額（{tickets}）",
@@ -259,6 +262,7 @@ var locales_default = {
 		"pisell2.adjust-time.change-time-date-range": "スケジュール日を選択",
 		"pisell2.adjust-time.start-time": "開始時間",
 		"pisell2.adjust-time.end-time": "終了時間",
+		"pisell2.adjust-time.end-must-be-after-start": "終了時間は開始時間より後にしてください。",
 		"pisell2.adjust-time.edit": "編集",
 		"pisell2.adjust-time.amount-due": "支払い金額",
 		"pisell2.adjust-time.amount-due-with-ticket-count": "支払い金額（{tickets}）",
@@ -337,6 +341,7 @@ var locales_default = {
 		"pisell2.adjust-time.change-time-date-range": "Selecionar data do agendamento",
 		"pisell2.adjust-time.start-time": "Horário de início",
 		"pisell2.adjust-time.end-time": "Horário de término",
+		"pisell2.adjust-time.end-must-be-after-start": "O horário de término deve ser posterior ao horário de início.",
 		"pisell2.adjust-time.edit": "editar",
 		"pisell2.adjust-time.amount-due": "Valor devido",
 		"pisell2.adjust-time.amount-due-with-ticket-count": "Valor devido ({tickets})",

package/lib/plus/salesSdk/adjustTime/utils/changeTime.js

@@ -1,16 +1,23 @@
 const require_runtime = require("../../../../_virtual/_rolldown/runtime.js");
-const require_objectSpread2 = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
 const require_time = require("./time.js");
 let dayjs = require("dayjs");
 dayjs = require_runtime.__toESM(dayjs);
+let _pisell_utils = require("@pisell/utils");
 //#region src/plus/salesSdk/adjustTime/utils/changeTime.ts
 const DEFAULT_DATE_FORMAT = "YYYY/MM/DD";
 const DEFAULT_DATE_TIME_FORMAT = "YYYY/MM/DD HH:mm";
 const FALLBACK_DURATION_MINUTES = 60;
 const toPickerValue = (value) => [(0, dayjs.default)(value.start), (0, dayjs.default)(value.end)];
-const ensureEndAfterStart = (value) => {
-	if (value.end.getTime() > value.start.getTime()) return value;
-	return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, value), {}, { end: require_time.addMinutes(value.start, FALLBACK_DURATION_MINUTES) });
+/** 在业务组件内联动开始时间，结束时间单独编辑时保留输入，交给 Apply 校验。 */
+const resolveChangeTimePickerDraft = (previous, next) => {
+	var _next$, _next$2;
+	if (!((_next$ = next[0]) === null || _next$ === void 0 ? void 0 : _next$.isValid()) || !((_next$2 = next[1]) === null || _next$2 === void 0 ? void 0 : _next$2.isValid())) return previous;
+	const start = next[0].toDate();
+	const duration = previous.end.getTime() - previous.start.getTime();
+	return {
+		start,
+		end: start.getTime() !== previous.start.getTime() && duration > 0 ? new Date(start.getTime() + duration) : next[1].toDate()
+	};
 };
 const applyDateWithClock = (date, clockSource) => {
 	return require_time.applyTimeToDate(date.toDate(), require_time.formatTime(clockSource));
@@ -26,8 +33,22 @@ const resolveDefaultChangeTimeValue = (value, minDate = (0, dayjs.default)().sta
 	if (!(0, dayjs.default)(value.start).isBefore(minDate, "day")) return value;
 	return moveChangeTimeRangeToDate(value, minDate.format("YYYY-MM-DD"));
 };
-const buildChangeTimeDateRangeProps = ({ value, mode = "multiDay", showTime = true, placeholder, minDate, maxDate, onChange, disabledDate }) => {
+const buildChangeTimeDateRangeProps = ({ value, mode = "multiDay", showTime = true, placeholder, minDate, maxDate, onChange, onValidationError, disabledDate }) => {
 	const resolvedMinDate = minDate || (0, dayjs.default)().startOf("day");
+	const resolveValidNextValue = (nextValue) => {
+		if (!Array.isArray(nextValue) || !nextValue[0] || !nextValue[1]) return;
+		const [nextStartDay, nextEndDay] = nextValue;
+		const endDay = mode === "singleDay" && !showTime ? nextStartDay : nextEndDay;
+		const next = {
+			start: showTime ? nextStartDay.toDate() : applyDateWithClock(nextStartDay, value.start),
+			end: showTime ? endDay.toDate() : applyDateWithClock(endDay, value.end)
+		};
+		if (!(next.end.getTime() > next.start.getTime())) {
+			onValidationError === null || onValidationError === void 0 || onValidationError(_pisell_utils.locales.getText("pisell2.adjust-time.end-must-be-after-start"));
+			return;
+		}
+		return next;
+	};
 	return {
 		value: toPickerValue(value),
 		placeholder,
@@ -52,14 +73,8 @@ const buildChangeTimeDateRangeProps = ({ value, mode = "multiDay", showTime = tr
 		isHideCustomSelect: true,
 		disabledDate,
 		onChange: (nextValue) => {
-			if (!Array.isArray(nextValue) || !nextValue[0]) return;
-			const [nextStartDay, nextEndDay] = nextValue;
-			const endDay = mode === "singleDay" ? nextStartDay : nextEndDay || nextStartDay;
-			if (!endDay) return;
-			onChange(ensureEndAfterStart({
-				start: showTime ? nextStartDay.toDate() : applyDateWithClock(nextStartDay, value.start),
-				end: showTime ? endDay.toDate() : applyDateWithClock(endDay, value.end)
-			}));
+			const next = resolveValidNextValue(nextValue);
+			if (next) onChange(next);
 		}
 	};
 };
@@ -91,4 +106,5 @@ const buildChangeTimeCalendarProps = ({ value, onChange }) => {
 //#endregion
 exports.buildChangeTimeCalendarProps = buildChangeTimeCalendarProps;
 exports.buildChangeTimeDateRangeProps = buildChangeTimeDateRangeProps;
+exports.resolveChangeTimePickerDraft = resolveChangeTimePickerDraft;
 exports.resolveDefaultChangeTimeValue = resolveDefaultChangeTimeValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.680",
+  "version": "6.11.681",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -71,8 +71,8 @@
     "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.263",
+    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.10"
   },
   "peerDependencies": {