@pisell/private-materials 6.12.362 → 6.12.363

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.362",
+  "version": "6.12.363",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -75,9 +75,9 @@
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.4",
     "@pisell/utils": "3.0.7",
-    "@pisell/materials": "6.12.86",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.12"
+    "@pisell/date-picker": "3.0.12",
+    "@pisell/materials": "6.12.86"
   },
   "peerDependencies": {
     "react": "^18.0.0",

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

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