@pisell/private-materials 6.11.123 → 6.11.125

package/lib/plus/pisellReservation/PisellReservation.js

@@ -60,7 +60,6 @@ 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");
@@ -71,13 +70,148 @@ var import_useReservationFloorMapMerged = require("./floorMap/useReservationFloo
 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");
 var import_useNewReservationRoutesFromEngine = require("./hooks/useNewReservationRoutesFromEngine");
 var import_useReservationLoadingShownDebounced = require("./hooks/useReservationLoadingShownDebounced");
 var import_useFloorMapBookingInteraction = require("./hooks/useFloorMapBookingInteraction");
+function sanitizeVenueWallResourceLayout(raw) {
+  if (raw == null || typeof raw !== "object") return void 0;
+  const o = raw;
+  const clampInt = (v, min, max, d) => {
+    const n = typeof v === "number" ? v : Number(v);
+    if (!Number.isFinite(n)) return d;
+    return Math.max(min, Math.min(max, Math.round(n)));
+  };
+  const heroRaw = typeof o.heroMaxWidthRatio === "number" ? o.heroMaxWidthRatio : Number(o.heroMaxWidthRatio);
+  const heroMaxWidthRatio = Number.isFinite(heroRaw) ? Math.max(0.4, Math.min(0.8, heroRaw)) : import_materials.DEFAULT_RESOURCE_WALL_LAYOUT_PERSIST.heroMaxWidthRatio;
+  const layoutKey = typeof o.layoutKey === "string" && o.layoutKey.length > 0 ? o.layoutKey : import_materials.DEFAULT_RESOURCE_WALL_LAYOUT_PERSIST.layoutKey;
+  return {
+    layoutKey,
+    customCols: clampInt(
+      o.customCols,
+      1,
+      6,
+      import_materials.DEFAULT_RESOURCE_WALL_LAYOUT_PERSIST.customCols
+    ),
+    customRows: clampInt(
+      o.customRows,
+      1,
+      6,
+      import_materials.DEFAULT_RESOURCE_WALL_LAYOUT_PERSIST.customRows
+    ),
+    pageDurationSec: clampInt(
+      o.pageDurationSec,
+      3,
+      60,
+      import_materials.DEFAULT_RESOURCE_WALL_LAYOUT_PERSIST.pageDurationSec
+    ),
+    boardingSoonBeforeMin: clampInt(
+      o.boardingSoonBeforeMin,
+      1,
+      60,
+      import_materials.DEFAULT_RESOURCE_WALL_LAYOUT_PERSIST.boardingSoonBeforeMin
+    ),
+    heroMaxWidthRatio
+  };
+}
+function isVenueWallAppearanceThemeNonEmpty(t) {
+  const slotHasData = (s) => {
+    if (!s) return false;
+    if (s.occupiedCardColor || s.availableCardColor) return true;
+    const o = s.statusToneOverrides;
+    return o != null && Object.keys(o).length > 0;
+  };
+  return slotHasData(t.light) || slotHasData(t.dark);
+}
+function dedupeResourceWallIdsPreserveOrder(ids) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const raw of ids) {
+    const t = String(raw).trim();
+    if (!t || seen.has(t)) continue;
+    seen.add(t);
+    out.push(t);
+  }
+  return out;
+}
+function parseResourceWallLocalStorage(raw, whitelist) {
+  const empty = { filterValuePatches: {} };
+  if (!raw) return empty;
+  try {
+    const parsed = JSON.parse(raw);
+    if (Array.isArray(parsed)) {
+      return {
+        resourceIds: parsed.map(String),
+        resourceWallResourceIdsInFile: true,
+        filterValuePatches: {}
+      };
+    }
+    if (!parsed || typeof parsed !== "object") return empty;
+    const o = parsed;
+    const hasRidKey = Object.prototype.hasOwnProperty.call(
+      o,
+      "resource_wall_resource_ids"
+    );
+    const ridRaw = o.resource_wall_resource_ids;
+    const resourceIds = !hasRidKey ? void 0 : Array.isArray(ridRaw) ? ridRaw.map(String) : [];
+    const patches = {};
+    const fv = o.filter_values;
+    if (fv && typeof fv === "object") {
+      for (const k of whitelist) {
+        if (k === "resource_wall_resource_ids") continue;
+        if (Object.prototype.hasOwnProperty.call(fv, k)) {
+          patches[k] = fv[k];
+        }
+      }
+    }
+    const legacyTones = o.venueWallStatusToneOverrides;
+    const diskTheme = o.venueWallAppearanceTheme;
+    let venueWallAppearanceTheme = diskTheme && typeof diskTheme === "object" ? diskTheme : void 0;
+    if (!venueWallAppearanceTheme && legacyTones && typeof legacyTones === "object" && Object.keys(legacyTones).length > 0) {
+      venueWallAppearanceTheme = {
+        light: { statusToneOverrides: legacyTones },
+        dark: { statusToneOverrides: legacyTones }
+      };
+    }
+    const rawMode = o.venueWallAppearanceMode;
+    const venueWallAppearanceMode = rawMode === "light" || rawMode === "dark" ? rawMode : void 0;
+    const venueWallResourceLayout = sanitizeVenueWallResourceLayout(
+      o.venueWallResourceLayout
+    );
+    return {
+      resourceIds,
+      resourceWallResourceIdsInFile: hasRidKey,
+      filterValuePatches: patches,
+      venueWallAppearanceTheme,
+      venueWallAppearanceMode,
+      venueWallResourceLayout
+    };
+  } catch {
+    return empty;
+  }
+}
+function readResourceWallPersistedSliceFromDisk(bodyViewStorageKey) {
+  const key = `${import_reservationConstants.PISELL_RESERVATION_RESOURCE_WALL_FILTER_STORAGE_PREFIX}:${bodyViewStorageKey ?? "default"}`;
+  let raw = null;
+  try {
+    if (typeof localStorage !== "undefined") {
+      raw = localStorage.getItem(key);
+    }
+  } catch {
+    raw = null;
+  }
+  const ls = parseResourceWallLocalStorage(
+    raw,
+    import_reservationConstants.RESERVATION_RESOURCE_WALL_PERSISTED_FILTER_VALUE_KEYS
+  );
+  return {
+    venueWallAppearanceTheme: ls.venueWallAppearanceTheme != null && isVenueWallAppearanceThemeNonEmpty(ls.venueWallAppearanceTheme) ? ls.venueWallAppearanceTheme : {},
+    venueWallAppearanceMode: ls.venueWallAppearanceMode === "light" || ls.venueWallAppearanceMode === "dark" ? ls.venueWallAppearanceMode : "light",
+    venueWallResourceLayout: ls.venueWallResourceLayout ?? import_materials.DEFAULT_RESOURCE_WALL_LAYOUT_PERSIST
+  };
+}
 function ReservationHudMapItemsSync({
   items,
   setItems
@@ -377,29 +511,6 @@ 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,
@@ -449,103 +560,10 @@ 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)(
@@ -606,6 +624,16 @@ var PisellReservationCore = (props) => {
     (0, import_reservationDataUtils.readBodyViewFromStorageKey)(bodyViewStorageKey)
   );
   const resourceWallFilterHydratedRef = (0, import_react.useRef)(false);
+  const [venueWallBoot] = (0, import_react.useState)(
+    () => readResourceWallPersistedSliceFromDisk(bodyViewStorageKey)
+  );
+  const [venueWallAppearanceTheme, setVenueWallAppearanceTheme] = (0, import_react.useState)(
+    venueWallBoot.venueWallAppearanceTheme
+  );
+  const [venueWallAppearanceMode, setVenueWallAppearanceMode] = (0, import_react.useState)(venueWallBoot.venueWallAppearanceMode);
+  const [venueWallResourceLayout, setVenueWallResourceLayout] = (0, import_react.useState)(
+    venueWallBoot.venueWallResourceLayout
+  );
   const floorMapLayoutRef = (0, import_react.useRef)(null);
   const [followWallClock, setFollowWallClock] = (0, import_react.useState)(true);
   const [calendarGranularity, setCalendarGranularity] = (0, import_react.useState)("week");
@@ -938,23 +966,139 @@ var PisellReservationCore = (props) => {
   );
   const onSearch = isInternalListData ? onGridBookingSearch : onSearchProp;
   const onReset = isInternalListData ? gridBookingData.onReset : onResetProp;
+  (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
+  ]);
+  (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) ? dedupeResourceWallIdsPreserveOrder(selectedRaw.map((x) => String(x))) : [];
+    const allCards = venueWallCards;
+    const byId = new Map(allCards.map((c) => [String(c.resourceId), c]));
+    const visibleCards = selectedIds.length === 0 ? [] : selectedIds.map((id) => {
+      const hit = byId.get(id);
+      return hit ?? {
+        resourceId: id,
+        resource: id,
+        status: "available"
+      };
+    });
+    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
+  ]);
   (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 whitelist = import_reservationConstants.RESERVATION_RESOURCE_WALL_PERSISTED_FILTER_VALUE_KEYS;
+    let lsParsed = {
+      filterValuePatches: {}
+    };
+    try {
+      const raw = localStorage.getItem(resourceWallFilterStorageKey);
+      lsParsed = parseResourceWallLocalStorage(raw, whitelist);
+    } catch {
+    }
+    if ((lsParsed == null ? void 0 : lsParsed.venueWallAppearanceTheme) != null && isVenueWallAppearanceThemeNonEmpty(lsParsed.venueWallAppearanceTheme)) {
+      setVenueWallAppearanceTheme(lsParsed.venueWallAppearanceTheme);
+    }
+    if (lsParsed.venueWallAppearanceMode === "light" || lsParsed.venueWallAppearanceMode === "dark") {
+      setVenueWallAppearanceMode(lsParsed.venueWallAppearanceMode);
+    }
+    if (lsParsed.venueWallResourceLayout != null) {
+      setVenueWallResourceLayout(lsParsed.venueWallResourceLayout);
+    }
     const existing = values.resource_wall_resource_ids;
     if (Array.isArray(existing) && existing.length > 0) {
-      if (existing.length > maxRw && onSearch) {
+      const hasPatches = Object.keys(lsParsed.filterValuePatches).length > 0;
+      if (onSearch && hasPatches) {
         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)
+              ...lsParsed.filterValuePatches,
+              resource_wall_resource_ids: existing.map(String)
             }
           }
         });
