@pisell/private-materials 6.12.355 → 6.12.357

package/es/components/appointmentBooking/components/Cart/Item/index.js

@@ -1,6 +1,7 @@
 import { _objectSpread2 } from "../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import { _asyncToGenerator } from "../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
 import shoppingCart from "../../../../shoppingCart/index.js";
+import { isHolderConfigEnabled } from "../../../../../utils/holderConfig.js";
 import { formatCurrentUser, formatHolder, getMultiResources, openForm, updateCartResources } from "../../../utils.js";
 import SubTotal from "../../../../subTotal/index.js";
 import { contextUtils, useAppointmentBooking, useAppointmentBookingAccount, useAppointmentBookingLogin, useAppointmentBookingResource, useAppointmentBookingSetting } from "../../../hooks.js";
@@ -9,7 +10,8 @@ import Deposit from "../../Deposit/index.js";
 import { handleAddHolder } from "../utils.js";
 import ContinueButton from "../ContinueButton/index.js";
 import VoucherCard from "../../Voucher/index.js";
-import React, { useMemo } from "react";
+import { buildCartHolderOption, buildCartHolderParams, getAppointmentCartHolderConfig, getSkuRelationFormId, handleCartHolderFormSuccess } from "../../../../../utils/buildCartHolderParams.js";
+import React, { useEffect, useMemo, useState } from "react";
 import { isMobile, locales } from "@pisell/utils";
 import "./index.less";
 //#region src/components/appointmentBooking/components/Cart/Item/index.tsx
