@pisell/private-materials 6.12.355 → 6.12.357

package/es/components/venueBooking/locales.js

@@ -126,7 +126,8 @@ var locales_default = {
 		"pisell2.appointment.policy": "You have read and agreed to this policy",
 		"pisell2.appointment.policy.confirm": "Confirm",
 		"pisell2.appointment.booking.empty.data": "No data",
-		"pisell2.product-select.search": "Search"
+		"pisell2.product-select.search": "Search",
+		"pisell2.venue.create.form": "Create form"
 	},
 	"zh-CN": {
 		"pisell2.venue.step.select": "选择场地",
@@ -250,7 +251,8 @@ var locales_default = {
 		"pisell2.appointment.policy": "您已仔细阅读并同意此协议",
 		"pisell2.appointment.policy.confirm": "确定",
 		"pisell2.appointment.booking.empty.data": "暂无数据",
-		"pisell2.product-select.search": "搜索"
+		"pisell2.product-select.search": "搜索",
+		"pisell2.venue.create.form": "创建表单"
 	},
 	"zh-HK": {
 		"pisell2.venue.step.select": "選擇場地",
@@ -374,7 +376,8 @@ var locales_default = {
 		"pisell2.appointment.policy": "您已仔細閱讀並同意此協議",
 		"pisell2.appointment.policy.confirm": "確定",
 		"pisell2.appointment.booking.empty.data": "暫無數據",
-		"pisell2.product-select.search": "搜索"
+		"pisell2.product-select.search": "搜索",
+		"pisell2.venue.create.form": "创建表单"
 	},
 	ja: {
 		"pisell2.venue.step.select": "コートを選択",
@@ -498,7 +501,8 @@ var locales_default = {
 		"pisell2.appointment.policy": "このポリシーを読み、同意しました",
 		"pisell2.appointment.policy.confirm": "確認",
 		"pisell2.appointment.booking.empty.data": "データなし",
-		"pisell2.product-select.search": "検索"
+		"pisell2.product-select.search": "検索",
+		"pisell2.venue.create.form": "フォームを作成"
 	},
 	pt: {
 		"pisell2.venue.step.select": "Escolher quadra",
@@ -622,7 +626,8 @@ var locales_default = {
 		"pisell2.appointment.policy": "Você leu e concordou com esta política",
 		"pisell2.appointment.policy.confirm": "Confirmar",
 		"pisell2.appointment.booking.empty.data": "Sem dados",
-		"pisell2.product-select.search": "Pesquisar"
+		"pisell2.product-select.search": "Pesquisar",
+		"pisell2.venue.create.form": "Criar formulário"
 	}
 };
 //#endregion

package/es/plus/invoice/README.md

@@ -77,8 +77,14 @@ type OrderInvoiceHandle = {
 
 OS `OrderInvoicePreview` 从模板 language 中提供 `languageOptions` 和
 `selectedLanguage`；宿主选择器调用实例 `selectLanguage(code)`，不重新准备订单或
-加载低代码页面。`result.locale` 为主语言，`secondaryLocale` 仅在 `cn_en` 时为
-`zh_CN`。页面 UI 的 `locale` 不随此选择改变。
+加载低代码页面。`result.locale` 为主语言；`cn_en` 沿用英语在前、简体中文在后，
+`ja_en` 为日语在前、英语在后，`secondaryLocale` 为对应的第二语言。
+页面 UI 的 `locale` 不随此选择改变。
+
+POS Invoice 预览从同一份 `getInvoiceTemplateSettings()` 配置取得 modules 和
+language，展示首个启用的语言模式（打印份数不重复预览），并请求该模式所需的所有
+语言快照。双语模式任一语言缺失时保留重试提示，不静默降级为单语。旧 OS 仅提供
+layout 或 DEFAULT 模板未指定语言时，继续按界面语言选择。
 
 物料使用 `receipt_key` 关联来源相同的双语节点，保留仅次语言有内容的行。
 `receipt_item_kind` / `receipt_value_kind` 区分共享值和翻译文本，避免时间、编号和

package/es/plus/invoice/ReceiptRenderer.js

@@ -26,7 +26,7 @@ function ReceiptRows({ locale, rows }) {
 		return /* @__PURE__ */ React.createElement("div", {
 			className: `${PREFIX}__receipt-row ${row.size === 2 ? `${PREFIX}__receipt-row--strong` : ""} ${singleValue ? `${PREFIX}__receipt-row--single` : ""} ${alignment ? `${PREFIX}__receipt-row--align-${alignment}` : ""}`,
 			key: `${row.item}-${row.value}-${index}`
-		}, row.item ? /* @__PURE__ */ React.createElement("span", null, label(String(row.item), locale)) : null, row.value ? /* @__PURE__ */ React.createElement("span", null, row.value) : null);
+		}, row.item ? /* @__PURE__ */ React.createElement("span", null, label(String(row.item), row.labelLocale || locale)) : null, row.value ? /* @__PURE__ */ React.createElement("span", null, row.value) : null);
 	}));
 }
 function ReceiptSectionTitle({ children }) {

package/es/plus/invoice/receipt.d.ts

@@ -10,6 +10,8 @@ interface InvoiceLayoutConfig {
   module: InvoiceModuleConfig[];
 }
 interface SmallTicketItem {
+  /** View-only locale retained when primary and secondary rows are merged. */
+  labelLocale?: string;
   receipt_key?: string;
   receipt_value_kind?: 'shared' | 'text';
   receipt_item_kind?: 'shared' | 'text';

package/es/plus/invoice/receipt.js

@@ -317,12 +317,8 @@ function findLocaleKey(data, candidate) {
 	const lowerCandidate = candidate.toLowerCase().replace(/-/g, "_");
 	return Object.keys(data).find((key) => key.toLowerCase().replace(/-/g, "_") === lowerCandidate);
 }
-function selectSmallTicketLocale(data, appLocale, primaryLocale) {
-	const candidates = [
-		...localeCandidates(appLocale),
-		"en",
-		...localeCandidates(primaryLocale || "")
-	];
+function selectSmallTicketLocale(data, appLocale, primaryLocale, allowFallback = true) {
+	const candidates = [...localeCandidates(appLocale), ...allowFallback ? ["en", ...localeCandidates(primaryLocale || "")] : []];
 	for (const candidate of candidates) {
 		const key = findLocaleKey(data, candidate);
 		if (key && hasLocalePayload(data[key])) return {
@@ -330,7 +326,7 @@ function selectSmallTicketLocale(data, appLocale, primaryLocale) {
 			locale: key
 		};
 	}
-	const first = Object.keys(data).find((key) => hasLocalePayload(data[key]));
+	const first = allowFallback ? Object.keys(data).find((key) => hasLocalePayload(data[key])) : void 0;
 	return first ? {
 		data: data[first],
 		locale: first
@@ -362,6 +358,40 @@ function _resolveInvoiceLayoutConfig() {
 	});
 	return _resolveInvoiceLayoutConfig.apply(this, arguments);
 }
+const INVOICE_PREVIEW_LANGUAGES = {
+	en: ["en"],
+	zh_cn: ["zh_CN"],
+	zh_hk: ["zh_HK"],
+	ja: ["ja"],
+	pt: ["pt"],
+	cn_en: ["en", "zh_CN"],
+	ja_en: ["ja", "en"]
+};
+/** Use the first enabled print mode once, regardless of its copy count. */
+function resolveInvoicePreviewConfig(_x2) {
+	return _resolveInvoicePreviewConfig.apply(this, arguments);
+}
+function _resolveInvoicePreviewConfig() {
+	_resolveInvoicePreviewConfig = _asyncToGenerator(function* (salesModule) {
+		if (typeof (salesModule === null || salesModule === void 0 ? void 0 : salesModule.getInvoiceTemplateSettings) === "function") {
+			const settings = yield salesModule.getInvoiceTemplateSettings();
+			if (isRecord(settings)) {
+				const layout = normalizeInvoiceLayoutConfig({ module: settings.modules });
+				if (typeof settings.template === "string" && settings.template.trim() && settings.template.trim().toUpperCase() !== "DEFAULT" && isRecord(settings.language)) for (const [rawCode, count] of Object.entries(settings.language)) {
+					if (typeof count !== "number" || !Number.isFinite(count) || count <= 0) continue;
+					const locales = INVOICE_PREVIEW_LANGUAGES[rawCode.trim().toLowerCase().replace(/-/g, "_")];
+					if (Array.isArray(locales)) return {
+						layout,
+						locales: [...locales]
+					};
+				}
+				return { layout };
+			}
+		}
+		return { layout: yield resolveInvoiceLayoutConfig(salesModule) };
+	});
+	return _resolveInvoicePreviewConfig.apply(this, arguments);
+}
 function text(value) {
 	return value === void 0 || value === null ? "" : String(value).trim();
 }
@@ -893,4 +923,4 @@ function getModuleImage(module) {
 	return text(module.image.value);
 }
 //#endregion
-export { buildInvoiceReceiptViewModel, formatReceiptPreviewTime, getModuleImage, getModuleText, getReceiptBookingId, getReceiptLabel, getReceiptProductTotal, isSmallTicketData, multiplyReceiptMoney, receiptMoneyValuesDiffer, resolveInvoiceLayoutConfig, resolveSmallTicketData, selectSmallTicketLocale, subtractReceiptMoney, sumReceiptMoney };
+export { buildInvoiceReceiptViewModel, formatReceiptPreviewTime, getModuleImage, getModuleText, getReceiptBookingId, getReceiptLabel, getReceiptProductTotal, isSmallTicketData, multiplyReceiptMoney, receiptMoneyValuesDiffer, resolveInvoicePreviewConfig, resolveSmallTicketData, selectSmallTicketLocale, subtractReceiptMoney, sumReceiptMoney };

package/es/plus/invoice/receiptTranslations.js

@@ -42,9 +42,14 @@ function receiptLabel(receipt, key) {
 	return bilingualText(getReceiptLabel(receipt.locale, key), receipt.secondary && getReceiptLabel(receipt.secondary.locale, key));
 }
 function mergeTranslatedRows(primary, secondary, locale, secondaryLocale, sharedValues = false) {
+	const primaryRows = new Set(primary);
 	return pairReceiptEntries(primary, secondary, (row) => row.receipt_key).flatMap(({ primary: row, secondary: other }) => {
-		const item = getReceiptLabel(locale, row.item || "");
-		const result = [_objectSpread2(_objectSpread2({}, row), {}, { item })];
+		const labelLocale = primaryRows.has(row) ? locale : secondaryLocale;
+		const item = getReceiptLabel(labelLocale, row.item || "");
+		const result = [_objectSpread2(_objectSpread2({}, row), {}, {
+			item,
+			labelLocale
+		})];
 		if (!other) return result;
 		let secondItem = getReceiptLabel(secondaryLocale, other.item || "");
 		if (row.receipt_key === "settlement/tax-included") secondItem = secondItem.replace(/\s-?[^\s\d]*\d[\d,.]*\s(?=\()/, " ");
@@ -53,6 +58,7 @@ function mergeTranslatedRows(primary, secondary, locale, secondaryLocale, shared
 		if (!secondItem && !secondValue) return result;
 		result.push(_objectSpread2(_objectSpread2({}, other), {}, {
 			item: secondItem,
+			labelLocale: secondaryLocale,
 			value: secondValue,
 			receipt_key: `${other.receipt_key}/secondary`
 		}));

package/es/plus/saleDetail/tmpl/B/components/Invoice/useInvoiceReceiptPreview.js

@@ -6,7 +6,7 @@ import { isVirtualSettlementTempOrder } from "../../../../../multiCurrencySettle
 import { getLocalOrderReceiptSnapshot, getOrderSmallTicketData } from "../../../../serve.js";
 import { withDisplayedReceiptFormTitles } from "../../../../utils/formTitleDisplay.js";
 import { hasInvoiceDetailSettings, hasInvoicePaymentTimeKeys, isInvoiceResourceTitleVisible, requiresInvoiceDataFiltering, requiresInvoicePaymentTimeKeys } from "../../../../../invoice/invoiceVisibility.js";
-import { buildInvoiceReceiptViewModel, formatReceiptPreviewTime, isSmallTicketData, resolveInvoiceLayoutConfig, resolveSmallTicketData, selectSmallTicketLocale } from "../../../../../invoice/receipt.js";
+import { buildInvoiceReceiptViewModel, formatReceiptPreviewTime, isSmallTicketData, resolveInvoicePreviewConfig, resolveSmallTicketData, selectSmallTicketLocale } from "../../../../../invoice/receipt.js";
 import { useEffect, useMemo, useState } from "react";
 //#region src/plus/saleDetail/tmpl/B/components/Invoice/useInvoiceReceiptPreview.ts
 const LOADING_STATE = {
@@ -81,13 +81,12 @@ function useInvoiceReceiptPreview(context) {
 		setState(_objectSpread2(_objectSpread2({}, LOADING_STATE), {}, { scope }));
 		(function() {
 			var _ref3 = _asyncToGenerator(function* () {
-				var _bookingTicket$getFor;
 				const { appLocale, bookingTicket, engineContext, orderId, platform, previewCreatedAt, salesDetail, salesModule, tempOrder } = scope;
-				const layout = yield resolveInvoiceLayoutConfig(salesModule);
+				const { layout, locales } = yield resolveInvoicePreviewConfig(salesModule);
 				if (cancelled) return null;
 				const mustFilter = requiresInvoiceDataFiltering(layout);
 				const needsPaymentTimeKeys = requiresInvoicePaymentTimeKeys(layout);
-				const useSharedConfig = hasInvoiceDetailSettings(layout) || mustFilter;
+				const useSharedConfig = hasInvoiceDetailSettings(layout) || mustFilter || Boolean(locales);
 				const isVirtualOrder = isVirtualSettlementTempOrder(tempOrder) || isVirtualSettlementTempOrder(salesDetail === null || salesDetail === void 0 ? void 0 : salesDetail.raw);
 				const legacyVirtualResult = {
 					receipt: null,
@@ -97,11 +96,12 @@ function useInvoiceReceiptPreview(context) {
 				};
 				if (isVirtualOrder && !useSharedConfig) return legacyVirtualResult;
 				const requiresSource = isVirtualOrder && useSharedConfig;
+				const requiresFreshSnapshot = mustFilter || needsPaymentTimeKeys || requiresSource || ((locales === null || locales === void 0 ? void 0 : locales.length) || 0) > 1;
 				const embeddedSnapshot = resolveSmallTicketData(salesDetail, tempOrder);
 				const { snapshot, source } = yield function() {
 					var _ref2 = _asyncToGenerator(function* () {
 						if (platform !== "h5" && orderId !== null && orderId !== void 0) try {
-							const freshSnapshot = yield getLocalOrderReceiptSnapshot(orderId, [appLocale], layout);
+							const freshSnapshot = yield getLocalOrderReceiptSnapshot(orderId, locales || [appLocale], layout);
 							if (!freshSnapshot || !isSmallTicketData(freshSnapshot.small_ticket_data)) throw new Error("Receipt snapshot is unavailable");
 							if (mustFilter && freshSnapshot.template_visibility_applied !== true) throw new Error("Receipt snapshot does not support template filtering");
 							if (needsPaymentTimeKeys && !hasInvoicePaymentTimeKeys(freshSnapshot.small_ticket_data)) throw new Error("Receipt snapshot does not identify payment history times");
@@ -111,10 +111,10 @@ function useInvoiceReceiptPreview(context) {
 								source: freshSnapshot.source || null
 							};
 						} catch (error) {
-							if (mustFilter || needsPaymentTimeKeys || requiresSource) throw error;
+							if (requiresFreshSnapshot) throw error;
 							console.warn("[SaleDetail.Invoice] Failed to rebuild local receipt snapshot", error);
 						}
-						if (mustFilter || needsPaymentTimeKeys || requiresSource) throw new Error("A template-aware local receipt snapshot is required");
+						if (requiresFreshSnapshot) throw new Error("A template-aware local receipt snapshot is required");
 						return {
 							snapshot: embeddedSnapshot || (orderId !== null && orderId !== void 0 ? yield getOrderSmallTicketData(orderId) : null),
 							source: null
@@ -128,17 +128,23 @@ function useInvoiceReceiptPreview(context) {
 				const isVirtualSource = isVirtualSettlementTempOrder(source);
 				if (isVirtualSource && !useSharedConfig) return legacyVirtualResult;
 				const shopInfo = getShopInfo(engineContext);
-				const selected = selectSmallTicketLocale(isInvoiceResourceTitleVisible(layout) ? withDisplayedReceiptFormTitles(snapshot, (bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$getFor = bookingTicket.getFormTitleMap) === null || _bookingTicket$getFor === void 0 ? void 0 : _bookingTicket$getFor.call(bookingTicket)) || {}, appLocale, (salesDetail === null || salesDetail === void 0 ? void 0 : salesDetail.bookings) || []) : snapshot, appLocale, shopInfo.primary_locale);
-				if (!selected) throw new Error("Receipt language data is unavailable");
-				return {
-					receipt: buildInvoiceReceiptViewModel({
-						data: selected.data,
+				const buildReceipt = (locale) => {
+					var _bookingTicket$getFor;
+					const selected = selectSmallTicketLocale(snapshot, locale, shopInfo.primary_locale, !locales);
+					if (!selected) throw new Error(`Receipt language data is unavailable: ${locale}`);
+					return buildInvoiceReceiptViewModel({
+						data: isInvoiceResourceTitleVisible(layout) ? withDisplayedReceiptFormTitles(selected.data, (bookingTicket === null || bookingTicket === void 0 || (_bookingTicket$getFor = bookingTicket.getFormTitleMap) === null || _bookingTicket$getFor === void 0 ? void 0 : _bookingTicket$getFor.call(bookingTicket)) || {}, selected.locale, (salesDetail === null || salesDetail === void 0 ? void 0 : salesDetail.bookings) || []) : selected.data,
 						layout,
 						locale: selected.locale,
 						previewTime: formatReceiptPreviewTime(previewCreatedAt, selected.locale),
 						shopLogo: getShopLogo(shopInfo),
 						taxNumberLabel: shopInfo.tax_number_title || (String(shopInfo.tax_country_code || "").toUpperCase() === "AU" ? "ABN" : void 0)
-					}),
+					});
+				};
+				const receipt = buildReceipt((locales === null || locales === void 0 ? void 0 : locales[0]) || appLocale);
+				if (locales === null || locales === void 0 ? void 0 : locales[1]) receipt.secondary = buildReceipt(locales[1]);
+				return {
+					receipt,
 					source,
 					useLegacyVirtualCurrencyInvoice: false,
 					useVirtualCurrencyReceipt: useSharedConfig && isVirtualSource

package/es/utils/buildCartHolderParams.js

@@ -0,0 +1,166 @@
+import { _objectSpread2 } from "../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
+import { isHolderConfigEnabled, isHolderConfigRequired } from "./holderConfig.js";
+import { getCustomer } from "../components/appointmentBooking/utils.js";
+//#region src/utils/buildCartHolderParams.ts
+const toHolderRecordId = (value) => {
+	if (value == null || value === "") return void 0;
+	const id = Number(value);
+	return Number.isNaN(id) ? void 0 : id;
+};
+/**
+* 从 _origin.holder 解析 form_record_id。
+* form_record 可能是 number、number[]；不能假定一定是数组下标 [0]。
+*/
+const resolveOriginHolderId = (holder) => {
+	const formRecord = holder === null || holder === void 0 ? void 0 : holder.form_record;
+	if (Array.isArray(formRecord)) for (const value of formRecord) {
+		const id = toHolderRecordId(value);
+		if (id != null) return id;
+	}
+	else {
+		const id = toHolderRecordId(formRecord);
+		if (id != null) return id;
+	}
+	return toHolderRecordId(holder === null || holder === void 0 ? void 0 : holder.form_record_id);
+};
+/**
+* 从购物车行解析当前选中的 holder form_record_id。
+*
+* venueBooking：以 _origin.holder 为准（SDK 会原地更新 form_record）；
+* 顶层 item.holder_id 可能是上一轮 UI 注入或 SDK 回灌的滞后值，不能优先于 _origin.holder。
+*/
+const resolveCartItemHolderId = (item) => {
+	var _item$_origin;
+	const originHolder = item === null || item === void 0 || (_item$_origin = item._origin) === null || _item$_origin === void 0 ? void 0 : _item$_origin.holder;
+	if (originHolder && typeof originHolder === "object") return resolveOriginHolderId(originHolder);
+	return toHolderRecordId(item === null || item === void 0 ? void 0 : item.holder_id);
+};
+const getCurrentCustomerId = (utils) => {
+	var _getCustomer;
+	return (_getCustomer = getCustomer(utils)) === null || _getCustomer === void 0 ? void 0 : _getCustomer.id;
+};
+const createCartHolderOption = (holder, customerId) => {
+	const _id = (holder === null || holder === void 0 ? void 0 : holder.formRecordId) || (holder === null || holder === void 0 ? void 0 : holder.form_record_id);
+	return {
+		key: _id,
+		id: _id,
+		label: holder === null || holder === void 0 ? void 0 : holder.main_field,
+		name: holder === null || holder === void 0 ? void 0 : holder.main_field,
+		username: holder === null || holder === void 0 ? void 0 : holder.main_field,
+		type: "holder",
+		_origin: _objectSpread2(_objectSpread2({}, holder), {}, { customer_id: customerId })
+	};
+};
+/**
+* 构建 ProductCard Holder 组件使用的单条 holder 数据。
+* 输出字段需要与购物车 ProductCard 消费格式保持一致。
+*/
+const buildCartHolderOption = (holder, utils) => {
+	if (!holder) return {};
+	return createCartHolderOption(holder, getCurrentCustomerId(utils));
+};
+const buildCartHolderOptions = (records, utils) => {
+	const customerId = getCurrentCustomerId(utils);
+	return records.map((record) => createCartHolderOption(record, customerId));
+};
+const getCartHolderTitle = (records, holderId) => {
+	var _records$find;
+	if (!holderId) return "";
+	return (_records$find = records.find((record) => Number(record === null || record === void 0 ? void 0 : record.form_record_id) === holderId)) === null || _records$find === void 0 ? void 0 : _records$find.main_field;
+};
+/**
+* 根据 holderMap 与购物车行数据，构建 ProductCard 所需的 holder 展示字段。
+* 供 appointmentBooking、venueBooking 等购物车场景复用。
+*/
+const buildCartHolderParams = ({ item, holderConfig = {}, formData, translation, enabled = true, utils }) => {
+	var _formData$form;
+	if (!enabled || !isHolderConfigEnabled(holderConfig)) return {
+		isShowChangeHolder: false,
+		isErrorHolder: false,
+		holders: []
+	};
+	const records = (formData === null || formData === void 0 ? void 0 : formData.records) || [];
+	const holderId = resolveCartItemHolderId(item);
+	return {
+		holder_id: holderId,
+		isErrorHolder: !!(!holderId && isHolderConfigRequired(holderConfig)),
+		isShowChangeHolder: true,
+		addHolderButtonText: translation(formData === null || formData === void 0 || (_formData$form = formData.form) === null || _formData$form === void 0 || (_formData$form = _formData$form.form) === null || _formData$form === void 0 || (_formData$form = _formData$form.setting) === null || _formData$form === void 0 ? void 0 : _formData$form.title),
+		holder_title: getCartHolderTitle(records, holderId),
+		holders: buildCartHolderOptions(records, utils)
+	};
+};
+/**
+* 从 appointmentBooking 购物车行读取 holder_config
+*/
+const getAppointmentCartHolderConfig = (item) => {
+	var _item$_productInit;
+	return (item === null || item === void 0 || (_item$_productInit = item._productInit) === null || _item$_productInit === void 0 ? void 0 : _item$_productInit.holder_config) || {};
+};
+/**
+* 从 venueBooking 购物车行读取 holder_config
+*/
+const getVenueCartHolderConfig = (item) => {
+	var _item$_origin2;
+	return (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.holder_config) || {};
+};
+/**
+* 校验购物车中 holder_config.required 的行是否已选择 holder。
+*/
+const validateRequiredCartHolders = ({ items = [], getHolderConfig = getVenueCartHolderConfig }) => {
+	const invalidItems = items.filter((item) => {
+		if (!isHolderConfigRequired(getHolderConfig(item))) return false;
+		return !resolveCartItemHolderId(item);
+	});
+	return {
+		hasError: invalidItems.length > 0,
+		invalidItems
+	};
+};
+/**
+* 从 holderMap 解析 minors 表单关联的 sku 关系表单 ID（form_to_form 隐藏字段的 linkedTable）。
+*/
+const getSkuRelationFormId = (holderMap, formId) => {
+	var _formData$form2, _formData$form3, _detail$setting;
+	if (!formId) return 0;
+	const formData = holderMap === null || holderMap === void 0 ? void 0 : holderMap[formId];
+	if ((formData === null || formData === void 0 || (_formData$form2 = formData.form) === null || _formData$form2 === void 0 || (_formData$form2 = _formData$form2.form) === null || _formData$form2 === void 0 ? void 0 : _formData$form2.form_type) !== "minors") return 0;
+	const detail = formData === null || formData === void 0 || (_formData$form3 = formData.form) === null || _formData$form3 === void 0 || (_formData$form3 = _formData$form3.field) === null || _formData$form3 === void 0 ? void 0 : _formData$form3.find((item) => (item === null || item === void 0 ? void 0 : item.filed_type) === "form_to_form" && (item === null || item === void 0 ? void 0 : item.status) === "hide");
+	return (detail === null || detail === void 0 || (_detail$setting = detail.setting) === null || _detail$setting === void 0 ? void 0 : _detail$setting.linkedTable) || 0;
+};
+/**
+* 从 form_to_form_value 中取最新创建的 form_record_id。
+*/
+const getSkuRelationFormRecordId = (res) => {
+	var _res$values;
+	const formToFormValue = res === null || res === void 0 || (_res$values = res.values) === null || _res$values === void 0 || (_res$values = _res$values.form_to_form_value) === null || _res$values === void 0 ? void 0 : _res$values[0];
+	const formDataValue = (formToFormValue === null || formToFormValue === void 0 ? void 0 : formToFormValue.form_data_value) || [];
+	return formDataValue[formDataValue.length - 1];
+};
+/**
+* 处理购物车添加 holder 表单提交成功后的公共逻辑。
+* - minors 关联表单：刷新 holder 列表，取 form_to_form_value 中的 record id
+* - 普通表单：appendFormRecord 并直接使用 form_record_id
+*/
+const handleCartHolderFormSuccess = ({ res, formId, skuRelationFormId, utils, module }) => {
+	var _res$values2, _res$values3, _res$values4;
+	let formRecordId = res === null || res === void 0 || (_res$values2 = res.values) === null || _res$values2 === void 0 ? void 0 : _res$values2.form_record_id;
+	let resolvedFormId = res === null || res === void 0 || (_res$values3 = res.values) === null || _res$values3 === void 0 ? void 0 : _res$values3.form_id;
+	if (formId && skuRelationFormId) {
+		var _module$refreshAllHol;
+		const customer = getCustomer(utils);
+		module === null || module === void 0 || (_module$refreshAllHol = module.refreshAllHolderFormRecords) === null || _module$refreshAllHol === void 0 || _module$refreshAllHol.call(module, { customer_id: customer === null || customer === void 0 ? void 0 : customer.id });
+		formRecordId = getSkuRelationFormRecordId(res);
+		resolvedFormId = formId;
+	} else if (formId) {
+		var _module$appendFormRec;
+		module === null || module === void 0 || (_module$appendFormRec = module.appendFormRecord) === null || _module$appendFormRec === void 0 || _module$appendFormRec.call(module, { record: res === null || res === void 0 ? void 0 : res.values });
+	}
+	return {
+		formRecordId,
+		mainField: res === null || res === void 0 || (_res$values4 = res.values) === null || _res$values4 === void 0 ? void 0 : _res$values4.main_field,
+		formId: resolvedFormId
+	};
+};
+//#endregion
+export { buildCartHolderOption, buildCartHolderParams, getAppointmentCartHolderConfig, getSkuRelationFormId, getVenueCartHolderConfig, handleCartHolderFormSuccess, validateRequiredCartHolders };

package/es/utils/holderConfig.js

@@ -0,0 +1,6 @@
+//#region src/utils/holderConfig.ts
+/** Holder selection requires an enabled configuration and a valid form ID. */
+const isHolderConfigEnabled = (config) => (config === null || config === void 0 ? void 0 : config.status) === "enable" && Number.isFinite(Number(config === null || config === void 0 ? void 0 : config.resource_id)) && Number(config === null || config === void 0 ? void 0 : config.resource_id) > 0;
+const isHolderConfigRequired = (config) => isHolderConfigEnabled(config) && Number(config === null || config === void 0 ? void 0 : config.required) === 1;
+//#endregion
+export { isHolderConfigEnabled, isHolderConfigRequired };

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

@@ -2,6 +2,7 @@ const require_runtime = require("../../../../../_virtual/_rolldown/runtime.js");
 const require_objectSpread2 = require("../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
 const require_asyncToGenerator = require("../../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
 const require_index = require("../../../../shoppingCart/index.js");
+const require_holderConfig = require("../../../../../utils/holderConfig.js");
 const require_utils = require("../../../utils.js");
 const require_index$1 = require("../../../../subTotal/index.js");
 const require_hooks = require("../../../hooks.js");
@@ -10,6 +11,7 @@ const require_index$2 = require("../../Deposit/index.js");
 const require_utils$1 = require("../utils.js");
 const require_index$3 = require("../ContinueButton/index.js");
 const require_index$4 = require("../../Voucher/index.js");
+const require_buildCartHolderParams = require("../../../../../utils/buildCartHolderParams.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
 let _pisell_utils = require("@pisell/utils");
@@ -23,9 +25,29 @@ const CartItem = ({ onNext, renderContactInfo }) => {
 	const { getResourceList } = require_hooks.useAppointmentBookingResource();
 	const { isFormSubject, bookingSubject, isRetailTemplate } = require_hooks.useAppointmentBookingSetting();
 	const { isLogin } = require_hooks.useAppointmentBookingLogin();
+	const isLoggedIn = isLogin();
 	const utils = require_hooks.contextUtils();
-	const { businessUtils, translation } = utils;
+	const { businessUtils, translation, pisellos } = utils;
 	const { taxTitle, totalTaxFee, isPriceIncludeTax, total, deposit } = summary;
+	const [holderMap, setHolderMap] = (0, react.useState)({});
+	(0, react.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]);
+	(0, react.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:
@@ -80,14 +102,32 @@ const CartItem = ({ onNext, renderContactInfo }) => {
 		}
 		if (type === "add_holder") {
 			const relationShipFormId = bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.relationship_form_id;
+			const holderConfig = require_buildCartHolderParams.getAppointmentCartHolderConfig(e);
+			const formId = require_holderConfig.isHolderConfigEnabled(holderConfig) ? holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.resource_id : void 0;
+			const skuRelationFormId = require_buildCartHolderParams.getSkuRelationFormId(holderMap, formId);
 			return require_utils.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: _pisell_utils.locales.getText("pisell2.event.create.form"),
 				utils,
 				callback: function() {
 					var _ref = require_asyncToGenerator._asyncToGenerator(function* (res) {
 						if ((res === null || res === void 0 ? void 0 : res.status) === "success") {
 							let result = void 0;
+							if (formId) {
+								const { formRecordId, mainField } = require_buildCartHolderParams.handleCartHolderFormSuccess({
+									res,
+									formId,
+									skuRelationFormId,
+									utils,
+									module: appointmentBooking
+								});
+								result = require_buildCartHolderParams.buildCartHolderOption(require_objectSpread2._objectSpread2(require_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 require_utils$1.handleAddHolder({
 								res,
@@ -112,24 +152,36 @@ const CartItem = ({ onNext, renderContactInfo }) => {
 	};
 	const products = (0, react.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 = require_buildCartHolderParams.getAppointmentCartHolderConfig(item);
+			const holderParams = require_buildCartHolderParams.buildCartHolderParams({
+				item,
+				holderConfig,
+				formData: require_holderConfig.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 require_objectSpread2._objectSpread2(require_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 = require_utils.getMultiResources(item, currentResourceData === null || currentResourceData === void 0 ? void 0 : currentResourceData.currentSelectedResource, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key);
 			return require_objectSpread2._objectSpread2(require_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: 结算列表数据
@@ -189,8 +241,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/lib/components/appointmentBooking/components/ConfirmInformation/index.js

@@ -3,6 +3,7 @@ const require_useEngineContext = require("../../../../hooks/useEngineContext.js"
 const require_objectSpread2 = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
 const require_asyncToGenerator = require("../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/asyncToGenerator.js");
 const require_ContactInfoContent = require("../../../../plus/contactInfoModal/ContactInfoContent.js");
+const require_holderConfig = require("../../../../utils/holderConfig.js");
 const require_utils = require("../../utils.js");
 const require_useLoginUser = require("../../../../hooks/useLoginUser.js");
 const require_index = require("../../../productStockCheckModal/index.js");
@@ -25,7 +26,7 @@ const ConfirmInformation = (0, react.forwardRef)((props, ref) => {
 	const utils = require_hooks.contextUtils();
 	const { pubsub } = context.appHelper.utils;
 	const { appointmentBooking, summary, isAgreeDepositPolicy, setLoading, carts, setTimes } = require_context.useAppointmentBookingContext();
-	const { isRetailTemplate, bookingSetting } = require_hooks.useAppointmentBookingSetting();
+	const { isRetailTemplate, bookingSetting, isFormSubject } = require_hooks.useAppointmentBookingSetting();
 	console.log(bookingSetting, "bookingSetting");
 	const [form] = antd.Form.useForm();
 	const userInfo = require_useLoginUser.default();
@@ -181,10 +182,14 @@ const ConfirmInformation = (0, react.forwardRef)((props, ref) => {
 	const onCheckout = function() {
 		var _ref5 = require_asyncToGenerator._asyncToGenerator(function* (extraData) {
 			try {
+				const _extraData = (carts === null || carts === void 0 ? void 0 : carts.some((item) => {
+					var _item$_productInit;
+					return require_holderConfig.isHolderConfigEnabled(item === null || item === void 0 || (_item$_productInit = item._productInit) === null || _item$_productInit === void 0 ? void 0 : _item$_productInit.holder_config);
+				})) ? require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, extraData), {}, { is_add_holder_info: isFormSubject }) : extraData;
 				const { deposit } = summary;
 				const customer = require_utils.formatAppointmentCustomerInfo(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, userInfo), extraData === null || extraData === void 0 ? void 0 : extraData.contacts_info));
 				logCheckout("调用 submitOrder", require_objectSpread2._objectSpread2({ products: require_utils.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 返回", require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({ products: require_utils.formatAppointmentCartSummary(carts) }, customer), {}, {
 					order_id: order_id || null,

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

@@ -29,6 +29,7 @@ const Layout = () => {
 	const { currentStep, setResourceOtherParams, resourceOtherParams, setIsAgreeDepositPolicy, appointmentBooking, setLoading, policyParams, closePolicy, currentStepParams, setIsErrorHolder } = require_context.useAppointmentBookingContext();
 	const { isDateSelectedFirst, isFormSubject, isRetailTemplate } = require_hooks.useAppointmentBookingSetting();
 	const { isLogin } = require_hooks.useAppointmentBookingLogin();
+	const isLoggedIn = isLogin();
 	const { getHolders } = require_hooks.useAppointmentBookingAccount();
 	const { removeStep } = require_hooks.useAppointmentBookingStep();
 	const { shopDiscount } = require_hooks.useShopDiscount();
@@ -49,7 +50,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);
@@ -88,11 +89,12 @@ const Layout = () => {
 		} catch (error) {}
 	}, [isFormSubject, isRetailTemplate]);
 	(0, react.useEffect)(() => {
-		if (isFormSubject && isLogin && !isRetailTemplate) getHolders();
+		if (isFormSubject && isLoggedIn && !isRetailTemplate) getHolders();
 	}, [
 		isFormSubject,
-		isLogin,
-		isRetailTemplate
+		isLoggedIn,
+		isRetailTemplate,
+		appointmentBooking
 	]);
 	(0, react.useEffect)(() => {
 		var _currentStep$step;