@pisell/private-materials 6.3.137 → 6.3.139

package/es/components/venueBooking/components/VenueSelection/components/TimeGrid.js

@@ -4,6 +4,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /**
  * 时段网格
  * 核心交互组件：横轴为时间（每 30 分钟一格），纵轴为资源/场地
@@ -16,11 +22,11 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  *   首个可用时段。
  * - 同步方向单向：body.scrollLeft -> headerInner.style.transform。
  */
-import React, { useEffect, useMemo, useRef, useCallback } from 'react';
+import React, { useEffect, useMemo, useRef, useCallback, useState } from 'react';
 import { Iconfont, PisellText } from '@pisell/materials';
 import { locales, isIos } from '@pisell/utils';
 import { useVenueBookingContext } from "../../../context";
-import { isSlotSelected as checkSlotSelected, useVenueBookingSymbol } from "../../../hooks";
+import { isSlotSelected as checkSlotSelected, isSlotDisabledBySelection, useVenueBookingSymbol } from "../../../hooks";
 import { formatHourHeader, isHourBoundary, buildHourGroups, buildSlotPriceInfo, getPriceColor, getSlotTag, getColumnTag, getTimeMetaFromGrid, getResourceCourtMeta, getTableGridStyle, getFirstAvailableSlotIndex, FIRST_COLUMN_WIDTH } from "../../../utils";
 export default function TimeGrid() {
   var symbol = useVenueBookingSymbol();
@@ -206,13 +212,24 @@ export default function TimeGrid() {
       return scroller.removeEventListener('wheel', onWheel);
     };
   }, []);
-  function handleSlotClick(resourceId, slot) {
+
+  /** 记录哪些多商品资源是展开态（resourceId -> expanded） */
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    expandedResources = _useState2[0],
+    setExpandedResources = _useState2[1];
+  var toggleExpanded = useCallback(function (resourceId) {
+    setExpandedResources(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, String(resourceId), !prev[String(resourceId)]));
+    });
+  }, []);
+  function handleSlotClick(resourceId, productId, slot) {
     if (dragStateRef.current.moved) {
       dragStateRef.current.moved = false;
       return;
     }
     if (slot.status !== 'available') return;
-    toggleSlot(resourceId, slot);
+    toggleSlot(resourceId, productId, slot);
   }
 
   // 网格加载中（周数据拉取 / 切换日期过渡 / 数据未就绪）：渲染骨架屏
