@pisell/private-materials 6.11.180 → 6.11.181

package/es/plus/pisellReservation/PisellReservation.js

@@ -1,4 +1,4 @@
-var _excluded = ["gridDataSourceKey", "dataSources", "scheduleValue", "onScheduleChange", "toolBar", "floorMap", "scheduleStartSlot", "scheduleEndSlot", "onNewReservation", "timeNavigatorProps", "scheduleProps", "fab", "defaultBodyView", "data", "total", "pagination", "onPageChange", "onSearch", "onReset", "searchParams", "loading", "rowKey", "className", "style", "floorPlanId", "floorPlanCanvasWidth", "floorPlanCanvasHeight", "floorPlanCode", "floorPlanName", "floorPlanSort", "floorPlanStatus", "onFloorPlanPersisted", "putFloorPlan", "onFloorMapBookingClick", "bodyViewSwitchable", "lockedBodyView", "bodyViewStorageKey", "floorMapHudTableDrawer"];
+var _excluded = ["gridDataSourceKey", "dataSources", "scheduleValue", "onScheduleChange", "toolBar", "floorMap", "scheduleStartSlot", "scheduleEndSlot", "onNewReservation", "timeNavigatorProps", "scheduleProps", "fab", "defaultBodyView", "data", "total", "pagination", "onPageChange", "onSearch", "onReset", "searchParams", "loading", "rowKey", "className", "style", "floorPlanId", "floorPlanCanvasWidth", "floorPlanCanvasHeight", "floorPlanCode", "floorPlanName", "floorPlanSort", "floorPlanStatus", "onFloorPlanPersisted", "putFloorPlan", "onFloorMapBookingClick", "bodyViewSwitchable", "lockedBodyView", "bodyViewStorageKey", "floorMapHudTableDrawer", "forceFollowWallClock"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -115,6 +115,7 @@ export var PisellReservationCore = function PisellReservationCore(props) {
     bodyViewStorageKey = props.bodyViewStorageKey,
     _props$floorMapHudTab = props.floorMapHudTableDrawer,
     floorMapHudTableDrawer = _props$floorMapHudTab === void 0 ? false : _props$floorMapHudTab,
+    forceFollowWallClockProp = props.forceFollowWallClock,
     rest = _objectWithoutProperties(props, _excluded);
   void _unusedDefaultBodyView;
 
@@ -236,6 +237,11 @@ export var PisellReservationCore = function PisellReservationCore(props) {
     _useState2 = _slicedToArray(_useState, 2),
     shellBodyView = _useState2[0],
     setShellBodyView = _useState2[1];
+
+  /** 锁定大屏子视图、显式 prop、或 Segmented 切到「大屏」：强制墙钟跟随且不可关 */
+  var wallClockFollowLocked = useMemo(function () {
+    return Boolean(forceFollowWallClockProp) || lockedBodyView === 'resourceWall' || shellBodyView === 'resourceWall';
+  }, [forceFollowWallClockProp, lockedBodyView, shellBodyView]);
   var _useReservationFloorP = useReservationFloorPlan({
       resolvedFloorPlanId: resolvedFloorPlanId,
       effectiveFloorPlanCode: effectiveFloorPlanCode,
@@ -374,7 +380,7 @@ export var PisellReservationCore = function PisellReservationCore(props) {
     debouncedSchedule = _useReservationSchedu.debouncedSchedule,
     flushCommittedSchedule = _useReservationSchedu.flushCommittedSchedule,
     queueCommittedSchedule = _useReservationSchedu.queueCommittedSchedule;
-  var _useReservationWallCl = useReservationWallClockFollow(scheduleValueProp, setInternalSchedule, flushCommittedSchedule, onScheduleChange),
+  var _useReservationWallCl = useReservationWallClockFollow(scheduleValueProp, setInternalSchedule, flushCommittedSchedule, onScheduleChange, wallClockFollowLocked),
     followWallClock = _useReservationWallCl.followWallClock,
     setFollowWallClock = _useReservationWallCl.setFollowWallClock,
     onFollowWallClockToggle = _useReservationWallCl.onFollowWallClockToggle,
@@ -387,6 +393,7 @@ export var PisellReservationCore = function PisellReservationCore(props) {
       pisellosRef: pisellosRef,
       hasPisellosGetModule: hasPisellosGetModule,
       debouncedSchedule: debouncedSchedule,
+      followWallClock: followWallClock,
       resourceBoardLoading: resourceBoardData.loading,
       floorDayBookingLoading: floorDayBookingData.loading,
       floorDayBookingData: floorDayBookingData.data,
@@ -530,13 +537,15 @@ export var PisellReservationCore = function PisellReservationCore(props) {
     }
   }, [debouncedSchedule, isInternalListData, floorDayBookingData.patchSearchParams, operatingDayBoundary]);
   var handleScheduleChange = useCallback(function (next) {
-    setFollowWallClock(false);
+    if (!wallClockFollowLocked) {
+      setFollowWallClock(false);
+    }
     if (scheduleValueProp === undefined) {
       setInternalSchedule(next);
     }
     onScheduleChange === null || onScheduleChange === void 0 || onScheduleChange(next);
     queueCommittedSchedule(next);
-  }, [scheduleValueProp, onScheduleChange, setFollowWallClock, queueCommittedSchedule]);
+  }, [scheduleValueProp, onScheduleChange, setFollowWallClock, queueCommittedSchedule, wallClockFollowLocked]);
 
   // --- 平面图：合并 props、点击预约、HUD；loading 防抖后交给 RecordBoard ---
 

package/es/plus/pisellReservation/PisellVenueWallPage.d.ts

@@ -7,6 +7,7 @@ import type { PisellReservationProps } from './types';
  * - `lockedBodyView="resourceWall"`：锁定在大屏视图。
  *
  * **无需新增 props 类型**：沿用 {@link PisellReservationProps}；可选行为与预约页相同（如 `toolBar`、`scheduleValue`、`floorMap` 等）。
+ * Core 在锁定大屏或预约页内 Segmented 切到「大屏」时（`shellBodyView === 'resourceWall'`）均 **强制跟随当前时间**（不可关闭）。
  * 默认使用 {@link PISELL_RESERVATION_VENUE_WALL_PAGE_STORAGE_KEY} 作为 `bodyViewStorageKey`，以便大屏筛选与主预约页 localStorage 隔离；可传入自定义 key 覆盖。
  */
 export declare const PisellVenueWallPage: React.FC<PisellReservationProps>;

package/es/plus/pisellReservation/PisellVenueWallPage.js

@@ -12,6 +12,7 @@ import { PISELL_RESERVATION_VENUE_WALL_PAGE_STORAGE_KEY } from "./reservationCon
  * - `lockedBodyView="resourceWall"`：锁定在大屏视图。
  *
  * **无需新增 props 类型**：沿用 {@link PisellReservationProps}；可选行为与预约页相同（如 `toolBar`、`scheduleValue`、`floorMap` 等）。
+ * Core 在锁定大屏或预约页内 Segmented 切到「大屏」时（`shellBodyView === 'resourceWall'`）均 **强制跟随当前时间**（不可关闭）。
  * 默认使用 {@link PISELL_RESERVATION_VENUE_WALL_PAGE_STORAGE_KEY} 作为 `bodyViewStorageKey`，以便大屏筛选与主预约页 localStorage 隔离；可传入自定义 key 覆盖。
  */
 export var PisellVenueWallPage = function PisellVenueWallPage(props) {

package/es/plus/pisellReservation/floorMap/useReservationFloorPlan.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { FloorMapViewConfig } from '@pisell/materials';
 export declare function useReservationFloorPlan(options: {
     resolvedFloorPlanId: number | null;

package/es/plus/pisellReservation/hooks/useReservationSalesHostData.d.ts

@@ -10,12 +10,17 @@ declare type PisellOSLike = {
  * 内置列表且资源台 + floorDayBooking 均就绪后，向宿主 sales 拉两套数据：
  * - `getResourceBookingList`：游标时刻下的预约子集，参与合并进平面图 dataSources；
  * - `getTimelineHighlights`：时间轴密度折线（无则退回 PisellReservation 内本地计算）。
+ *
+ * **跟随当前**：`followWallClock === true` 时第三个参数 `currentTimeStr` 与 `timeStr` 相同（均来自 `debouncedSchedule.at`），
+ * 避免与墙钟 `dayjs()` 差一分钟；手动关闭跟随后仍传实时 `dayjs()`，保留「游标 vs 此刻」双通道语义。
  */
 export declare function useReservationSalesHostData(options: {
     isInternalListData: boolean;
     pisellosRef: MutableRefObject<PisellOSLike>;
     hasPisellosGetModule: boolean;
     debouncedSchedule: ReservationScheduleBandValue;
+    /** 顶栏「跟随当前时间」：为 true 时 `getResourceBookingList` 的 currentTime 与 timeStr 一致 */
+    followWallClock: boolean;
     resourceBoardLoading: boolean;
     floorDayBookingLoading: boolean;
     floorDayBookingData: unknown[];

package/es/plus/pisellReservation/hooks/useReservationSalesHostData.js

@@ -12,12 +12,16 @@ import { normalizeSalesResourceBookingListResult } from "../data/reservationTabl
  * 内置列表且资源台 + floorDayBooking 均就绪后，向宿主 sales 拉两套数据：
  * - `getResourceBookingList`：游标时刻下的预约子集，参与合并进平面图 dataSources；
  * - `getTimelineHighlights`：时间轴密度折线（无则退回 PisellReservation 内本地计算）。
+ *
+ * **跟随当前**：`followWallClock === true` 时第三个参数 `currentTimeStr` 与 `timeStr` 相同（均来自 `debouncedSchedule.at`），
+ * 避免与墙钟 `dayjs()` 差一分钟；手动关闭跟随后仍传实时 `dayjs()`，保留「游标 vs 此刻」双通道语义。
  */
 export function useReservationSalesHostData(options) {
   var isInternalListData = options.isInternalListData,
     pisellosRef = options.pisellosRef,
     hasPisellosGetModule = options.hasPisellosGetModule,
     debouncedSchedule = options.debouncedSchedule,
+    followWallClock = options.followWallClock,
     resourceBoardLoading = options.resourceBoardLoading,
     floorDayBookingLoading = options.floorDayBookingLoading,
     floorDayBookingData = options.floorDayBookingData,
@@ -106,7 +110,7 @@ export function useReservationSalesHostData(options) {
     if (!Array.isArray(list)) {
       return;
     }
-    var retryGateKey = "".concat(debouncedAtMs !== null && debouncedAtMs !== void 0 ? debouncedAtMs : 'na', "|").concat(floorDayBookingDepKey, "|v").concat(floorDayBookingDataVersion, "|").concat(hasPisellosGetModule ? 1 : 0);
+    var retryGateKey = "".concat(debouncedAtMs !== null && debouncedAtMs !== void 0 ? debouncedAtMs : 'na', "|").concat(floorDayBookingDepKey, "|v").concat(floorDayBookingDataVersion, "|").concat(hasPisellosGetModule ? 1 : 0, "|fw").concat(followWallClock ? 1 : 0);
     if (retryGateKey !== resourceListRetryGateRef.current) {
       resourceListRetryGateRef.current = retryGateKey;
       resourceListHostSkipRef.current = false;
@@ -139,7 +143,7 @@ export function useReservationSalesHostData(options) {
 
     var resourceBookingListTimeFormat = 'YYYY-MM-DD HH:mm';
     var timeStr = dayjs(debouncedSchedule.at).format(resourceBookingListTimeFormat);
-    var currentTimeStr = dayjs().format(resourceBookingListTimeFormat);
+    var currentTimeStr = followWallClock ? timeStr : dayjs().format(resourceBookingListTimeFormat);
     var applyHostList = function applyHostList(raw) {
       if (salesBookingRequestRef.current !== reqId) return;
       var normalized = normalizeSalesResourceBookingListResult(raw);
@@ -177,7 +181,7 @@ export function useReservationSalesHostData(options) {
    * 兜底信号：哪怕 cheap hash 没变，只要有 WS 推送 mutate 就重跑 host call。
    * 配合 `resourceListRetryGateRef` 保证非宿主场景不会重复打接口。
    */
-  floorDayBookingDataVersion, debouncedAtMs, pisellosRef]);
+  floorDayBookingDataVersion, debouncedAtMs, followWallClock, pisellosRef]);
   var _useState3 = useState(null),
     _useState4 = _slicedToArray(_useState3, 2),
     salesTimelineHighlights = _useState4[0],

package/es/plus/pisellReservation/hooks/useReservationWallClockFollow.d.ts

@@ -1,12 +1,15 @@
-/// <reference types="react" />
+import { type SetStateAction } from 'react';
 import type { ReservationScheduleBandValue } from '@pisell/materials';
 declare type OnScheduleChange = ((v: ReservationScheduleBandValue) => void) | undefined;
 /**
- * 顶栏「跟随当前时间」：30s 对齐日程，并通过 flushCommittedSchedule 触发防抖链。
+ * 顶栏「跟随当前时间」：在每自然分钟整点（*: * :00）对齐日程，`at` 使用当前分钟的 `startOf('minute')`，
+ * 并通过 flushCommittedSchedule 触发防抖链。
+ *
+ * @param wallClockFollowLocked 为 true 时（如大屏锁定 resourceWall）：定时器始终运行，且不可通过交互关闭跟随。
  */
-export declare function useReservationWallClockFollow(scheduleValueProp: ReservationScheduleBandValue | undefined, setInternalSchedule: (v: ReservationScheduleBandValue) => void, flushCommittedSchedule: (v: ReservationScheduleBandValue) => void, onScheduleChange: OnScheduleChange): {
+export declare function useReservationWallClockFollow(scheduleValueProp: ReservationScheduleBandValue | undefined, setInternalSchedule: (v: ReservationScheduleBandValue) => void, flushCommittedSchedule: (v: ReservationScheduleBandValue) => void, onScheduleChange: OnScheduleChange, wallClockFollowLocked?: boolean): {
     followWallClock: boolean;
-    setFollowWallClock: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    setFollowWallClock: (value: SetStateAction<boolean>) => void;
     onFollowWallClockToggle: () => void;
     onTimeNavigatorUserInteraction: () => void;
 };

package/es/plus/pisellReservation/hooks/useReservationWallClockFollow.js

@@ -7,51 +7,90 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useCallback, useEffect, useRef, useState } from 'react';
 import dayjs from 'dayjs';
 /**
- * 顶栏「跟随当前时间」：30s 对齐日程，并通过 flushCommittedSchedule 触发防抖链。
+ * 顶栏「跟随当前时间」：在每自然分钟整点（*: * :00）对齐日程，`at` 使用当前分钟的 `startOf('minute')`，
+ * 并通过 flushCommittedSchedule 触发防抖链。
+ *
+ * @param wallClockFollowLocked 为 true 时（如大屏锁定 resourceWall）：定时器始终运行，且不可通过交互关闭跟随。
  */
 export function useReservationWallClockFollow(scheduleValueProp, setInternalSchedule, flushCommittedSchedule, onScheduleChange) {
+  var wallClockFollowLocked = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     followWallClock = _useState2[0],
-    setFollowWallClock = _useState2[1];
+    setFollowWallClockInternal = _useState2[1];
   var onScheduleChangeRef = useRef(onScheduleChange);
+  /** 避免 effect 依赖整个 `scheduleValueProp` 引用：父级每次 render 新对象会误重置定时器并多次首帧 tick */
+  var scheduleValuePropRef = useRef(scheduleValueProp);
+  scheduleValuePropRef.current = scheduleValueProp;
+  var scheduleControlled = scheduleValueProp !== undefined;
+  var followWallClockEffective = wallClockFollowLocked || followWallClock;
+
+  /** 锁定模式下始终保持内部开关为 true，避免闭包里读到 false */
+  useEffect(function () {
+    if (wallClockFollowLocked) setFollowWallClockInternal(true);
+  }, [wallClockFollowLocked]);
   useEffect(function () {
     onScheduleChangeRef.current = onScheduleChange;
   });
   useEffect(function () {
-    if (!followWallClock) return;
+    if (!followWallClockEffective) return;
+    var timeoutId = null;
+    var cancelled = false;
+
+    /** 距下一自然分钟整点的毫秒数（下一分钟的 :00.000） */
+    var msUntilNextMinuteBoundary = function msUntilNextMinuteBoundary() {
+      var now = dayjs();
+      return Math.max(0, now.startOf('minute').add(1, 'minute').diff(now));
+    };
     var tick = function tick() {
       var _onScheduleChangeRef$;
-      var now = dayjs();
+      var now = dayjs().startOf('minute');
       var next = {
         date: now.startOf('day'),
         at: now
       };
-      if (scheduleValueProp === undefined) {
+      if (scheduleValuePropRef.current === undefined) {
         setInternalSchedule(next);
       }
       (_onScheduleChangeRef$ = onScheduleChangeRef.current) === null || _onScheduleChangeRef$ === void 0 || _onScheduleChangeRef$.call(onScheduleChangeRef, next);
       /** 跟随当前：立即提交日程，patch / 外部 onSearch 由 debouncedSchedule effect 统一处理 */
       flushCommittedSchedule(next);
     };
+    var scheduleNextBoundary = function scheduleNextBoundary() {
+      if (cancelled) return;
+      timeoutId = window.setTimeout(function () {
+        if (cancelled) return;
+        tick();
+        scheduleNextBoundary();
+      }, msUntilNextMinuteBoundary());
+    };
+
+    /** 首帧：立刻对齐到当前整分；之后仅在每分钟 rollover 时再 tick */
     tick();
-    var id = window.setInterval(tick, 30000);
+    scheduleNextBoundary();
     return function () {
-      return window.clearInterval(id);
+      cancelled = true;
+      if (timeoutId != null) window.clearTimeout(timeoutId);
     };
-    // setInternalSchedule 为 schedule hook 的 setState，引用稳定；与旧版一致不把其列入 deps
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- match legacy interval deps
-  }, [followWallClock, scheduleValueProp, flushCommittedSchedule]);
+    // setInternalSchedule 为 schedule hook 的 setState，引用稳定；不把 scheduleValueProp 放进 deps（见 ref）
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- scheduleControlled：仅受控/非受控切换时重启定时器
+  }, [followWallClockEffective, flushCommittedSchedule, scheduleControlled]);
+  var setFollowWallClock = useCallback(function (value) {
+    if (wallClockFollowLocked) return;
+    setFollowWallClockInternal(value);
+  }, [wallClockFollowLocked]);
   var onFollowWallClockToggle = useCallback(function () {
-    return setFollowWallClock(function (v) {
+    if (wallClockFollowLocked) return;
+    setFollowWallClockInternal(function (v) {
       return !v;
     });
-  }, []);
+  }, [wallClockFollowLocked]);
   var onTimeNavigatorUserInteraction = useCallback(function () {
-    return setFollowWallClock(false);
-  }, []);
+    if (wallClockFollowLocked) return;
+    setFollowWallClockInternal(false);
+  }, [wallClockFollowLocked]);
   return {
-    followWallClock: followWallClock,
+    followWallClock: followWallClockEffective,
     setFollowWallClock: setFollowWallClock,
     onFollowWallClockToggle: onFollowWallClockToggle,
     onTimeNavigatorUserInteraction: onTimeNavigatorUserInteraction

package/es/plus/pisellReservation/types.d.ts

@@ -165,4 +165,10 @@ export interface PisellReservationProps extends Omit<RecordBoardProps, 'toolBar'
     bodyViewStorageKey?: string;
     /** 点击平面图左上角 HUD 打开窄屏表格抽屉（画布已绑定资源行） */
     floorMapHudTableDrawer?: boolean;
+    /**
+     * 强制「跟随当前时间」不可关闭（定时对齐墙钟、`getResourceBookingList` 与游标时间一致）。
+     * - **默认**：{@link lockedBodyView} 为 `resourceWall`，或用户在 RecordBoard 内**切换到「大屏 / resourceWall」子视图**时自动启用。
+     * - 设为 `true` 可在其它场景也强制跟随。
+     */
+    forceFollowWallClock?: boolean;
 }

package/lib/plus/pisellReservation/PisellReservation.js

@@ -118,6 +118,7 @@ var PisellReservationCore = (props) => {
     lockedBodyView,
     bodyViewStorageKey,
     floorMapHudTableDrawer = false,
+    forceFollowWallClock: forceFollowWallClockProp,
     ...rest
   } = props;
   const isInternalListData = (0, import_reservationDataUtils.shouldUseBuiltinReservationList)(
@@ -204,6 +205,10 @@ var PisellReservationCore = (props) => {
   const [shellBodyView, setShellBodyView] = (0, import_react.useState)(
     () => (0, import_reservationDataUtils.readBodyViewFromStorageKey)(bodyViewStorageKey)
   );
+  const wallClockFollowLocked = (0, import_react.useMemo)(
+    () => Boolean(forceFollowWallClockProp) || lockedBodyView === "resourceWall" || shellBodyView === "resourceWall",
+    [forceFollowWallClockProp, lockedBodyView, shellBodyView]
+  );
   const { baseFloorConfig, floorPlanRemoteId, setRemoteFloorPlanView } = (0, import_useReservationFloorPlan.useReservationFloorPlan)({
     resolvedFloorPlanId,
     effectiveFloorPlanCode,
@@ -338,7 +343,8 @@ var PisellReservationCore = (props) => {
     scheduleValueProp,
     setInternalSchedule,
     flushCommittedSchedule,
-    onScheduleChange
+    onScheduleChange,
+    wallClockFollowLocked
   );
   const prevCommittedDateRef = (0, import_react.useRef)(null);
   const { salesResourceBookings, salesTimelineHighlights } = (0, import_useReservationSalesHostData.useReservationSalesHostData)({
@@ -346,6 +352,7 @@ var PisellReservationCore = (props) => {
     pisellosRef,
     hasPisellosGetModule,
     debouncedSchedule,
+    followWallClock,
     resourceBoardLoading: resourceBoardData.loading,
     floorDayBookingLoading: floorDayBookingData.loading,
     floorDayBookingData: floorDayBookingData.data,
@@ -487,7 +494,9 @@ var PisellReservationCore = (props) => {
   ]);
   const handleScheduleChange = (0, import_react.useCallback)(
     (next) => {
-      setFollowWallClock(false);
+      if (!wallClockFollowLocked) {
+        setFollowWallClock(false);
+      }
       if (scheduleValueProp === void 0) {
         setInternalSchedule(next);
       }
@@ -498,7 +507,8 @@ var PisellReservationCore = (props) => {
       scheduleValueProp,
       onScheduleChange,
       setFollowWallClock,
-      queueCommittedSchedule
+      queueCommittedSchedule,
+      wallClockFollowLocked
     ]
   );
   const dataSources = (0, import_react.useMemo)(() => {

package/lib/plus/pisellReservation/PisellVenueWallPage.d.ts

@@ -7,6 +7,7 @@ import type { PisellReservationProps } from './types';
  * - `lockedBodyView="resourceWall"`：锁定在大屏视图。
  *
  * **无需新增 props 类型**：沿用 {@link PisellReservationProps}；可选行为与预约页相同（如 `toolBar`、`scheduleValue`、`floorMap` 等）。
+ * Core 在锁定大屏或预约页内 Segmented 切到「大屏」时（`shellBodyView === 'resourceWall'`）均 **强制跟随当前时间**（不可关闭）。
  * 默认使用 {@link PISELL_RESERVATION_VENUE_WALL_PAGE_STORAGE_KEY} 作为 `bodyViewStorageKey`，以便大屏筛选与主预约页 localStorage 隔离；可传入自定义 key 覆盖。
  */
 export declare const PisellVenueWallPage: React.FC<PisellReservationProps>;

package/lib/plus/pisellReservation/floorMap/useReservationFloorPlan.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { FloorMapViewConfig } from '@pisell/materials';
 export declare function useReservationFloorPlan(options: {
     resolvedFloorPlanId: number | null;

package/lib/plus/pisellReservation/hooks/useReservationSalesHostData.d.ts

@@ -10,12 +10,17 @@ declare type PisellOSLike = {
  * 内置列表且资源台 + floorDayBooking 均就绪后，向宿主 sales 拉两套数据：
  * - `getResourceBookingList`：游标时刻下的预约子集，参与合并进平面图 dataSources；
  * - `getTimelineHighlights`：时间轴密度折线（无则退回 PisellReservation 内本地计算）。
+ *
+ * **跟随当前**：`followWallClock === true` 时第三个参数 `currentTimeStr` 与 `timeStr` 相同（均来自 `debouncedSchedule.at`），
+ * 避免与墙钟 `dayjs()` 差一分钟；手动关闭跟随后仍传实时 `dayjs()`，保留「游标 vs 此刻」双通道语义。
  */
 export declare function useReservationSalesHostData(options: {
     isInternalListData: boolean;
     pisellosRef: MutableRefObject<PisellOSLike>;
     hasPisellosGetModule: boolean;
     debouncedSchedule: ReservationScheduleBandValue;
+    /** 顶栏「跟随当前时间」：为 true 时 `getResourceBookingList` 的 currentTime 与 timeStr 一致 */
+    followWallClock: boolean;
     resourceBoardLoading: boolean;
     floorDayBookingLoading: boolean;
     floorDayBookingData: unknown[];

package/lib/plus/pisellReservation/hooks/useReservationSalesHostData.js

@@ -42,6 +42,7 @@ function useReservationSalesHostData(options) {
     pisellosRef,
     hasPisellosGetModule,
     debouncedSchedule,
+    followWallClock,
     resourceBoardLoading,
     floorDayBookingLoading,
     floorDayBookingData,
@@ -104,7 +105,7 @@ function useReservationSalesHostData(options) {
     if (!Array.isArray(list)) {
       return;
     }
-    const retryGateKey = `${debouncedAtMs ?? "na"}|${floorDayBookingDepKey}|v${floorDayBookingDataVersion}|${hasPisellosGetModule ? 1 : 0}`;
+    const retryGateKey = `${debouncedAtMs ?? "na"}|${floorDayBookingDepKey}|v${floorDayBookingDataVersion}|${hasPisellosGetModule ? 1 : 0}|fw${followWallClock ? 1 : 0}`;
     if (retryGateKey !== resourceListRetryGateRef.current) {
       resourceListRetryGateRef.current = retryGateKey;
       resourceListHostSkipRef.current = false;
@@ -129,7 +130,7 @@ function useReservationSalesHostData(options) {
     const timeStr = (0, import_dayjs.default)(debouncedSchedule.at).format(
       resourceBookingListTimeFormat
     );
-    const currentTimeStr = (0, import_dayjs.default)().format(resourceBookingListTimeFormat);
+    const currentTimeStr = followWallClock ? timeStr : (0, import_dayjs.default)().format(resourceBookingListTimeFormat);
     const applyHostList = (raw) => {
       if (salesBookingRequestRef.current !== reqId) return;
       const normalized = (0, import_reservationTablesMerge.normalizeSalesResourceBookingListResult)(raw);
@@ -178,6 +179,7 @@ function useReservationSalesHostData(options) {
      */
     floorDayBookingDataVersion,
     debouncedAtMs,
+    followWallClock,
     pisellosRef
   ]);
   const [salesTimelineHighlights, setSalesTimelineHighlights] = (0, import_react.useState)(null);

package/lib/plus/pisellReservation/hooks/useReservationWallClockFollow.d.ts

@@ -1,12 +1,15 @@
-/// <reference types="react" />
+import { type SetStateAction } from 'react';
 import type { ReservationScheduleBandValue } from '@pisell/materials';
 declare type OnScheduleChange = ((v: ReservationScheduleBandValue) => void) | undefined;
 /**
- * 顶栏「跟随当前时间」：30s 对齐日程，并通过 flushCommittedSchedule 触发防抖链。
+ * 顶栏「跟随当前时间」：在每自然分钟整点（*: * :00）对齐日程，`at` 使用当前分钟的 `startOf('minute')`，
+ * 并通过 flushCommittedSchedule 触发防抖链。
+ *
+ * @param wallClockFollowLocked 为 true 时（如大屏锁定 resourceWall）：定时器始终运行，且不可通过交互关闭跟随。
  */
-export declare function useReservationWallClockFollow(scheduleValueProp: ReservationScheduleBandValue | undefined, setInternalSchedule: (v: ReservationScheduleBandValue) => void, flushCommittedSchedule: (v: ReservationScheduleBandValue) => void, onScheduleChange: OnScheduleChange): {
+export declare function useReservationWallClockFollow(scheduleValueProp: ReservationScheduleBandValue | undefined, setInternalSchedule: (v: ReservationScheduleBandValue) => void, flushCommittedSchedule: (v: ReservationScheduleBandValue) => void, onScheduleChange: OnScheduleChange, wallClockFollowLocked?: boolean): {
     followWallClock: boolean;
-    setFollowWallClock: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    setFollowWallClock: (value: SetStateAction<boolean>) => void;
     onFollowWallClockToggle: () => void;
     onTimeNavigatorUserInteraction: () => void;
 };

package/lib/plus/pisellReservation/hooks/useReservationWallClockFollow.js

@@ -34,41 +34,72 @@ __export(useReservationWallClockFollow_exports, {
 module.exports = __toCommonJS(useReservationWallClockFollow_exports);
 var import_react = require("react");
 var import_dayjs = __toESM(require("dayjs"));
-function useReservationWallClockFollow(scheduleValueProp, setInternalSchedule, flushCommittedSchedule, onScheduleChange) {
-  const [followWallClock, setFollowWallClock] = (0, import_react.useState)(true);
+function useReservationWallClockFollow(scheduleValueProp, setInternalSchedule, flushCommittedSchedule, onScheduleChange, wallClockFollowLocked = false) {
+  const [followWallClock, setFollowWallClockInternal] = (0, import_react.useState)(true);
   const onScheduleChangeRef = (0, import_react.useRef)(onScheduleChange);
+  const scheduleValuePropRef = (0, import_react.useRef)(scheduleValueProp);
+  scheduleValuePropRef.current = scheduleValueProp;
+  const scheduleControlled = scheduleValueProp !== void 0;
+  const followWallClockEffective = wallClockFollowLocked || followWallClock;
+  (0, import_react.useEffect)(() => {
+    if (wallClockFollowLocked) setFollowWallClockInternal(true);
+  }, [wallClockFollowLocked]);
   (0, import_react.useEffect)(() => {
     onScheduleChangeRef.current = onScheduleChange;
   });
   (0, import_react.useEffect)(() => {
-    if (!followWallClock) return;
+    if (!followWallClockEffective) return;
+    let timeoutId = null;
+    let cancelled = false;
+    const msUntilNextMinuteBoundary = () => {
+      const now = (0, import_dayjs.default)();
+      return Math.max(0, now.startOf("minute").add(1, "minute").diff(now));
+    };
     const tick = () => {
       var _a;
-      const now = (0, import_dayjs.default)();
+      const now = (0, import_dayjs.default)().startOf("minute");
       const next = {
         date: now.startOf("day"),
         at: now
       };
-      if (scheduleValueProp === void 0) {
+      if (scheduleValuePropRef.current === void 0) {
         setInternalSchedule(next);
       }
       (_a = onScheduleChangeRef.current) == null ? void 0 : _a.call(onScheduleChangeRef, next);
       flushCommittedSchedule(next);
     };
+    const scheduleNextBoundary = () => {
+      if (cancelled) return;
+      timeoutId = window.setTimeout(() => {
+        if (cancelled) return;
+        tick();
+        scheduleNextBoundary();
+      }, msUntilNextMinuteBoundary());
+    };
     tick();
-    const id = window.setInterval(tick, 3e4);
-    return () => window.clearInterval(id);
-  }, [followWallClock, scheduleValueProp, flushCommittedSchedule]);
-  const onFollowWallClockToggle = (0, import_react.useCallback)(
-    () => setFollowWallClock((v) => !v),
-    []
-  );
-  const onTimeNavigatorUserInteraction = (0, import_react.useCallback)(
-    () => setFollowWallClock(false),
-    []
+    scheduleNextBoundary();
+    return () => {
+      cancelled = true;
+      if (timeoutId != null) window.clearTimeout(timeoutId);
+    };
+  }, [followWallClockEffective, flushCommittedSchedule, scheduleControlled]);
+  const setFollowWallClock = (0, import_react.useCallback)(
+    (value) => {
+      if (wallClockFollowLocked) return;
+      setFollowWallClockInternal(value);
+    },
+    [wallClockFollowLocked]
   );
+  const onFollowWallClockToggle = (0, import_react.useCallback)(() => {
+    if (wallClockFollowLocked) return;
+    setFollowWallClockInternal((v) => !v);
+  }, [wallClockFollowLocked]);
+  const onTimeNavigatorUserInteraction = (0, import_react.useCallback)(() => {
+    if (wallClockFollowLocked) return;
+    setFollowWallClockInternal(false);
+  }, [wallClockFollowLocked]);
   return {
-    followWallClock,
+    followWallClock: followWallClockEffective,
     setFollowWallClock,
     onFollowWallClockToggle,
     onTimeNavigatorUserInteraction

package/lib/plus/pisellReservation/types.d.ts

@@ -165,4 +165,10 @@ export interface PisellReservationProps extends Omit<RecordBoardProps, 'toolBar'
     bodyViewStorageKey?: string;
     /** 点击平面图左上角 HUD 打开窄屏表格抽屉（画布已绑定资源行） */
     floorMapHudTableDrawer?: boolean;
+    /**
+     * 强制「跟随当前时间」不可关闭（定时对齐墙钟、`getResourceBookingList` 与游标时间一致）。
+     * - **默认**：{@link lockedBodyView} 为 `resourceWall`，或用户在 RecordBoard 内**切换到「大屏 / resourceWall」子视图**时自动启用。
+     * - 设为 `true` 可在其它场景也强制跟随。
+     */
+    forceFollowWallClock?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.180",
+  "version": "6.11.181",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -69,8 +69,8 @@
     "styled-components": "^6.0.0-rc.3",
     "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.11.57",
-    "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.8"
+    "@pisell/date-picker": "3.0.8",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",