@@ -21,9 +23,29 @@ const CartItem = ({ onNext, renderContactInfo }) => {
 	const { getResourceList } = useAppointmentBookingResource();
 	const { isFormSubject, bookingSubject, isRetailTemplate } = useAppointmentBookingSetting();
 	const { isLogin } = useAppointmentBookingLogin();
+	const isLoggedIn = isLogin();
 	const utils = contextUtils();
-	const { businessUtils, translation } = utils;
+	const { businessUtils, translation, pisellos } = utils;
 	const { taxTitle, totalTaxFee, isPriceIncludeTax, total, deposit } = summary;
+	const [holderMap, setHolderMap] = useState({});
+	useEffect(() => {
+		var _pisellos$effects;
+		const onHolderChanged = (res) => {
+			if ((res === null || res === void 0 ? void 0 : res.path) === "holderMap") {
+				var _appointmentBooking$g;
+				setHolderMap((appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$g = appointmentBooking.getHolderFormMap) === null || _appointmentBooking$g === void 0 ? void 0 : _appointmentBooking$g.call(appointmentBooking)) || {});
+			}
+		};
+		pisellos === null || pisellos === void 0 || (_pisellos$effects = pisellos.effects) === null || _pisellos$effects === void 0 || _pisellos$effects.on("appointmentBooking_holder:changed", onHolderChanged);
+		return () => {
+			var _pisellos$effects2;
+			pisellos === null || pisellos === void 0 || (_pisellos$effects2 = pisellos.effects) === null || _pisellos$effects2 === void 0 || _pisellos$effects2.off("appointmentBooking_holder:changed", onHolderChanged);
+		};
+	}, [appointmentBooking, pisellos]);
+	useEffect(() => {
+		var _appointmentBooking$g2;
+		setHolderMap((appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$g2 = appointmentBooking.getHolderFormMap) === null || _appointmentBooking$g2 === void 0 ? void 0 : _appointmentBooking$g2.call(appointmentBooking)) || {});
+	}, [appointmentBooking, isLoggedIn]);
 	/**
 	* @title: 当前客户
 	* @description:
@@ -78,14 +100,32 @@ const CartItem = ({ onNext, renderContactInfo }) => {
 		}
 		if (type === "add_holder") {
 			const relationShipFormId = bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.relationship_form_id;
+			const holderConfig = getAppointmentCartHolderConfig(e);
+			const formId = isHolderConfigEnabled(holderConfig) ? holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.resource_id : void 0;
+			const skuRelationFormId = getSkuRelationFormId(holderMap, formId);
 			return openForm({
-				form_id: relationShipFormId || (bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.form_id),
+				form_id: skuRelationFormId || formId || relationShipFormId || (bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.form_id),
 				title: locales.getText("pisell2.event.create.form"),
 				utils,
 				callback: function() {
 					var _ref = _asyncToGenerator(function* (res) {
 						if ((res === null || res === void 0 ? void 0 : res.status) === "success") {
 							let result = void 0;
+							if (formId) {
+								const { formRecordId, mainField } = handleCartHolderFormSuccess({
+									res,
+									formId,
+									skuRelationFormId,
+									utils,
+									module: appointmentBooking
+								});
+								result = buildCartHolderOption(_objectSpread2(_objectSpread2({}, res === null || res === void 0 ? void 0 : res.values), {}, { formRecordId }), utils);
+								appointmentBooking.updateCart({
+									_id: e === null || e === void 0 ? void 0 : e._id,
+									account: result
+								});
+								return;
+							}
 							if (!relationShipFormId) result = yield addAccount(res === null || res === void 0 ? void 0 : res.values, "holder");
 							else result = yield handleAddHolder({
 								res,
@@ -110,24 +150,36 @@ const CartItem = ({ onNext, renderContactInfo }) => {
 	};
 	const products = useMemo(() => {
 		if (!(carts === null || carts === void 0 ? void 0 : carts.length)) return [];
-		carts.forEach((item) => {
-			item.isShowChangeHolder = !appointmentBooking.isTargetCartIdNormalProduct(item === null || item === void 0 ? void 0 : item._id);
+		const enrichedCarts = carts.map((item) => {
+			const isNormalProduct = appointmentBooking.isTargetCartIdNormalProduct(item === null || item === void 0 ? void 0 : item._id);
+			const holderConfig = getAppointmentCartHolderConfig(item);
+			const holderParams = buildCartHolderParams({
+				item,
+				holderConfig,
+				formData: isHolderConfigEnabled(holderConfig) ? holderMap === null || holderMap === void 0 ? void 0 : holderMap[holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.resource_id] : {},
+				translation,
+				enabled: isLoggedIn && isFormSubject && !isNormalProduct,
+				utils
+			});
+			return _objectSpread2(_objectSpread2({}, item), holderParams);
 		});
-		if ((currentSelectedResources === null || currentSelectedResources === void 0 ? void 0 : currentSelectedResources.length) > 0) return carts.map((item) => {
+		if ((currentSelectedResources === null || currentSelectedResources === void 0 ? void 0 : currentSelectedResources.length) > 0) return enrichedCarts.map((item) => {
 			const currentResourceData = currentSelectedResources.find((resource) => (resource === null || resource === void 0 ? void 0 : resource._id) === (item === null || item === void 0 ? void 0 : item._id));
 			const multiResources = getMultiResources(item, currentResourceData === null || currentResourceData === void 0 ? void 0 : currentResourceData.currentSelectedResource, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key);
 			return _objectSpread2(_objectSpread2({}, item), {}, {
 				isMultipleResource: true,
-				multiResources,
-				isErrorHolder: isErrorHolder || false
+				multiResources
 			});
 		});
-		else return carts;
+		else return enrichedCarts;
 	}, [
 		carts,
 		currentSelectedResources,
 		currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key,
-		isErrorHolder
+		isErrorHolder,
+		holderMap,
+		isFormSubject,
+		isLoggedIn
 	]);
 	/**
 	* @description: 结算列表数据
@@ -187,8 +239,8 @@ const CartItem = ({ onNext, renderContactInfo }) => {
 			isShowDelete: (currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key) === "select-service",
 			isShowAmountFooter: true,
 			isShowPackageNote: false,
-			isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
-			isShowHolder: isFormSubject,
+			isShowChangeHolder: isLastStep ? false : isFormSubject && isLoggedIn,
+			isShowHolder: isFormSubject && isLoggedIn,
 			isShowAddHolderButton: true
 		},
 		collapseParams: {

package/es/components/appointmentBooking/components/ConfirmInformation/index.js

@@ -2,6 +2,7 @@ import useEngineContext from "../../../../hooks/useEngineContext.js";
 import { _objectSpread2 } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import { _asyncToGenerator } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
 import ContactInfoContent from "../../../../plus/contactInfoModal/ContactInfoContent.js";
+import { isHolderConfigEnabled } from "../../../../utils/holderConfig.js";
 import { Toast, formatAppointmentCartSummary, formatAppointmentCustomerInfo, sendAppointmentBookingLog } from "../../utils.js";
 import useLoginUser from "../../../../hooks/useLoginUser.js";
 import productStockCheckModal_default from "../../../productStockCheckModal/index.js";
@@ -23,7 +24,7 @@ const ConfirmInformation = forwardRef((props, ref) => {
 	const utils = contextUtils();
 	const { pubsub } = context.appHelper.utils;
 	const { appointmentBooking, summary, isAgreeDepositPolicy, setLoading, carts, setTimes } = useAppointmentBookingContext();
-	const { isRetailTemplate, bookingSetting } = useAppointmentBookingSetting();
+	const { isRetailTemplate, bookingSetting, isFormSubject } = useAppointmentBookingSetting();
 	console.log(bookingSetting, "bookingSetting");
 	const [form] = Form.useForm();
 	const userInfo = useLoginUser();
@@ -179,10 +180,14 @@ const ConfirmInformation = forwardRef((props, ref) => {
 	const onCheckout = function() {
 		var _ref5 = _asyncToGenerator(function* (extraData) {
 			try {
+				const _extraData = (carts === null || carts === void 0 ? void 0 : carts.some((item) => {
+					var _item$_productInit;
+					return isHolderConfigEnabled(item === null || item === void 0 || (_item$_productInit = item._productInit) === null || _item$_productInit === void 0 ? void 0 : _item$_productInit.holder_config);
+				})) ? _objectSpread2(_objectSpread2({}, extraData), {}, { is_add_holder_info: isFormSubject }) : extraData;
 				const { deposit } = summary;
 				const customer = formatAppointmentCustomerInfo(_objectSpread2(_objectSpread2({}, userInfo), extraData === null || extraData === void 0 ? void 0 : extraData.contacts_info));
 				logCheckout("调用 submitOrder", _objectSpread2({ products: formatAppointmentCartSummary(carts) }, customer));
-				const { data } = yield appointmentBooking.submitOrder(extraData);
+				const { data } = yield appointmentBooking.submitOrder(_extraData);
 				const { is_deposit, deposit_amount, total_amount, order_id } = data || {};
 				logCheckout("submitOrder 返回", _objectSpread2(_objectSpread2({ products: formatAppointmentCartSummary(carts) }, customer), {}, {
 					order_id: order_id || null,

package/es/components/appointmentBooking/components/Content/index.js

@@ -27,6 +27,7 @@ const Layout = () => {
 	const { currentStep, setResourceOtherParams, resourceOtherParams, setIsAgreeDepositPolicy, appointmentBooking, setLoading, policyParams, closePolicy, currentStepParams, setIsErrorHolder } = useAppointmentBookingContext();
 	const { isDateSelectedFirst, isFormSubject, isRetailTemplate } = useAppointmentBookingSetting();
 	const { isLogin } = useAppointmentBookingLogin();
+	const isLoggedIn = isLogin();
 	const { getHolders } = useAppointmentBookingAccount();
 	const { removeStep } = useAppointmentBookingStep();
 	const { shopDiscount } = useShopDiscount();
@@ -47,7 +48,7 @@ const Layout = () => {
 					const accountLists = yield appointmentBooking.getAccounts();
 					const meAccount = accountLists === null || accountLists === void 0 ? void 0 : accountLists.find((d) => !(d === null || d === void 0 ? void 0 : d.isGuest));
 					appointmentBooking.setLoginAccount(meAccount === null || meAccount === void 0 ? void 0 : meAccount.id, currentUser);
-				} else if (!isRetailTemplate) getHolders();
+				} else if (!isRetailTemplate) yield getHolders();
 			});
 			return function handleLoginSuccess(_x) {
 				return _ref.apply(this, arguments);
@@ -86,11 +87,12 @@ const Layout = () => {
 		} catch (error) {}
 	}, [isFormSubject, isRetailTemplate]);
 	useEffect(() => {
-		if (isFormSubject && isLogin && !isRetailTemplate) getHolders();
+		if (isFormSubject && isLoggedIn && !isRetailTemplate) getHolders();
 	}, [
 		isFormSubject,
-		isLogin,
-		isRetailTemplate
+		isLoggedIn,
+		isRetailTemplate,
+		appointmentBooking
 	]);
 	useEffect(() => {
 		var _currentStep$step;

package/es/components/appointmentBooking/components/Voucher/index.js

@@ -2,6 +2,7 @@ import useEngineContext from "../../../../hooks/useEngineContext.js";
 import { _objectSpread2 } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import { _asyncToGenerator } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
 import { showDiscountScanFailMessage } from "../../../booking/utils.js";
+import { getCustomer } from "../../utils.js";
 import { useAppointmentBooking, useAppointmentBookingAccount, useAppointmentBookingLogin, useShopDiscount } from "../../hooks.js";
 import { useAppointmentBookingContext } from "../../context.js";
 import React, { useEffect, useMemo, useRef, useState } from "react";
@@ -195,7 +196,16 @@ const VoucherCard = (props) => {
 			className: "login-btn",
 			onClick: () => {
 				if (!action) return;
-				openLoginModal({ callback: (status) => {} });
+				openLoginModal({
+					data: { type: "plugin" },
+					callback: (status) => {
+						if (status === "success") {
+							var _appointmentBooking$r;
+							const customer = getCustomer(utils);
+							appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$r = appointmentBooking.refreshAllHolderFormRecords) === null || _appointmentBooking$r === void 0 || _appointmentBooking$r.call(appointmentBooking, { customer_id: customer === null || customer === void 0 ? void 0 : customer.id });
+						}
+					}
+				});
 			}
 		}, locales.getText("pisell2.text.goodpass.login")), /* @__PURE__ */ React.createElement("span", null, locales.getText("pisell2.text.goodpass.login-tip"))));
 	};