@@ -292,43 +309,79 @@ export default function TimeGrid() {
     key: grid.date
   }, visibleResources.map(function (resource) {
     var courtMeta = getResourceCourtMeta(resource);
-    return /*#__PURE__*/React.createElement("div", {
-      key: "".concat(resource.resourceId, "-").concat(grid.date),
+    var isMultiProduct = !!resource.hasMultipleProducts && Array.isArray(resource.products);
+    var expanded = !!expandedResources[String(resource.resourceId)];
+    return /*#__PURE__*/React.createElement(React.Fragment, {
+      key: "".concat(resource.resourceId, "-").concat(grid.date)
+    }, /*#__PURE__*/React.createElement("div", {
       className: "grid border-b border-black/6",
       style: tableGridStyle
     }, /*#__PURE__*/React.createElement("div", {
       className: "sticky left-0 z-10 border-r border-black/6 px-2 py-2 shadow-[10px_0_16px_-14px_rgba(0,0,0,0.2)] md:px-4 ".concat(courtMeta.soldOut ? 'bg-zinc-50' : 'bg-white')
     }, /*#__PURE__*/React.createElement("div", {
       className: "flex items-start justify-between gap-2"
-    }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "flex items-center gap-1.5"
+    }, isMultiProduct ? /*#__PURE__*/React.createElement("button", {
+      type: "button",
+      "data-cart-button": "true",
+      onClick: function onClick(e) {
+        e.stopPropagation();
+        toggleExpanded(resource.resourceId);
+      },
+      className: "flex h-5 w-5 items-center justify-center rounded text-zinc-500 hover:bg-black/5",
+      "aria-label": expanded ? 'collapse' : 'expand'
+    }, /*#__PURE__*/React.createElement(Iconfont, {
+      type: expanded ? 'pisell2-chevron-down' : 'pisell2-chevron-right',
+      style: {
+        fontSize: 12
+      }
+    })) : null, /*#__PURE__*/React.createElement("div", {
       className: "text-[13px] font-extrabold leading-5 md:text-[15px] ".concat(courtMeta.soldOut ? 'text-zinc-400' : 'text-zinc-900')
     }, resource.resourceName)))), resource.slots.map(function (slot, slotIndex) {
       var isAvailable = slot.status === 'available';
-      // unavailable：该时段不提供服务（如非营业时段）；occupied/past 同样不可选
       var isUnavailable = slot.status === 'occupied' || slot.status === 'past' || slot.status === 'unavailable';
-      var selected = isAvailable && checkSlotSelected(venueBookingModule, resource.resourceId, slot.startTime);
+      var timeLabel = timeLabels[slotIndex] || '';
       var priceInfo = buildSlotPriceInfo(slot);
       var priceClass = getPriceColor(_objectSpread(_objectSpread({}, priceInfo), {}, {
         courtType: resource.productTitle
       }));
-      var timeLabel = timeLabels[slotIndex] || '';
       var tag = getSlotTag(priceInfo);
       var tagText = (tag === null || tag === void 0 ? void 0 : tag.text) === 'pisell2.venue.label.promo' ? locales.getText('pisell2.venue.label.promo') || '促销' : (tag === null || tag === void 0 ? void 0 : tag.text) === 'pisell2.venue.label.off.peak' ? locales.getText('pisell2.venue.label.off.peak') || '非高峰' : null;
+
+      // 单商品：保持原选中/禁用判定；多商品：外层 slot 不可直接选，点击仅触发展开
+      var productIdForSingle = resource.productId;
+      var disabledBySelection = !isMultiProduct && !isUnavailable ? isSlotDisabledBySelection(venueBookingModule, {
+        resourceId: resource.resourceId,
+        productId: productIdForSingle,
+        startTime: slot.startTime
+      }) : false;
+      // 跨行互斥禁用视觉上与 unavailable 一致（灰底 + ×），用户能明确看到冲突
+      var isBlocked = isUnavailable || disabledBySelection;
+      var selected = !isMultiProduct && isAvailable && checkSlotSelected(venueBookingModule, resource.resourceId, slot.startTime, productIdForSingle);
+      var interactive = !isMultiProduct && !isBlocked;
+      var showPlusLabel = isMultiProduct && !isBlocked;
       return /*#__PURE__*/React.createElement("button", {
         "data-slot-button": "true",
-        key: "".concat(resource.resourceId, "-").concat(slot.startTime),
+        key: "".concat(resource.resourceId, "-outer-").concat(slot.startTime),
         onClick: function onClick() {
-          return handleSlotClick(resource.resourceId, slot);
+          if (isMultiProduct) {
+            if (isBlocked) return;
+            toggleExpanded(resource.resourceId);
+            return;
+          }
+          if (isBlocked) return;
+          handleSlotClick(resource.resourceId, productIdForSingle, slot);
         },
-        disabled: isUnavailable,
-        className: "px-1 py-2 text-center transition md:px-2 ".concat(isUnavailable ? 'cursor-not-allowed bg-zinc-100 text-zinc-400' : selected ? 'text-white' : 'bg-white hover:bg-[#fff6f6]'),
+        disabled: isBlocked,
+        className: "px-1 py-2 text-center transition md:px-2 ".concat(isBlocked ? 'cursor-not-allowed bg-zinc-100 text-zinc-400' : selected ? 'text-white' : 'bg-white hover:bg-[#fff6f6]'),
         style: _objectSpread({
           borderLeft: isHourBoundary(timeLabel) ? '1px solid rgba(0,0,0,0.08)' : '1px solid rgba(0,0,0,0.03)',
           borderBottom: '1px solid rgba(0,0,0,0.04)'
-        }, selected && !isUnavailable ? {
+        }, selected && interactive ? {
           backgroundColor: 'var(--vb-primary)'
         } : null)
-      }, isUnavailable ? /*#__PURE__*/React.createElement("div", {
+      }, isBlocked ? /*#__PURE__*/React.createElement("div", {
         className: "flex flex-col items-center justify-center gap-1 text-zinc-400"
       }, /*#__PURE__*/React.createElement("div", {
         className: "text-lg font-bold leading-none"
@@ -342,16 +395,75 @@ export default function TimeGrid() {
         className: "text-[13px] font-extrabold leading-4 text-white md:text-sm"
       })) : /*#__PURE__*/React.createElement("div", {
         className: "space-y-0.5"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "flex items-baseline justify-center gap-0.5"
       }, /*#__PURE__*/React.createElement(PisellText.Amount, {
         value: Number(slot.price || 0),
         symbol: symbol,
         precision: 2,
         showCurrencySymbol: true,
-        hideDecimalForWholeNumbers: false,
+        hideDecimalForWholeNumbers: true,
         className: "text-[13px] font-normal leading-4 ".concat(priceClass, " md:text-sm")
-      }), tag ? /*#__PURE__*/React.createElement("div", {
+      }), showPlusLabel ? /*#__PURE__*/React.createElement("span", {
+        className: "text-[13px] font-semibold leading-4 ".concat(priceClass, " md:text-sm")
+      }, "+") : null), tag ? /*#__PURE__*/React.createElement("div", {
         className: "inline-flex rounded-full px-1.5 py-0 text-[8px] font-semibold leading-4 ring-1 md:text-[9px] ".concat(tag.className)
       }, tagText) : null));
+    })), isMultiProduct && expanded && resource.products.map(function (subRow) {
+      return /*#__PURE__*/React.createElement("div", {
+        key: "".concat(resource.resourceId, "-sub-").concat(subRow.productId),
+        className: "grid border-b border-black/6 bg-zinc-50/60",
+        style: tableGridStyle
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "sticky left-0 z-10 border-r border-black/6 bg-zinc-50/60 px-2 py-2 pl-8 shadow-[10px_0_16px_-14px_rgba(0,0,0,0.2)] md:px-4 md:pl-10"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "text-[12px] font-semibold leading-5 text-zinc-700 md:text-[13px]"
+      }, subRow.productTitle)), subRow.slots.map(function (slot, slotIndex) {
+        var isAvailable = slot.status === 'available';
+        var isUnavailable = slot.status === 'occupied' || slot.status === 'past' || slot.status === 'unavailable';
+        var timeLabel = timeLabels[slotIndex] || '';
+        var disabledBySelection = !isUnavailable && isSlotDisabledBySelection(venueBookingModule, {
+          resourceId: resource.resourceId,
+          productId: subRow.productId,
+          startTime: slot.startTime
+        });
+        var isBlocked = isUnavailable || disabledBySelection;
+        var selected = isAvailable && checkSlotSelected(venueBookingModule, resource.resourceId, slot.startTime, subRow.productId);
+        var interactive = !isBlocked;
+        var priceInfo = buildSlotPriceInfo(slot);
+        var priceClass = getPriceColor(_objectSpread(_objectSpread({}, priceInfo), {}, {
+          courtType: subRow.productTitle
+        }));
+        return /*#__PURE__*/React.createElement("button", {
+          "data-slot-button": "true",
+          key: "".concat(resource.resourceId, "-").concat(subRow.productId, "-").concat(slot.startTime),
+          onClick: function onClick() {
+            if (!interactive) return;
+            handleSlotClick(resource.resourceId, subRow.productId, slot);
+          },
+          disabled: !interactive,
+          className: "px-1 py-2 text-center transition md:px-2 ".concat(isBlocked ? 'cursor-not-allowed bg-zinc-100 text-zinc-400' : selected ? 'text-white' : 'bg-white hover:bg-[#fff6f6]'),
+          style: _objectSpread({
+            borderLeft: isHourBoundary(timeLabel) ? '1px solid rgba(0,0,0,0.08)' : '1px solid rgba(0,0,0,0.03)',
+            borderBottom: '1px solid rgba(0,0,0,0.04)'
+          }, selected && interactive ? {
+            backgroundColor: 'var(--vb-primary)'
+          } : null)
+        }, isBlocked ? /*#__PURE__*/React.createElement("div", {
+          className: "flex flex-col items-center justify-center gap-1 text-zinc-400"
+        }, /*#__PURE__*/React.createElement("div", {
+          className: "text-lg font-bold leading-none"
+        }, "\xD7")) : /*#__PURE__*/React.createElement("div", {
+          className: "space-y-0.5"
+        }, /*#__PURE__*/React.createElement(PisellText.Amount, {
+          value: Number(slot.price || 0),
+          symbol: symbol,
+          precision: 2,
+          showCurrencySymbol: true,
+          hideDecimalForWholeNumbers: true,
+          className: "text-[13px] leading-4 ".concat(selected ? 'font-extrabold text-white' : "font-normal ".concat(priceClass), " md:text-sm")
+        })));
+      }));
     }));
   }))));
 }

