@pisell/private-materials 6.12.361 → 6.12.363

package/es/plus/walletPassGallery/index.js

@@ -42,7 +42,7 @@ const KEYS = {
 const ARow = Row;
 const ACol = Col;
 const WalletPassGallery = (props) => {
-	var _context$appHelper, _context$appHelper2, _context$engine, _utils$translation, _getWalletDetail$data;
+	var _context$appHelper, _context$appHelper2, _utils$businessUtils, _utils$businessUtils$, _context$engine, _utils$translation, _getWalletDetail$data;
 	const { hideAddButton, hideTitle, customer, platform: platformProp } = props;
 	const [activeKey, setActiveKey] = useState("available");
 	const [currentItemId, setCurrentItemId] = useState(void 0);
@@ -53,6 +53,7 @@ const WalletPassGallery = (props) => {
 	const context = useEngineContext();
 	const utils = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {};
 	const { apiPrefix } = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.constants) || { apiPrefix: "/h5" };
+	const includeFranchiseePasses = Boolean((_utils$businessUtils = utils.businessUtils) === null || _utils$businessUtils === void 0 || (_utils$businessUtils$ = _utils$businessUtils.getAppByModal) === null || _utils$businessUtils$ === void 0 ? void 0 : _utils$businessUtils$.call(_utils$businessUtils, "franchisor"));
 	const { isTerminal, isApp, interaction, action, isWebPos } = utils;
 	const isTerminalEnv = (typeof isTerminal === "function" ? isTerminal() : !!isTerminal) || (isApp === null || isApp === void 0 ? void 0 : isApp());
 	const platform = useMemo(() => {
@@ -69,7 +70,7 @@ const WalletPassGallery = (props) => {
 			const _searchParams = new URLSearchParams(window.location.search);
 			const walletId = _searchParams.get("id");
 			const holderId = _searchParams.get("holder_id");
-			const res = yield getWalletPassList(_objectSpread2({
+			const res = yield getWalletPassList(_objectSpread2(_objectSpread2({
 				available: 1,
 				num: 20,
 				skip: (d === null || d === void 0 ? void 0 : d.nextId) || 1,
@@ -83,7 +84,7 @@ const WalletPassGallery = (props) => {
 				],
 				customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
 				limit_status: "enable"
-			}, isWebPos ? { with_franchisor_data: true } : {}), { apiPrefix });
+			}, isWebPos ? { with_franchisor_data: true } : {}), {}, { include_franchisee_passes: includeFranchiseePasses ? 1 : void 0 }), { apiPrefix });
 			return {
 				list: (res === null || res === void 0 ? void 0 : res.list) || [],
 				count: (res === null || res === void 0 ? void 0 : res.count) || 0,
@@ -106,7 +107,7 @@ const WalletPassGallery = (props) => {
 			const _searchParams = new URLSearchParams(window.location.search);
 			const walletId = _searchParams.get("id");
 			const holderId = _searchParams.get("holder_id");
-			const res = yield getWalletPassList(_objectSpread2({
+			const res = yield getWalletPassList(_objectSpread2(_objectSpread2({
 				available: 0,
 				num: 20,
 				skip: (d === null || d === void 0 ? void 0 : d.nextId) || 1,
@@ -120,7 +121,7 @@ const WalletPassGallery = (props) => {
 				],
 				customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
 				limit_status: "enable"
-			}, isWebPos ? { with_franchisor_data: true } : {}), { apiPrefix });
+			}, isWebPos ? { with_franchisor_data: true } : {}), {}, { include_franchisee_passes: includeFranchiseePasses ? 1 : void 0 }), { apiPrefix });
 			return {
 				list: (res === null || res === void 0 ? void 0 : res.list) || [],
 				count: (res === null || res === void 0 ? void 0 : res.count) || 0,
@@ -199,7 +200,11 @@ const WalletPassGallery = (props) => {
 				}
 			}
 		});
-	}, [customer]);
+	}, [
+		customer,
+		apiPrefix,
+		includeFranchiseePasses
+	]);
 	useEffect(() => {
 		var _interaction$utils, _interaction$utils$mo;
 		interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$mo = _interaction$utils.mountFunction) === null || _interaction$utils$mo === void 0 || _interaction$utils$mo.call(_interaction$utils, "customer", "new", () => {

package/es/pro/Login2.0/AuthModal.d.ts

@@ -14,4 +14,4 @@ interface AuthModalProps {
  */
 declare const AuthModal: React.FC<AuthModalProps>;
 //#endregion
-export { AuthModal, AuthModalProps };
+export { AuthModal };

package/es/pro/Login2.0/index.d.ts

@@ -1,4 +1,4 @@
-import { AuthMethodType, VerificationMethod } from "./shared/types.js";
+import { AuthMethodType, EmailAuthConfig, EmailRegistrationVerification, LoginFormData, OAuthConfig, PhoneAuthConfig, RegisterFormData, UIConfig, VerificationMethod } from "./shared/types.js";
 import { Login2, Login2Config, Login2Events, Login2Props } from "./Login2.js";
 import { Register2, Register2Config, Register2Events, Register2Props } from "./Register2.js";
-import { AuthModal, AuthModalProps } from "./AuthModal.js";
+import { AuthModal } from "./AuthModal.js";

package/es/pro/Login2.0/shared/types.d.ts

@@ -226,4 +226,4 @@ interface RegisterFormData {
   verification_token?: string;
 }
 //#endregion
-export { AuthMethodType, EmailAuthConfig, LegalTermsConfig, LoginFormData, LoginMethodItem, OAuthConfig, PhoneAuthConfig, RegisterFormData, RegistrationMethodItem, UIConfig, VerificationMethod };
+export { AuthMethodType, EmailAuthConfig, EmailRegistrationVerification, LegalTermsConfig, LoginFormData, LoginMethodItem, OAuthConfig, PhoneAuthConfig, RegisterFormData, RegistrationMethodItem, UIConfig, VerificationMethod };

package/lib/components/scanOrder/components/Check/index.js

@@ -16,6 +16,8 @@ function Check() {
 	const { viewModel, runModuleAction, refreshViewModel, tableName, entryMode, clearStepCache, entryContext } = require_context.useScanOrderContext();
 	const isAdditionalOrder = entryMode === "additional_order";
 	const [submitting, setSubmitting] = (0, react.useState)(false);
+	const submittingRef = (0, react.useRef)(false);
+	const menuUnavailableRef = (0, react.useRef)(false);
 	const [note, setNote] = (0, react.useState)((viewModel === null || viewModel === void 0 ? void 0 : viewModel.note) || "");
 	const [pickupRefOpen, setPickupRefOpen] = (0, react.useState)(false);
 	const [addOnConfirmOpen, setAddOnConfirmOpen] = (0, react.useState)(false);
@@ -53,9 +55,52 @@ function Check() {
 	const showSubmitFailedTip = (0, react.useCallback)((tip) => {
 		(0, _pisell_materials.PisellToast)({ content: String(tip || _pisell_utils.locales.getText("pisell2.scan.order.submit.failed") || "Submit order failed") });
 	}, []);
+	const handleMenuValidationFailure = (error) => {
+		if ((error === null || error === void 0 ? void 0 : error.code) === "SCAN_ORDER_MENU_UNAVAILABLE") {
+			if (menuUnavailableRef.current) return true;
+			menuUnavailableRef.current = true;
+			antd.Modal.info({
+				title: String(_pisell_utils.locales.getText("pisell2.scan.order.menu.unavailable.title") || "Ordering time has ended"),
+				content: String(_pisell_utils.locales.getText("pisell2.scan.order.menu.unavailable.description") || "Some items in your cart are no longer available to order at this time. Select Confirm to refresh the page and choose your items again."),
+				okText: String(_pisell_utils.locales.getText("pisell2.event.confirm") || "OK"),
+				maskClosable: false,
+				keyboard: false,
+				closable: false,
+				onOk: () => {
+					const url = new URL(window.location.href);
+					url.searchParams.delete("cacheId");
+					window.location.replace(url.toString());
+				}
+			});
+			return true;
+		}
+		if ((error === null || error === void 0 ? void 0 : error.code) === "SCAN_ORDER_MENU_VALIDATION_FAILED") {
+			showSubmitFailedTip(String(_pisell_utils.locales.getText("pisell2.scan.order.menu.validation.failed") || "Unable to check the ordering time. Please try again. Your cart has been kept."));
+			return true;
+		}
+		return false;
+	};
+	const runSubmitAction = function() {
+		var _ref = require_asyncToGenerator._asyncToGenerator(function* (action) {
+			if (submittingRef.current || menuUnavailableRef.current) return;
+			submittingRef.current = true;
+			setSubmitting(true);
+			try {
+				yield action();
+			} catch (error) {
+				console.error("[scanOrder] submit action failed", error);
+				if (!handleMenuValidationFailure(error)) showSubmitFailedTip(error === null || error === void 0 ? void 0 : error.message);
+			} finally {
+				submittingRef.current = false;
+				setSubmitting(false);
+			}
+		});
+		return function runSubmitAction(_x) {
+			return _ref.apply(this, arguments);
+		};
+	}();
 	const showInventoryInsufficientModal = (0, react.useCallback)((error) => {
 		var _error$data;
-		setSubmitting(false);
 		const productNames = (Array.isArray(error === null || error === void 0 || (_error$data = error.data) === null || _error$data === void 0 ? void 0 : _error$data.unavailable_products) ? error.data.unavailable_products : []).map((product) => String((product === null || product === void 0 ? void 0 : product.title) || (product === null || product === void 0 ? void 0 : product.product_id) || "").trim()).filter(Boolean);
 		const title = String(_pisell_utils.locales.getText("pisell2.scan.order.inventory.insufficient.title") || "Insufficient inventory");
 		const description = String(_pisell_utils.locales.getText("pisell2.scan.order.inventory.insufficient.description") || "The following items are out of stock or do not have enough inventory. Please adjust your cart and try again.");
@@ -69,24 +114,22 @@ function Check() {
 		});
 	}, []);
 	const doSubmit = function() {
-		var _ref2 = require_asyncToGenerator._asyncToGenerator(function* () {
+		var _ref3 = require_asyncToGenerator._asyncToGenerator(function* () {
 			if (((viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) || []).length === 0) {
 				showCheckStepEmptyCartTip();
-				setSubmitting(false);
 				return;
 			}
 			try {
 				var _res$data;
-				setSubmitting(true);
 				yield runModuleAction("updateTempOrderNote", note);
 				const res = yield runModuleAction("submitScanOrder");
 				console.log("submitScanOrder >>>>> ", res);
 				if ((res === null || res === void 0 ? void 0 : res.status) === false) {
+					if (handleMenuValidationFailure(res)) return;
 					if ((res === null || res === void 0 ? void 0 : res.code) === 6008) {
 						showInventoryInsufficientModal(res);
 						return;
 					}
-					setSubmitting(false);
 					showSubmitFailedTip(res === null || res === void 0 ? void 0 : res.message);
 					return;
 				}
@@ -104,7 +147,6 @@ function Check() {
 				}[channel] || channel;
 				if (shouldPayOnSubmit) {
 					var _res$data2, _viewModel$summary;
-					setSubmitting(false);
 					utils.action({
 						type: "pisell1.payment",
 						data: {
@@ -113,15 +155,15 @@ function Check() {
 							sale_channel: saleChannel
 						},
 						callback: function() {
-							var _ref = require_asyncToGenerator._asyncToGenerator(function* (_e) {
+							var _ref2 = require_asyncToGenerator._asyncToGenerator(function* (_e) {
 								try {
 									yield runModuleAction("restoreOrder");
 								} catch (error) {
 									console.warn("[scanOrder] restoreOrder after payment failed", error);
 								}
 							});
-							return function callback(_x) {
-								return _ref.apply(this, arguments);
+							return function callback(_x2) {
+								return _ref2.apply(this, arguments);
 							};
 						}()
 					});
@@ -145,96 +187,65 @@ function Check() {
 				yield refreshViewModel();
 			} catch (error) {
 				console.error("[scanOrder] submitScanOrder failed", error);
-				if ((error === null || error === void 0 ? void 0 : error.code) === 670005) {
-					setSubmitting(false);
-					showSubmitFailedTip(String(_pisell_utils.locales.getText("pisell2.scan.order.settled.cannot.add.tip") || ""));
-				} else if ((error === null || error === void 0 ? void 0 : error.code) === 670007 && (entryContext === null || entryContext === void 0 ? void 0 : entryContext.resource_id)) {
+				if (handleMenuValidationFailure(error)) return;
+				if ((error === null || error === void 0 ? void 0 : error.code) === 670005) showSubmitFailedTip(String(_pisell_utils.locales.getText("pisell2.scan.order.settled.cannot.add.tip") || ""));
+				else if ((error === null || error === void 0 ? void 0 : error.code) === 670007 && (entryContext === null || entryContext === void 0 ? void 0 : entryContext.resource_id)) {
 					const reservationResourceSelectType = yield runModuleAction("getReservationResourceSelectType");
 					const allowAddItems = yield runModuleAction("checkAllowAddItems");
 					const res = yield runModuleAction("syncAdditionalOrderFromResource", entryContext === null || entryContext === void 0 ? void 0 : entryContext.resource_id);
-					if (reservationResourceSelectType.resourceSelectType === "single" && (allowAddItems === null || allowAddItems === void 0 ? void 0 : allowAddItems.enabled) && (res === null || res === void 0 ? void 0 : res.matched)) {
-						setSubmitting(false);
-						setAddOnConfirmOpen(true);
-					} else {
-						setSubmitting(false);
-						showSubmitFailedTip(error === null || error === void 0 ? void 0 : error.message);
-					}
+					if (reservationResourceSelectType.resourceSelectType === "single" && (allowAddItems === null || allowAddItems === void 0 ? void 0 : allowAddItems.enabled) && (res === null || res === void 0 ? void 0 : res.matched)) setAddOnConfirmOpen(true);
+					else showSubmitFailedTip(error === null || error === void 0 ? void 0 : error.message);
 				} else if ((error === null || error === void 0 ? void 0 : error.code) === 6008) showInventoryInsufficientModal(error);
-				else {
-					setSubmitting(false);
-					showSubmitFailedTip(error === null || error === void 0 ? void 0 : error.message);
-				}
+				else showSubmitFailedTip(error === null || error === void 0 ? void 0 : error.message);
 			}
 		});
 		return function doSubmit() {
-			return _ref2.apply(this, arguments);
-		};
-	}();
-	const handleSubmit = function() {
-		var _ref3 = require_asyncToGenerator._asyncToGenerator(function* () {
-			if (submitting) return;
-			if (((viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) || []).length === 0) {
-				showCheckStepEmptyCartTip();
-				return;
-			}
-			if (isAdditionalOrder) {
-				yield doSubmit();
-				return;
-			}
-			try {
-				setSubmitting(true);
-				const manualPickup = yield runModuleAction("checkManualPickupRef");
-				if (manualPickup === null || manualPickup === void 0 ? void 0 : manualPickup.enabled) {
-					setPickupRefOpen(true);
-					setSubmitting(false);
-					return;
-				}
-			} catch (error) {
-				console.error("[scanOrder] checkManualPickupRef failed", error);
-				antd.message.error((error === null || error === void 0 ? void 0 : error.message) || "Submit order failed");
-				setSubmitting(false);
-				return;
-			}
-			yield doSubmit();
-		});
-		return function handleSubmit() {
 			return _ref3.apply(this, arguments);
 		};
 	}();
-	const handlePickupRefConfirm = function() {
-		var _ref4 = require_asyncToGenerator._asyncToGenerator(function* (value) {
-			try {
-				setSubmitting(true);
-				yield runModuleAction("setPickupRef", value);
-			} catch (error) {
-				console.error("[scanOrder] setPickupRef failed", error);
-				antd.message.error((error === null || error === void 0 ? void 0 : error.message) || "Submit order failed");
-				setSubmitting(false);
+	const handleSubmit = () => runSubmitAction(require_asyncToGenerator._asyncToGenerator(function* () {
+		if (((viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) || []).length === 0) {
+			showCheckStepEmptyCartTip();
+			return;
+		}
+		if (isAdditionalOrder) {
+			yield doSubmit();
+			return;
+		}
+		try {
+			const manualPickup = yield runModuleAction("checkManualPickupRef");
+			if (manualPickup === null || manualPickup === void 0 ? void 0 : manualPickup.enabled) {
+				setPickupRefOpen(true);
 				return;
 			}
-			setPickupRefOpen(false);
-			yield doSubmit();
-		});
-		return function handlePickupRefConfirm(_x2) {
-			return _ref4.apply(this, arguments);
-		};
-	}();
+		} catch (error) {
+			console.error("[scanOrder] checkManualPickupRef failed", error);
+			antd.message.error((error === null || error === void 0 ? void 0 : error.message) || "Submit order failed");
+			return;
+		}
+		yield doSubmit();
+	}));
+	const handlePickupRefConfirm = (value) => runSubmitAction(require_asyncToGenerator._asyncToGenerator(function* () {
+		try {
+			yield runModuleAction("setPickupRef", value);
+		} catch (error) {
+			console.error("[scanOrder] setPickupRef failed", error);
+			antd.message.error((error === null || error === void 0 ? void 0 : error.message) || "Submit order failed");
+			return;
+		}
+		setPickupRefOpen(false);
+		yield doSubmit();
+	}));
 	const handlePickupRefCancel = () => {
-		if (submitting) return;
+		if (submittingRef.current) return;
 		setPickupRefOpen(false);
 	};
-	const handleAddOnConfirm = function() {
-		var _ref5 = require_asyncToGenerator._asyncToGenerator(function* () {
-			if (submitting) return;
-			setAddOnConfirmOpen(false);
-			yield doSubmit();
-		});
-		return function handleAddOnConfirm() {
-			return _ref5.apply(this, arguments);
-		};
-	}();
+	const handleAddOnConfirm = () => runSubmitAction(require_asyncToGenerator._asyncToGenerator(function* () {
+		setAddOnConfirmOpen(false);
+		yield doSubmit();
+	}));
 	const handleAddOnReturn = () => {
-		if (submitting) return;
+		if (submittingRef.current) return;
 		setAddOnConfirmOpen(false);
 	};
 	const noteContent = /* @__PURE__ */ react.default.createElement("div", { className: "pisell-scan-order-check-note" }, /* @__PURE__ */ react.default.createElement("div", { className: "pisell-scan-order-check-note-title" }, noteTitle), /* @__PURE__ */ react.default.createElement(antd.Input.TextArea, {

package/lib/components/scanOrder/locales.js

@@ -32,6 +32,9 @@ var locales_default = {
 		"pisell2.scan.order.check.cart.empty.tip": "Please go back to add products",
 		"pisell2.scan.order.submit.disabled.default": "Order submission is currently disabled.",
 		"pisell2.scan.order.submit.failed": "Failed to submit order",
+		"pisell2.scan.order.menu.unavailable.title": "Ordering time has ended",
+		"pisell2.scan.order.menu.unavailable.description": "Some items in your cart are no longer available to order at this time. Select Confirm to refresh the page and choose your items again.",
+		"pisell2.scan.order.menu.validation.failed": "Unable to check the ordering time. Please try again. Your cart has been kept.",
 		"pisell2.scan.order.multiple.orders.tip": "There are multiple active orders for this table. Please contact staff for add-on orders.",
 		"pisell2.scan.order.multiple.orders.confirm": "I Got It",
 		"pisell2.scan.order.settled.cannot.add.tip": "This order has already been settled and you cannot add more items. Please scan again to create a new order or contact staff.",
@@ -97,6 +100,9 @@ var locales_default = {
 		"pisell2.scan.order.check.cart.empty.tip": "请返回添加商品",
 		"pisell2.scan.order.submit.disabled.default": "当前暂不可下单",
 		"pisell2.scan.order.submit.failed": "订单提交失败",
+		"pisell2.scan.order.menu.unavailable.title": "已过可下单时间",
+		"pisell2.scan.order.menu.unavailable.description": "购物车中有商品已不在可下单时间内。点击确定后将刷新页面，请重新选择商品。",
+		"pisell2.scan.order.menu.validation.failed": "暂时无法校验商品的可下单时间，请重试。购物车已保留。",
 		"pisell2.scan.order.multiple.orders.tip": "当前桌台存在多个进行中的订单，请联系店员处理加餐。",
 		"pisell2.scan.order.multiple.orders.confirm": "我知道了",
 		"pisell2.scan.order.settled.cannot.add.tip": "当前订单已结账，无法继续加餐。请重新扫码创建新订单或联系店员。",
@@ -162,6 +168,9 @@ var locales_default = {
 		"pisell2.scan.order.check.cart.empty.tip": "請返回添加商品",
 		"pisell2.scan.order.submit.disabled.default": "當前暫不可下單",
 		"pisell2.scan.order.submit.failed": "訂單提交失敗",
+		"pisell2.scan.order.menu.unavailable.title": "已過可下單時間",
+		"pisell2.scan.order.menu.unavailable.description": "購物車中有商品已不在可下單時間內。點擊確定後將重新整理頁面，請重新選擇商品。",
+		"pisell2.scan.order.menu.validation.failed": "暫時無法核實商品的可下單時間，請重試。購物車已保留。",
 		"pisell2.scan.order.multiple.orders.tip": "當前桌台存在多個進行中的訂單，請聯繫店員處理加餐。",
 		"pisell2.scan.order.multiple.orders.confirm": "我知道了",
 		"pisell2.scan.order.settled.cannot.add.tip": "當前訂單已結賬，無法繼續加餐。請重新掃碼創建新訂單或聯繫店員。",
@@ -227,6 +236,9 @@ var locales_default = {
 		"pisell2.scan.order.check.cart.empty.tip": "商品を追加するには、前の画面に戻ってください",
 		"pisell2.scan.order.submit.disabled.default": "現在、注文を送信できません。",
 		"pisell2.scan.order.submit.failed": "注文の送信に失敗しました",
+		"pisell2.scan.order.menu.unavailable.title": "注文可能な時間を過ぎています",
+		"pisell2.scan.order.menu.unavailable.description": "カートに注文可能な時間を過ぎた商品があります。「確認」を押すとページが再読み込みされます。商品を選び直してください。",
+		"pisell2.scan.order.menu.validation.failed": "注文可能な時間を確認できませんでした。もう一度お試しください。カートの内容は保持されています。",
 		"pisell2.scan.order.multiple.orders.tip": "現在のテーブルには進行中の注文が複数あります。追加注文についてはスタッフにお問い合わせください。",
 		"pisell2.scan.order.multiple.orders.confirm": "了解しました",
 		"pisell2.scan.order.settled.cannot.add.tip": "現在の注文はすでに会計済みのため、追加注文できません。再度QRコードをスキャンして新しい注文を作成するか、スタッフにお問い合わせください。",
@@ -292,6 +304,9 @@ var locales_default = {
 		"pisell2.scan.order.check.cart.empty.tip": "Volte para adicionar produtos",
 		"pisell2.scan.order.submit.disabled.default": "No momento, não é possível enviar pedidos.",
 		"pisell2.scan.order.submit.failed": "Falha ao enviar o pedido",
+		"pisell2.scan.order.menu.unavailable.title": "O horário para pedidos terminou",
+		"pisell2.scan.order.menu.unavailable.description": "Alguns itens no carrinho não estão mais disponíveis para pedido neste horário. Selecione Confirmar para atualizar a página e escolher os itens novamente.",
+		"pisell2.scan.order.menu.validation.failed": "Não foi possível verificar o horário para pedidos. Tente novamente. Seu carrinho foi mantido.",
 		"pisell2.scan.order.multiple.orders.tip": "Há vários pedidos ativos nesta mesa. Entre em contato com a equipe para adicionar itens.",
 		"pisell2.scan.order.multiple.orders.confirm": "Entendi",
 		"pisell2.scan.order.settled.cannot.add.tip": "Este pedido já foi finalizado e não é possível adicionar mais itens. Escaneie novamente para criar um novo pedido ou entre em contato com a equipe.",

package/lib/plus/salesSdk/bookingEditService/BookingEditHolderField.js

@@ -33,7 +33,7 @@ function hasHolderFormFields(formDataConfig) {
 	return Array.isArray(formDataConfig === null || formDataConfig === void 0 ? void 0 : formDataConfig.field) || Array.isArray(formDataConfig === null || formDataConfig === void 0 ? void 0 : formDataConfig.form_field);
 }
 const BookingEditHolderField = ({ state, cacheItem, required, value, onChange, getCurrentCacheItem, presentation = "modal" }) => {
-	var _context$appHelper, _currentCacheItem$_ex, _cacheItem$_extend, _inlinePet$formData, _state$pet, _state$pet6, _state$pet7, _state$pet8, _inlineState$pet2, _state$client2, _inlineState$client5;
+	var _context$appHelper, _currentCacheItem$_ex, _cacheItem$_extend, _inlinePet$formData, _state$pet, _state$pet6, _state$pet7, _state$pet8, _inlineState$client, _inlineState$pet2, _state$client2, _inlineState$client6;
 	const bridges = require_SalesSdkHostBridgesContext.useSalesSdkHostBridges();
 	const platform = require_useEngineContext.usePlatform();
 	const context = require_useEngineContext.default();
@@ -124,6 +124,33 @@ const BookingEditHolderField = ({ state, cacheItem, required, value, onChange, g
 	const handleApply = (0, react.useCallback)((nextValues) => {
 		onChange === null || onChange === void 0 || onChange(nextValues);
 	}, [onChange]);
+	const defaultSelectionKey = JSON.stringify([inlineState === null || inlineState === void 0 || (_inlineState$client = inlineState.client) === null || _inlineState$client === void 0 || (_inlineState$client = _inlineState$client.value) === null || _inlineState$client === void 0 ? void 0 : _inlineState$client.id, currentHolderFormId]);
+	const defaultSelectionRef = (0, react.useRef)(null);
+	(0, react.useEffect)(() => {
+		var _ref4, _holder$id;
+		if (!isInline || !isRequired || maxSelectedCount !== 1) return;
+		if (defaultSelectionRef.current === defaultSelectionKey) return;
+		if (selectedValues.length) {
+			defaultSelectionRef.current = defaultSelectionKey;
+			return;
+		}
+		if (!Array.isArray(inlinePet.holders)) return;
+		if (inlinePet.holders.length !== 1) return;
+		const holder = inlinePet.holders[0];
+		const id = (_ref4 = (_holder$id = holder === null || holder === void 0 ? void 0 : holder.id) !== null && _holder$id !== void 0 ? _holder$id : holder === null || holder === void 0 ? void 0 : holder.form_record_id) !== null && _ref4 !== void 0 ? _ref4 : holder === null || holder === void 0 ? void 0 : holder.value;
+		if (id == null) return;
+		defaultSelectionRef.current = defaultSelectionKey;
+		setSelectedValues([id]);
+		handleApply([id]);
+	}, [
+		defaultSelectionKey,
+		handleApply,
+		inlinePet.holders,
+		isInline,
+		isRequired,
+		maxSelectedCount,
+		selectedValues
+	]);
 	const { formDataConfig, isMinorAndWaiver } = (0, react.useMemo)(() => {
 		var _inlineState$pet;
 		const productHolderFormData = inlineState === null || inlineState === void 0 || (_inlineState$pet = inlineState.pet) === null || _inlineState$pet === void 0 || (_inlineState$pet = _inlineState$pet.formData) === null || _inlineState$pet === void 0 ? void 0 : _inlineState$pet[0];
@@ -141,9 +168,9 @@ const BookingEditHolderField = ({ state, cacheItem, required, value, onChange, g
 		};
 	}, [inlineState === null || inlineState === void 0 || (_inlineState$pet2 = inlineState.pet) === null || _inlineState$pet2 === void 0 ? void 0 : _inlineState$pet2.formData]);
 	const refreshHoldersFromServer = (0, ahooks.useMemoizedFn)(require_asyncToGenerator._asyncToGenerator(function* () {
-		var _inlineState$client;
+		var _inlineState$client2;
 		const params = require_enrichCartLineHolderDisplay.buildHolderListRequestParams({
-			customerId: inlineState === null || inlineState === void 0 || (_inlineState$client = inlineState.client) === null || _inlineState$client === void 0 || (_inlineState$client = _inlineState$client.value) === null || _inlineState$client === void 0 ? void 0 : _inlineState$client.id,
+			customerId: inlineState === null || inlineState === void 0 || (_inlineState$client2 = inlineState.client) === null || _inlineState$client2 === void 0 || (_inlineState$client2 = _inlineState$client2.value) === null || _inlineState$client2 === void 0 ? void 0 : _inlineState$client2.id,
 			source: currentCacheItem
 		});
 		if (!params) return;
@@ -157,20 +184,23 @@ const BookingEditHolderField = ({ state, cacheItem, required, value, onChange, g
 		reloadHolderOptions();
 		return list;
 	}));
-	const selectCreatedHolder = (0, ahooks.useMemoizedFn)((holder) => {
-		var _ref4, _holder$id;
-		if (!isNormalProduct) return;
-		const id = (_ref4 = (_holder$id = holder === null || holder === void 0 ? void 0 : holder.id) !== null && _holder$id !== void 0 ? _holder$id : holder === null || holder === void 0 ? void 0 : holder.form_record_id) !== null && _ref4 !== void 0 ? _ref4 : holder === null || holder === void 0 ? void 0 : holder.value;
+	const applyCreatedHolderSelection = (0, ahooks.useMemoizedFn)((holder) => {
+		var _ref5, _holder$id2;
+		const id = (_ref5 = (_holder$id2 = holder === null || holder === void 0 ? void 0 : holder.id) !== null && _holder$id2 !== void 0 ? _holder$id2 : holder === null || holder === void 0 ? void 0 : holder.form_record_id) !== null && _ref5 !== void 0 ? _ref5 : holder === null || holder === void 0 ? void 0 : holder.value;
 		if (id == null || selectedValues.some((value) => String(value) === String(id))) return;
 		const nextValues = maxSelectedCount === 1 ? [id] : [...selectedValues.slice(0, Math.max(0, maxSelectedCount - 1)), id];
 		setSelectedValues(nextValues);
 		handleApply(nextValues);
 	});
+	const selectCreatedHolder = (0, ahooks.useMemoizedFn)((holder) => {
+		if (!isNormalProduct) return;
+		applyCreatedHolderSelection(holder);
+	});
 	const handleAddHolder = (0, ahooks.useMemoizedFn)(() => {
 		if (!action || !inlineState) return;
 		(function() {
-			var _ref8 = require_asyncToGenerator._asyncToGenerator(function* () {
-				var _inlineState$pet3, _waiverForm$form_id, _inlineState$client2, _inlineState$client3;
+			var _ref11 = require_asyncToGenerator._asyncToGenerator(function* () {
+				var _inlineState$pet3, _waiverForm$form_id, _inlineState$client3, _inlineState$pet4, _inlineState$client4;
 				let waiverForm = (_inlineState$pet3 = inlineState.pet) === null || _inlineState$pet3 === void 0 ? void 0 : _inlineState$pet3.waiverForm;
 				if (isMinorAndWaiver && !hasHolderFormFields(waiverForm)) {
 					waiverForm = yield require_waiverFormDetailCache.getCachedWaiverFormDetail(Number(isMinorAndWaiver), platform);
@@ -181,37 +211,45 @@ const BookingEditHolderField = ({ state, cacheItem, required, value, onChange, g
 				}
 				const resolvedActionFormDataConfig = require_productHolderConfig.ensureProductHolderFormId(isMinorAndWaiver ? require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, waiverForm), {}, {
 					form_id: (_waiverForm$form_id = waiverForm === null || waiverForm === void 0 ? void 0 : waiverForm.form_id) !== null && _waiverForm$form_id !== void 0 ? _waiverForm$form_id : Number(isMinorAndWaiver),
-					customer_id: (_inlineState$client2 = inlineState.client) === null || _inlineState$client2 === void 0 || (_inlineState$client2 = _inlineState$client2.value) === null || _inlineState$client2 === void 0 ? void 0 : _inlineState$client2.id,
+					customer_id: (_inlineState$client3 = inlineState.client) === null || _inlineState$client3 === void 0 || (_inlineState$client3 = _inlineState$client3.value) === null || _inlineState$client3 === void 0 ? void 0 : _inlineState$client3.id,
 					is_franchisor: formDataConfig === null || formDataConfig === void 0 ? void 0 : formDataConfig.is_franchisor
 				}) : require_objectSpread2._objectSpread2({}, formDataConfig || {}), currentCacheItem);
 				if (resolvedActionFormDataConfig.form_id === void 0 || resolvedActionFormDataConfig.form_id === null || resolvedActionFormDataConfig.form_id === "") {
 					antd.message.error(_pisell_utils.locales.getText("pisell-select-holder-form-unavailable"));
 					return;
 				}
+				const previousHolderIds = new Set((((_inlineState$pet4 = inlineState.pet) === null || _inlineState$pet4 === void 0 ? void 0 : _inlineState$pet4.holders) || []).map((holder) => {
+					var _ref6, _holder$id3;
+					return String((_ref6 = (_holder$id3 = holder.id) !== null && _holder$id3 !== void 0 ? _holder$id3 : holder.form_record_id) !== null && _ref6 !== void 0 ? _ref6 : holder.value);
+				}));
 				action({
 					type: "pisell1.goCustomFormAddData",
 					data: {
 						zIndex: 1101,
-						customerId: (_inlineState$client3 = inlineState.client) === null || _inlineState$client3 === void 0 || (_inlineState$client3 = _inlineState$client3.value) === null || _inlineState$client3 === void 0 ? void 0 : _inlineState$client3.id,
+						customerId: (_inlineState$client4 = inlineState.client) === null || _inlineState$client4 === void 0 || (_inlineState$client4 = _inlineState$client4.value) === null || _inlineState$client4 === void 0 ? void 0 : _inlineState$client4.id,
 						formDataConfig: resolvedActionFormDataConfig
 					},
 					callback: function() {
-						var _ref7 = require_asyncToGenerator._asyncToGenerator(function* (res) {
-							var _inlineState$client4, _inlineState$pet5;
+						var _ref10 = require_asyncToGenerator._asyncToGenerator(function* (res) {
+							var _inlineState$client5, _inlineState$pet6;
 							const obj = {};
 							for (const item of Array.isArray(res) ? res : []) obj[item.key] = item.value;
 							if (isMinorAndWaiver) {
 								try {
 									const list = yield refreshHoldersFromServer();
+									if (isInline && !isNormalProduct) applyCreatedHolderSelection(list === null || list === void 0 ? void 0 : list.find((holder) => {
+										var _ref7, _holder$id4;
+										return !previousHolderIds.has(String((_ref7 = (_holder$id4 = holder.id) !== null && _holder$id4 !== void 0 ? _holder$id4 : holder.form_record_id) !== null && _ref7 !== void 0 ? _ref7 : holder.value));
+									}));
 									if (isNormalProduct) {
-										var _inlineState$pet4;
-										const previousIds = new Set((((_inlineState$pet4 = inlineState.pet) === null || _inlineState$pet4 === void 0 ? void 0 : _inlineState$pet4.holders) || []).map((holder) => {
-											var _ref5, _holder$id2;
-											return String((_ref5 = (_holder$id2 = holder.id) !== null && _holder$id2 !== void 0 ? _holder$id2 : holder.form_record_id) !== null && _ref5 !== void 0 ? _ref5 : holder.value);
+										var _inlineState$pet5;
+										const previousIds = new Set((((_inlineState$pet5 = inlineState.pet) === null || _inlineState$pet5 === void 0 ? void 0 : _inlineState$pet5.holders) || []).map((holder) => {
+											var _ref8, _holder$id5;
+											return String((_ref8 = (_holder$id5 = holder.id) !== null && _holder$id5 !== void 0 ? _holder$id5 : holder.form_record_id) !== null && _ref8 !== void 0 ? _ref8 : holder.value);
 										}));
 										selectCreatedHolder(list === null || list === void 0 ? void 0 : list.find((holder) => {
-											var _ref6, _holder$id3;
-											return !previousIds.has(String((_ref6 = (_holder$id3 = holder.id) !== null && _holder$id3 !== void 0 ? _holder$id3 : holder.form_record_id) !== null && _ref6 !== void 0 ? _ref6 : holder.value));
+											var _ref9, _holder$id6;
+											return !previousIds.has(String((_ref9 = (_holder$id6 = holder.id) !== null && _holder$id6 !== void 0 ? _holder$id6 : holder.form_record_id) !== null && _ref9 !== void 0 ? _ref9 : holder.value));
 										}));
 									}
 								} catch (err) {
@@ -219,22 +257,23 @@ const BookingEditHolderField = ({ state, cacheItem, required, value, onChange, g
 								}
 								return;
 							}
-							if (require_utils$1.isWalkIn((_inlineState$client4 = inlineState.client) === null || _inlineState$client4 === void 0 || (_inlineState$client4 = _inlineState$client4.value) === null || _inlineState$client4 === void 0 ? void 0 : _inlineState$client4.id)) return;
+							if (require_utils$1.isWalkIn((_inlineState$client5 = inlineState.client) === null || _inlineState$client5 === void 0 || (_inlineState$client5 = _inlineState$client5.value) === null || _inlineState$client5 === void 0 ? void 0 : _inlineState$client5.id)) return;
 							inlineDispatch({
 								type: "setPet",
-								payload: { holders: [obj, ...((_inlineState$pet5 = inlineState.pet) === null || _inlineState$pet5 === void 0 ? void 0 : _inlineState$pet5.holders) || []] }
+								payload: { holders: [obj, ...((_inlineState$pet6 = inlineState.pet) === null || _inlineState$pet6 === void 0 ? void 0 : _inlineState$pet6.holders) || []] }
 							});
 							upsertHolderOptions([obj], currentCacheItem);
+							if (isInline && !isNormalProduct) applyCreatedHolderSelection(obj);
 							selectCreatedHolder(obj);
 						});
 						return function callback(_x) {
-							return _ref7.apply(this, arguments);
+							return _ref10.apply(this, arguments);
 						};
 					}()
 				});
 			});
 			return function run() {
-				return _ref8.apply(this, arguments);
+				return _ref11.apply(this, arguments);
 			};
 		})()().catch((error) => {
 			console.warn("[SalesSdk] open add holder form failed", error);
@@ -246,7 +285,7 @@ const BookingEditHolderField = ({ state, cacheItem, required, value, onChange, g
 		handleApply(nextValues);
 	}, [handleApply]);
 	const handleEdit = (0, react.useCallback)(function() {
-		var _ref9 = require_asyncToGenerator._asyncToGenerator(function* (event) {
+		var _ref12 = require_asyncToGenerator._asyncToGenerator(function* (event) {
 			var _latestCacheItem$_ext, _latestCacheItem$_ext2, _state$client;
 			event === null || event === void 0 || event.preventDefault();
 			const latestCacheItem = (getCurrentCacheItem === null || getCurrentCacheItem === void 0 ? void 0 : getCurrentCacheItem()) || cacheItem;
@@ -265,7 +304,7 @@ const BookingEditHolderField = ({ state, cacheItem, required, value, onChange, g
 			}
 		});
 		return function(_x2) {
-			return _ref9.apply(this, arguments);
+			return _ref12.apply(this, arguments);
 		};
 	}(), [
 		bridges.holder,
@@ -300,7 +339,7 @@ const BookingEditHolderField = ({ state, cacheItem, required, value, onChange, g
 		holders: inlineHolders,
 		productSource: currentCacheItem,
 		holderTitle: title,
-		customerId: inlineState === null || inlineState === void 0 || (_inlineState$client5 = inlineState.client) === null || _inlineState$client5 === void 0 || (_inlineState$client5 = _inlineState$client5.value) === null || _inlineState$client5 === void 0 ? void 0 : _inlineState$client5.id,
+		customerId: inlineState === null || inlineState === void 0 || (_inlineState$client6 = inlineState.client) === null || _inlineState$client6 === void 0 || (_inlineState$client6 = _inlineState$client6.value) === null || _inlineState$client6 === void 0 ? void 0 : _inlineState$client6.id,
 		initialValue: selectedValues,
 		maxSelectedCount,
 		onAddHolder: action ? handleAddHolder : void 0,

package/lib/plus/skuOptionsSelection/utils/normalizeSelectorLayout.js

@@ -0,0 +1,15 @@
+const require_objectSpread2 = require("../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
+//#region src/plus/skuOptionsSelection/utils/normalizeSelectorLayout.ts
+/** 商品选项的固定栅格默认在手机端使用单列，保留显式响应式配置。 */
+const normalizeSelectorLayout = (layout) => {
+	var _colConfig$span, _colConfig$xs, _colConfig$sm;
+	if (!layout || layout.type !== "antdGrid" || layout.responsive) return layout || null;
+	const colConfig = layout.colConfig || {};
+	const span = (_colConfig$span = colConfig.span) !== null && _colConfig$span !== void 0 ? _colConfig$span : 24 / (layout.columns || 1);
+	return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, layout), {}, { colConfig: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, colConfig), {}, {
+		xs: (_colConfig$xs = colConfig.xs) !== null && _colConfig$xs !== void 0 ? _colConfig$xs : 24,
+		sm: (_colConfig$sm = colConfig.sm) !== null && _colConfig$sm !== void 0 ? _colConfig$sm : span
+	}) });
+};
+//#endregion
+exports.normalizeSelectorLayout = normalizeSelectorLayout;

package/lib/plus/skuOptionsSelection/utils/resolveCollectionLayout.js

@@ -1,7 +1,7 @@
+const require_normalizeSelectorLayout = require("./normalizeSelectorLayout.js");
 //#region src/plus/skuOptionsSelection/utils/resolveCollectionLayout.ts
 function resolveCollectionLayout(collection, context, fallback) {
-	if (!collection) return fallback;
-	return typeof collection === "function" ? collection(context) : collection;
+	return require_normalizeSelectorLayout.normalizeSelectorLayout(!collection ? fallback : typeof collection === "function" ? collection(context) : collection) || fallback;
 }
 //#endregion
 exports.resolveCollectionLayout = resolveCollectionLayout;