@pisell/private-materials 6.11.693 → 6.11.696

package/lib/components/bigSale/dialog.js

@@ -343,7 +343,7 @@ function BigSaleDialogBootstrap({ open, contentActive, openNonce, orderId, prelo
 */
 function BigSaleDialog(props) {
 	var _createSeed$row2, _createSeed$row$id2, _createSeed$row3;
-	const { open, contentActive = open, onVisualStateSettled, orderId, preloadedSalesDetail, createSeed, onClose, callback, rulesHooks, enableGlobalScanListener, title, preloaded, destroyOnUnmount, osKey = "cached-dine-in-dialog", mode = "retail", businessCode, bookingConfigParams, productDisplayConfig, productLoadParams, productCatalogReady = true, orderType = "table-order", variant, openNonce = 0 } = props;
+	const { open, contentActive = open, onVisualStateSettled, orderId, preloadedSalesDetail, createSeed, onClose, callback, rulesHooks, enableGlobalScanListener, title, preloaded, destroyOnUnmount, osKey = "cached-dine-in-dialog", mode = "retail", businessCode, bookingConfigParams, productDisplayConfig, productLoadParams, productCatalogReady = true, orderType = orderId ? void 0 : "table-order", variant, openNonce = 0 } = props;
 	const isPhoneVariant = variant === "phone";
 	require_index.useCancelPosPermissionOnHide(open);
 	const isEditMode = Boolean(orderId);

package/lib/components/booking/addons/index.js

@@ -1,5 +1,6 @@
 const require_runtime = require("../../../_virtual/_rolldown/runtime.js");
 const require_useEngineContext = require("../../../hooks/useEngineContext.js");
+const require_isWebPos = require("../../../utils/isWebPos.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("../../../pro/posPermission/index.js");
@@ -330,15 +331,14 @@ const Addons = require_model.Provider((props) => {
 	* @Date: 2024-01-30 16:40
 	*/
 	const handleOpenAdd = () => {
-		if (isWebPos) return runWithPermission("order_edit", () => state.action({
+		if (require_isWebPos.resolveAppHelperIsWebPos(isWebPos)) return runWithPermission("order_edit", () => state.action({
 			type: "pisell1.handleOpenCachedBigSale",
-			data: {
-				order_id: state.bookingId,
-				business_code: "retail"
-			},
+			data: { order_id: state.bookingId },
 			callback: (res) => {
-				var _window;
-				(_window = window) === null || _window === void 0 || (_window = _window.shopApi) === null || _window === void 0 || (_window = _window.booking) === null || _window === void 0 || _window.refreshBookingDetail();
+				var _window, _state$callback;
+				const refresh = (_window = window) === null || _window === void 0 || (_window = _window.shopApi) === null || _window === void 0 || (_window = _window.booking) === null || _window === void 0 ? void 0 : _window.refreshBookingDetail;
+				if (typeof refresh === "function") refresh();
+				else (_state$callback = state.callback) === null || _state$callback === void 0 || _state$callback.call(state, { order_id: state.bookingId });
 			}
 		}));
 		if ((isTerminal === null || isTerminal === void 0 ? void 0 : isTerminal()) && platform !== "webpos") {

package/lib/components/booking/components/footer/index.js

@@ -1,5 +1,6 @@
 const require_runtime = require("../../../../_virtual/_rolldown/runtime.js");
 const require_useEngineContext = require("../../../../hooks/useEngineContext.js");
+const require_isWebPos = require("../../../../utils/isWebPos.js");
 const require_IsActiveContext = require("../../../ticketBooking/context/IsActiveContext.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");
@@ -849,15 +850,14 @@ const Footer = (props) => {
 		(_state$onRebook = state.onRebook) === null || _state$onRebook === void 0 || _state$onRebook.call(state);
 	};
 	const handleSale = () => {
-		if (isWebPos) return runWithPermission("order_edit", () => state.action({
+		if (require_isWebPos.resolveAppHelperIsWebPos(isWebPos)) return runWithPermission("order_edit", () => state.action({
 			type: "pisell1.handleOpenCachedBigSale",
-			data: {
-				order_id: state.bookingId,
-				business_code: "ticket"
-			},
+			data: { order_id: state.bookingId },
 			callback: (res) => {
-				var _window5;
-				(_window5 = window) === null || _window5 === void 0 || (_window5 = _window5.shopApi) === null || _window5 === void 0 || (_window5 = _window5.booking) === null || _window5 === void 0 || _window5.refreshBookingDetail();
+				var _window5, _state$callback;
+				const refresh = (_window5 = window) === null || _window5 === void 0 || (_window5 = _window5.shopApi) === null || _window5 === void 0 || (_window5 = _window5.booking) === null || _window5 === void 0 ? void 0 : _window5.refreshBookingDetail;
+				if (typeof refresh === "function") refresh();
+				else (_state$callback = state.callback) === null || _state$callback === void 0 || _state$callback.call(state, { order_id: state.bookingId });
 			}
 		}));
 		if (isTerminal === null || isTerminal === void 0 ? void 0 : isTerminal()) {
@@ -876,15 +876,20 @@ const Footer = (props) => {
 	};
 	const handlePrint = () => {};
 	const handleOrderDetail = () => {
-		if (isWebPos) return state.action({
-			type: "pisell1.handleOpenCachedBigSale",
+		if (require_isWebPos.resolveAppHelperIsWebPos(isWebPos)) return state.action({
+			type: "pisell1.handleOpenSaleDetail",
 			data: {
-				order_id: state.bookingId,
-				business_code: "ticket"
+				osKey: "booking-order-detail",
+				osProps: {
+					orderId: state.bookingId,
+					syncDetailOnOrderChange: true
+				}
 			},
 			callback: (res) => {
-				var _window6;
-				(_window6 = window) === null || _window6 === void 0 || (_window6 = _window6.shopApi) === null || _window6 === void 0 || (_window6 = _window6.booking) === null || _window6 === void 0 || _window6.refreshBookingDetail();
+				var _window6, _state$callback2;
+				const refresh = (_window6 = window) === null || _window6 === void 0 || (_window6 = _window6.shopApi) === null || _window6 === void 0 || (_window6 = _window6.booking) === null || _window6 === void 0 ? void 0 : _window6.refreshBookingDetail;
+				if (typeof refresh === "function") refresh();
+				else (_state$callback2 = state.callback) === null || _state$callback2 === void 0 || _state$callback2.call(state, { order_id: state.bookingId });
 			}
 		});
 		if (isTerminal === null || isTerminal === void 0 ? void 0 : isTerminal()) return interaction.utils.postMessageToApp({

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.less

@@ -121,8 +121,8 @@
   &.selectDate {
     .calendar-content,
     .day-item-calendar-content {
-      border-color: var(--Primary-600, #7f56d9);
-      box-shadow: inset 0 0 0 1px var(--Primary-600, #7f56d9);
+      border-color: var(--theme-color, #7f56d9);
+      box-shadow: inset 0 0 0 1px var(--theme-color, #7f56d9);
       box-sizing: border-box;
     }
   }

package/lib/components/eventBooking/components/resourceUsability/index.less

@@ -81,12 +81,12 @@
 }
 
 .pisell-event-usability-selected {
-  border: 1px solid var(--Primary-600, #7f56d9);
+  border: 1px solid var(--theme-color, #7f56d9);
   // PisellCard 的 hover/background 样式可能晚于业务样式加载；明确覆盖，
   // 避免只剩选中白字而卡片仍是白底。
-  background: var(--Primary-600, #7f56d9) !important;
+  background: var(--theme-color, #7f56d9) !important;
   &:hover {
-    background: var(--Primary-600, #7f56d9) !important;
+    background: var(--theme-color, #7f56d9) !important;
   }
 
   .pisell-event-usability-slot,
@@ -100,6 +100,6 @@
 // box-shadow 补出原来的双像素选中效果。
 .pisell-event-usability.pisell-card-wrap-selected {
   border-width: 1px;
-  border-color: var(--Primary-600, #7f56d9);
-  box-shadow: 0 0 0 1px var(--Primary-600, #7f56d9);
+  border-color: var(--theme-color, #7f56d9);
+  box-shadow: 0 0 0 1px var(--theme-color, #7f56d9);
 }

package/lib/plus/skuOptionsSelection/components/OptionsModal/index.js

@@ -27,9 +27,8 @@ const OptionsModal = (props) => {
 	const renderType = (customConfig === null || customConfig === void 0 ? void 0 : customConfig.modalRenderType) || (variant === "phone" ? "drawer" : "modal");
 	const isDrawer = renderType === "drawer";
 	const isTabletVariant = !isDrawer && (variant === "tablet" || variant === "smallTablet");
-	const viewportAspectRatio = typeof window !== "undefined" && window.innerHeight > 0 ? window.innerWidth / window.innerHeight : 0;
-	const isPosTabletViewport = !isDrawer && variant === "pos" && typeof window !== "undefined" && window.innerWidth <= 1400 && viewportAspectRatio >= 1.25 && viewportAspectRatio <= 1.65;
-	const shouldUseLargeModal = isTabletVariant || isPosTabletViewport;
+	const shouldUsePrimaryModalLayout = !isDrawer;
+	const modalWidth = isDrawer ? "100%" : isTabletVariant ? "95%" : "80%";
 	const platform = isDrawer ? "h5" : variant === "tablet" || variant === "smallTablet" ? "ipad" : "pc";
 	(0, react.useEffect)(() => {
 		if (!open || typeof window === "undefined" || typeof document === "undefined") return;
@@ -41,21 +40,20 @@ const OptionsModal = (props) => {
 				const rect = wrapper === null || wrapper === void 0 ? void 0 : wrapper.getBoundingClientRect();
 				const computedStyle = wrapper ? window.getComputedStyle(wrapper) : null;
 				const viewport = window.visualViewport;
-				const expectedWidth = shouldUseLargeModal ? window.innerWidth * .95 : null;
+				const expectedWidth = shouldUsePrimaryModalLayout ? window.innerWidth * (isTabletVariant ? .95 : .8) : window.innerWidth;
 				const actualWidth = (_rect$width = rect === null || rect === void 0 ? void 0 : rect.width) !== null && _rect$width !== void 0 ? _rect$width : null;
 				logger === null || logger === void 0 || (_logger$addLog = logger.addLog) === null || _logger$addLog === void 0 || _logger$addLog.call(logger, {
-					type: shouldUseLargeModal && actualWidth != null && actualWidth < window.innerWidth * .9 ? "warning" : "info",
+					type: shouldUsePrimaryModalLayout && actualWidth != null && actualWidth < expectedWidth * .9 ? "warning" : "info",
 					title: "SKU选项弹窗-布局",
 					metadata: {
 						reason,
 						variant,
 						renderType,
 						isTabletVariant,
-						isPosTabletViewport,
-						shouldUseLargeModal,
+						primaryModalLayoutApplied: shouldUsePrimaryModalLayout,
 						configuredWidth: (customConfig === null || customConfig === void 0 ? void 0 : customConfig.modalWidth) || "480px",
 						expectedWidth,
-						expectedHeight: shouldUseLargeModal ? "95%" : null,
+						expectedHeight: "95%",
 						actual: rect ? {
 							width: Number(rect.width.toFixed(2)),
 							height: Number(rect.height.toFixed(2)),
@@ -69,7 +67,7 @@ const OptionsModal = (props) => {
 							maxHeight: computedStyle.maxHeight,
 							transform: computedStyle.transform
 						} : null,
-						largeModalSizeApplied: !shouldUseLargeModal || actualWidth != null && actualWidth >= window.innerWidth * .9,
+						primaryModalSizeApplied: !shouldUsePrimaryModalLayout || actualWidth != null && actualWidth >= expectedWidth * .9,
 						window: {
 							innerWidth: window.innerWidth,
 							innerHeight: window.innerHeight,
@@ -98,8 +96,8 @@ const OptionsModal = (props) => {
 		return () => window.clearTimeout(settledTimer);
 	}, [
 		customConfig === null || customConfig === void 0 ? void 0 : customConfig.modalWidth,
-		isPosTabletViewport,
-		shouldUseLargeModal,
+		isTabletVariant,
+		shouldUsePrimaryModalLayout,
 		logger,
 		open,
 		renderType,
@@ -152,11 +150,10 @@ const OptionsModal = (props) => {
 			className: (0, classnames.default)("pisell-sku-options-modal", props.appearanceClassName, {
 				"pisell-sku-options-modal--drawer": isDrawer,
 				"pisell-sku-options-modal--smallTablet": isTabletVariant && variant === "smallTablet",
-				"pisell-sku-options-modal--tablet": isTabletVariant && variant === "tablet",
-				"pisell-sku-options-modal--pos-tablet": isPosTabletViewport
+				"pisell-sku-options-modal--tablet": isTabletVariant && variant === "tablet"
 			}),
 			style: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, props.appearanceStyle), {}, { maxHeight: isDrawer ? "95dvh" : void 0 }),
-			height: isDrawer || shouldUseLargeModal ? "95%" : void 0,
+			height: "95%",
 			footer: /* @__PURE__ */ react.default.createElement("div", { className: "pisell-plus-sku-options-card-footer" }, /* @__PURE__ */ react.default.createElement("div", null, /* @__PURE__ */ react.default.createElement(require_index$1.default, {
 				min: canSelectedMin,
 				max: canSelectedMax,
@@ -179,7 +176,7 @@ const OptionsModal = (props) => {
 				display: "flex",
 				flexDirection: "column"
 			},
-			width: isDrawer ? "100%" : shouldUseLargeModal ? "95%" : (customConfig === null || customConfig === void 0 ? void 0 : customConfig.modalWidth) || "480px",
+			width: modalWidth,
 			placement: isDrawer ? "bottom" : void 0
 		}
 	}, /* @__PURE__ */ react.default.createElement(SelectorGroup, {

package/lib/plus/skuOptionsSelection/components/OptionsModal/index.less

@@ -1,10 +1,13 @@
 /**
  * SKU 二级规格选择弹窗（OptionsModal）
  * - Drawer 限制在可视区 95dvh 内，超长规格由内容区自行滚动
- * - 与 .pisell-sku-detail-modal 对齐：smallTablet / tablet 下放宽到 95% 宽 + 95vh 高
- * - 其他设备保持组件原生默认（受 `width={customConfig?.modalWidth || '480px'}` 控制）
+ * - 与 .pisell-sku-detail-modal 对齐：非 Drawer 为 80% 宽 + 95% 高；
+ *   smallTablet / tablet 下放宽到 95% 宽 + 95% 高
  */
 .pisell-sku-options-modal {
+  height: 95% !important;
+  max-height: 884px !important;
+
   &--drawer {
     .pisell-lowcode-floating-layer-content,
     .pisell-lowcode-modal-content {
@@ -18,11 +21,9 @@
   }
 
   &--smallTablet,
-  &--tablet,
-  // iPad WebPOS 当前会注入 variant=pos；仅由组件在横屏平板视口条件下添加。
-  &--pos-tablet {
+  &--tablet {
     width: 95% !important;
-    height: 95% !important;
+    max-height: 95% !important;
 
     .pisell-lowcode-modal-content {
       height: 100% !important;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.693",
+  "version": "6.11.696",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -71,11 +71,11 @@
     "react-zoom-pan-pinch": "^3.7.0",
     "styled-components": "^6.0.0-rc.3",
     "use-sync-external-store": "^1.6.0",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.12",
-    "@pisell/pi-payment-sdk": "0.0.3",
     "@pisell/utils": "3.0.7",
-    "@pisell/materials": "6.11.269"
+    "@pisell/pi-payment-sdk": "0.0.3",
+    "@pisell/materials": "6.11.269",
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "3.0.12"
   },
   "peerDependencies": {
     "react": "^18.0.0",

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

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