@pisell/private-materials 6.12.167 → 6.12.168

package/es/plus/saleDetail/components/DetailActions/index.js

@@ -9,7 +9,6 @@ import { useSalesSdk } from "../../../salesSdk/hooks/useSalesSdk.js";
 import { useSalesSdkCart } from "../../../salesSdk/hooks/useSalesSdkCart.js";
 import { useSalesSdkGlobalScanActivity } from "../../../salesSdk/context/SalesSdkGlobalScanActivityContext.js";
 import { useSalesSdkSummary } from "../../../salesSdk/hooks/useSalesSdkSummary.js";
-import "../../../salesSdk/index.js";
 import { getNumericAmount, getSalesHostModule, resolveSaleDetailOrderIdFromSales, resolveSaleDetailOrderIdFromSalesResult, shouldCloseDialogAfterCheckout, updateLocalOrder } from "./utils.js";
 import { getRemotePrintActions, getWristbandList } from "../../serve.js";
 import { deriveSaleOrderSubmitState } from "../../actions/state.js";

package/es/plus/saleDetail/components/SummaryFinancialSections/index.js

@@ -3,7 +3,6 @@ import { resolvePaymentMethodName, usePaymentMethodNameMap } from "../../../pise
 import { useSalesSdk } from "../../../salesSdk/hooks/useSalesSdk.js";
 import { useSalesSdkCart } from "../../../salesSdk/hooks/useSalesSdkCart.js";
 import { useSalesSdkSummary } from "../../../salesSdk/hooks/useSalesSdkSummary.js";
-import "../../../salesSdk/index.js";
 import React, { memo, useMemo } from "react";
 import { formatAmount, locales } from "@pisell/utils";
 import Decimal from "decimal.js";

package/es/plus/saleDetail/index.js

@@ -4,7 +4,6 @@ import { useSalesSdk } from "../salesSdk/hooks/useSalesSdk.js";
 import { SalesSdkProvider } from "../salesSdk/context/SalesSdkProvider.js";
 import { SalesSdkDishProvider } from "../salesSdk/context/SalesSdkDishContext.js";
 import { SalesSdkBookingContextProvider } from "../salesSdk/context/SalesSdkBookingContext.js";
-import "../salesSdk/index.js";
 import Base_default from "./Base.js";
 import React, { forwardRef, useImperativeHandle } from "react";
 //#region src/plus/saleDetail/index.tsx

package/es/plus/saleDetail/tmpl/B/components/Dish/index.js

@@ -1,7 +1,6 @@
 import useStableInstanceId from "../../../../../../hooks/useStableInstanceId.js";
 import { useSalesSdkDish } from "../../../../../salesSdk/hooks/useSalesSdkDish.js";
 import { useCurrentSalesSdkDish } from "../../../../../salesSdk/hooks/useCurrentSalesSdkDish.js";
-import "../../../../../salesSdk/index.js";
 import { SaleDetailStatusOverview } from "../shared/StatusOverview.js";
 import { DishGroupView } from "./DishGroupView.js";
 import dayjs from "dayjs";

package/es/plus/saleDetail/tmpl/B/index.js

@@ -1,7 +1,6 @@
 import { _objectSpread2 } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import useEngineContext from "../../../../hooks/useEngineContext.js";
 import { useCurrentSalesSdkDish } from "../../../salesSdk/hooks/useCurrentSalesSdkDish.js";
-import "../../../salesSdk/index.js";
 import { getInternalNotesByScheduleEvent } from "../../serve.js";
 import { TEMPLATE_B_PAY_ACTIONS, TEMPLATE_B_SUMMARY_ACTIONS } from "../../components/DetailActions/configs/index.js";
 import { DetailActions } from "../../components/DetailActions/index.js";

package/es/plus/salesSdk/utils/addProductWithFlowDebounced.js

@@ -342,4 +342,4 @@ function createAddProductWithFlowDebounced(deps) {
 	};
 }
 //#endregion
-export { createAddProductWithFlowDebounced, shouldBypassAddProductDebounce };
+export { createAddProductWithFlowDebounced };

package/es/plus/salesSdk/utils/bookingDate.js

@@ -31,4 +31,4 @@ function subscribeBookingDateChange(bookingTicket, callback) {
 	return typeof off === "function" ? off : () => {};
 }
 //#endregion
-export { BOOKING_CONTEXT_DATE_EVENT, formatBookingDateTime, subscribeBookingDateChange };
+export { formatBookingDateTime, subscribeBookingDateChange };

package/es/plus/salesSdk/utils/customerAuthGate.js

@@ -62,4 +62,4 @@ function normalizeCustomerAuthCustomer(value) {
 	return null;
 }
 //#endregion
-export { isHolderRequiredProduct, isKioskRuntime, isValidOrderCustomerId, normalizeCustomerAuthCustomer, resolveCustomerAuthCurrentCustomerId, shouldPromptCustomerAuthForProduct };
+export { isValidOrderCustomerId, normalizeCustomerAuthCustomer, resolveCustomerAuthCurrentCustomerId, shouldPromptCustomerAuthForProduct };

package/es/plus/salesSdk/utils/enrichCartLineHolderDisplay.js

@@ -71,4 +71,4 @@ function buildHolderListRequestKey(params) {
 	});
 }
 //#endregion
-export { buildHolderListRequestKey, buildHolderListRequestParams, enrichCartBookingHolderDisplay, pickHolderIdFromBooking, resolveHolderDisplayConfig };
+export { buildHolderListRequestKey, buildHolderListRequestParams, enrichCartBookingHolderDisplay, resolveHolderDisplayConfig };

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

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

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

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

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

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

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

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