package/es/components/appointmentBooking/hooks.js

@@ -184,15 +184,19 @@ const useAppointmentBookingStep = () => {
 			const selectedResource = (currentSelectedResources === null || currentSelectedResources === void 0 || (_currentSelectedResou2 = currentSelectedResources[0]) === null || _currentSelectedResou2 === void 0 ? void 0 : _currentSelectedResou2.currentSelectedResource) || {};
 			const renderItem = (selectedResource === null || selectedResource === void 0 ? void 0 : selectedResource.renderItem) || {};
 			const checkHolder = function() {
-				var _ref2 = _asyncToGenerator(function* () {
+				var _ref2 = _asyncToGenerator(function* (isLoginTrigger = false) {
 					setLoading(false);
 					if (isRetailTemplate || (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.isCartAllNormalProducts())) return appointmentBooking.next();
 					let cartLists = carts || [];
 					if (!(carts === null || carts === void 0 ? void 0 : carts.length)) cartLists = (yield appointmentBooking.getCart()) || [];
 					else cartLists = carts || [];
-					const { hasError } = checkAndGoNext(isFormSubject, checkAccount, cartLists.filter((n) => !(appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id))));
+					const { hasError, isEnableSkuHolderRule } = checkAndGoNext(isFormSubject, checkAccount, cartLists.filter((n) => !(appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id))));
 					setIsErrorHolder(hasError);
-					if (hasError) return;
+					if (hasError) {
+						scrollToFirstErrorCard(".pisell-lowcode-product-card-select-holder-error");
+						return;
+					}
+					if (isLoginTrigger && isEnableSkuHolderRule) return;
 					if (!!(renderItem === null || renderItem === void 0 ? void 0 : renderItem.policy_id)) openPolicy({ id: renderItem === null || renderItem === void 0 ? void 0 : renderItem.policy_id }, () => {
 						return appointmentBooking.next();
 					});
@@ -204,10 +208,17 @@ const useAppointmentBookingStep = () => {
 			}();
 			const checkLogin = function() {
 				var _ref3 = _asyncToGenerator(function* () {
-					if (!isLogin) {
+					if (!isLogin()) {
 						const { pubsub } = utils;
 						pubsub.once("pisell1.login.success", (res) => {
-							if (res === "success") checkHolder();
+							if (res === "success") {
+								if (isFormSubject && !isRetailTemplate && !(appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.isCartAllNormalProducts())) {
+									var _appointmentBooking$r;
+									const customer = getCustomer(utils);
+									appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$r = appointmentBooking.refreshAllHolderFormRecords) === null || _appointmentBooking$r === void 0 || _appointmentBooking$r.call(appointmentBooking, { customer_id: customer === null || customer === void 0 ? void 0 : customer.id });
+								}
+								checkHolder(true);
+							}
 							if (res === "close") setLoading(false);
 						});
 						return openLoginModal({ callback: (status) => {} });
@@ -341,10 +352,10 @@ const useAppointmentBookingLogin = () => {
 		return Boolean(utils === null || utils === void 0 || (_utils$token = utils.token) === null || _utils$token === void 0 || (_utils$token$get = _utils$token.get) === null || _utils$token$get === void 0 ? void 0 : _utils$token$get.call(_utils$token));
 	}, [utils]);
 	const openLoginModal = (params) => {
-		const { callback } = params || {};
+		const { callback, data = {} } = params || {};
 		utils.action({
 			type: "pisell1.login",
-			data: { type: "plugin" },
+			data: _objectSpread2({ type: "plugin" }, data),
 			callback
 		});
 	};
@@ -389,19 +400,23 @@ const useAppointmentBookingAccount = () => {
 	}, []);
 	const getHolders = function() {
 		var _ref9 = _asyncToGenerator(function* () {
-			var _utils$getStore$getSt;
+			var _utils$getStore$getSt, _appointmentBooking$r2;
 			const shop_id = (_utils$getStore$getSt = utils.getStore().getState()) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.global) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.shop) === null || _utils$getStore$getSt === void 0 ? void 0 : _utils$getStore$getSt.id;
 			const customer = getCustomer(utils);
-			if (!shop_id || !form_id || !(customer === null || customer === void 0 ? void 0 : customer.id)) return [];
-			const params = {
-				url: "/form/data/v1",
-				query: {
-					customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
-					form_id,
-					shop_id
-				}
-			};
-			const data = yield appointmentBooking.fetchHolderAccountsAsync(params);
+			if (!(customer === null || customer === void 0 ? void 0 : customer.id)) return [];
+			let data;
+			if (shop_id && form_id) {
+				const params = {
+					url: "/form/data/v1",
+					query: {
+						customer_id: customer.id,
+						form_id,
+						shop_id
+					}
+				};
+				data = yield appointmentBooking.fetchHolderAccountsAsync(params);
+			}
+			yield appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$r2 = appointmentBooking.refreshAllHolderFormRecords) === null || _appointmentBooking$r2 === void 0 ? void 0 : _appointmentBooking$r2.call(appointmentBooking, { customer_id: customer.id });
 			return (data === null || data === void 0 ? void 0 : data.map((item) => {
 				return {
 					id: item === null || item === void 0 ? void 0 : item.form_record_id,

package/es/components/appointmentBooking/utils.js

@@ -1,5 +1,6 @@
 import { _objectSpread2 } from "../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import { _asyncToGenerator } from "../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
+import { isHolderConfigEnabled, isHolderConfigRequired } from "../../utils/holderConfig.js";
 import { getUniqueId, locales } from "@pisell/utils";
 import { PisellToast } from "@pisell/materials";
 //#region src/components/appointmentBooking/utils.ts
@@ -338,10 +339,19 @@ const getFormInsertBeforeKey = (currentKey, stepList) => {
 * @Date: 2025-05-24 22:46
 */
 const checkAndGoNext = (isFormSubject, checkAccount, carts) => {
+	if (!isFormSubject) return {
+		hasError: false,
+		isEnableSkuHolderRule: false,
+		updatedCartList: carts
+	};
 	let hasError = false;
+	let isEnableSkuHolderRule = false;
 	let updatedCartList = [...carts];
-	if (isFormSubject && !checkAccount("holder")) updatedCartList = carts === null || carts === void 0 ? void 0 : carts.map((item) => {
-		if (!(item === null || item === void 0 ? void 0 : item.holder_id)) {
+	updatedCartList = carts === null || carts === void 0 ? void 0 : carts.map((item) => {
+		var _item$_productInit;
+		const holderConfig = (item === null || item === void 0 || (_item$_productInit = item._productInit) === null || _item$_productInit === void 0 ? void 0 : _item$_productInit.holder_config) || {};
+		if (!(item === null || item === void 0 ? void 0 : item.holder_id) && isHolderConfigEnabled(holderConfig) && !isHolderConfigRequired(holderConfig)) isEnableSkuHolderRule = true;
+		if (!(item === null || item === void 0 ? void 0 : item.holder_id) && isHolderConfigRequired(holderConfig)) {
 			hasError = true;
 			return _objectSpread2(_objectSpread2({}, item), {}, { isErrorHolder: true });
 		}
@@ -349,7 +359,8 @@ const checkAndGoNext = (isFormSubject, checkAccount, carts) => {
 	});
 	return {
 		hasError,
-		updatedCartList
+		updatedCartList,
+		isEnableSkuHolderRule
 	};
 };
 const currentAppointmentBoard = (currentKey, resources, appointmentBooking) => {
@@ -411,8 +422,8 @@ const isSessionProduct = function() {
 	var _ref2 = _asyncToGenerator(function* (appointmentBooking) {
 		const carts = yield appointmentBooking.getCart();
 		return carts === null || carts === void 0 ? void 0 : carts.some((item) => {
-			var _item$_productInit;
-			return (item === null || item === void 0 || (_item$_productInit = item._productInit) === null || _item$_productInit === void 0 || (_item$_productInit = _item$_productInit["schedule.ids"]) === null || _item$_productInit === void 0 ? void 0 : _item$_productInit.length) > 0;
+			var _item$_productInit2;
+			return (item === null || item === void 0 || (_item$_productInit2 = item._productInit) === null || _item$_productInit2 === void 0 || (_item$_productInit2 = _item$_productInit2["schedule.ids"]) === null || _item$_productInit2 === void 0 ? void 0 : _item$_productInit2.length) > 0;
 		});
 	});
 	return function isSessionProduct(_x) {

package/es/components/venueBooking/components/Cart/index.js

@@ -2,12 +2,15 @@ import useEngineContext from "../../../../hooks/useEngineContext.js";
 import { _objectSpread2 } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import { _asyncToGenerator } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
 import shoppingCart from "../../../shoppingCart/index.js";
+import { isHolderConfigEnabled } from "../../../../utils/holderConfig.js";
+import { getCustomer, openForm } from "../../../appointmentBooking/utils.js";
 import SubTotal from "../../../subTotal/index.js";
+import { buildCartHolderParams, getSkuRelationFormId, getVenueCartHolderConfig, handleCartHolderFormSuccess } from "../../../../utils/buildCartHolderParams.js";
 import { getVenueBookingProductIdentity } from "../../utils/orderProductIdentity.js";
 import { useVenueBookingContext } from "../../context.js";
 import VoucherCard from "../Voucher/index.js";
 import VenueDeposit from "../Deposit/index.js";
-import React, { useEffect, useMemo } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import { message } from "antd";
 import { locales } from "@pisell/utils";
 import { Button as Button$1 } from "@pisell/materials";
@@ -19,24 +22,65 @@ import "./index.less";
 * 支持两种模式：embedded（桌面端内嵌）和 drawer（移动端抽屉弹出）
 */
 function Cart(props) {
-	var _engineContext$appHel, _engineContext$appHel2, _engineContext$appHel3, _engineContext$engine, _businessUtils$getApp, _businessUtils$getApp2, _ref, _ref2, _ref3, _summary$total_amount, _summary$deposit3;
+	var _engineContext$appHel, _engineContext$appHel2, _engineContext$appHel3, _engineContext$engine, _engineContext$appHel4, _businessUtils$getApp, _businessUtils$getApp2, _ref, _ref2, _ref3, _summary$total_amount, _summary$deposit3;
 	const { open, onCancel, onNext, items, summary, embedded = false, confirmLoading = false, extraContent } = props;
-	const { currentStep, runModuleAction, refreshViewModel, refreshTimeSlotGrid, venueBookingModule, isAgreeDepositPolicy, setIsAgreeDepositPolicy } = useVenueBookingContext();
+	const { currentStep, runModuleAction, refreshViewModel, refreshTimeSlotGrid, venueBookingModule, isAgreeDepositPolicy, setIsAgreeDepositPolicy, isLoading, isLogin } = useVenueBookingContext();
 	const engineContext = useEngineContext();
 	const businessUtils = engineContext === null || engineContext === void 0 || (_engineContext$appHel = engineContext.appHelper) === null || _engineContext$appHel === void 0 || (_engineContext$appHel = _engineContext$appHel.utils) === null || _engineContext$appHel === void 0 ? void 0 : _engineContext$appHel.businessUtils;
 	const symbol = String((engineContext === null || engineContext === void 0 || (_engineContext$appHel2 = engineContext.appHelper) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel2 = _engineContext$appHel2.utils) === null || _engineContext$appHel2 === void 0 || (_engineContext$appHel3 = _engineContext$appHel2.getSymbolic) === null || _engineContext$appHel3 === void 0 ? void 0 : _engineContext$appHel3.call(_engineContext$appHel2)) || "$");
 	const locale = (engineContext === null || engineContext === void 0 || (_engineContext$engine = engineContext.engine) === null || _engineContext$engine === void 0 || (_engineContext$engine = _engineContext$engine.props) === null || _engineContext$engine === void 0 ? void 0 : _engineContext$engine.locale) || "en";
+	const [holderMap, setHolderMap] = useState({});
+	const { pisellos, translation } = (engineContext === null || engineContext === void 0 || (_engineContext$appHel4 = engineContext.appHelper) === null || _engineContext$appHel4 === void 0 ? void 0 : _engineContext$appHel4.utils) || {};
 	const hasGoodPassApp = !!(businessUtils === null || businessUtils === void 0 || (_businessUtils$getApp = businessUtils.getAppByModal) === null || _businessUtils$getApp === void 0 ? void 0 : _businessUtils$getApp.call(businessUtils, "goodpass"));
 	const hasDiscountCardApp = !!(businessUtils === null || businessUtils === void 0 || (_businessUtils$getApp2 = businessUtils.getAppByModal) === null || _businessUtils$getApp2 === void 0 ? void 0 : _businessUtils$getApp2.call(businessUtils, "discountcard"));
 	const showVoucher = hasGoodPassApp || hasDiscountCardApp;
+	useEffect(() => {
+		var _pisellos$effects;
+		const onHolderChanged = (res) => {
+			if ((res === null || res === void 0 ? void 0 : res.path) === "holderMap") setHolderMap(res === null || res === void 0 ? void 0 : res.value);
+		};
+		pisellos === null || pisellos === void 0 || (_pisellos$effects = pisellos.effects) === null || _pisellos$effects === void 0 || _pisellos$effects.on("venueBooking_holder:changed", onHolderChanged);
+		return () => {
+			var _pisellos$effects2;
+			pisellos === null || pisellos === void 0 || (_pisellos$effects2 = pisellos.effects) === null || _pisellos$effects2 === void 0 || _pisellos$effects2.off("venueBooking_holder:changed", onHolderChanged);
+		};
+	}, [pisellos]);
+	useEffect(() => {
+		if (isLoading || !venueBookingModule) return;
+		try {
+			var _venueBookingModule$g;
+			setHolderMap(((_venueBookingModule$g = venueBookingModule.getHolderFormMap) === null || _venueBookingModule$g === void 0 ? void 0 : _venueBookingModule$g.call(venueBookingModule)) || {});
+		} catch (error) {
+			console.warn("[venueBooking] Holder data is not ready", error);
+			setHolderMap({});
+		}
+	}, [venueBookingModule, isLoading]);
 	const isVisible = embedded || open;
 	const totalAmount = (_ref = (_ref2 = (_ref3 = (_summary$total_amount = summary === null || summary === void 0 ? void 0 : summary.total_amount) !== null && _summary$total_amount !== void 0 ? _summary$total_amount : summary === null || summary === void 0 ? void 0 : summary.expect_amount) !== null && _ref3 !== void 0 ? _ref3 : summary === null || summary === void 0 ? void 0 : summary.amount) !== null && _ref2 !== void 0 ? _ref2 : summary === null || summary === void 0 ? void 0 : summary.total) !== null && _ref !== void 0 ? _ref : "0.00";
 	const cartProducts = useMemo(() => {
-		return (items || []).map((item) => _objectSpread2(_objectSpread2({}, item), {}, {
-			symbol: (item === null || item === void 0 ? void 0 : item.symbol) || symbol,
-			is_hide_like: true
-		}));
-	}, [items, symbol]);
+		return (items || []).map((item) => {
+			var _item$_origin, _engineContext$appHel5;
+			const holderConfig = getVenueCartHolderConfig(item);
+			const holderParams = buildCartHolderParams({
+				item,
+				holderConfig,
+				formData: isHolderConfigEnabled(holderConfig) ? holderMap === null || holderMap === void 0 ? void 0 : holderMap[holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.resource_id] : {},
+				translation,
+				enabled: !!(item === null || item === void 0 || (_item$_origin = item._origin) === null || _item$_origin === void 0 || (_item$_origin = _item$_origin.product) === null || _item$_origin === void 0 ? void 0 : _item$_origin.bookingUuid),
+				utils: engineContext === null || engineContext === void 0 || (_engineContext$appHel5 = engineContext.appHelper) === null || _engineContext$appHel5 === void 0 ? void 0 : _engineContext$appHel5.utils
+			});
+			return _objectSpread2(_objectSpread2({}, item), {}, {
+				symbol: (item === null || item === void 0 ? void 0 : item.symbol) || symbol,
+				is_hide_like: true,
+				allowClearHolder: true
+			}, holderParams);
+		});
+	}, [
+		items,
+		symbol,
+		holderMap,
+		translation
+	]);
 	const confirmOrderText = currentStep === "checkout" ? String(locales.getText("pisell2.venue.action.pay.now") || "立即支付") : String(locales.getText("pisell2.venue.action.next") || "下一步");
 	/**
 	* SubTotal 金额明细列表
@@ -44,12 +88,12 @@ function Cart(props) {
 	* surcharges 为服务费列表，label 支持多语言对象，按当前 locale 取值
 	*/
 	const subTotalList = useMemo(() => {
-		var _summary$product_amou, _summary$tax_fee, _ref4, _summary$total_amount2, _summary$deposit, _venueBookingModule$g, _tempSummary$is_price, _summary$deposit$tota, _summary$deposit2;
+		var _summary$product_amou, _summary$tax_fee, _ref4, _summary$total_amount2, _summary$deposit, _venueBookingModule$g2, _tempSummary$is_price, _summary$deposit$tota, _summary$deposit2;
 		const subTotal = Number((_summary$product_amou = summary === null || summary === void 0 ? void 0 : summary.product_amount) !== null && _summary$product_amou !== void 0 ? _summary$product_amou : 0);
 		const totalTaxFee = Number((_summary$tax_fee = summary === null || summary === void 0 ? void 0 : summary.tax_fee) !== null && _summary$tax_fee !== void 0 ? _summary$tax_fee : 0);
 		const total = Number((_ref4 = (_summary$total_amount2 = summary === null || summary === void 0 ? void 0 : summary.total_amount) !== null && _summary$total_amount2 !== void 0 ? _summary$total_amount2 : summary === null || summary === void 0 ? void 0 : summary.expect_amount) !== null && _ref4 !== void 0 ? _ref4 : 0);
 		const hasDeposit = !!(summary === null || summary === void 0 || (_summary$deposit = summary.deposit) === null || _summary$deposit === void 0 ? void 0 : _summary$deposit.hasDeposit);
-		const tempOrder = venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$g = venueBookingModule.getTempOrder) === null || _venueBookingModule$g === void 0 ? void 0 : _venueBookingModule$g.call(venueBookingModule);
+		const tempOrder = venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$g2 = venueBookingModule.getTempOrder) === null || _venueBookingModule$g2 === void 0 ? void 0 : _venueBookingModule$g2.call(venueBookingModule);
 		const tempSummary = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.summary) || {};
 		const taxTitle = String((tempSummary === null || tempSummary === void 0 ? void 0 : tempSummary.tax_title) || (summary === null || summary === void 0 ? void 0 : summary.tax_title) || "GST/Tax");
 		const rawTaxRate = Number(tempSummary === null || tempSummary === void 0 ? void 0 : tempSummary.tax_rate);
@@ -111,7 +155,57 @@ function Cart(props) {
 		return false;
 	};
 	const handleCartChange = function() {
-		var _ref5 = _asyncToGenerator(function* (item, type, sourceItem) {
+		var _ref6 = _asyncToGenerator(function* (item, type, sourceItem) {
+			if (type === "add_holder") {
+				var _engineContext$appHel6;
+				const holderConfig = getVenueCartHolderConfig(item);
+				if (!isHolderConfigEnabled(holderConfig)) return;
+				const formId = holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.resource_id;
+				if (!formId) return;
+				const skuRelationFormId = getSkuRelationFormId(holderMap, formId);
+				return openForm({
+					form_id: skuRelationFormId || formId,
+					title: locales.getText("pisell2.venue.create.form"),
+					utils: engineContext === null || engineContext === void 0 || (_engineContext$appHel6 = engineContext.appHelper) === null || _engineContext$appHel6 === void 0 ? void 0 : _engineContext$appHel6.utils,
+					callback: function() {
+						var _ref5 = _asyncToGenerator(function* (res) {
+							if ((res === null || res === void 0 ? void 0 : res.status) === "success") {
+								var _engineContext$appHel7, _engineContext$appHel8, _item$_origin2;
+								const { formRecordId, formId: holderFormId } = handleCartHolderFormSuccess({
+									res,
+									formId,
+									skuRelationFormId,
+									utils: engineContext === null || engineContext === void 0 || (_engineContext$appHel7 = engineContext.appHelper) === null || _engineContext$appHel7 === void 0 ? void 0 : _engineContext$appHel7.utils,
+									module: venueBookingModule
+								});
+								const customer = getCustomer(engineContext === null || engineContext === void 0 || (_engineContext$appHel8 = engineContext.appHelper) === null || _engineContext$appHel8 === void 0 ? void 0 : _engineContext$appHel8.utils);
+								venueBookingModule.setBookingHolder(item === null || item === void 0 || (_item$_origin2 = item._origin) === null || _item$_origin2 === void 0 || (_item$_origin2 = _item$_origin2.product) === null || _item$_origin2 === void 0 ? void 0 : _item$_origin2.bookingUuid, {
+									customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
+									form_id: holderFormId,
+									form_record: [formRecordId]
+								});
+								yield refreshViewModel();
+							}
+						});
+						return function callback(_x) {
+							return _ref5.apply(this, arguments);
+						};
+					}()
+				});
+			}
+			if (type === "change_holder") {
+				var _engineContext$appHel9, _item$_origin3;
+				const customer = getCustomer(engineContext === null || engineContext === void 0 || (_engineContext$appHel9 = engineContext.appHelper) === null || _engineContext$appHel9 === void 0 ? void 0 : _engineContext$appHel9.utils);
+				const holder = (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem._origin) || sourceItem;
+				const params = !sourceItem ? null : {
+					customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
+					form_id: holder === null || holder === void 0 ? void 0 : holder.form_id,
+					form_record: [holder === null || holder === void 0 ? void 0 : holder.form_record_id]
+				};
+				venueBookingModule.setBookingHolder(item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.bookingUuid, params);
+				yield refreshViewModel();
+				return;
+			}
 			if (type !== "delete") return;
 			const targetItem = sourceItem && typeof sourceItem === "object" ? sourceItem : item;
 			if (currentStep !== "select-venue" && isVenueBookingCartItem(targetItem)) {
@@ -137,8 +231,8 @@ function Cart(props) {
 				});
 			}
 		});
-		return function handleCartChange(_x, _x2, _x3) {
-			return _ref5.apply(this, arguments);
+		return function handleCartChange(_x2, _x3, _x4) {
+			return _ref6.apply(this, arguments);
 		};
 	}();
 	useEffect(() => {
@@ -154,9 +248,9 @@ function Cart(props) {
 			isShowNote: false,
 			isShowDelete: true,
 			isShowPackageNote: false,
-			isShowChangeHolder: false,
-			isShowHolder: false,
-			isShowAddHolderButton: false
+			isShowChangeHolder: currentStep === "checkout" ? false : !!isLogin,
+			isShowHolder: true,
+			isShowAddHolderButton: true
 		},
 		platform: "h5",
 		emptyText: locales.getText("pisell2.venue.cart.empty"),
@@ -172,8 +266,8 @@ function Cart(props) {
 		isAgreePolicy: isAgreeDepositPolicy,
 		onChange: setIsAgreeDepositPolicy,
 		getProtocol: (id) => {
-			var _venueBookingModule$g2;
-			return venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$g2 = venueBookingModule.getProtocol) === null || _venueBookingModule$g2 === void 0 ? void 0 : _venueBookingModule$g2.call(venueBookingModule, id);
+			var _venueBookingModule$g3;
+			return venueBookingModule === null || venueBookingModule === void 0 || (_venueBookingModule$g3 = venueBookingModule.getProtocol) === null || _venueBookingModule$g3 === void 0 ? void 0 : _venueBookingModule$g3.call(venueBookingModule, id);
 		}
 	}) : null), extraContent ? /* @__PURE__ */ React.createElement("div", { className: "pisell-venue-booking-cart-extra-content" }, extraContent) : null);
 	if (embedded) return /* @__PURE__ */ React.createElement(React.Fragment, null, cartListContent, /* @__PURE__ */ React.createElement("div", { className: "pisell-venue-booking-cart-embedded-footer" }, cartSummaryContent, /* @__PURE__ */ React.createElement(Button$1, {

package/es/components/venueBooking/context.js

@@ -1,6 +1,7 @@
 import useEngineContext, { usePisellOS } from "../../hooks/useEngineContext.js";
 import { _objectSpread2 } from "../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import { _asyncToGenerator } from "../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js";
+import { getVenueCartHolderConfig, validateRequiredCartHolders } from "../../utils/buildCartHolderParams.js";
 import { VENUE_PRODUCT_IDS, createVenueBookingViewModel, fetchResourceAvailability, getAllSelectedSlots, getDateRangeSummary, getOtherParams, getTimeSlotGrid, loadVenueProducts, safeRunModuleAction, toggleSlotAction, useVenueBookingLogin, useVenueBookingModule } from "./hooks.js";
 import { formatDateKey, getWeekDays } from "./utils.js";
 import dayjs from "dayjs";
@@ -501,13 +502,23 @@ function VenueBookingProvider({ entryContext, children }) {
 			} });
 			return;
 		}
+		if (currentStep === "addons") {
+			const { hasError } = validateRequiredCartHolders({
+				items: viewModel.cartItems,
+				getHolderConfig: getVenueCartHolderConfig
+			});
+			if (hasError) return;
+		}
 		goToStep("checkout");
 	}, [
 		isLogin,
 		openLoginModal,
 		handleLoginSuccess,
 		goToStep,
-		venueBookingModule
+		venueBookingModule,
+		currentStep,
+		viewModel.cartItems,
+		getVenueCartHolderConfig
 	]);
 	/** 主操作按钮行为（含登录门禁，自适应 2/3 步流程） */
 	const handlePrimaryAction = useCallback(() => {
@@ -543,9 +554,9 @@ function VenueBookingProvider({ entryContext, children }) {
 		isAgreeDepositPolicy,
 		viewModel.summary,
 		stepList,
-		proceedToCheckout,
 		goToStep,
-		handleSubmitOrder
+		handleSubmitOrder,
+		proceedToCheckout
 	]);
 	useEffect(() => {
 		var _pubsub$subscribe;