package/es/components/venueBooking/context.js

@@ -243,6 +243,13 @@ export function VenueBookingProvider(_ref) {
   var anchorDateRef = useRef(anchorDate);
   anchorDateRef.current = anchorDate;
 
+  /**
+   * bootstrap 只跑一次：避免宿主 Provider 重渲染导致的依赖身份抖动
+   * （例如 utils 引用变化 → syncCustomerLoginToModule 重建 → effect 重跑 → 骨架屏闪烁）。
+   * 只在首次 venueBookingModule 就绪时执行，和步骤 hydrate 的 hydratedRef 同语义。
+   */
+  var bootstrappedRef = useRef(false);
+
   /** 是否有已选时段（用于判断能否进入下一步） */
   var canNext = useMemo(function () {
     // 优先从 OS 模块查询选中状态
@@ -541,7 +548,7 @@ export function VenueBookingProvider(_ref) {
    * 调用 OS venueBooking.toggleSlot 后刷新 grid + 购物车
    */
   var toggleSlot = useCallback( /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(resourceId, slot) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(resourceId, productId, slot) {
       return _regeneratorRuntime().wrap(function _callee4$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -555,12 +562,12 @@ export function VenueBookingProvider(_ref) {
             _context5.next = 5;
             return toggleSlotAction(venueBookingModule, {
               resourceId: resourceId,
+              productId: productId,
               startTime: slot.startTime,
               endTime: slot.endTime,
               price: slot.price
             });
           case 5:
-            // toggleSlot 后刷新 grid 获取最新选中状态
             refreshTimeSlotGrid();
             _context5.next = 8;
             return refreshViewModel();
@@ -577,7 +584,7 @@ export function VenueBookingProvider(_ref) {
         }
       }, _callee4, null, [[2, 10]]);
     }));
-    return function (_x5, _x6) {
+    return function (_x5, _x6, _x7) {
       return _ref5.apply(this, arguments);
     };
   }(), [venueBookingModule, refreshTimeSlotGrid, refreshViewModel]);
@@ -599,7 +606,7 @@ export function VenueBookingProvider(_ref) {
         }
       }, _callee5);
     }));