@@ -962,16 +1106,9 @@ var PisellReservationCore = (props) => {
       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);
+    const explicitRid = lsParsed.resourceWallResourceIdsInFile === true;
+    const idsFromLs = lsParsed.resourceIds ?? [];
+    const finalList = explicitRid ? dedupeResourceWallIdsPreserveOrder(idsFromLs) : [];
     resourceWallFilterHydratedRef.current = true;
     if (!onSearch) return;
     onSearch({
@@ -980,32 +1117,56 @@ var PisellReservationCore = (props) => {
         ...typeof searchParams.filter === "object" && searchParams.filter !== null ? searchParams.filter : {},
         values: {
           ...typeof values === "object" ? values : {},
+          ...lsParsed.filterValuePatches,
           resource_wall_resource_ids: finalList
         }
       }
     });
-  }, [
-    isInternalListData,
-    calendarOrderedResourceIds,
-    resourceWallFilterStorageKey,
-    onSearch,
-    searchParams
-  ]);
+  }, [isInternalListData, resourceWallFilterStorageKey, onSearch, searchParams]);
   (0, import_react.useEffect)(() => {
+    if (!isInternalListData) return;
     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;
+    const vals = fv.values;
+    const rid = vals.resource_wall_resource_ids;
     if (!Array.isArray(rid)) return;
+    const ridStable = dedupeResourceWallIdsPreserveOrder(rid.map(String));
+    const filter_values = {};
+    for (const k of import_reservationConstants.RESERVATION_RESOURCE_WALL_PERSISTED_FILTER_VALUE_KEYS) {
+      if (k === "resource_wall_resource_ids") continue;
+      if (Object.prototype.hasOwnProperty.call(vals, k)) {
+        filter_values[k] = vals[k];
+      }
+    }
+    const pack = {
+      v: 1,
+      resource_wall_resource_ids: ridStable
+    };
+    if (Object.keys(filter_values).length > 0) {
+      pack.filter_values = filter_values;
+    }
+    if (isVenueWallAppearanceThemeNonEmpty(venueWallAppearanceTheme)) {
+      pack.venueWallAppearanceTheme = venueWallAppearanceTheme;
+    }
+    pack.venueWallAppearanceMode = venueWallAppearanceMode;
+    pack.venueWallResourceLayout = venueWallResourceLayout;
     try {
       localStorage.setItem(
         resourceWallFilterStorageKey,
-        JSON.stringify(rid.map(String))
+        JSON.stringify(pack)
       );
     } catch {
     }
-  }, [searchParams == null ? void 0 : searchParams.filter, resourceWallFilterStorageKey]);
+  }, [
+    isInternalListData,
+    searchParams,
+    resourceWallFilterStorageKey,
+    venueWallAppearanceTheme,
+    venueWallAppearanceMode,
+    venueWallResourceLayout
+  ]);
   const handleRouteJump = (0, import_ahooks.useMemoizedFn)((routePath) => {
     var _a2, _b2;
     if (!routePath) return;
@@ -1099,37 +1260,18 @@ 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,
       topRight: topRightProp,
       bottomLeft: bottomLeftProp,
+      quickFilter: toolBarQuickFilterOverride,
       ...restToolbar
     } = toolBarProp ?? {};
     return {
       ...bookingToolBar ?? {},
       ...restToolbar,
-      quickFilter: reservationResourceWallQuickFilter,
+      quickFilter: toolBarQuickFilterOverride !== void 0 ? toolBarQuickFilterOverride : bookingToolBar == null ? void 0 : bookingToolBar.quickFilter,
       tabs: /* @__PURE__ */ import_react.default.createElement(
         import_PisellReservationSubcomponents.PisellReservationToolbarTabs,
         {
@@ -1162,8 +1304,7 @@ var PisellReservationCore = (props) => {
     mergedTimeNavigatorProps,
     schedulePropsProp,
     loadReservationDensity,
-    calendarGranularity,
-    reservationResourceWallQuickFilter
+    calendarGranularity
   ]);
   const recordBoardGrid = (0, import_react.useMemo)(() => {
     return bookingChildProps.grid;
@@ -1336,9 +1477,21 @@ var PisellReservationCore = (props) => {
     () => ({
       cards: venueWallCards,
       loading: floorDayBookingData.loading,
-      filterFieldKey: import_materials.DEFAULT_RESOURCE_WALL_FILTER_FIELD_KEY
+      filterFieldKey: import_materials.DEFAULT_RESOURCE_WALL_FILTER_FIELD_KEY,
+      appearanceTheme: venueWallAppearanceTheme,
+      onAppearanceThemeChange: setVenueWallAppearanceTheme,
+      appearanceMode: venueWallAppearanceMode,
+      onAppearanceModeChange: setVenueWallAppearanceMode,
+      resourceWallLayout: venueWallResourceLayout,
+      onResourceWallLayoutChange: setVenueWallResourceLayout
     }),
-    [venueWallCards, floorDayBookingData.loading]
+    [
+      venueWallCards,
+      floorDayBookingData.loading,
+      venueWallAppearanceTheme,
+      venueWallAppearanceMode,
+      venueWallResourceLayout
+    ]
   );
   return /* @__PURE__ */ import_react.default.createElement(
     import_date_picker.LocalizationProvider,
@@ -1380,20 +1533,22 @@ var PisellReservationCore = (props) => {
           lockedBodyView,
           floorMapLayoutRef
         },
-        /* @__PURE__ */ import_react.default.createElement(import_materials.PisellRecordBoard.ShellFrame, null, /* @__PURE__ */ import_react.default.createElement(
+        /* @__PURE__ */ import_react.default.createElement(
           import_PisellReservationSubcomponents.RecordBoardBodyViewCapture,
           {
             bodyViewRef,
             onBodyViewChange: setShellBodyView
           }
-        ), /* @__PURE__ */ import_react.default.createElement(
+        ),
+        /* @__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.ResourceWall, null))
+        ),
+        /* @__PURE__ */ import_react.default.createElement(import_materials.PisellRecordBoard.ShellFrame, 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

@@ -14,7 +14,17 @@ export declare function RecordBoardBodyViewCapture(props: {
     bodyViewRef: React.MutableRefObject<RecordBoardBodyView>;
     onBodyViewChange?: (v: RecordBoardBodyView) => void;
 }): null;
-/** 从表格切回平面图/日历，或从日历回到平面图时，用当前日程收敛 `booking_time` 查询窗（与视口逻辑一致） */
+/**
+ * 视图切换时统一收敛 `floorDayBookingData.searchParams`：
+ * - 从 grid / 任意非视图区切到 floorMap / calendar / resourceWall 时，锚定当前营业日单日窗；
+ * - 从 calendar / resourceWall 切回 floorMap 时，除锚定单日窗外，必须清掉 calendar 周/月视图写入的
+ *   `compact_fields` / `enable_remote_memory_cache`（否则 osServer 在非今日锚定下会走 compact with，
+ *    booking 缺失 resources，平面图合并落空）；
+ * - 从 calendar 切到 grid / resourceWall 时，单独清 calendar-only flags，避免之后再切回 floorMap 时残留。
+ *
+ * 注意：此组件必须常驻挂载（放在 `<PisellRecordBoard>` 内、`<ShellFrame>` 外），
+ * 否则 ShellFrame 会按 bodyView 条件渲染 children，导致它只在 grid 视图下挂载而无法观测到切换事件。
+ */
 export declare function ScheduleSyncOnFloorEnter(props: {
     schedule: ReservationScheduleBandValue;
     isInternalListData: boolean;

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

@@ -61,12 +61,23 @@ function ScheduleSyncOnFloorEnter(props) {
     const prev = prevRef.current;
     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)
+        (p) => (0, import_reservationDataUtils.stripCalendarOnlyFlags)(
+          (0, import_reservationDataUtils.mergeSearchParamsBookingWindow)(p, props.schedule.date)
+        )
       );
     }
     if (props.isInternalListData && (prev === "calendar" || prev === "resourceWall") && bodyView === "floorMap") {
       props.patchSearchParams(
-        (p) => (0, import_reservationDataUtils.mergeSearchParamsBookingWindow)(p, props.schedule.date)
+        (p) => (0, import_reservationDataUtils.stripCalendarOnlyFlags)(
+          (0, import_reservationDataUtils.mergeSearchParamsBookingWindow)(p, props.schedule.date)
+        )
+      );
+    }
+    if (props.isInternalListData && prev === "calendar" && (bodyView === "grid" || bodyView === "resourceWall")) {
+      props.patchSearchParams(
+        (p) => (0, import_reservationDataUtils.stripCalendarOnlyFlags)(
+          (0, import_reservationDataUtils.mergeSearchParamsBookingWindow)(p, props.schedule.date)
+        )
       );
     }
     prevRef.current = bodyView;