package/lib/components/HDLKiosk/app/ScreenRenderer.js

@@ -8,8 +8,8 @@ let _pisell_utils = require("@pisell/utils");
 //#region src/components/HDLKiosk/app/ScreenRenderer.tsx
 /**
 * 文件角色：把当前 Workflow Node 交给其 Slice 自有 View 渲染。
-* 运行机制：从应用 View 注册表按 Activity 读取同步组件；Modal 节点先渲染 base
-* Slice，再叠加当前 Slice View。
+* 运行机制：从应用 View 注册表按 Activity 读取同步组件；先渲染 Actor
+* Surface 保留的 Page，再按顺序叠加 Modal Slice View。
 * 边界：只组装 View Context，不调用 Host、不创建 ViewModel、不决定下一节点。
 */
 function ScreenRenderer({ definition, snapshot, sales, send, commandState = { busy: false }, resetting, capabilities, businessMode = "prototype", scaleMinimumWeightKg = .01, renderIdentityAuth, memberAction = {
@@ -24,10 +24,10 @@ function ScreenRenderer({ definition, snapshot, sales, send, commandState = { bu
 	methods: [],
 	loading: false
 } }) {
-	var _activeNode$presentat, _commandState$error;
+	var _definition$nodes$sna, _commandState$error;
 	const activeNode = definition.nodes[snapshot.nodeId];
-	const modalBaseNodeId = ((_activeNode$presentat = activeNode.presentation) === null || _activeNode$presentat === void 0 ? void 0 : _activeNode$presentat.mode) === "modal" ? activeNode.presentation.base : void 0;
-	const renderedNode = definition.nodes[modalBaseNodeId !== null && modalBaseNodeId !== void 0 ? modalBaseNodeId : snapshot.nodeId];
+	const pageNode = (_definition$nodes$sna = definition.nodes[snapshot.surface.pageStepId]) !== null && _definition$nodes$sna !== void 0 ? _definition$nodes$sna : activeNode;
+	const overlayNodes = snapshot.surface.overlays.map((stepId) => definition.nodes[stepId]).filter((node) => Boolean(node));
 	const bindActivity = (activityId) => (action) => {
 		send(action.kind === "intent" || action.kind === "navigation" ? require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, action), {}, { activityId }) : action);
 	};
@@ -66,7 +66,7 @@ function ScreenRenderer({ definition, snapshot, sales, send, commandState = { bu
 		};
 		return /* @__PURE__ */ react.default.createElement(SliceView, context);
 	};
-	return /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, renderNode(renderedNode), modalBaseNodeId ? renderNode(activeNode) : null);
+	return /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, renderNode(pageNode), overlayNodes.map((node) => /* @__PURE__ */ react.default.createElement(react.default.Fragment, { key: node.id }, renderNode(node))));
 }
 //#endregion
 exports.ScreenRenderer = ScreenRenderer;

package/lib/components/HDLKiosk/app/workflow/barcode.js