-    return function (_x7) {
+    return function (_x8) {
       return _ref6.apply(this, arguments);
     };
   }(), [venueBookingModule, refreshViewModel]);
@@ -624,7 +631,7 @@ export function VenueBookingProvider(_ref) {
         }
       }, _callee6);
     }));
-    return function (_x8) {
+    return function (_x9) {
       return _ref7.apply(this, arguments);
     };
   }(), [venueBookingModule]);
@@ -730,6 +737,18 @@ export function VenueBookingProvider(_ref) {
     }, _callee8, null, [[0, 9]]);
   })), [syncCustomerLoginToModule, venueBookingModule, refreshViewModel]);
 
+  /**
+   * 以 ref 持有最新的 callback，供仅需稳定调用、不希望因 callback 身份变动而重跑的 effect 使用
+   * - bootstrap useEffect：只关心 venueBookingModule 首次就绪，不应被 utils/callback 身份抖动连带重跑
+   * - pubsub 订阅 useEffect：只订阅一次，真正回调取最新实现
+   */
+  var syncCustomerLoginRef = useRef(syncCustomerLoginToModule);
+  syncCustomerLoginRef.current = syncCustomerLoginToModule;
+  var goToNearestAvailableDateRef = useRef(goToNearestAvailableDate);
+  goToNearestAvailableDateRef.current = goToNearestAvailableDate;
+  var handleLoginSuccessRef = useRef(handleLoginSuccess);
+  handleLoginSuccessRef.current = handleLoginSuccess;
+
   /** 结账步骤提交订单（调用 OS venueBooking.submitOrder） */
   var submitOrder = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
     var _result$data, _viewModel$summary, result, orderId, totalAmount, _otherParams$openData, otherParams;
@@ -894,6 +913,8 @@ export function VenueBookingProvider(_ref) {
   }, [currentStep, canNext, isAgreeDepositPolicy, viewModel.summary, stepList, proceedToCheckout, goToStep, handleSubmitOrder]);
 
   // ── 监听全局登录成功事件（Voucher 区域内登录等场景） ──
