@pisell/private-materials 6.12.166 → 6.12.168

package/lib/components/HDLKiosk/slices/index.js

@@ -3,13 +3,14 @@ const require_slice$1 = require("./customization/slice.js");
 const require_slice$2 = require("./fulfillment/slice.js");
 const require_slice$3 = require("./identity/slice.js");
 const require_slice$4 = require("./payment/slice.js");
+const require_slice$5 = require("./primaryProductPrompt/slice.js");
 //#region src/components/HDLKiosk/slices/index.ts
 const hdlKioskSlices = Object.freeze([
 	require_slice$3.identitySlice,
 	require_slice$2.fulfillmentSlice,
 	require_slice$1.customizationSlice,
 	require_slice.catalogSlice,
-	require_slice.catalogWithPrimaryProductPromptSlice,
+	require_slice$5.primaryProductPromptSlice,
 	require_slice$4.paymentMethodSlice,
 	require_slice$4.paymentCompletedSlice
 ]);

package/lib/components/HDLKiosk/slices/payment/Screen/index.js

@@ -44,8 +44,8 @@ function PaymentMethodIcon({ code, type }) {
 function CheckoutScreen({ model, orderBar, send }) {
 	var _model$paymentFeedbac;
 	const goBack = (0, react.useCallback)(() => send({
-		kind: "outcome",
-		outcome: "back"
+		kind: "navigation",
+		direction: "back"
 	}), [send]);
 	const hasOrder = Boolean(orderBar && orderBar.cartLineCount > 0);
 	const cartMutable = hasOrder && model.canLeavePayment;
@@ -176,9 +176,9 @@ function CheckoutScreen({ model, orderBar, send }) {
 				dismissCurrentFeedback();
 				if (eftpos) {
 					send({
-						kind: "outcome",
-						outcome: "eftposSelected",
-						operationInput: { paymentMethodId: method.id }
+						kind: "command",
+						command: "checkout.payEftpos",
+						input: { paymentMethodId: method.id }
 					});
 					return;
 				}

package/lib/components/HDLKiosk/slices/payment/slice.js

@@ -5,18 +5,17 @@ const require_checkout = require("../../app/operations/checkout.js");
 const paymentMethodSlice = require_defineSlice.defineSlice({
 	id: "paymentMethod",
 	screen: { id: "checkout" },
-	commands: { requestStaffPaymentApproval: require_checkout.checkoutRequestStaffPaymentApprovalOperation },
-	outcomes: {
-		eftposSelected: require_defineSlice.effect(require_checkout.checkoutPayEftposOperation),
-		confirmed: require_defineSlice.guard("payment.succeeded", { navigate: "next" }),
-		back: require_defineSlice.back()
-	}
+	commands: {
+		payEftpos: require_checkout.checkoutPayEftposOperation,
+		requestStaffPaymentApproval: require_checkout.checkoutRequestStaffPaymentApprovalOperation
+	},
+	intents: { complete: require_defineSlice.intentPrecondition("payment.succeeded", { navigate: "next" }) }
 });
 /** 支付完成仍复用 Checkout Screen，仅作为 Workflow 的成功终态。 */
 const paymentCompletedSlice = require_defineSlice.defineSlice({
 	id: "paymentCompleted",
 	screen: { id: "checkout" },
-	outcomes: {}
+	intents: {}
 });
 //#endregion
 exports.paymentCompletedSlice = paymentCompletedSlice;

package/lib/components/HDLKiosk/slices/primaryProductPrompt/slice.js

@@ -0,0 +1,14 @@
+const require_defineSlice = require("../../kernel/application/defineSlice.js");
+//#region src/components/HDLKiosk/slices/primaryProductPrompt/slice.ts
+/** 主商品询问 Slice：只表达是否进入称重定制，不承担 Catalog 页面职责。 */
+const primaryProductPromptSlice = require_defineSlice.defineSlice({
+	id: "primaryProductPrompt",
+	screen: { id: "primaryProductPrompt" },
+	presentation: "modal",
+	intents: {
+		complete: require_defineSlice.intentPrecondition("cart.notEmpty", { navigate: "next" }),
+		omit: require_defineSlice.intentPrecondition("cart.notEmpty")
+	}
+});
+//#endregion
+exports.primaryProductPromptSlice = primaryProductPromptSlice;

package/lib/components/HDLKiosk/slices/primaryProductPrompt/view.js

@@ -0,0 +1,25 @@
+const require_runtime = require("../../../../_virtual/_rolldown/runtime.js");
+const require_index = require("../catalog/PrimaryProductPromptDialog/index.js");
+let react = require("react");
+react = require_runtime.__toESM(react);
+//#region src/components/HDLKiosk/slices/primaryProductPrompt/view.tsx
+/** 主商品询问展示：将用户选择转换为标准 complete/omit 结果。 */
+function PrimaryProductPromptView({ busy, send }) {
+	return /* @__PURE__ */ react.default.createElement(require_index.PrimaryProductPromptDialog, {
+		busy,
+		onDecline: () => send({
+			kind: "intent",
+			intent: "omit"
+		}),
+		onAccept: () => send({
+			kind: "intent",
+			intent: "complete"
+		})
+	});
+}
+const renderPrimaryProductPrompt = ({ viewSnapshot, bindActivity }) => /* @__PURE__ */ react.default.createElement(PrimaryProductPromptView, {
+	busy: viewSnapshot.status === "running",
+	send: bindActivity("primaryProductPrompt")
+});
+//#endregion
+exports.renderPrimaryProductPrompt = renderPrimaryProductPrompt;

package/lib/components/HDLKiosk/utils.js

@@ -1,4 +1,5 @@
 require("../../_virtual/_rolldown/runtime.js");
+const require_selectors = require("./kernel/workflow/selectors.js");
 let _pisell_utils = require("@pisell/utils");
 //#region src/components/HDLKiosk/utils.ts
 function fallbackErrorMessage(surface) {
@@ -95,8 +96,8 @@ function createActivityScreenModel(screenId, snapshot, node, sales, businessMode
 		title,
 		description,
 		busy: snapshot.status === "running",
-		canContinue: snapshot.status === "idle" && canReviewCatalog && !placeholderBlocked && Boolean(node.on.completed || node.on.detected),
-		canGoBack: snapshot.status === "idle" && Boolean(node.on.back),
+		canContinue: snapshot.status === "idle" && canReviewCatalog && !placeholderBlocked && Boolean(node.on.complete),
+		canGoBack: snapshot.status === "idle" && require_selectors.canNavigateBack(snapshot),
 		placeholder,
 		placeholderBlocked,
 		errorMessage: error === null || error === void 0 ? void 0 : error.message,

package/lib/components/bigSale/templates/HDLKiosk/auth/HDLKioskIdentityAuthPanel.js

@@ -138,12 +138,25 @@ function _resolveCustomerFromAuthResult() {
 	});
 	return _resolveCustomerFromAuthResult.apply(this, arguments);
 }
-function HDLKioskIdentityAuthPanel({ context, registerAndLoginModuleName, disabled, onAuthenticated, onAuthError, onCustomerResolved }) {
+function HDLKioskIdentityAuthPanel({ context, registerAndLoginModuleName, disabled, onAuthenticated, onAuthError, onBusyChange, onCustomerResolved }) {
 	const engineContext = require_useEngineContext.default();
 	const [view, setView] = (0, react.useState)("login");
 	const [submitting, setSubmitting] = (0, react.useState)(false);
+	const [authLoading, setAuthLoading] = (0, react.useState)(false);
 	const loginConfig = (0, react.useMemo)(buildLoginConfig, []);
 	const registerConfig = (0, react.useMemo)(buildRegisterConfig, []);
+	(0, react.useEffect)(() => {
+		onBusyChange === null || onBusyChange === void 0 || onBusyChange(submitting || authLoading);
+	}, [
+		authLoading,
+		onBusyChange,
+		submitting
+	]);
+	(0, react.useEffect)(() => {
+		return () => {
+			onBusyChange === null || onBusyChange === void 0 || onBusyChange(false);
+		};
+	}, [onBusyChange]);
 	const completeWithCustomer = function() {
 		var _ref11 = require_asyncToGenerator._asyncToGenerator(function* (originResult, _method, authFormData) {
 			if (submitting || disabled || !registerAndLoginModuleName) return;
@@ -177,6 +190,7 @@ function HDLKioskIdentityAuthPanel({ context, registerAndLoginModuleName, disabl
 		config: loginConfig,
 		visible: true,
 		registerAndLoginModuleName,
+		onLoadingChange: setAuthLoading,
 		onSwitchToRegister: () => setView("register"),
 		onLogin: completeWithCustomer,
 		onError: onAuthError
@@ -184,6 +198,7 @@ function HDLKioskIdentityAuthPanel({ context, registerAndLoginModuleName, disabl
 		config: registerConfig,
 		visible: true,
 		registerAndLoginModuleName,
+		onLoadingChange: setAuthLoading,
 		onGoToLogin: () => setView("login"),
 		onRegister: completeWithCustomer,
 		onError: onAuthError

package/lib/pro/Login2.0/Login2.d.ts

@@ -24,6 +24,8 @@ interface Login2Config {
 }
 /** 登录组件事件 */
 interface Login2Events {
+  /** 内部异步认证任务的执行状态 */
+  onLoadingChange?: (loading: boolean) => void;
   /** 登录回调 */
   onLogin?: (originResult: any, method: AuthMethodType, data: LoginFormData, channel?: string) => Promise<void> | void;
   /** 三方登录回调 */

package/lib/pro/Login2.0/Login2.js

@@ -27,7 +27,7 @@ require("./index.less");
 * 支持邮箱、手机、三方登录
 * 组件宽度固定 360px
 */
-const Login2 = ({ config, visible = true, onClose, className, style, onLogin, onOAuthLogin, onSendVerificationCode, onForgotPassword, onSwitchToRegister, onError, registerAndLoginModule, registerAndLoginModuleName }) => {
+const Login2 = ({ config, visible = true, onClose, className, style, onLogin, onOAuthLogin, onSendVerificationCode, onForgotPassword, onSwitchToRegister, onError, onLoadingChange, registerAndLoginModule, registerAndLoginModuleName }) => {
 	var _context$appHelper, _config$ui, _config$emailLinkVeri, _config$emailLinkVeri2, _config$emailLinkVeri4;
 	const [form] = antd.Form.useForm();
 	const [loading, setLoading] = (0, react.useState)(false);
@@ -37,6 +37,14 @@ const Login2 = ({ config, visible = true, onClose, className, style, onLogin, on
 	const registerAndLogin = registerAndLoginModule !== null && registerAndLoginModule !== void 0 ? registerAndLoginModule : pisellOS === null || pisellOS === void 0 ? void 0 : pisellOS.getModule(registerAndLoginModuleName || "registerAndLogin");
 	const context = require_useEngineContext.default();
 	const storage = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.storage;
+	(0, react.useEffect)(() => {
+		onLoadingChange === null || onLoadingChange === void 0 || onLoadingChange(loading);
+	}, [loading, onLoadingChange]);
+	(0, react.useEffect)(() => {
+		return () => {
+			onLoadingChange === null || onLoadingChange === void 0 || onLoadingChange(false);
+		};
+	}, [onLoadingChange]);
 	const rememberMeWatch = antd.Form.useWatch("remember_me", form);
 	(0, react.useEffect)(() => {
 		if (typeof rememberMeWatch === "boolean" && !rememberMeWatch) {

package/lib/pro/Login2.0/Register2.d.ts

@@ -27,6 +27,8 @@ interface Register2Config {
 }
 /** 注册组件事件 */
 interface Register2Events {
+  /** 内部异步认证任务的执行状态 */
+  onLoadingChange?: (loading: boolean) => void;
   /** 注册回调 */
   onRegister?: (originResult: any, method: AuthMethodType, data: RegisterFormData, channel?: string) => Promise<void> | void;
   /** 三方登录回调 */

package/lib/pro/Login2.0/Register2.js

@@ -36,7 +36,7 @@ require("./steps/steps.less");
 * 支持邮箱、手机、三方注册
 * 组件宽度固定 360px
 */
-const Register2 = ({ config, visible = true, onClose, className, style, onRegister, onOAuthLogin, onSendVerificationCode, onEmailLinkExpired, onGoToLogin, onError, registerAndLoginModule, registerAndLoginModuleName }) => {
+const Register2 = ({ config, visible = true, onClose, className, style, onRegister, onOAuthLogin, onSendVerificationCode, onEmailLinkExpired, onGoToLogin, onError, onLoadingChange, registerAndLoginModule, registerAndLoginModuleName }) => {
 	var _context$appHelper, _utils$getStore, _utils$getStore$getSt, _config$ui, _config$emailLinkVeri3, _config$ui4, _config$ui5, _config$ui6, _config$ui7, _config$ui8, _config$ui9;
 	const [form] = antd.Form.useForm();
 	const [loading, setLoading] = (0, react.useState)(false);
@@ -45,6 +45,14 @@ const Register2 = ({ config, visible = true, onClose, className, style, onRegist
 	const [codeError, setCodeError] = (0, react.useState)("");
 	const pisellOS = require_useEngineContext.usePisellOS();
 	const registerAndLogin = registerAndLoginModule !== null && registerAndLoginModule !== void 0 ? registerAndLoginModule : pisellOS === null || pisellOS === void 0 ? void 0 : pisellOS.getModule(registerAndLoginModuleName || "registerAndLogin");
+	(0, react.useEffect)(() => {
+		onLoadingChange === null || onLoadingChange === void 0 || onLoadingChange(loading);
+	}, [loading, onLoadingChange]);
+	(0, react.useEffect)(() => {
+		return () => {
+			onLoadingChange === null || onLoadingChange === void 0 || onLoadingChange(false);
+		};
+	}, [onLoadingChange]);
 	const context = require_useEngineContext.default();
 	const utils = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {};
 	const shopId = ((_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 || (_utils$getStore$getSt = _utils$getStore.getState) === null || _utils$getStore$getSt === void 0 || (_utils$getStore$getSt = _utils$getStore$getSt.call(_utils$getStore)) === 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) || 9;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.166",
+  "version": "6.12.168",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -70,10 +70,10 @@
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.3",
-    "@pisell/utils": "3.0.4",
-    "@pisell/materials": "6.12.50",
     "@pisell/date-picker": "3.0.10",
-    "@pisell/icon": "0.0.11"
+    "@pisell/utils": "3.0.4",
+    "@pisell/icon": "0.0.11",
+    "@pisell/materials": "6.12.50"
   },
   "peerDependencies": {
     "react": "^18.0.0",