@@ -19,17 +19,11 @@ const barcodeWorkflow = require_defineApplication.defineWorkflow({
 		require_slice.catalogSlice,
 		{
 			slice: require_slice$4.primaryProductPromptSlice,
-			presentation: {
-				mode: "modal",
-				base: "catalog"
-			},
-			visitPolicy: "reuseResolution",
-			on: { skip: "fulfillment" }
-		},
-		{
-			slice: require_slice$1.customizationSlice,
-			visitPolicy: "reuseResolution"
+			presentation: { mode: "modal" },
+			visitPolicy: "once",
+			on: { omit: "fulfillment" }
 		},
+		require_slice$1.customizationSlice,
 		require_slice$2.fulfillmentSlice,
 		require_slice$3.paymentMethodSlice,
 		{

package/lib/components/HDLKiosk/docs/00-/346/226/207/344/273/266/345/257/274/350/210/252.md

@@ -84,7 +84,7 @@ slices/<name>/
 
 `Slice` 是作者侧唯一业务能力概念：`defineSlice` 定义能力，`application.slices` 收集能力，Workflow 的 `slice` 字段引用能力；运行期再编译为 Activity Contract。
 
-命名关系必须保持单向：Slice `id` 是业务 Activity；`screen.id` 是页面类别；`app/views.ts` 按 Activity 注册实际 UI。`catalog` 负责商品浏览，`primaryProductPrompt` 负责主商品询问，两者通过 Modal base 组合。支付派发和店员支付授权是 `paymentMethod` 页面内 Command，不创建流程 Intent。
+命名关系必须保持单向：Slice `id` 是业务 Activity；`screen.id` 是页面类别；`app/views.ts` 按 Activity 注册实际 UI。`catalog` 负责商品浏览，`primaryProductPrompt` 负责主商品询问；Prompt 以 Modal 覆盖 Actor Surface 中当前实际 Page，不引用固定背景 Step。支付派发和店员支付授权是 `paymentMethod` 页面内 Command，不创建流程 Intent。
 
 ## 5. `components/`：共享展示能力
 

package/lib/components/HDLKiosk/docs/01-/346/240/270/345/277/203/350/277/220/350/241/214/346/234/272/345/210/266.md

@@ -175,13 +175,11 @@ Workflow 用有序 Slice 数组描述静态编排。数组顺序是默认主路
     catalogSlice,
     {
       slice: primaryProductPromptSlice,
-      presentation: { mode: 'modal', base: 'catalog' },
-      on: { complete: 'customization', skip: 'fulfillment' },
-    },
-    {
-      slice: customizationSlice,
-      on: { complete: 'fulfillment', skip: 'fulfillment' },
+      presentation: { mode: 'modal' },
+      visitPolicy: 'once',
+      on: { omit: 'fulfillment' },
     },
+    customizationSlice,
     fulfillmentSlice,
     paymentMethodSlice,
     { slice: paymentCompletedSlice, end: 'success' },
@@ -206,7 +204,7 @@ Predicate 是本地可信的纯真假判断，例如 `cart.notEmpty`；Intent Pr
 
 业务 Workflow 当前不启用 Slice `beforeEnter` 守卫。Actor 仍保留全局 `beforeEach` 管线，用于 `sessionExit` 等会话安全策略；它不承载 Identity、Fulfillment 等步骤的业务进入条件。
 
-Actor 分别记录已成功向前离开的 Step、每个 Step 已提交的 `complete | skip` Resolution，以及用户实际访问过的页面历史。`back` 按实际页面历史返回，Modal 和 Skip Step 不写入历史；历史为空时 Back 进入会话退出导航。Workflow occurrence 通过 `visitPolicy: 'always' | 'reuseResolution' | 'once'` 明确声明再次访问策略：`always` 重新展示，`reuseResolution` 再次向前时复用已提交 Resolution，`once` 提交后不再进入且不写入 Back 历史。用户通过 Back 退出一个已解决页面时，其旧 Resolution 失效。导航在执行 Activity Exit Effect 之前完成解析；被 cancel/defer 的导航不会先写 Host。
+Actor 分别记录已成功向前离开的 Step、每个 Step 已提交的 `complete | omit` Resolution，以及用户实际访问过的页面历史。`complete` 保留页面的 Back 路径；`omit` 表示将该 Step 从当前流程路径中排除，后续遇到时沿已提交的 `omit` transition 继续，也不写入 Back 历史。Modal 不写入页面历史；历史为空时 Back 进入会话退出导航。Workflow occurrence 只有 `visitPolicy: 'always' | 'once'`：`always` 保留已 `complete` Step 的正常访问，`once` 表示任意 Resolution 提交后不再进入且不写入 Back 历史。用户通过 Back 退出一个已解决页面时，其旧 Resolution 失效。导航在执行 Activity Exit Effect 之前完成解析；被 cancel/defer 的导航不会先写 Host。
 
 退出流程也是导航目标 `{ kind: 'sessionExit' }`。全局 `beforeEach` 对它返回 `defer({ kind: 'confirmEndOrder' })`，Actor 保存带唯一 `navigationId` 的 `pendingNavigation`。Shell 只根据该 request 展示确认；旧 ID 不能恢复后来的导航。
 
@@ -224,7 +222,7 @@ Step ID 只标识“一次出现”。Runtime 判断加载哪类数据、是否
 - Screen 内有哪些不会离开节点的 Command；
 - 使用该 Slice 的流程在支付前需要哪些业务事实。
 
-例如 `identity.complete` / `identity.skip` 可在携带输入时执行 `identity.sync`，`customization.complete` 执行主商品同步，`paymentMethod.complete` 检查 Host 已确认支付成功。EFTPOS 派发和店员支付授权是 Payment 页面 Command，不作为流程 Intent。`defineKioskApplication` 从 Slice 自动生成 Activity Contract 与 Operation 注册信息；远端定义只看到 `Slice ID + 标准 Intent → target`，不能替换这些安全规则。
+例如 `identity.complete` / `identity.omit` 可在携带输入时执行 `identity.sync`，`customization.complete` 执行主商品同步，`paymentMethod.complete` 检查 Host 已确认支付成功。EFTPOS 派发和店员支付授权是 Payment 页面 Command，不作为流程 Intent。`defineKioskApplication` 从 Slice 自动生成 Activity Contract 与 Operation 注册信息；远端定义只看到 `Slice ID + 标准 Intent → target`，不能替换这些安全规则。
 
 Slice 的业务定义与 React View 分离：Slice `id` 是 Workflow 和 Actor 使用的业务 Activity；`screen.id` 会被 Compiler 复制为 Workflow Node 的 `screenId`，供 Shell、Controller 和数据加载策略使用；`app/views.ts` 按 Activity 注册本地可信 View。各 Slice 的 `view.tsx` 仍负责 ViewModel 派生与组件装配，但不会进入 `defineSlice` 或 Workflow Definition。
 
@@ -240,15 +238,15 @@ Slice 的业务定义与 React View 分离：Slice `id` 是 Workflow 和 Actor
 
 Compiler 从实际使用的 Slice 汇总 Checkout Requirement ID，但不把判断函数或 Host 字段写入 Workflow。当前 HDLKiosk 默认注册表为空；未来增加其他业务要求时仍由 [`checkoutRequirements.ts`](../app/operations/checkoutRequirements.ts) 集中判断。
 
-`WorkflowEvent` 同时约束 Activity、Intent 和必要输入：例如 `identity.skip` 必须携带身份输入，`fulfillment.complete` 必须携带 fulfillment context patch。Back 使用不携带业务输入的 `NAVIGATE_BACK`。Barcode 入口的条码输入不是 Workflow Event，而是 Session Controller 在发布会话前交给 `barcode.consume` 的 Command 输入。Screen Command 由 `OperationInputMap` 约束 Command ID 与输入类型。
+`WorkflowEvent` 同时约束 Activity、Intent 和必要输入：例如 `identity.omit` 必须携带身份输入，`fulfillment.complete` 必须携带 fulfillment context patch。Back 使用不携带业务输入的 `NAVIGATE_BACK`。Barcode 入口的条码输入不是 Workflow Event，而是 Session Controller 在发布会话前交给 `barcode.consume` 的 Command 输入。Screen Command 由 `OperationInputMap` 约束 Command ID 与输入类型。
 
 Step 可选声明 Modal 展示关系：
 
 ```ts
-presentation: { mode: 'modal', base: 'customization' }
+presentation: { mode: 'modal' }
 ```
 
-这只控制渲染层级。Compiler 会拒绝缺失、自引用或嵌套 Modal base。
+这只控制渲染层级。Actor Surface 保留进入 Modal 前实际展示的 Page，Workflow 不指定背景 Step。Compiler 会拒绝以 Modal 作为首节点或 Modal 直接进入另一个 Modal。
 
 ### 6.3 结构 Compiler 与业务 Policy 校验
 
@@ -412,7 +410,7 @@ BigSale Login2/Register2
 → 成功后进入下一节点
 ```
 
-认证 UI 通过 HDLKiosk 应用展示层插槽注入，不进入 `defineSlice`、View 注册表或 Kernel。Slice 的 `complete` 在携带输入时执行 `identity.sync`；已登录客户的自动略过使用 `skip` 且不携带输入，因此不会重复写客户。
+认证 UI 通过 HDLKiosk 应用展示层插槽注入，不进入 `defineSlice`、View 注册表或 Kernel。Slice 的 `complete` 在携带输入时执行 `identity.sync`；已登录客户的自动略过使用 `omit` 且不携带输入，因此不会重复写客户。
 
 Shell 登录不是 Workflow 跳转，而是 session-level 插入 Operation：
 
@@ -429,7 +427,7 @@ Shell Login
 
 ### 8.4 Screen Data Controller
 
-只在相关节点加载 Catalog、Weighted Product 或 Customization DTO；使用 AbortController 防止离开页面后的结果写回。Modal Step 通过 `presentation.base` 继续复用底层页面数据，避免称重读数和 options 被重置。
+只在相关节点加载 Catalog、Weighted Product 或 Customization DTO；使用 AbortController 防止离开页面后的结果写回。Modal 激活时，Screen Data Controller 继续使用 Actor Surface 中保留的 `pageStepId`，底层 Page 保持挂载和原数据，不按 Modal Activity 清空或重新加载。
 
 ### 8.5 返回 Entry 能力接口
 
@@ -530,7 +528,7 @@ Workflow View 负责控制器组合、自动推进和会话级 Dialog；Renderer
 
 OS 加购过程中的内部弹窗和业务判断不属于 HDLKiosk Activity、Host Contract 或 Checkout Requirement。HDLKiosk 不读写相关业务事实，只根据主商品加购操作的最终结果决定是否跳转。
 
-Barcode 的主商品询问是独立 `primaryProductPrompt` Modal Slice：Yes 发出 `complete`，No 发出 `skip`。Actor 成功提交后直接记录同名 Resolution。Prompt 和 Customization occurrence 均声明 `visitPolicy: 'reuseResolution'`，因此拒绝或跳过后，从 Fulfillment 返回 Catalog 再次前进不会重复展示它们。正常完成 Customization 后可从 Fulfillment Back 返回编辑；若再退回 Catalog，旧 Customization Resolution 失效，之后前进会重新展示。跳过已有主商品前会先通过本地 Exit Effect 删除对应购物车行。
+Barcode 的主商品询问是独立 `primaryProductPrompt` Modal Slice：Yes 发出 `complete`，No 发出 `omit`。Prompt 声明 `visitPolicy: 'once'`，因此任一选择成功提交后不再询问；关闭 Modal 只执行 Back，没有 Resolution，下次仍会展示。Customization 使用缺省 `always`：`complete` 后保留 Back 编辑能力；`omit` 会先通过本地 Exit Effect 删除已有主商品，再将该 Step 从后续路径和 Back 历史中排除。
 
 ## 11. 四条端到端调用链
 

package/lib/components/HDLKiosk/docs/03-/344/270/232/345/212/241/346/265/201/347/250/213/344/270/216/344/272/244/344/272/222/350/247/204/345/210/231.md

@@ -26,7 +26,7 @@ Entry → Identity → Customization → Catalog → Fulfillment
       → Payment Method / Payment Completed → Entry
 ```
 
-- Quick 的 Identity occurrence 显式声明 `visitPolicy: 'once'`。登录或 Skip 成功后，该 Step 在本会话不再进入，也不写入 Back 页面历史。当没有更早的已访问页面时，Back 的导航目标为 `sessionExit`；全局会话策略返回 `defer(confirmEndOrder)` 并打开结束订单确认。确认后返回 Entry，取消则留在当前页。
+- Quick 的 Identity occurrence 显式声明 `visitPolicy: 'once'`。登录或 Omit 成功后，该 Step 在本会话不再进入，也不写入 Back 页面历史。当没有更早的已访问页面时，Back 的导航目标为 `sessionExit`；全局会话策略返回 `defer(confirmEndOrder)` 并打开结束订单确认。确认后返回 Entry，取消则留在当前页。
 - Fulfillment 统一位于 Payment 之前确认堂食/外带。
 - Customization 只在稳定正净重且必选 options 完整时启用 Next。
 - “I don't need Malatang” 直接跳过主商品并进入 Catalog；如果正在编辑已确认主商品，则先移除该行。
@@ -67,7 +67,7 @@ Entry 消费第一个有效重量边沿后启动以 Fulfillment 为首节点的
 
 ## 6. 会员中途插入
 
-Identity 的 Skip 只表示当前以 Guest 继续。Shell 可在本地策略允许的页面执行 `identity.sync`。登录、Customer 写入、重报价和 Projection 验证成功后仍留在原节点；`partial`/`unknown` 不得带着未确认价格继续。
+Identity 的 Omit 只表示当前以 Guest 继续。Shell 可在本地策略允许的页面执行 `identity.sync`。登录、Customer 写入、重报价和 Projection 验证成功后仍留在原节点；`partial`/`unknown` 不得带着未确认价格继续。
 
 ## 7. UI 和修改规则
 

package/lib/components/HDLKiosk/docs/07-/345/220/216/347/273/255/345/267/245/344/275/234.md

@@ -35,7 +35,7 @@
 ### P1-1 商品和 Catalog
 
 - 将模板内临时固定商品 ID 改为租户/门店正式称重商品配置；商品结构已经切换为 OS `queryProducts`，不得恢复本地 fallback；
-- 确认 Quick 是否允许跳过称重主商品；若不允许，从 `customization` Activity Contract/Workflow 中移除 `skip` Intent；
+- 确认 Quick 是否允许排除称重主商品；若不允许，从 `customization` Activity Contract/Workflow 中移除 `omit` Intent；
 - 大目录分页/虚拟滚动与分类切换性能；分类、子分类和本地搜索首版已完成；
 - 缺货、下架、菜单不可用、价格变化；
 - Barcode 细分 added/requiresSelection/notFound/cancelled；

package/lib/components/HDLKiosk/kernel/README.md

@@ -12,7 +12,7 @@ const identity = defineSlice({
   screen: { id: 'identity' },
   intents: {
     complete: effect(identifyCustomer, { navigate: 'next' }),
-    skip: next(),
+    omit: next(),
   },
   commands: {
     requestSmsCode,

package/lib/components/HDLKiosk/kernel/workflow/actor.js

@@ -50,7 +50,7 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 			visited.add(stepId);
 			const node = definition.nodes[stepId];
 			const storedResolution = stepResolutions.get(stepId);
-			if (!node || !storedResolution || node.visitPolicy !== "reuseResolution" && node.visitPolicy !== "once") return stepId;
+			if (!node || !storedResolution || storedResolution !== "omit" && node.visitPolicy !== "once") return stepId;
 			const transition = node.on[storedResolution];
 			if (!transition) return stepId;
 			stepId = transition.target;
@@ -116,7 +116,16 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 			const direction = !fromNodeId ? "initial" : delta < 0 ? "backward" : "forward";
 			for (let candidateIndex = targetIndex; candidateIndex >= 0 && candidateIndex < definition.stepOrder.length; candidateIndex += delta) {
 				const candidateStepId = definition.stepOrder[candidateIndex];
-				if (definition.nodes[candidateStepId].visitPolicy === "once" && stepResolutions.has(candidateStepId)) continue;
+				const candidateNode = definition.nodes[candidateStepId];
+				if (candidateNode.presentation.mode === "modal") {
+					const fromNode = fromNodeId ? definition.nodes[fromNodeId] : void 0;
+					if (!fromNode || fromNode.presentation.mode === "modal") return {
+						type: "block",
+						error: createWorkflowError(fromNode ? "workflowNestedModalUnsupported" : "workflowModalRequiresPage", "staff")
+					};
+				}
+				const candidateResolution = stepResolutions.get(candidateStepId);
+				if (candidateResolution === "omit" || candidateNode.visitPolicy === "once" && candidateResolution) continue;
 				const decision = beforeEach({
 					navigationId,
 					intentId,
@@ -176,6 +185,10 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 		context: Object.freeze(require_objectSpread2._objectSpread2({}, context)),
 		completedStepIds: Object.freeze([]),
 		stepResolutions: Object.freeze({}),
+		surface: Object.freeze({
+			pageStepId: startingNodeId,
+			overlays: Object.freeze([])
+		}),
 		navigationHistory: Object.freeze([]),
 		lastError: (_ref2 = initialError !== null && initialError !== void 0 ? initialError : initialResolutionError) !== null && _ref2 !== void 0 ? _ref2 : startingNode.end === "blocked" ? createWorkflowError("workflowEndedBlocked", "staff") : void 0
 	});
@@ -184,6 +197,10 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 			context: Object.freeze(require_objectSpread2._objectSpread2({}, next.context)),
 			completedStepIds: Object.freeze([...next.completedStepIds]),
 			stepResolutions: Object.freeze(require_objectSpread2._objectSpread2({}, next.stepResolutions)),
+			surface: Object.freeze({
+				pageStepId: next.surface.pageStepId,
+				overlays: Object.freeze([...next.surface.overlays])
+			}),
 			navigationHistory: Object.freeze([...next.navigationHistory]),
 			pendingNavigation: next.pendingNavigation ? Object.freeze(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, next.pendingNavigation), {}, {
 				to: Object.freeze(require_objectSpread2._objectSpread2({}, next.pendingNavigation.to)),
@@ -197,12 +214,20 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 	const commit = function() {
 		var _ref3 = require_asyncToGenerator._asyncToGenerator(function* (fromNodeId, nodeId, event, nextContext, blocked, lastError, confirmedCheckout) {
 			const node = definition.nodes[nodeId];
+			const surface = node.presentation.mode === "modal" ? Object.freeze({
+				pageStepId: snapshot.surface.pageStepId,
+				overlays: Object.freeze([nodeId])
+			}) : Object.freeze({
+				pageStepId: nodeId,
+				overlays: Object.freeze([])
+			});
 			publish(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, snapshot), {}, {
 				nodeId,
 				status: blocked || node.end === "blocked" ? "blocked" : node.end === "success" ? "finished" : "idle",
 				context: nextContext,
 				completedStepIds: Object.freeze([...completedStepIds]),
 				stepResolutions: Object.freeze(readStepResolutions()),
+				surface,
 				navigationHistory: Object.freeze([...navigationHistory]),
 				pendingNavigation: void 0,
 				confirmedCheckout: confirmedCheckout !== null && confirmedCheckout !== void 0 ? confirmedCheckout : snapshot.confirmedCheckout,
@@ -357,7 +382,7 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 				if (event.intent === "complete" && node.presentation.mode === "page" && movesForward && node.visitPolicy !== "once") {
 					navigationHistory = navigationHistory.filter((stepId) => stepId !== fromNodeId);
 					navigationHistory.push(fromNodeId);
-				} else if (event.intent === "skip") navigationHistory = navigationHistory.filter((stepId) => stepId !== fromNodeId);
+				} else if (event.intent === "omit") navigationHistory = navigationHistory.filter((stepId) => stepId !== fromNodeId);
 				yield commit(fromNodeId, resolvedTarget, event, nextContext, false, void 0, result.confirmedCheckout);
 				return;
 			}
@@ -411,8 +436,13 @@ function createWorkflowActor({ definition, context, sessionEpoch, transitionRunn
 			if (resolution.type === "step") {
 				const fromIndex = definition.stepOrder.indexOf(fromNodeId);
 				if (definition.stepOrder.indexOf(resolution.stepId) < fromIndex) stepResolutions.delete(fromNodeId);
-				const historyIndex = navigationHistory.lastIndexOf(resolution.stepId);
-				if (historyIndex >= 0) navigationHistory = navigationHistory.slice(0, historyIndex);
+				if (definition.nodes[resolution.stepId].presentation.mode === "modal" && definition.nodes[fromNodeId].presentation.mode === "page") {
+					navigationHistory = navigationHistory.filter((stepId) => stepId !== fromNodeId);
+					navigationHistory.push(fromNodeId);
+				} else {
+					const historyIndex = navigationHistory.lastIndexOf(resolution.stepId);
+					if (historyIndex >= 0) navigationHistory = navigationHistory.slice(0, historyIndex);
+				}
 				yield commit(fromNodeId, resolution.stepId, {
 					intentId,
 					intent: "directNavigation"

package/lib/components/HDLKiosk/kernel/workflow/compiler.js

@@ -127,7 +127,7 @@ function compileWorkflowStructure(input, options) {
 			"screen"
 		], stepPath, issues);
 		if (rawStep.screen !== void 0) addIssue(issues, "step.screen.forbidden", `${stepPath}.screen`, "Screen is resolved by the local Activity Contract");
-		if (rawStep.visitPolicy !== void 0 && rawStep.visitPolicy !== "always" && rawStep.visitPolicy !== "reuseResolution" && rawStep.visitPolicy !== "once") addIssue(issues, "step.visitPolicy.invalid", `${stepPath}.visitPolicy`, "Step visitPolicy must be always, reuseResolution or once");
+		if (rawStep.visitPolicy !== void 0 && rawStep.visitPolicy !== "always" && rawStep.visitPolicy !== "once") addIssue(issues, "step.visitPolicy.invalid", `${stepPath}.visitPolicy`, "Step visitPolicy must be always or once");
 		const activityValue = rawStep.activity;
 		if (typeof activityValue !== "string" || !activities.has(activityValue)) addIssue(issues, "activity.unknown", `${stepPath}.activity`, `Unknown activity: ${String(activityValue)}`);
 		const fallbackActivityId = activities.ids[0];
@@ -161,15 +161,11 @@ function compileWorkflowStructure(input, options) {
 		const rawPresentation = rawStep.presentation;
 		let presentation = { mode: "page" };
 		if (rawPresentation !== void 0) {
-			if (isRecord(rawPresentation)) rejectUnknownFields(rawPresentation, ["mode", "base"], `${stepPath}.presentation`, issues);
+			if (isRecord(rawPresentation)) rejectUnknownFields(rawPresentation, ["mode"], `${stepPath}.presentation`, issues);
 			if (!isRecord(rawPresentation)) addIssue(issues, "step.presentation.invalid", `${stepPath}.presentation`, "Step presentation must be an object");
 			else if (rawPresentation.mode !== "page" && rawPresentation.mode !== "modal") addIssue(issues, "step.presentation.mode.invalid", `${stepPath}.presentation.mode`, "Presentation mode must be page or modal");
 			else if (!activity.allowedPresentations.includes(rawPresentation.mode)) addIssue(issues, "activity.presentation.unsupported", `${stepPath}.presentation.mode`, `Activity ${activity.id} does not support ${rawPresentation.mode}`);
-			else if (rawPresentation.mode === "modal") if (typeof rawPresentation.base !== "string" || !rawPresentation.base.trim()) addIssue(issues, "step.presentation.base.invalid", `${stepPath}.presentation.base`, "Modal base must be a non-empty step id");
-			else presentation = {
-				mode: "modal",
-				base: rawPresentation.base.trim()
-			};
+			else if (rawPresentation.mode === "modal") presentation = { mode: "modal" };
 		}
 		if (rawStep.readiness !== void 0 && rawStep.readiness !== "implemented" && rawStep.readiness !== "placeholder") addIssue(issues, "step.readiness.invalid", `${stepPath}.readiness`, "Step readiness must be implemented or placeholder");
 		if (rawStep.end !== void 0 && rawStep.end !== "success" && rawStep.end !== "blocked") addIssue(issues, "step.end.invalid", `${stepPath}.end`, "Step end must be success or blocked");
@@ -235,7 +231,7 @@ function compileWorkflowStructure(input, options) {
 			screenId: activity.screenId,
 			presentation,
 			readiness: rawStep.readiness === "placeholder" ? "placeholder" : void 0,
-			visitPolicy: rawStep.visitPolicy === "reuseResolution" || rawStep.visitPolicy === "once" ? rawStep.visitPolicy : "always",
+			visitPolicy: rawStep.visitPolicy === "once" ? "once" : "always",
 			guardPhases: Object.freeze([...guardPhases]),
 			on: Object.freeze(transitions),
 			end: rawStep.end === "success" || rawStep.end === "blocked" ? rawStep.end : void 0
@@ -246,13 +242,12 @@ function compileWorkflowStructure(input, options) {
 	Object.entries(nodes).forEach(([stepId, node]) => {
 		var _stepIndex$get;
 		const path = `steps.${(_stepIndex$get = stepIndex.get(stepId)) !== null && _stepIndex$get !== void 0 ? _stepIndex$get : 0}`;
-		if (node.presentation.mode === "modal") {
-			const base = nodes[node.presentation.base];
-			if (!base) addIssue(issues, "step.presentation.base.missing", `${path}.presentation.base`, `Modal base step does not exist: ${node.presentation.base}`);
-			else if (node.presentation.base === stepId) addIssue(issues, "step.presentation.base.self", `${path}.presentation.base`, "Modal step cannot use itself as its base");
-			else if (base.presentation.mode === "modal") addIssue(issues, "step.presentation.base.modal", `${path}.presentation.base`, "Modal step cannot use another modal step as its base");
-		}
+		if (node.presentation.mode === "modal" && stepId === stepIds[0]) addIssue(issues, "workflow.initial.modal", `${path}.presentation.mode`, "Workflow initial step must provide a page surface");
 		const transitions = Object.entries(node.on).filter((entry) => entry[1]);
+		transitions.forEach(([intent, transition]) => {
+			var _nodes$transition$tar;
+			if (node.presentation.mode === "modal" && transition && ((_nodes$transition$tar = nodes[transition.target]) === null || _nodes$transition$tar === void 0 ? void 0 : _nodes$transition$tar.presentation.mode) === "modal") addIssue(issues, "transition.modal.nested", `${path}.on.${intent}`, "A modal step cannot navigate directly to another modal step");
+		});
 		if (!node.end && transitions.length === 0) addIssue(issues, "step.deadEnd", path, "A step without outgoing transitions must declare its end state");
 		if (node.end && transitions.length > 0) addIssue(issues, "step.end.hasTransitions", path, "An end step cannot expose outgoing transitions");
 		transitions.forEach(([intent, transition]) => {

package/lib/components/HDLKiosk/runtime/HDLKioskWorkflowView.js

@@ -49,7 +49,7 @@ function HDLKioskWorkflowCartOverlay({ model, busy, memberAction, send, renderCa
 * Host、Workflow Actor 或会话计时器。
 */
 function HDLKioskWorkflowView({ session, host, sales, config, isActive, renderIdentityAuth, renderCartContent, cartOverlayActions, returnToEntry }) {
-	var _snapshot$pendingNavi, _snapshot$pendingNavi2, _activeNode$presentat, _customer$error, _activeNode$presentat2;
+	var _snapshot$pendingNavi, _snapshot$pendingNavi2, _session$definition$n2, _customer$error, _activeNode$presentat;
 	const snapshot = require_useWorkflowSnapshot.useWorkflowSnapshot(session.actor);
 	const sequence = (0, react.useRef)(0);
 	const resetInFlight = (0, react.useRef)(false);
@@ -68,7 +68,7 @@ function HDLKioskWorkflowView({ session, host, sales, config, isActive, renderId
 		var _session$definition$n;
 		return ((_session$definition$n = session.definition.nodes[stepId]) === null || _session$definition$n === void 0 ? void 0 : _session$definition$n.activity) === "customization";
 	});
-	const screenDataNode = ((_activeNode$presentat = activeNode.presentation) === null || _activeNode$presentat === void 0 ? void 0 : _activeNode$presentat.mode) === "modal" ? session.definition.nodes[activeNode.presentation.base] : activeNode;
+	const screenDataNode = (_session$definition$n2 = session.definition.nodes[snapshot.surface.pageStepId]) !== null && _session$definition$n2 !== void 0 ? _session$definition$n2 : activeNode;
 	const paymentSafeForReset = sales.payment.status === "idle" || sales.payment.status === "failed";
 	const resetSession = (0, react.useCallback)(require_asyncToGenerator._asyncToGenerator(function* () {
 		if (resetInFlight.current) return;
@@ -246,7 +246,7 @@ function HDLKioskWorkflowView({ session, host, sales, config, isActive, renderId
 		memberAction,
 		variant: currentScreenId === "identity" ? "identityGate" : "default"
 	}, /* @__PURE__ */ react.default.createElement(require_index$5.HDLKioskBottomBarHost, {
-		mode: ((_activeNode$presentat2 = activeNode.presentation) === null || _activeNode$presentat2 === void 0 ? void 0 : _activeNode$presentat2.mode) === "modal" || endOrderConfirmationOpen || memberLoginOpen ? "masked" : "visible",
+		mode: ((_activeNode$presentat = activeNode.presentation) === null || _activeNode$presentat === void 0 ? void 0 : _activeNode$presentat.mode) === "modal" || endOrderConfirmationOpen || memberLoginOpen ? "masked" : "visible",
 		fallback: endOrderBottomBar,
 		cartOverlayActions,
 		promotionsAvailable: Boolean(renderCartContent)

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

@@ -244,11 +244,11 @@ function CustomizationScreen({ product, loading, errorReference, errorMessage, b
 		send,
 		syncing
 	]);
-	const skipPrimaryProduct = (0, react.useCallback)(() => {
+	const omitPrimaryProduct = (0, react.useCallback)(() => {
 		var _orderBar$primaryLine10;
 		send({
 			kind: "intent",
-			intent: "skip",
+			intent: "omit",
 			operationInput: { lineId: (_orderBar$primaryLine10 = orderBar.primaryLine) === null || _orderBar$primaryLine10 === void 0 ? void 0 : _orderBar$primaryLine10.lineId }
 		});
 	}, [(_orderBar$primaryLine11 = orderBar.primaryLine) === null || _orderBar$primaryLine11 === void 0 ? void 0 : _orderBar$primaryLine11.lineId, send]);
@@ -335,7 +335,7 @@ function CustomizationScreen({ product, loading, errorReference, errorMessage, b
 		type: "button",
 		className: "hdl-customization-skip",
 		disabled: busy || syncing,
-		onClick: skipPrimaryProduct
+		onClick: omitPrimaryProduct
 	}, _pisell_utils.locales.getText("pisell2.hdl-kiosk.customization-skip")));
 }
 //#endregion

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

@@ -9,7 +9,7 @@ const customizationSlice = require_defineSlice.defineSlice({
 	commands: { removePrimaryProduct: require_cart.cartRemoveLineOperation },
 	intents: {
 		complete: require_defineSlice.effect(require_operation.productSyncPrimaryWeightedProductOperation, { navigate: "next" }),
-		skip: require_defineSlice.effect(require_operation.productRemovePrimaryProductOperation, { navigate: "next" })
+		omit: require_defineSlice.effect(require_operation.productRemovePrimaryProductOperation, { navigate: "next" })
 	}
 });
 //#endregion

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

@@ -10,7 +10,7 @@ const QR_CELLS = Object.freeze(Array.from({ length: 49 }, (_, index) => index *
 * Quick Order 的前置会员提示页。
 *
 * 宿主可注入认证 UI；未注入时保留 QR / SMS 视觉 fallback。Skip 继续产生
-* identity.skip Intent，由本地 Exit Policy 同步访客后进入下一步。
+* identity.omit Intent，由本地 Exit Policy 同步访客后进入下一步。
 */
 function IdentityScreen({ model, orderBar, send, renderIdentityAuth }) {
 	const [authBusy, setAuthBusy] = (0, react.useState)(false);
@@ -82,7 +82,7 @@ function IdentityScreen({ model, orderBar, send, renderIdentityAuth }) {
 		disabled: busy,
 		onClick: () => send({
 			kind: "intent",
-			intent: "skip",
+			intent: "omit",
 			operationInput: {}
 		})
 	}, _pisell_utils.locales.getText("pisell2.hdl-kiosk.skip")), model.errorReference ? /* @__PURE__ */ react.default.createElement("div", {

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

@@ -7,7 +7,7 @@ const identitySlice = require_defineSlice.defineSlice({
 	screen: { id: "identity" },
 	intents: {
 		complete: require_defineSlice.effect(require_operation.identitySyncOperation, { navigate: "next" }),
-		skip: require_defineSlice.effect(require_operation.identitySyncOperation, { navigate: "next" })
+		omit: require_defineSlice.effect(require_operation.identitySyncOperation, { navigate: "next" })
 	}
 });
 //#endregion

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

@@ -7,7 +7,7 @@ const primaryProductPromptSlice = require_defineSlice.defineSlice({
 	presentation: "modal",
 	intents: {
 		complete: require_defineSlice.intentPrecondition("cart.notEmpty", { navigate: "next" }),
-		skip: require_defineSlice.intentPrecondition("cart.notEmpty")
+		omit: require_defineSlice.intentPrecondition("cart.notEmpty")
 	}
 });
 //#endregion

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

@@ -3,13 +3,13 @@ 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
-/** 主商品询问展示：将用户选择转换为标准 completed/skipped 结果。 */
+/** 主商品询问展示：将用户选择转换为标准 complete/omit 结果。 */
 function PrimaryProductPromptView({ busy, send }) {
 	return /* @__PURE__ */ react.default.createElement(require_index.PrimaryProductPromptDialog, {
 		busy,
 		onDecline: () => send({
 			kind: "intent",
-			intent: "skip"
+			intent: "omit"
 		}),
 		onAccept: () => send({
 			kind: "intent",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.167",
+  "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/date-picker": "3.0.10",
     "@pisell/utils": "3.0.4",
     "@pisell/icon": "0.0.11",
-    "@pisell/materials": "6.12.50",
-    "@pisell/date-picker": "3.0.10"
+    "@pisell/materials": "6.12.50"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/plus/pisellReservation/index.js

@@ -1,17 +0,0 @@
-import "./serve/formResourcePage.js";
-import "./floorRoomCard/mapRowToFloorRoomCardData.js";
-import "./floorRoomCard/ReservationFloorRoomCard.js";
-import "./floorMap/reservationMock.js";
-import "./floorMap/floorPlanApi.js";
-import "./reservationConstants.js";
-import "./data/bookingToReservationTables.js";
-import "./data/formResourceToReservationTables.js";
-import "./data/salesEmbeddedResourceToTableRows.js";
-import "./floorMap/reservationCards.js";
-import "./PisellReservation.js";
-import "./PisellReservationBookingPage.js";
-import "./PisellVenueControlPage.js";
-import "./PisellVenueWallPage.js";
-import "./PisellReservationTablePage.js";
-import "./components/SelectFloorMapResourceDialog.js";
-export {};