+  // 仅依赖 pubsub 实例，回调经 ref 取最新实现，避免 handleLoginSuccess 重建
+  // 时反复 sub/unsub（宿主 utils 引用抖动也会连带触发）。
   useEffect(function () {
     var _pubsub$subscribe;
     var pubsub = utils === null || utils === void 0 ? void 0 : utils.pubsub;
@@ -908,14 +929,14 @@ export function VenueBookingProvider(_ref) {
                 break;
               }
               _context12.next = 3;
-              return handleLoginSuccess();
+              return handleLoginSuccessRef.current();
             case 3:
             case "end":
               return _context12.stop();
           }
         }, _callee11);
       }));
-      return function onGlobalLoginSuccess(_x9) {
+      return function onGlobalLoginSuccess(_x10) {
         return _ref12.apply(this, arguments);
       };
     }();
@@ -924,7 +945,7 @@ export function VenueBookingProvider(_ref) {
       var _pubsub$unsubscribe;
       (_pubsub$unsubscribe = pubsub.unsubscribe) === null || _pubsub$unsubscribe === void 0 || _pubsub$unsubscribe.call(pubsub, 'pisell1.login.success', onGlobalLoginSuccess);
     };
-  }, [utils === null || utils === void 0 ? void 0 : utils.pubsub, handleLoginSuccess]);
+  }, [utils === null || utils === void 0 ? void 0 : utils.pubsub]);
 
   // ── anchorDate 变化时刷新 timeSlotGrid + 短暂 grid 加载动画 ──
   useEffect(function () {
@@ -998,8 +1019,13 @@ export function VenueBookingProvider(_ref) {
   }, [pisellOS, venueBookingModule]);
 
   // ── 模块初始化引导 ──
+  // 只在首次 venueBookingModule 就绪时执行一次；内部依赖的 callback 走 ref，
+  // 避免宿主 Provider 重渲染（如登录弹窗打开/关闭）让 utils 引用变化，导致
+  // syncCustomerLoginToModule / goToNearestAvailableDate 身份抖动连带 effect 重跑，
+  // 进而触发 setIsWeekLoading(true) 造成 VenueSelection 骨架屏闪烁。
   useEffect(function () {
-    if (!venueBookingModule) return;
+    if (bootstrappedRef.current || !venueBookingModule) return;
+    bootstrappedRef.current = true;
     var unmounted = false;
     var bootstrap = /*#__PURE__*/function () {
       var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
@@ -1012,14 +1038,14 @@ export function VenueBookingProvider(_ref) {
 
               // 初始化阶段尝试同步 customer 到 venueBooking 模块（未登录时内部自动跳过）
               _context14.next = 4;
-              return syncCustomerLoginToModule();
+              return syncCustomerLoginRef.current();
             case 4:
               _context14.next = 6;
               return loadVenueProducts(venueBookingModule, VENUE_PRODUCT_IDS);
             case 6:
               venueProducts = typeof (venueBookingModule === null || venueBookingModule === void 0 ? void 0 : venueBookingModule.getVenueProducts) === 'function' ? venueBookingModule.getVenueProducts() : []; // 2. 自动定位最近可用日期（当前周无可用则滚动到后续周）
               _context14.next = 9;
-              return goToNearestAvailableDate(anchorDateRef.current);
+              return goToNearestAvailableDateRef.current(anchorDateRef.current);
             case 9:
               // 3. 刷新购物车数据
               moduleData = createVenueBookingViewModel(venueBookingModule);
@@ -1078,7 +1104,7 @@ export function VenueBookingProvider(_ref) {
     return function () {
       unmounted = true;
     };
-  }, [venueBookingModule, entryContext === null || entryContext === void 0 ? void 0 : entryContext.biz, entryContext === null || entryContext === void 0 ? void 0 : entryContext.resource_id, syncCustomerLoginToModule, goToNearestAvailableDate]);
+  }, [venueBookingModule]);
 
   // ── 聚合 Context Value ──
   var value = useMemo(function () {

package/es/components/venueBooking/hooks.d.ts

@@ -27,15 +27,28 @@ export declare function fetchResourceAvailability(module: any, startDate: string
 export declare function getDateRangeSummary(module: any, startDate: string, endDate: string): VenueDateSummaryItem[];
 /** 获取某天的时段网格（纯计算不发请求，切换日期时调用） */
 export declare function getTimeSlotGrid(module: any, date: string): VenueTimeSlotGrid | null;
-/** 切换选中/取消一个时段 */
+/** 切换选中/取消一个时段（同一资源下多商品场景必须携带 productId） */
 export declare function toggleSlotAction(module: any, params: {
     resourceId: number;
+    productId: number;
     startTime: string;
     endTime: string;
     price: string;
 }): Promise<any>;
-/** 查询某个时段是否已被选中 */
-export declare function isSlotSelected(module: any, resourceId: number, startTime: string): boolean;
+/**
+ * 查询某个时段是否已被选中
+ * 不传 productId 时：该资源下任一商品选中即 true；传了则精确匹配
+ */
+export declare function isSlotSelected(module: any, resourceId: number, startTime: string, productId?: number): boolean;
+/**
+ * 询问 OS：该 (resourceId, productId, startTime) 格子是否因其它已选项而应禁用
+ * 覆盖：同场地多商品互斥、组合资源 ↔ 子资源联动
+ */
+export declare function isSlotDisabledBySelection(module: any, params: {
+    resourceId: number;
+    productId: number;
+    startTime: string;
+}): boolean;
 /** 获取全部已选时段（按资源分组） */
 export declare function getAllSelectedSlots(module: any): any[];
 /** 查询 otherParams */

package/es/components/venueBooking/hooks.js

@@ -164,12 +164,15 @@ export function getTimeSlotGrid(module, date) {
   return module.getTimeSlotGrid(date) || null;
 }
 
-/** 切换选中/取消一个时段 */
+/** 切换选中/取消一个时段（同一资源下多商品场景必须携带 productId） */
 export function toggleSlotAction(_x8, _x9) {
   return _toggleSlotAction.apply(this, arguments);
 }
 
-/** 查询某个时段是否已被选中 */
+/**
+ * 查询某个时段是否已被选中
+ * 不传 productId 时：该资源下任一商品选中即 true；传了则精确匹配
+ */
 function _toggleSlotAction() {
   _toggleSlotAction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(module, params) {
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -184,9 +187,18 @@ function _toggleSlotAction() {
   }));
   return _toggleSlotAction.apply(this, arguments);
 }
-export function isSlotSelected(module, resourceId, startTime) {
+export function isSlotSelected(module, resourceId, startTime, productId) {
   if (!module || typeof module.isSlotSelected !== 'function') return false;
-  return !!module.isSlotSelected(resourceId, startTime);
+  return !!module.isSlotSelected(resourceId, startTime, productId);
+}
+
+/**
+ * 询问 OS：该 (resourceId, productId, startTime) 格子是否因其它已选项而应禁用
+ * 覆盖：同场地多商品互斥、组合资源 ↔ 子资源联动
+ */
+export function isSlotDisabledBySelection(module, params) {
+  if (!module || typeof module.isSlotDisabledBySelection !== 'function') return false;
+  return !!module.isSlotDisabledBySelection(params);
 }
 
 /** 获取全部已选时段（按资源分组） */

package/es/components/venueBooking/types.d.ts

@@ -16,16 +16,33 @@ export interface VenueBookingEntryContext {
 export interface VenueResourceSlot {
     startTime: string;
     endTime: string;
-    status: 'past' | 'occupied' | 'available';
+    status: 'past' | 'occupied' | 'available' | 'partially_occupied' | 'unavailable';
     price: string | null;
+    /** per-product 子行的 slot 带 productId；外层合并 slot 不带 */
+    productId?: number;
+}
+/** 多商品共享一个 resource 时的子行 */
+export interface VenueResourceSubRow {
+    productId: number;
+    productTitle: string;
+    price: string;
+    slots: VenueResourceSlot[];
 }
 /** 单个资源/场地（来自 getTimeSlotGrid） */
 export interface VenueResource {
     resourceId: number;
     resourceName: string;
+    /** 单商品时唯一；多商品时取第一个（兼容字段，请优先使用 products） */
     productId: number;
     productTitle: string;
     slots: VenueResourceSlot[];
+    /** 多商品子行；仅当 hasMultipleProducts 时存在 */
+    products?: VenueResourceSubRow[];
+    hasMultipleProducts?: boolean;
+    /** 组合资源元信息（combined_resource.status === 1） */
+    combinedResource?: {
+        resourceIds: Array<number | string>;
+    };
 }
 /** 日期时段网格（来自 getTimeSlotGrid） */
 export interface VenueTimeSlotGrid {
@@ -162,7 +179,7 @@ export interface VenueBookingContextValue {
     setMonthCursor: (cursor: Dayjs) => void;
     setFooterActionText: (text: string) => void;
     /** 切换选中/取消某个时段（调用 OS venueBooking.toggleSlot） */
-    toggleSlot: (resourceId: number, slot: VenueResourceSlot) => Promise<void>;
+    toggleSlot: (resourceId: number, productId: number, slot: VenueResourceSlot) => Promise<void>;
     /** 刷新 OS 模块视图模型（调用 getSummary + 重建 viewModel），可选传入额外字段合并 */
     refreshViewModel: (extraFields?: Partial<VenueBookingViewModel>) => Promise<void>;
     /** 拉取指定周的资源数据并刷新 dateSummary + timeSlotGrid */

package/es/hooks/usePaymentLogger.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface LogData {
     key: string;
     value: any;

package/es/index.d.ts

@@ -0,0 +1,87 @@
+export { default as Login } from './components/login';
+export type { LoginProps } from './components/login';
+export { default as BookingInfo } from './components/booking/info/index';
+export { default as BookingNotes } from './components/booking/notes';
+export { default as BookingAddons } from './components/booking/addons';
+export { default as BookingForms } from './components/booking/forms';
+export { default as BookingPayment } from './components/booking/payments';
+export { default as Booking } from './components/booking';
+export { default as Schedules } from './components/schedules';
+export { default as BookingResources } from './components/booking/materiels/resources';
+export { default as BookingStartTime } from './components/booking/materiels/startTime';
+export { default as BookingDuration } from './components/booking/materiels/duration';
+export { default as BookingContacts } from './components/booking/materiels/contacts';
+export { VerticalClient } from './components/booking/info/clientVariant';
+export { default as VerticalAddService } from './components/booking/info/addServiceVariant';
+export { default as ProductExtension } from './components/productExtension';
+export { default as BookingDeposit } from './components/booking/deposit';
+export { default as WorkspaceList } from './components/workSpaceList';
+export { default as WorkspaceListDetail } from './components/workSpaceListDetail';
+export { default as RuleSetting } from './components/ruleSetting';
+export { default as TaxSelect } from './components/taxSelect';
+export { default as EftposPay } from './components/eftposPay';
+export { default as ToCPay } from './components/pay/toC';
+export { default as Eftpos } from './components/eftpos';
+export { default as WalletList } from './components/walletList';
+export { default as BookingDashboard } from './components/booking/dashboard';
+export { default as PisellSelectCustomerModal } from './components/pisellSelectCustomerModal';
+export { default as EventBooking } from './components/eventBooking';
+export { default as EventCard } from './components/eventBooking/components/eventCard';
+export { default as EventResourceDisplay } from './components/eventBooking/components/resourceDisplay';
+export { default as EventResourceUsability } from './components/eventBooking/components/resourceUsability';
+export { default as EventProductCard } from './components/eventBooking/components/productCard';
+export { default as EventTimeResourceSelector } from './components/eventBooking/components/timeResourceSelector';
+export { default as EventSelectHolder } from './components/eventBooking/components/selectHolder';
+export { default as EventBookingServiceList } from './components/eventBooking/components/bookingServiceList';
+export { default as EventBookingAvailabilityCalendar } from './components/eventBooking/components/bookingAvailabilityCalendar';
+export { default as EventScheduleCalendar } from './components/eventBooking/components/scheduleCalendar';
+export { default as EventBookingDetailModal } from './components/eventBooking/components/bookingDetailModal';
+export { default as EventProgressBar } from './components/eventBooking/components/progressBar';
+export { default as ShoppingCart } from './components/shoppingCart';
+export { default as AppointmentBooking } from './components/appointmentBooking';
+export { default as AppointmentDeposit } from './components/appointmentBooking/deposit';
+export { default as TicketBooking } from './components/ticketBooking';
+export { default as ScanOrder } from './components/scanOrder';
+export { default as VenueBooking } from './components/venueBooking';
+export type { ScanOrderProps } from './components/scanOrder';
+export { default as SubTotal } from './components/subTotal';
+export { default as EditBookingModal } from './components/booking/editBookingModal';
+export { default as StepController } from './components/stepController';
+export { default as ClientCard } from './plus/clientCard';
+export { default as ClientSearch } from './plus/clinetSearch';
+export { default as ComprehensiveSearch } from './pro/comprehensiveSearch';
+export { default as SaasLogin } from './plus/saasLogin';
+export { default as SaasRegister } from './plus/saasRegister';
+export { default as SaasCreateOrganization } from './plus/saasCreateOrganization';
+export { default as PinModal } from './components/pinModal';
+export { default as PinVerifyModal } from './components/pinVerifyModal';
+export { ChannelAuthSetting, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, } from './components/authentication/admin';
+export type { SaaSAdminAuthProps, OrgAdminAuthProps, DeviceAuthProps, POSOperatorAuthProps, CustomerOAuthConfigProps, } from './components/authentication/admin';
+export { default as ContactInfo } from './plus/contactInfo';
+export { default as ContactInfoModal } from './plus/contactInfoModal';
+export { Login2, Register2, AuthModal } from './pro/Login2.0';
+export { default as WalletEditor } from './plus/walletEditor';
+export { default as WalletPassGallery } from './plus/walletPassGallery';
+export { default as WalletPassDetail } from './plus/walletPassGallery/components/passDetail';
+export { default as SelectHolder } from './plus/selectHolder';
+export { default as HolderList } from './plus/selectHolder/components/HolderList';
+export { default as SettingsRegistry } from './components/systemSettings/registry';
+export { default as SaasRole } from './plus/saasRole';
+export { default as SaasTeamMembers } from './plus/saasTeamMembers';
+export type { SaasTeamMembersProps } from './plus/saasTeamMembers/type';
+export { default as KioskSkuDetail } from './components/kioskSkuDetail';
+export { default as ProNumberSelector } from './pro/pisellNumberSelector';
+export { default as SKUOptionsSelection } from './plus/skuOptionsSelection';
+export { default as SaasAttendance } from './plus/saasAttendance';
+export { default as Selector } from './pro/Selector';
+export { default as PisellSalesGrid } from './plus/pisellSalesGrid';
+export { PisellReservationCore, PisellReservationBookingPage, PisellReservation, PisellVenueControlPage, default, } from './plus/pisellReservation';
+export type { FloorMapBookingClickArgs, FloorMapBookingClickMode, PisellReservationProps, PisellReservationTableRow, } from './plus/pisellReservation';
+export { defaultReservationTableRows, getDefaultReservationFloorMapConfig, } from './plus/pisellReservation';
+export { default as EcoCupProject } from './components/ecocup/cupProject';
+export { default as EcoCupList } from './components/ecocup/cupList';
+export { default as EcoCustomerList } from './components/ecocup/customerList';
+export { default as OrderList } from './plus/orderList';
+export { default as pisellSalesManagement } from './plus/pisellSalesManagement';
+export { PisellFinancialSummary, financialSummaryLocales } from './plus/pisellFinancialSummary';
+export type { PisellFinancialSummaryProps, FinancialSummaryData, FinancialSummaryLineItem, FinancialSummaryPaymentItem, FinancialSummaryRefundItem, FinancialSummaryTotalBlock, FinancialSummaryAmountFormatOptions, } from './plus/pisellFinancialSummary';

package/es/index.js

@@ -58,7 +58,7 @@ export { default as SaasRegister } from "./plus/saasRegister";
 export { default as SaasCreateOrganization } from "./plus/saasCreateOrganization";
 export { default as PinModal } from "./components/pinModal";
 export { default as PinVerifyModal } from "./components/pinVerifyModal";
-export { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from "./components/authentication/admin";
+export { ChannelAuthSetting, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from "./components/authentication/admin";
 export { default as ContactInfo } from "./plus/contactInfo";
 export { default as ContactInfoModal } from "./plus/contactInfoModal";
 export { Login2, Register2, AuthModal } from "./pro/Login2.0";

package/es/plus/clientName/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { IClientNameProps } from './type';
 declare const ClientName: ({ className, dataSource, style }: IClientNameProps) => JSX.Element | null;

package/es/plus/clinetSearch/Add/BirthdayField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => JSX.Element;
 export default DateSectionCom;

package/es/plus/clinetSearch/Add/GenderField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const GenderField: (props: any) => JSX.Element;
 export default GenderField;

package/es/plus/clinetSearch/Add/PhoneField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const PhoneField: ({ value, onChange }: any) => JSX.Element;
 export default PhoneField;

package/es/plus/pisellReservation/floorRoomCard/views/RoomCardIcons.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const IconClock: () => JSX.Element;
 export declare const IconUsers: () => JSX.Element;
 export declare const IconWarn: () => JSX.Element;