@pisell/private-materials 6.11.115 → 6.11.117

package/lib/plus/orderList/components/QuickFilter.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const QuickFilter: (props: {
     locales: any;
 }) => JSX.Element;

package/lib/plus/orderList/components/Reset.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const Reset: (props: {
     locales: any;
     setValueType: (value: any) => void;

package/lib/plus/orderList/components/Toolbar.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const Toolbar: (props: {
     locales: any;
     clearSelectedData: () => void;

package/lib/plus/pisellReservation/PisellReservation.js

@@ -60,6 +60,7 @@ var import_reservationDensity = require("./data/reservationDensity");
 var import_bookingToReservationTables = require("./data/bookingToReservationTables");
 var import_hudDrawerLocalListQuery = require("./data/hudDrawerLocalListQuery");
 var import_reservationTablesMerge = require("./data/reservationTablesMerge");
+var import_formResourceToReservationTables = require("./data/formResourceToReservationTables");
 var import_bookingToReservationTables2 = require("./data/bookingToReservationTables");
 var import_calendarAdapter = require("./data/calendarAdapter");
 var import_reservationDataUtils = require("./data/reservationDataUtils");
@@ -69,6 +70,8 @@ var import_useReservationFloorPlan = require("./floorMap/useReservationFloorPlan
 var import_useReservationFloorMapMerged = require("./floorMap/useReservationFloorMapMerged");
 var import_ReservationCalendarDayBookingRoomCard = require("./components/ReservationCalendarDayBookingRoomCard");
 var import_reservationConstants = require("./reservationConstants");
+var import_mapReservationToVenueWallCards = require("./data/mapReservationToVenueWallCards");
+var import_ReservationResourceWallResourceSelect = require("./components/ReservationResourceWallResourceSelect");
 var import_reservationOperatingDayRange = require("./data/reservationOperatingDayRange");
 var import_useReservationScheduleDebounced = require("./hooks/useReservationScheduleDebounced");
 var import_useReservationSalesHostData = require("./hooks/useReservationSalesHostData");
@@ -207,6 +210,9 @@ var PisellReservationCore = (props) => {
      */
     subscribeRealtimePush: true
   });
+  const [shellBodyView, setShellBodyView] = (0, import_react.useState)(
+    () => (0, import_reservationDataUtils.readBodyViewFromStorageKey)(bodyViewStorageKey)
+  );
   const { baseFloorConfig, floorPlanRemoteId, setRemoteFloorPlanView } = (0, import_useReservationFloorPlan.useReservationFloorPlan)({
     resolvedFloorPlanId,
     effectiveFloorPlanCode,
@@ -232,11 +238,44 @@ var PisellReservationCore = (props) => {
     ),
     [floorConfigForBindings.sceneElements, gridDataSourceKey]
   );
+  const resourceWallFilterIdsForFloorBooking = (0, import_react.useMemo)(() => {
+    if (!isInternalListData) return [];
+    const sp = gridBookingData.searchParams;
+    const fv = sp == null ? void 0 : sp.filter;
+    if (!fv || typeof fv !== "object" || fv === null) return [];
+    const vals = fv.values;
+    if (!vals || typeof vals !== "object") return [];
+    const raw = vals[import_materials.DEFAULT_RESOURCE_WALL_FILTER_FIELD_KEY];
+    if (!Array.isArray(raw)) return [];
+    return raw.map(String).filter(Boolean);
+  }, [isInternalListData, gridBookingData.searchParams]);
   const floorBookingResourceReady = isInternalListData && !resourceBoardData.loading;
-  const floorBookingExtraParams = (0, import_react.useMemo)(
-    () => ({ form_record_ids: floorBoundFormRecordIds }),
-    [floorBoundFormRecordIds]
-  );
+  const floorBookingExtraParams = (0, import_react.useMemo)(() => {
+    const normalizeIds = (ids) => {
+      const out = [];
+      for (const id of ids) {
+        const t = String(id).trim();
+        if (!t) continue;
+        const n = Number(t);
+        if (Number.isFinite(n) && n > 0 && /^\d+$/.test(t)) {
+          out.push(Math.trunc(n));
+        } else {
+          out.push(t);
+        }
+      }
+      return out;
+    };
+    if (shellBodyView === "resourceWall" && resourceWallFilterIdsForFloorBooking.length > 0) {
+      return {
+        form_record_ids: normalizeIds(resourceWallFilterIdsForFloorBooking)
+      };
+    }
+    return { form_record_ids: floorBoundFormRecordIds };
+  }, [
+    shellBodyView,
+    resourceWallFilterIdsForFloorBooking,
+    floorBoundFormRecordIds
+  ]);
   const floorDayBookingData = (0, import_usePisellReservationBookingData.usePisellReservationBookingData)(
     floorBookingResourceReady,
     { listPageSize: 999, extraRequestParams: floorBookingExtraParams }
@@ -299,6 +338,24 @@ var PisellReservationCore = (props) => {
     timeNavigatorPropsProp,
     timelineRange: effectiveTimelineRange
   });
+  (0, import_react.useEffect)(() => {
+    if (!isInternalListData) return;
+    const raw = salesResourceBookings;
+    if (raw == null) {
+      console.log("[PisellReservation] salesResourceBookings", null);
+      return;
+    }
+    if (!Array.isArray(raw)) {
+      console.log("[PisellReservation] salesResourceBookings (non-array)", raw);
+      return;
+    }
+    const head = raw.slice(0, 3);
+    console.log("[PisellReservation] salesResourceBookings", {
+      length: raw.length,
+      head,
+      full: raw
+    });
+  }, [isInternalListData, salesResourceBookings]);
   const tables = (0, import_react.useMemo)(
     () => (0, import_reservationTablesMerge.buildReservationMergedTableRows)({
       dataSourcesProp,
@@ -320,6 +377,29 @@ var PisellReservationCore = (props) => {
       dataProp
     ]
   );
+  const resourceWallFilterSelectOptions = (0, import_react.useMemo)(() => {
+    if (isInternalListData && Array.isArray(resourceBoardData.data) && resourceBoardData.data.length > 0) {
+      return (0, import_formResourceToReservationTables.formResourceListToReservationTableRows)(
+        resourceBoardData.data
+      ).map((r) => ({
+        label: r.code || r.main_field || String(r.id),
+        value: String(r.id)
+      }));
+    }
+    const seen = /* @__PURE__ */ new Set();
+    const out = [];
+    for (const row of tables) {
+      const id = String(row.id);
+      if (!id || id === "undefined" || id === "null") continue;
+      if (seen.has(id)) continue;
+      seen.add(id);
+      out.push({
+        label: row.code || row.main_field || id,
+        value: id
+      });
+    }
+    return out;
+  }, [isInternalListData, resourceBoardData.data, tables]);
   const calendarOrderedResourceIds = (0, import_react.useMemo)(() => {
     const fromScene = (0, import_calendarAdapter.orderedCanvasResourceRecordIdStrings)(
       floorConfigForBindings.sceneElements,
@@ -369,6 +449,104 @@ var PisellReservationCore = (props) => {
     }),
     [floorDayBookingData.data, calendarCanvasIdSet]
   );
+  (0, import_react.useEffect)(() => {
+    if (shellBodyView !== "calendar") return;
+    const summarizeBooking = (b) => ({
+      id: b.id,
+      courtId: b.courtId,
+      date: b.date,
+      startHour: b.startHour,
+      endHour: b.endHour,
+      name: b.name,
+      kind: b.kind
+    });
+    const summarizeResource = (r) => ({
+      id: r.id,
+      name: r.name,
+      groupType: r.groupType
+    });
+    console.log("[PisellReservation] calendar 展示数据", {
+      shellBodyView,
+      calendarGranularity,
+      anchorDate: schedule.date.toISOString(),
+      scheduleAt: (0, import_dayjs.default)(schedule.at).isValid() ? (0, import_dayjs.default)(schedule.at).toISOString() : String(schedule.at),
+      timelineRange: effectiveTimelineRange,
+      floorDayBookingLoading: floorDayBookingData.loading,
+      floorDayBookingCount: Array.isArray(floorDayBookingData.data) ? floorDayBookingData.data.length : 0,
+      calendarOrderedResourceIds,
+      resourcesCount: calendarResources.length,
+      resourcesPreview: calendarResources.slice(0, 12).map(summarizeResource),
+      bookingsCount: calendarBookings.length,
+      bookingsPreview: calendarBookings.slice(0, 12).map(summarizeBooking),
+      resourcesFull: calendarResources,
+      bookingsFull: calendarBookings
+    });
+  }, [
+    shellBodyView,
+    calendarGranularity,
+    schedule.date,
+    schedule.at,
+    effectiveTimelineRange,
+    floorDayBookingData.loading,
+    floorDayBookingData.data,
+    calendarOrderedResourceIds,
+    calendarResources,
+    calendarBookings
+  ]);
+  const venueWallCards = (0, import_react.useMemo)(
+    () => (0, import_mapReservationToVenueWallCards.mapReservationRowsToVenueWallCards)(tables),
+    [tables]
+  );
+  (0, import_react.useEffect)(() => {
+    if (shellBodyView !== "resourceWall") return;
+    const filterKey = import_materials.DEFAULT_RESOURCE_WALL_FILTER_FIELD_KEY;
+    const sp = searchParams;
+    const fv = sp == null ? void 0 : sp.filter;
+    const vals = fv && typeof fv === "object" && fv !== null && typeof fv.values === "object" && fv.values !== null ? fv.values : {};
+    const selectedRaw = vals[filterKey];
+    const selectedIds = Array.isArray(selectedRaw) ? selectedRaw.map((x) => String(x)) : null;
+    const allCards = venueWallCards;
+    const visibleCards = selectedIds == null || selectedIds.length === 0 ? allCards : (() => {
+      const set = new Set(selectedIds);
+      return allCards.filter((c) => set.has(String(c.resourceId)));
+    })();
+    const summarize = (c) => {
+      var _a2;
+      return {
+        resourceId: c.resourceId,
+        resource: c.resource,
+        area: c.area,
+        status: c.status,
+        currentTime: c.currentTime,
+        currentBooking: c.currentBooking,
+        startsInMin: c.startsInMin,
+        lateMin: c.lateMin,
+        remainingMin: c.remainingMin,
+        nextListHead: (_a2 = c.nextList) == null ? void 0 : _a2.slice(0, 2)
+      };
+    };
+    console.log("[PisellReservation] resourceWall 展示数据", {
+      shellBodyView,
+      filterFieldKey: filterKey,
+      searchParamsFilterValues: vals,
+      selectedIds,
+      floorDayBookingLoading: floorDayBookingData.loading,
+      floorBookingExtraParams,
+      cardsCount: allCards.length,
+      visibleCount: visibleCards.length,
+      cardsPreview: allCards.slice(0, 8).map(summarize),
+      visiblePreview: visibleCards.slice(0, 8).map(summarize),
+      cardsFull: allCards,
+      visibleFull: visibleCards
+    });
+  }, [
+    shellBodyView,
+    venueWallCards,
+    floorDayBookingData.loading,
+    searchParams,
+    floorBookingExtraParams
+  ]);
+  const resourceWallFilterStorageKey = `${import_reservationConstants.PISELL_RESERVATION_RESOURCE_WALL_FILTER_STORAGE_PREFIX}:${bodyViewStorageKey ?? "default"}`;
   const debouncedScheduleKey = (0, import_react.useMemo)(
     () => `${(0, import_dayjs.default)(debouncedSchedule.date).startOf("day").valueOf()}_${(0, import_dayjs.default)(
       debouncedSchedule.at
@@ -406,6 +584,7 @@ var PisellReservationCore = (props) => {
   const bodyViewRef = (0, import_react.useRef)(
     (0, import_reservationDataUtils.readBodyViewFromStorageKey)(bodyViewStorageKey)
   );
+  const resourceWallFilterHydratedRef = (0, import_react.useRef)(false);
   const floorMapLayoutRef = (0, import_react.useRef)(null);
   const [followWallClock, setFollowWallClock] = (0, import_react.useState)(true);
   const [calendarGranularity, setCalendarGranularity] = (0, import_react.useState)("week");
@@ -442,7 +621,7 @@ var PisellReservationCore = (props) => {
       }
       prevCommittedDateRef.current = d;
     }
-    if ((bodyViewRef.current === "floorMap" || bodyViewRef.current === "calendar") && !isInternalListData) {
+    if ((bodyViewRef.current === "floorMap" || bodyViewRef.current === "calendar" || bodyViewRef.current === "resourceWall") && !isInternalListData) {
       (_a2 = onSearchRef.current) == null ? void 0 : _a2.call(onSearchRef, {
         ...searchParamsRefControlled.current ?? {},
         reservationDate: debouncedSchedule.date.toISOString(),
@@ -736,6 +915,74 @@ var PisellReservationCore = (props) => {
   );
   const onSearch = isInternalListData ? onGridBookingSearch : onSearchProp;
   const onReset = isInternalListData ? gridBookingData.onReset : onResetProp;
+  (0, import_react.useEffect)(() => {
+    if (!isInternalListData) return;
+    if (resourceWallFilterHydratedRef.current) return;
+    if (calendarOrderedResourceIds.length === 0) return;
+    const fv = searchParams == null ? void 0 : searchParams.filter;
+    const values = fv && typeof fv === "object" && fv !== null && typeof fv.values === "object" && fv.values !== null ? fv.values : {};
+    const maxRw = import_reservationConstants.RESERVATION_RESOURCE_WALL_MAX_RESOURCE_SELECTION;
+    const existing = values.resource_wall_resource_ids;
+    if (Array.isArray(existing) && existing.length > 0) {
+      if (existing.length > maxRw && onSearch) {
+        onSearch({
+          ...searchParams,
+          filter: {
+            ...typeof searchParams.filter === "object" && searchParams.filter !== null ? searchParams.filter : {},
+            values: {
+              ...typeof values === "object" ? values : {},
+              resource_wall_resource_ids: existing.slice(0, maxRw).map(String)
+            }
+          }
+        });
+      }
+      resourceWallFilterHydratedRef.current = true;
+      return;
+    }
+    let stored;
+    try {
+      const raw = localStorage.getItem(resourceWallFilterStorageKey);
+      if (raw) stored = JSON.parse(raw);
+    } catch {
+    }
+    const all = calendarOrderedResourceIds;
+    const storedIds = Array.isArray(stored) && stored.length > 0 ? stored : [];
+    const picked = storedIds.length > 0 ? all.filter((id) => storedIds.includes(id)).slice(0, maxRw) : all.slice(0, maxRw);
+    const finalList = picked.length > 0 ? picked : all.slice(0, maxRw);
+    resourceWallFilterHydratedRef.current = true;
+    if (!onSearch) return;
+    onSearch({
+      ...searchParams,
+      filter: {
+        ...typeof searchParams.filter === "object" && searchParams.filter !== null ? searchParams.filter : {},
+        values: {
+          ...typeof values === "object" ? values : {},
+          resource_wall_resource_ids: finalList
+        }
+      }
+    });
+  }, [
+    isInternalListData,
+    calendarOrderedResourceIds,
+    resourceWallFilterStorageKey,
+    onSearch,
+    searchParams
+  ]);
+  (0, import_react.useEffect)(() => {
+    const fv = searchParams == null ? void 0 : searchParams.filter;
+    if (!fv || typeof fv !== "object" || fv === null || typeof fv.values !== "object" || fv.values === null) {
+      return;
+    }
+    const rid = fv.values.resource_wall_resource_ids;
+    if (!Array.isArray(rid)) return;
+    try {
+      localStorage.setItem(
+        resourceWallFilterStorageKey,
+        JSON.stringify(rid.map(String))
+      );
+    } catch {
+    }
+  }, [searchParams == null ? void 0 : searchParams.filter, resourceWallFilterStorageKey]);
   const handleRouteJump = (0, import_ahooks.useMemoizedFn)((routePath) => {
     var _a2, _b2;
     if (!routePath) return;
@@ -829,6 +1076,26 @@ var PisellReservationCore = (props) => {
       effectiveTimelineRange.end
     ]
   );
+  const reservationResourceWallQuickFilter = (0, import_react.useMemo)(
+    () => ({
+      filterList: [
+        {
+          type: "custom",
+          key: "resource_wall_resource_ids",
+          name: "resource_wall_resource_ids",
+          label: import_utils.locales.getText(import_reservationConstants.I18N_RESOURCE_WALL_RESOURCES),
+          props: {
+            options: resourceWallFilterSelectOptions
+          },
+          other: {
+            component: import_ReservationResourceWallResourceSelect.ReservationResourceWallResourceSelect
+          }
+        }
+      ],
+      hideFilterNamesOnFloorMap: []
+    }),
+    [resourceWallFilterSelectOptions]
+  );
   const toolBarMerged = (0, import_react.useMemo)(() => {
     const {
       tabs: extraTabs,
@@ -839,6 +1106,7 @@ var PisellReservationCore = (props) => {
     return {
       ...bookingToolBar ?? {},
       ...restToolbar,
+      quickFilter: reservationResourceWallQuickFilter,
       tabs: /* @__PURE__ */ import_react.default.createElement(
         import_PisellReservationSubcomponents.PisellReservationToolbarTabs,
         {
@@ -871,7 +1139,8 @@ var PisellReservationCore = (props) => {
     mergedTimeNavigatorProps,
     schedulePropsProp,
     loadReservationDensity,
-    calendarGranularity
+    calendarGranularity,
+    reservationResourceWallQuickFilter
   ]);
   const recordBoardGrid = (0, import_react.useMemo)(() => {
     return bookingChildProps.grid;
@@ -968,6 +1237,19 @@ var PisellReservationCore = (props) => {
     },
     [tables]
   );
+  const handleBlockedTimeSave = (0, import_react.useCallback)(
+    async (payload) => {
+      try {
+        await import_utils2.request.getRequest().post("/shop/schedule/blocked-time", payload);
+        import_antd.message.success("保存成功");
+        await floorDayBookingData.refreshAsync();
+        return true;
+      } catch {
+        return false;
+      }
+    },
+    [floorDayBookingData]
+  );
   const calendarLoadKey = (0, import_react.useMemo)(
     () => `${calendarGranularity}_${(0, import_dayjs.default)(schedule.date).startOf("day").valueOf()}_${(0, import_dayjs.default)(
       schedule.at
@@ -1000,7 +1282,8 @@ var PisellReservationCore = (props) => {
       persistGuard: reservationCalendarPersist,
       resources: calendarResources,
       bookings: calendarBookings,
-      loading: calendarLoading,
+      /** 不套全屏 Spin：数据刷新时仍展示上一帧内容，避免切日历闪 loading */
+      loading: false,
       onViewportChange: handleCalendarViewportChange,
       onBookingClick: handleCalendarBookingClick,
       timelineRange: effectiveTimelineRange,
@@ -1009,21 +1292,31 @@ var PisellReservationCore = (props) => {
       anchorDate: schedule.date.toDate(),
       onAnchorDateChange: handleCalendarAnchorChange,
       slotStepMinutes: 30,
-      renderBooking: renderReservationCalendarBooking
+      renderBooking: renderReservationCalendarBooking,
+      onBlockedTimeSave: handleBlockedTimeSave,
+      blockedTimeSalesChannels: ["online_store"]
     };
   }, [
     reservationCalendarPersist,
     calendarResources,
     calendarBookings,
-    calendarLoading,
     handleCalendarViewportChange,
     handleCalendarBookingClick,
     calendarGranularity,
     schedule.date,
     handleCalendarAnchorChange,
     effectiveTimelineRange,
-    renderReservationCalendarBooking
+    renderReservationCalendarBooking,
+    handleBlockedTimeSave
   ]);
+  const reservationResourceWallSlotProps = (0, import_react.useMemo)(
+    () => ({
+      cards: venueWallCards,
+      loading: floorDayBookingData.loading,
+      filterFieldKey: import_materials.DEFAULT_RESOURCE_WALL_FILTER_FIELD_KEY
+    }),
+    [venueWallCards, floorDayBookingData.loading]
+  );
   return /* @__PURE__ */ import_react.default.createElement(
     import_date_picker.LocalizationProvider,
     {
@@ -1057,20 +1350,27 @@ var PisellReservationCore = (props) => {
           batchActionBar: bookingChildProps.batchActionBar,
           floorMap: floorMapMerged,
           calendar: reservationCalendarSlotProps,
+          resourceWall: reservationResourceWallSlotProps,
           defaultBodyView: "floorMap",
           bodyViewStorageKey,
           bodyViewSwitchable,
           lockedBodyView,
           floorMapLayoutRef
         },
-        /* @__PURE__ */ import_react.default.createElement(import_materials.PisellRecordBoard.ShellFrame, null, /* @__PURE__ */ import_react.default.createElement(import_PisellReservationSubcomponents.RecordBoardBodyViewCapture, { bodyViewRef }), /* @__PURE__ */ import_react.default.createElement(
+        /* @__PURE__ */ import_react.default.createElement(import_materials.PisellRecordBoard.ShellFrame, null, /* @__PURE__ */ import_react.default.createElement(
+          import_PisellReservationSubcomponents.RecordBoardBodyViewCapture,
+          {
+            bodyViewRef,
+            onBodyViewChange: setShellBodyView
+          }
+        ), /* @__PURE__ */ import_react.default.createElement(
           import_PisellReservationSubcomponents.ScheduleSyncOnFloorEnter,
           {
             schedule,
             isInternalListData,
             patchSearchParams: floorDayBookingData.patchSearchParams
           }
-        ), /* @__PURE__ */ import_react.default.createElement(import_materials.PisellRecordBoard.GridLayout, null), /* @__PURE__ */ import_react.default.createElement(import_materials.PisellRecordBoard.FloorMap, null), /* @__PURE__ */ import_react.default.createElement(import_materials.PisellRecordBoard.Calendar, null))
+        ), /* @__PURE__ */ import_react.default.createElement(import_materials.PisellRecordBoard.GridLayout, null), /* @__PURE__ */ import_react.default.createElement(import_materials.PisellRecordBoard.FloorMap, null), /* @__PURE__ */ import_react.default.createElement(import_materials.PisellRecordBoard.Calendar, null), /* @__PURE__ */ import_react.default.createElement(import_materials.PisellRecordBoard.ResourceWall, null))
       ),
       /* @__PURE__ */ import_react.default.createElement(
         import_materials.PisellModal,

package/lib/plus/pisellReservation/components/PisellReservationSubcomponents.d.ts

@@ -1,17 +1,18 @@
 /**
  * 预约页拆出的轻量子组件（无业务数据请求）：
- * - `RecordBoardBodyViewCapture`：把当前 grid/floorMap 同步到父组件 ref，供 debounce effect 读 bodyView；
+ * - `RecordBoardBodyViewCapture`：同步 bodyView 到 ref，并可通知宿主；
  * - `ScheduleSyncOnFloorEnter`：从表格回到平面图/日历、或从日历回到平面图时，用当前营业日 patch 列表时间窗口；
- * - `PisellReservationToolbarTabs`：平面图下的日程带 + 表格/平面图 Segmented；
+ * - `PisellReservationToolbarTabs`：平面图/日历为日程带 + Segmented；表格 / 资源墙不展示日程带，仅 extraTabs；
  * - `ReservationGridTopRight` / `PisellReservationScheduleEndActions` / `ReservationFloorMapCanvasTabsTrailing`：工具栏与画布尾区。
  */
 import React from 'react';
-import type { Dayjs } from 'dayjs';
+import { type Dayjs } from 'dayjs';
 import type { PisellFloorMapLayoutRef, RecordBoardBodyView, ReservationScheduleBandValue } from '@pisell/materials';
 import type { PisellReservationProps } from '../types';
-/** 无 UI：仅将 RecordBoard Context 中的 `bodyView` 写入 ref */
+/** 无 UI：将 RecordBoard Context 中的 `bodyView` 写入 ref，并可选通知宿主（如预约页按视图切换 booking 的 form_record_ids） */
 export declare function RecordBoardBodyViewCapture(props: {
     bodyViewRef: React.MutableRefObject<RecordBoardBodyView>;
+    onBodyViewChange?: (v: RecordBoardBodyView) => void;
 }): null;
 /** 从表格切回平面图/日历，或从日历回到平面图时，用当前日程收敛 `booking_time` 查询窗（与视口逻辑一致） */
 export declare function ScheduleSyncOnFloorEnter(props: {
@@ -38,8 +39,8 @@ export declare type PisellReservationToolbarTabsProps = {
     calendarGranularity?: 'day' | 'week' | 'month';
 };
 /**
- * 顶栏 tabs：平面图下为日程带 + 时间轴 + 标题旁切换；表格下不展示 ScheduleBand，
- * 切换器由 RecordBoard 工具栏顶行（Find 左侧）承担，与历史行为一致。
+ * 顶栏 tabs：**仅平面图、日历**下为日程带 + 时间轴 + 标题旁切换；表格 / 资源墙不展示 ScheduleBand，
+ * 切换器由 RecordBoard 工具栏顶行承担（表格态在 Find 左侧；资源墙无 Find 时在顶行左侧），与历史行为一致。
  */
 export declare function PisellReservationToolbarTabs(props: PisellReservationToolbarTabsProps): JSX.Element | null;
 /** 表格视图时展示工具栏右上角透传；平面图时收起（编辑入口在画布 Tab 行右侧） */

package/lib/plus/pisellReservation/components/PisellReservationSubcomponents.js

@@ -48,8 +48,10 @@ var import_reservationConstants = require("../reservationConstants");
 function RecordBoardBodyViewCapture(props) {
   const { bodyView } = (0, import_materials.useRecordBoardContext)();
   (0, import_react.useEffect)(() => {
+    var _a;
     props.bodyViewRef.current = bodyView;
-  }, [bodyView, props.bodyViewRef]);
+    (_a = props.onBodyViewChange) == null ? void 0 : _a.call(props, bodyView);
+  }, [bodyView, props.bodyViewRef, props.onBodyViewChange]);
   return null;
 }
 function ScheduleSyncOnFloorEnter(props) {
@@ -57,12 +59,12 @@ function ScheduleSyncOnFloorEnter(props) {
   const prevRef = (0, import_react.useRef)(null);
   (0, import_react.useEffect)(() => {
     const prev = prevRef.current;
-    if (props.isInternalListData && (bodyView === "floorMap" || bodyView === "calendar") && prev !== null && prev !== "floorMap" && prev !== "calendar") {
+    if (props.isInternalListData && (bodyView === "floorMap" || bodyView === "calendar" || bodyView === "resourceWall") && prev !== null && prev !== "floorMap" && prev !== "calendar" && prev !== "resourceWall") {
       props.patchSearchParams(
         (p) => (0, import_reservationDataUtils.mergeSearchParamsBookingWindow)(p, props.schedule.date)
       );
     }
-    if (props.isInternalListData && prev === "calendar" && bodyView === "floorMap") {
+    if (props.isInternalListData && (prev === "calendar" || prev === "resourceWall") && bodyView === "floorMap") {
       props.patchSearchParams(
         (p) => (0, import_reservationDataUtils.mergeSearchParamsBookingWindow)(p, props.schedule.date)
       );
@@ -84,14 +86,19 @@ function PisellReservationToolbarTabs(props) {
   const hasGrid = (shellMeta == null ? void 0 : shellMeta.hasGridContent) ?? true;
   const hasFloor = shellMeta == null ? void 0 : shellMeta.hasFloorMapSlot;
   const hasCalendar = shellMeta == null ? void 0 : shellMeta.hasCalendarSlot;
+  const hasResourceWall = shellMeta == null ? void 0 : shellMeta.hasResourceWallSlot;
   const floorForToggle = shellMeta == null ? void 0 : shellMeta.effectiveFloorMapProps;
   const canFloor = Boolean(hasFloor && floorForToggle != null);
   const canCalendar = Boolean(hasCalendar);
-  const bodyViewOptionCount = (hasGrid ? 1 : 0) + (canFloor ? 1 : 0) + (canCalendar ? 1 : 0);
+  const canResourceWall = Boolean(hasResourceWall);
+  const bodyViewOptionCount = (hasGrid ? 1 : 0) + (canFloor ? 1 : 0) + (canCalendar ? 1 : 0) + (canResourceWall ? 1 : 0);
   const allowBodyViewToggle = bodyViewOptionCount >= 2 && bodyViewSwitchable !== false;
   if (bodyView === "grid") {
     return props.extraTabs ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, props.extraTabs) : null;
   }
+  if (bodyView === "resourceWall") {
+    return props.extraTabs ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, props.extraTabs) : null;
+  }
   const bodyViewSegmentedOptions = (0, import_react.useMemo)(() => {
     const opts = [];
     if (canFloor) {
@@ -103,11 +110,17 @@ function PisellReservationToolbarTabs(props) {
         value: "calendar"
       });
     }
+    if (canResourceWall) {
+      opts.push({
+        label: import_utils.locales.getText(import_reservationConstants.I18N_VIEW_RESOURCE_WALL),
+        value: "resourceWall"
+      });
+    }
     if (hasGrid) {
       opts.push({ label: import_utils.locales.getText(import_reservationConstants.I18N_VIEW_GRID), value: "grid" });
     }
     return opts;
-  }, [canFloor, canCalendar, hasGrid]);
+  }, [canFloor, canCalendar, canResourceWall, hasGrid]);
   const bodyViewToggle = allowBodyViewToggle ? /* @__PURE__ */ import_react.default.createElement(
     import_antd.Segmented,
     {

package/lib/plus/pisellReservation/components/ReservationResourceWallResourceSelect.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="react" />
+export declare type ReservationResourceWallResourceSelectProps = {
+    value?: string[];
+    onChange?: (v: string[]) => void;
+    /** 与日历资源同源：{ label, value } */
+    options?: Array<{
+        label: string;
+        value: string;
+    }>;
+};
+/**
+ * 大屏快筛：画布资源多选（写入 `searchParams.filter.values.resource_wall_resource_ids`）。
+ */
+export declare function ReservationResourceWallResourceSelect(props: ReservationResourceWallResourceSelectProps): JSX.Element;

package/lib/plus/pisellReservation/components/ReservationResourceWallResourceSelect.js

@@ -0,0 +1,60 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/plus/pisellReservation/components/ReservationResourceWallResourceSelect.tsx
+var ReservationResourceWallResourceSelect_exports = {};
+__export(ReservationResourceWallResourceSelect_exports, {
+  ReservationResourceWallResourceSelect: () => ReservationResourceWallResourceSelect
+});
+module.exports = __toCommonJS(ReservationResourceWallResourceSelect_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var import_utils = require("@pisell/utils");
+var import_reservationConstants = require("../reservationConstants");
+function ReservationResourceWallResourceSelect(props) {
+  const { value, onChange, options = [] } = props;
+  const max = import_reservationConstants.RESERVATION_RESOURCE_WALL_MAX_RESOURCE_SELECTION;
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Select,
+    {
+      mode: "multiple",
+      allowClear: true,
+      showSearch: true,
+      optionFilterProp: "label",
+      placeholder: import_utils.locales.getText(import_reservationConstants.I18N_RESOURCE_WALL_RESOURCES),
+      value: (value ?? []).slice(0, max),
+      onChange: (v) => onChange == null ? void 0 : onChange(v.slice(0, max)),
+      options,
+      style: { minWidth: 260, maxWidth: 420 }
+    }
+  );
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ReservationResourceWallResourceSelect
+});

package/lib/plus/pisellReservation/components/bookingDetailModal/ReservationBookingDetailModal.js

@@ -70,7 +70,7 @@ function stopUiClick(e) {
 }
 function resolveOrderIdForHostActions(bookingRaw) {
   const order = bookingRaw.order;
-  const id = (order == null ? void 0 : order.id) ?? bookingRaw.order_id;
+  const id = (order == null ? void 0 : order.id) ?? (order == null ? void 0 : order.order_id) ?? bookingRaw.order_id;
   if (id == null || id === "") return void 0;
   if (typeof id === "number" && Number.isFinite(id)) return id;
   const s = String(id).trim();