@pisell/materials 6.11.36 → 6.11.38

package/lib/components/pisellRecordBoard/shellFrame/ResourceWall/venueWallCardPresentation.js

@@ -0,0 +1,139 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/pisellRecordBoard/shellFrame/ResourceWall/venueWallCardPresentation.ts
+var venueWallCardPresentation_exports = {};
+__export(venueWallCardPresentation_exports, {
+  buildVenueWallCardPresentation: () => buildVenueWallCardPresentation
+});
+module.exports = __toCommonJS(venueWallCardPresentation_exports);
+var import_locales = require("../../../../locales");
+var import_venueWallUtils = require("./venueWallUtils");
+function buildVenueWallCardPresentation(args) {
+  const {
+    card,
+    toneMap,
+    liveRemainingMin,
+    liveStartsInMin,
+    liveLateMin,
+    boardingSoonBeforeMin,
+    idleMain,
+    idleSub,
+    occupiedCardColor,
+    availableCardColor
+  } = args;
+  const statusKey = (0, import_venueWallUtils.deriveVenueWallStatus)({
+    ...card,
+    remainingMin: liveRemainingMin
+  });
+  const tone = toneMap[statusKey] ?? toneMap.inUse;
+  const isOccupied = ["inUse", "endingSoon", "expired"].includes(statusKey);
+  let heroText = isOccupied ? (0, import_venueWallUtils.formatVenueWallCountdown)(liveRemainingMin) : (0, import_locales.getText)("pisell-resource-wall-card-hero-available");
+  let heroColor = isOccupied ? statusKey === "inUse" ? "#ffffff" : tone.color : toneMap.available.color;
+  let noteText = isOccupied ? tone.note : toneMap.available.note;
+  let noteTextColor = isOccupied ? "#ffffff" : idleMain;
+  let noteBg = isOccupied ? tone.noteBg : (0, import_venueWallUtils.alphaColor)(availableCardColor, 0.2);
+  const subColor = isOccupied ? "rgba(255,255,255,0.80)" : idleSub;
+  const mainColor = isOccupied ? "#ffffff" : idleMain;
+  let currentLabel = (0, import_locales.getText)("pisell-resource-wall-card-label-current");
+  let currentTime = card.currentTime ?? "";
+  let currentName = isOccupied ? card.currentBooking ?? "" : "";
+  let currentNameColor = mainColor;
+  let nextNameColor = mainColor;
+  let progress = isOccupied ? (0, import_venueWallUtils.clamp)(liveRemainingMin / 60 * 100, 0, 100) : 0;
+  let progressColor = heroColor;
+  let rightTag = tone.label;
+  let rightTagColor = isOccupied ? "#ffffff" : tone.color;
+  let rightTagBg = isOccupied ? statusKey === "inUse" ? "rgba(255,255,255,0.14)" : tone.color : (0, import_venueWallUtils.alphaColor)(tone.color, 0.12);
+  let rightTagBorder = isOccupied ? "rgba(255,255,255,0.18)" : (0, import_venueWallUtils.alphaColor)(tone.color, 0.35);
+  if (statusKey === "boardingSoon") {
+    heroText = (0, import_locales.getText)("pisell-resource-wall-card-starts-in").replace(
+      "{n}",
+      String(liveStartsInMin)
+    );
+    heroColor = toneMap.boardingSoon.color;
+    noteText = toneMap.boardingSoon.note;
+    noteTextColor = toneMap.boardingSoon.color;
+    noteBg = (0, import_venueWallUtils.alphaColor)(toneMap.boardingSoon.color, 0.18);
+    currentLabel = (0, import_locales.getText)("pisell-resource-wall-card-label-next");
+    currentName = card.currentBooking ?? "";
+    currentNameColor = toneMap.boardingSoon.color;
+    nextNameColor = toneMap.boardingSoon.color;
+    progress = (0, import_venueWallUtils.clamp)(
+      (boardingSoonBeforeMin - liveStartsInMin) / boardingSoonBeforeMin * 100,
+      0,
+      100
+    );
+    progressColor = toneMap.boardingSoon.color;
+    rightTag = toneMap.boardingSoon.label;
+    rightTagColor = toneMap.boardingSoon.color;
+    rightTagBg = (0, import_venueWallUtils.alphaColor)(toneMap.boardingSoon.color, 0.12);
+    rightTagBorder = (0, import_venueWallUtils.alphaColor)(toneMap.boardingSoon.color, 0.35);
+  }
+  if (statusKey === "late") {
+    heroText = (0, import_locales.getText)("pisell-resource-wall-card-late").replace(
+      "{n}",
+      String(liveLateMin)
+    );
+    heroColor = "rgb(239, 68, 68)";
+    noteText = toneMap.late.note;
+    noteTextColor = toneMap.available.color;
+    noteBg = toneMap.available.noteBg;
+    currentLabel = (0, import_locales.getText)("pisell-resource-wall-card-label-next");
+    currentName = card.currentBooking ?? "";
+    currentNameColor = toneMap.available.color;
+    nextNameColor = toneMap.available.color;
+    progress = 100;
+    progressColor = toneMap.available.color;
+    rightTag = toneMap.late.label;
+    rightTagColor = toneMap.available.color;
+    rightTagBg = (0, import_venueWallUtils.alphaColor)(toneMap.available.color, 0.12);
+    rightTagBorder = (0, import_venueWallUtils.alphaColor)(toneMap.available.color, 0.35);
+  }
+  if (statusKey === "expired") {
+    heroText = liveRemainingMin < 0 ? (0, import_venueWallUtils.formatVenueWallCountdown)(liveRemainingMin) : liveRemainingMin === 0 ? (0, import_locales.getText)("pisell-resource-wall-countdown-zero-overtime") : (0, import_venueWallUtils.formatVenueWallCountdown)(liveRemainingMin);
+  }
+  const surfaceAccentColor = statusKey === "late" ? availableCardColor : statusKey === "boardingSoon" ? toneMap.boardingSoon.color : availableCardColor;
+  return {
+    statusKey,
+    isOccupied,
+    heroText,
+    heroColor,
+    noteText,
+    noteTextColor,
+    noteBg,
+    subColor,
+    mainColor,
+    currentLabel,
+    currentTime,
+    currentName,
+    currentNameColor,
+    nextNameColor,
+    progress,
+    progressColor,
+    rightTag,
+    rightTagColor,
+    rightTagBg,
+    rightTagBorder,
+    surfaceAccentColor
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildVenueWallCardPresentation
+});

package/lib/components/pisellRecordBoard/shellFrame/ResourceWall/venueWallUtils.d.ts

@@ -1,3 +1,6 @@
+/**
+ * 资源墙（Venue Wall）共用工具：六态键、默认色板、倒计时文案、卡片状态推导、配色合并与 diff。
+ */
 import type { RecordBoardResourceWallCardModel } from '../../types';
 export declare type VenueWallStatusKey = 'inUse' | 'endingSoon' | 'expired' | 'available' | 'boardingSoon' | 'late';
 /** 单态展示配置（与 {@link VENUE_WALL_STATUS_COLOR_MAP} 值同形） */
@@ -21,11 +24,34 @@ export declare type VenueWallAppearanceTheme = {
     dark?: VenueWallAppearanceSlot;
 };
 export declare const VENUE_WALL_STATUS_KEYS: VenueWallStatusKey[];
+/**
+ * 六态默认色与占位英文；`getVenueWallStatusToneMap` 会将 label/note 换为 i18n，此处仅作 merge 基底。
+ */
 export declare const VENUE_WALL_STATUS_COLOR_MAP: Record<VenueWallStatusKey, VenueWallStatusTone>;
+/** 将 `#RGB` / `#RRGGBB` 转为 `rgba(...)`，供渐变与半透明底 */
 export declare function alphaColor(hex: string, alpha: number): string;
+/** 将数值限制在 [min, max]（布局行列、主文案比例等） */
 export declare const clamp: (value: number, min: number, max: number) => number;
 /** 由卡片字段推导状态键（与演示页 test.tsx 规则一致） */
 export declare function deriveVenueWallStatus(card: RecordBoardResourceWallCardModel): VenueWallStatusKey;
+/**
+ * ToolBar Sort 写入的 `searchParams.sort`（如 `status:asc:string`）拆出字段名与升降序。
+ */
+export declare function parseRecordBoardToolbarSortParam(sort: unknown): {
+    field: string;
+    dir: 'asc' | 'desc';
+} | null;
+/** 当 Sort 字段名匹配这些 key（忽略大小写）时，资源墙按占用态重排卡片 */
+export declare const DEFAULT_RESOURCE_WALL_STATUS_SORT_FIELD_KEYS: readonly ["status"];
+export declare function matchesResourceWallStatusSortField(sortField: string, keys: readonly string[]): boolean;
+/**
+ * 用于资源墙排序：占用/将结/已结束为 1，其余为 0（与 {@link deriveVenueWallStatus} 一致）。
+ * asc → 空闲侧在前；desc → 占用侧在前。
+ */
+export declare function venueWallOccupiedSortRank(card: RecordBoardResourceWallCardModel): 0 | 1;
+/**
+ * 将「剩余/超支分钟数」格式化为跑码条/主副标题用短文案（走 i18n 模板，负值表示 overtime）。
+ */
 export declare function formatVenueWallCountdown(min: number): string;
 /**
  * 合并默认六态配色与业务覆盖，供 {@link VenueWallCard} 与 Control Panel 表单初值共用。

package/lib/components/pisellRecordBoard/shellFrame/ResourceWall/venueWallUtils.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/pisellRecordBoard/shellFrame/ResourceWall/venueWallUtils.ts
 var venueWallUtils_exports = {};
 __export(venueWallUtils_exports, {
+  DEFAULT_RESOURCE_WALL_STATUS_SORT_FIELD_KEYS: () => DEFAULT_RESOURCE_WALL_STATUS_SORT_FIELD_KEYS,
   VENUE_WALL_STATUS_COLOR_MAP: () => VENUE_WALL_STATUS_COLOR_MAP,
   VENUE_WALL_STATUS_KEYS: () => VENUE_WALL_STATUS_KEYS,
   alphaColor: () => alphaColor,
@@ -26,7 +27,10 @@ __export(venueWallUtils_exports, {
   deriveVenueWallStatus: () => deriveVenueWallStatus,
   diffVenueWallStatusToneOverrides: () => diffVenueWallStatusToneOverrides,
   formatVenueWallCountdown: () => formatVenueWallCountdown,
-  getVenueWallStatusToneMap: () => getVenueWallStatusToneMap
+  getVenueWallStatusToneMap: () => getVenueWallStatusToneMap,
+  matchesResourceWallStatusSortField: () => matchesResourceWallStatusSortField,
+  parseRecordBoardToolbarSortParam: () => parseRecordBoardToolbarSortParam,
+  venueWallOccupiedSortRank: () => venueWallOccupiedSortRank
 });
 module.exports = __toCommonJS(venueWallUtils_exports);
 var import_locales = require("../../../../locales");
@@ -107,12 +111,32 @@ function deriveVenueWallStatus(card) {
   if (rm != null && rm <= 10) return "endingSoon";
   return "inUse";
 }
+function parseRecordBoardToolbarSortParam(sort) {
+  if (sort == null || typeof sort !== "string") return null;
+  const idx = sort.indexOf(":");
+  if (idx <= 0) return null;
+  const field = sort.slice(0, idx);
+  const rest = sort.slice(idx + 1);
+  const dirSep = rest.indexOf(":");
+  const dirRaw = dirSep >= 0 ? rest.slice(0, dirSep) : rest;
+  if (dirRaw !== "asc" && dirRaw !== "desc") return null;
+  return { field, dir: dirRaw };
+}
+var DEFAULT_RESOURCE_WALL_STATUS_SORT_FIELD_KEYS = ["status"];
+function matchesResourceWallStatusSortField(sortField, keys) {
+  const n = sortField.trim().toLowerCase();
+  return keys.some((k) => k.trim().toLowerCase() === n);
+}
+function venueWallOccupiedSortRank(card) {
+  const k = deriveVenueWallStatus(card);
+  return k === "inUse" || k === "endingSoon" || k === "expired" ? 1 : 0;
+}
 function formatDurationHM(minAbs) {
   const safe = Number.isFinite(minAbs) ? Math.max(0, Math.floor(minAbs)) : 0;
   if (safe < 60) return `${safe}m`;
   const h = Math.floor(safe / 60);
   const m = safe % 60;
-  return `${h}h${String(m).padStart(2, "0")}m`;
+  return `${h}h ${String(m).padStart(2, "0")}m`;
 }
 function formatVenueWallCountdown(min) {
   if (min < 0) {
@@ -160,6 +184,7 @@ function diffVenueWallStatusToneOverrides(draft) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  DEFAULT_RESOURCE_WALL_STATUS_SORT_FIELD_KEYS,
   VENUE_WALL_STATUS_COLOR_MAP,
   VENUE_WALL_STATUS_KEYS,
   alphaColor,
@@ -167,5 +192,8 @@ function diffVenueWallStatusToneOverrides(draft) {
   deriveVenueWallStatus,
   diffVenueWallStatusToneOverrides,
   formatVenueWallCountdown,
-  getVenueWallStatusToneMap
+  getVenueWallStatusToneMap,
+  matchesResourceWallStatusSortField,
+  parseRecordBoardToolbarSortParam,
+  venueWallOccupiedSortRank
 });

package/lib/components/pisellRecordBoard/shellFrame/ToolBar/index.js

@@ -48,6 +48,7 @@ var import_useRecordBoardContext = require("../../hooks/useRecordBoardContext");
 var import_utils = require("@pisell/utils");
 var import_locales = require("../../../../locales");
 var import_recordBoardColumns = require("../../utils/recordBoardColumns");
+var import_venueWallUtils = require("../ResourceWall/venueWallUtils");
 var import_ToolBarFilter = require("./ToolBarFilter.less");
 var import_recordBoardToolbar = require("./recordBoardToolbar.less");
 function getSortButtonText() {
@@ -55,6 +56,25 @@ function getSortButtonText() {
   const u = import_utils.locales.getText(key);
   return u && u !== key ? u : (0, import_locales.getText)(key) || (0, import_locales.getText)("sort-button-text");
 }
+function buildResourceWallStatusSortFallbackItem(sortConfig) {
+  const extras = typeof sortConfig === "object" && sortConfig !== null && Array.isArray(sortConfig.resourceWallSortFieldKeys) ? sortConfig.resourceWallSortFieldKeys.map((x) => String(x).trim()).filter(Boolean) : [];
+  const primaryKey = extras.length > 0 ? extras[0] : import_venueWallUtils.DEFAULT_RESOURCE_WALL_STATUS_SORT_FIELD_KEYS[0];
+  return {
+    name: primaryKey,
+    label: (0, import_locales.getText)("pisell2.recordBoard.toolbar.sortStatus"),
+    isCustom: true,
+    getSortItems: () => [
+      {
+        key: `${primaryKey}:asc:option`,
+        label: (0, import_locales.getText)("pisell2.recordBoard.toolbar.sortStatusFreeFirst")
+      },
+      {
+        key: `${primaryKey}:desc:option`,
+        label: (0, import_locales.getText)("pisell2.recordBoard.toolbar.sortStatusOccupiedFirst")
+      }
+    ]
+  };
+}
 function getViewGridLabel() {
   const key = "pisell2.recordBoard.toolbar.viewGrid";
   const u = import_utils.locales.getText(key);
@@ -210,13 +230,36 @@ var RecordBoardToolBar = (props) => {
     [onSearch, searchParams]
   );
   const sortList = (0, import_react.useMemo)(() => {
-    const fromConfig = typeof sortConfig === "object" && sortConfig !== null && Array.isArray(sortConfig.list) ? sortConfig.list : null;
-    return fromConfig ?? derivedSortFromColumnsList;
-  }, [sortConfig, derivedSortFromColumnsList]);
+    const configuredList = typeof sortConfig === "object" && sortConfig !== null && Array.isArray(sortConfig.list) ? sortConfig.list : null;
+    const base = configuredList != null && configuredList.length > 0 ? configuredList : derivedSortFromColumnsList;
+    if (bodyView !== "resourceWall") {
+      return base;
+    }
+    const extraWallKeys = typeof sortConfig === "object" && sortConfig !== null && Array.isArray(sortConfig.resourceWallSortFieldKeys) ? sortConfig.resourceWallSortFieldKeys.map(
+      String
+    ) : [];
+    const allowedKeys = [
+      ...import_venueWallUtils.DEFAULT_RESOURCE_WALL_STATUS_SORT_FIELD_KEYS.map(String),
+      ...extraWallKeys
+    ];
+    const filtered = base.filter(
+      (item) => item.name != null && (0, import_venueWallUtils.matchesResourceWallStatusSortField)(String(item.name), allowedKeys)
+    );
+    if (filtered.length > 0) return filtered;
+    return [buildResourceWallStatusSortFallbackItem(sortConfig)];
+  }, [sortConfig, derivedSortFromColumnsList, bodyView]);
+  const sortSpreadRest = typeof sortConfig === "object" && sortConfig !== null ? (() => {
+    const {
+      resourceWallSortFieldKeys: _w,
+      list: _omitList,
+      ...rest
+    } = sortConfig;
+    return rest;
+  })() : {};
   const sortNode = hideSort ? null : /* @__PURE__ */ import_react.default.createElement(
     import_sort.default,
     {
-      ...typeof sortConfig === "object" && sortConfig !== null ? sortConfig : {},
+      ...sortSpreadRest,
       list: sortList,
       value: sortValue,
       onChange: handleSortChange,
@@ -271,7 +314,9 @@ var RecordBoardToolBar = (props) => {
     let outOther = otherFilter;
     if (bodyView === "resourceWall") {
       outQuick = [];
-      outOther = quickFilterList.length > 0 ? quickFilterList.map((item) => ({ ...item })) : [];
+      outOther = quickFilterList.filter(
+        (item) => (item.key ?? item.name ?? "") === resourceWallFilterFieldKey
+      ).map((item) => ({ ...item }));
     }
     return {
       ...base,

package/lib/components/pisellRecordBoard/shellFrame/index.js

@@ -62,6 +62,18 @@ var import_RecordBoardResourceWall = __toESM(require("./ResourceWall/RecordBoard
 var import_PisellRecordBoardResourceWallView = require("./ResourceWall/PisellRecordBoardResourceWallView");
 var import_ShellBodyMetaContext = require("./ShellBodyMetaContext");
 var import_ShellBodyMetaContext2 = require("./ShellBodyMetaContext");
+function mergeRecordBoardSlotProps(root, child) {
+  if (!child || Object.keys(child).length === 0) {
+    return root;
+  }
+  const base = { ...root ?? {} };
+  for (const [key, val] of Object.entries(child)) {
+    if (val !== void 0) {
+      base[key] = val;
+    }
+  }
+  return base;
+}
 var FILL_HEIGHT_SCROLL_STYLE = {
   flex: 1,
   minHeight: 0,
@@ -122,28 +134,28 @@ var RecordBoardShellFrame = ({ children, className, style }) => {
   } = (0, import_react.useMemo)(() => (0, import_partitionShellFrameChildren.partitionShellFrameChildren)(children), [children]);
   const effectiveFloorMapProps = (0, import_react.useMemo)(() => {
     if (hasFloorMapChild) {
-      return {
-        ...ctx.floorMapProps ?? {},
-        ...floorMapPropsFromChild ?? {}
-      };
+      return mergeRecordBoardSlotProps(
+        ctx.floorMapProps,
+        floorMapPropsFromChild
+      );
     }
     return ctx.floorMapProps;
   }, [hasFloorMapChild, floorMapPropsFromChild, ctx.floorMapProps]);
   const effectiveCalendarProps = (0, import_react.useMemo)(() => {
     if (hasCalendarChild) {
-      return {
-        ...ctx.calendarProps ?? {},
-        ...calendarPropsFromChild ?? {}
-      };
+      return mergeRecordBoardSlotProps(
+        ctx.calendarProps,
+        calendarPropsFromChild
+      );
     }
     return ctx.calendarProps;
   }, [hasCalendarChild, calendarPropsFromChild, ctx.calendarProps]);
   const effectiveResourceWallProps = (0, import_react.useMemo)(() => {
     if (hasResourceWallChild) {
-      return {
-        ...ctx.resourceWallProps ?? {},
-        ...resourceWallPropsFromChild ?? {}
-      };
+      return mergeRecordBoardSlotProps(
+        ctx.resourceWallProps,
+        resourceWallPropsFromChild
+      );
     }
     return ctx.resourceWallProps;
   }, [hasResourceWallChild, resourceWallPropsFromChild, ctx.resourceWallProps]);
@@ -300,7 +312,11 @@ var RecordBoardShellFrame = ({ children, className, style }) => {
     import_pisellShellFrame.PisellShellFrame,
     {
       className: (0, import_classnames.default)(className, {
-        "pisell-shell-frame--floor-map-view": !showGrid
+        /** 非表格主区：工具栏与内容区无缝（与 PisellShellFrame.less body-subview 配对） */
+        "pisell-shell-frame--body-subview": !showGrid,
+        "pisell-shell-frame--floor-map-view": showFloorMap,
+        "pisell-shell-frame--calendar-view": showCalendar,
+        "pisell-shell-frame--resource-wall-view": showResourceWall
       }),
       style: shellStyle,
       config: {

package/lib/components/pisellRecordBoard/types.d.ts

@@ -226,6 +226,33 @@ export interface RecordBoardCalendarBookingRenderArgs {
     onDragStart: (item: RecordBoardCalendarBookingLike) => void;
     onJumpNext: () => void;
 }
+/**
+ * 月 / 周格内单条预约插槽参数。
+ * 未使用 {@link RecordBoardCalendarProps.renderMonthWeekBooking} 时，月 / 周格仅默认 booking（紫）/ block（红），不展示状态徽标与按状态的底色。
+ */
+export interface RecordBoardCalendarGridBookingRenderArgs {
+    item: RecordBoardCalendarBookingLike;
+    dateKey: string;
+    view: 'month' | 'week';
+    isLight: boolean;
+    /**
+     * 日历建议的外层样式（圆角、内边距、默认 booking/block 底色），可与自定义 `className` 拼接。
+     * 宿主若完全自定义外观，可忽略本字段。
+     */
+    layoutClassName: string;
+    onOpenDetail: (item: RecordBoardCalendarBookingLike) => void;
+    /** 开始拖拽（月视图内置会处理 `draggable`；周格当前未挂 draggable，可自行在插槽内处理） */
+    onDragStart?: (item: RecordBoardCalendarBookingLike) => void;
+    draggable: boolean;
+}
+/** 拖拽改期的投放目标（与日历内部确认态 moveDraft 字段一致）。 */
+export interface RecordBoardBookingMoveDraft {
+    targetCourtId: string;
+    /** `YYYY-MM-DD` */
+    targetDate: string;
+    /** 与日历 `hourSlots` 一致的浮点起点小时（可含半格如 9.5） */
+    targetHour: number;
+}
 /**
  * 对接 `POST /shop/schedule/blocked-time` 的请求体（与后台字段一致）。
  */
@@ -239,9 +266,40 @@ export interface RecordBoardCalendarBlockedTimePayload {
     /** `YYYY-MM-DD HH:mm` */
     end_time: string;
 }
+/** 日视图连续空闲槽合并后的一段（与内置锁台面版预填一致） */
+export interface RecordBoardBlockedTimeMergedRange {
+    courtId: string;
+    /** `YYYY-MM-DD` */
+    date: string;
+    /** 与时间轴一致的浮点小时 */
+    startHour: number;
+    endHour: number;
+}
+/** 日视图多选的空闲格 */
+export interface RecordBoardCalendarSelectedFreeSlot {
+    courtId: string;
+    date: string;
+    hour: number;
+    court?: string;
+}
+/** 宿主弹出锁台/屏蔽表单时由日历传入的上下文（替代内置锁台面版） */
+export interface RecordBoardBlockedTimePanelPayload {
+    /** 槽位步长（小时），与日历内部 `slotStepHours` 一致 */
+    slotStepHours: number;
+    /** 与 {@link RecordBoardCalendarProps.slotStepMinutes} 一致 */
+    slotStepMinutes: number;
+    /** 日视图锚定日 `YYYY-MM-DD` */
+    dayKey: string;
+    selectedFreeSlots: RecordBoardCalendarSelectedFreeSlot[];
+    mergedRange: RecordBoardBlockedTimeMergedRange;
+}
 /** 日历视图槽位 props：由 Shell 合并根级与子槽后传入 PisellRecordBoardCalendarView */
 export interface RecordBoardCalendarProps {
     persistGuard?: CalendarPersistContextValue;
+    /**
+     * 日历画布外观：亮色切换 `theme-root.theme-light`；未传或 `dark` 为深色（默认）。
+     */
+    appearance?: 'light' | 'dark';
     className?: string;
     style?: CSSProperties;
     /** 受控：画布等资源行；不传则使用内置演示数据 */
@@ -253,8 +311,18 @@ export interface RecordBoardCalendarProps {
      * 点击预约条。返回 true 表示已消费（不再打开内置详情抽屉）。
      */
     onBookingClick?: (item: RecordBoardCalendarBookingLike) => boolean | void;
+    /**
+     * 拖拽预约条松手且投放合法后，由宿主接管确认与持久化（例如业务侧 booking 改约弹窗）。
+     * **传入后**日历不再弹出内置 MoveConfirmModal，也不会写入本地 bookings。
+     * 返回 `true` 表示宿主已视为完成（一般由弹窗 resolve）；`false`/`undefined`/reject 表示未生效。
+     */
+    onBookingMoveRequest?: (payload: {
+        item: RecordBoardCalendarBookingLike;
+        draft: RecordBoardBookingMoveDraft;
+    }) => Promise<boolean | void>;
     /**
      * 锚点日 / 视图变化（月、周、日），用于父级扩展 booking 请求时间窗。
+     * 宿主导出时建议对拉数做 **debounce**（如 200–300ms），与切 `bodyView`、切日等快速操作对齐，避免重复请求。
      */
     onViewportChange?: (payload: {
         view: string;
@@ -282,8 +350,14 @@ export interface RecordBoardCalendarProps {
     /**
      * 保存「屏蔽时间」时提交（如 `/shop/schedule/blocked-time`）。
      * 返回 `false` 表示未成功（弹窗保持）；`true` 或 `undefined` 视为成功并关闭弹窗、清空选中。
+     * 若同时传 {@link onBlockedTimePanelRequest}，内置锁台面版不再展示，本回调仅在内置路径生效。
      */
     onBlockedTimeSave?: (payload: RecordBoardCalendarBlockedTimePayload) => Promise<boolean | void>;
+    /**
+     * 日视图选中连续空闲槽并点「屏蔽」时，由宿主弹出锁台表单（替代内置锁台面版）。
+     * **传入后**不再渲染内置屏蔽弹层；未传时仍使用内置表单 + {@link onBlockedTimeSave}。
+     */
+    onBlockedTimePanelRequest?: (payload: RecordBoardBlockedTimePanelPayload) => Promise<boolean | void>;
     /** 与接口 `blocked_sales_channels` 一致；默认 `['online_store']` */
     blockedTimeSalesChannels?: string[];
     /**
@@ -296,8 +370,14 @@ export interface RecordBoardCalendarProps {
      * 若同时传 {@link renderTimelineHeader}，则仅渲染插槽，**忽略**本字段。
      */
     timelineHeaderGroups?: RecordBoardCalendarTimelineHeaderGroup[];
-    /** 自定义日视图时间轴上的预约条内容（周/月格内仍用内置紧凑摘要） */
+    /**
+     * 自定义日视图时间轴上的预约条内容（仅日视图 overlay 生效；月 / 周见 {@link renderMonthWeekBooking}）。
+     */
     renderBooking?: (args: RecordBoardCalendarBookingRenderArgs) => ReactNode;
+    /**
+     * 自定义月 / 周格内单条预约。未传时仅默认 booking / block 样式与名称、时间，不展示迟到/取消等状态徽标与状态变色。
+     */
+    renderMonthWeekBooking?: (args: RecordBoardCalendarGridBookingRenderArgs) => ReactNode;
     /** 自定义周/日视图左侧资源列单元 */
     renderResourceCell?: (args: RecordBoardCalendarResourceRenderArgs) => ReactNode;
 }
@@ -353,8 +433,11 @@ export interface RecordBoardResourceWallLayoutPersist {
 export declare const DEFAULT_RESOURCE_WALL_LAYOUT_PERSIST: RecordBoardResourceWallLayoutPersist;
 /**
  * 大屏资源墙视图 props；与 Shell 内 `PisellRecordBoard.ResourceWall` 合并（子优先）。
- * 展示顺序由 `searchParams.filter.values[filterFieldKey]`（默认 `resource_wall_resource_ids`）非空 `string[]` 决定；
- * **未写该键、值非数组、或 `[]`**：不展示卡片。每个 id 优先用 `cards` 中同 `resourceId` 的项，否则用占位卡（仅 id）。
+ * 展示顺序默认由 `searchParams.filter.values[filterFieldKey]`（默认 `resource_wall_resource_ids`）非空 `string[]` 决定；
+ * **未写该键、值非数组、或 `[]`**：不展示卡片。**仅渲染 `cards` 中能按 `resourceId` 命中的项**；
+ * 命中不到的 id（例如磁盘残留的旧店铺 / 已删资源）直接剔除、不再回退成「数字占位卡」，磁盘清洗由宿主负责。
+ * 当 `searchParams.sort` 的字段名与 {@link RecordBoardResourceWallProps.statusSortFieldKeys} 匹配（默认 `status`）时，
+ * 在筛选顺序基础上按卡占用态重排：升序空闲在前，降序占用（inUse/将结/已结束）在前。
  */
 export interface RecordBoardResourceWallProps {
     className?: string;
@@ -367,6 +450,12 @@ export interface RecordBoardResourceWallProps {
      * @default 'resource_wall_resource_ids'
      */
     filterFieldKey?: string;
+    /**
+     * 与 ToolBar `searchParams.sort` 首段字段名比对（忽略大小写）；命中时资源墙按卡状态重排。
+     * 列 key 不是 `status` 时传入实际字段名，例如 `['courtStatus']`。
+     * @default ['status']
+     */
+    statusSortFieldKeys?: string[];
     /** 六态文案/配色覆盖（与默认 map 浅合并）；通常由宿主从 localStorage 水合 */
     statusToneOverrides?: VenueWallStatusToneOverrides;
     /** 覆盖变更时回调，宿主可写入 localStorage */
@@ -507,7 +596,11 @@ export interface RecordBoardToolBarProps {
     search?: boolean | RecordBoardSearchProps;
     /** 在 ToolBar 右侧渲染筛选：默认 PisellFilter；对象透传 PisellFilter props；false 不渲染。值存于 searchParams.filter */
     filter?: boolean | RecordBoardFilterProps;
-    /** 在 ToolBar 内、筛选左侧渲染排序：默认 Sort；对象可传 list、placement 等；false 不渲染。值存于 searchParams.sort */
+    /**
+     * 在 ToolBar 内、筛选左侧渲染排序：默认 Sort；对象可传 list、placement 等；false 不渲染。值存于 searchParams.sort。
+     * 资源墙视图：排序**菜单内**仅保留「状态」相关项（其余排序仅在表格等视图出现）；若无状态列派生项，会注入「空闲优先 / 占用优先」子项。
+     * 可传 `resourceWallSortFieldKeys: string[]` 与非 `status` 列 key 对齐。表格/平面图/日历仍使用完整排序列表。
+     */
     sort?: boolean | Record<string, any>;
     /**
      * 在 ToolBar 左侧展示内联快速筛选（替代 Filter 弹层内的 quickFilter）。

package/lib/components/pisellReservationScheduleBand/PisellReservationScheduleBand.less

@@ -45,18 +45,39 @@
   border-radius: 0;
   background: #141824;
   border: 1px solid rgba(255, 255, 255, 0.06);
+  /**
+   * 布局：auto | minmax(0,1fr) | auto
+   * - 左：标题 + 视图切换等内容宽占位
+   * - 右：「+ New」等固定贴行末
+   * - 中间：仅占左、右之间的剩余宽度；选日期 / 跟随时间文案在该「中间区域」内居中（见 .pisell-reservation-schedule-band-schedule）
+   */
+  /** 左/右栏 min-width:max-content 后整行可能超出视口，允许横向滚动而非压扁左侧 */
+  overflow-x: auto;
+  overflow-y: visible;
 }
 
 .pisell-reservation-schedule-band-slot-start {
   justify-self: start;
-  min-width: 0;
+  /** 勿用 min-width:0：会把「标题 + Segmented」挤折行；max-content 保证左侧优先单行横排 */
+  min-width: max-content;
   display: flex;
   align-items: center;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  /** 中间栏内容偶发溢出绘制时压在左侧 Tab 上，保证左侧在上层 */
+  position: relative;
+  z-index: 1;
+  /** 业务侧（如预约）在插槽里再包一层 merge 时，保证子级也按内容宽参与列宽计算，避免整条 min-width:0 收缩链 */
+  > * {
+    min-width: max-content;
+    flex-shrink: 0;
+  }
 }
 
 .pisell-reservation-schedule-band-slot-end {
   justify-self: end;
-  min-width: 0;
+  /** 右侧按钮区同样保留完整占位，避免被 1fr 中间列挤压 */
+  min-width: max-content;
   display: flex;
   align-items: center;
 }
@@ -68,7 +89,18 @@
   flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
+  /**
+   * 仅在 Grid 的中间列（左、右扣掉之后的剩余宽度）内居中选日区；
+   * 不与「整行居中」混淆，也不会贴死到 + New。
+   */
   justify-content: center;
+  @supports (justify-content: safe center) {
+    justify-content: safe center;
+  }
+  /** 中间块总宽超过中间列时在本格内滚动，避免向左绘制盖住左侧 Segmented */
+  overflow-x: auto;
+  overflow-y: visible;
+  box-sizing: border-box;
   /** 日期与右侧「当前时间」等插槽留出间距，避免贴太紧 */
   gap: 14px;
 }

package/lib/components/pisellShellFrame/PisellShellFrame.less

@@ -36,8 +36,11 @@
     margin-bottom: 8px;
   }
 
-  /** RecordBoard 平面图模式：与日程带衔接，去掉工具栏与内容区间距 */
-
+  /**
+   * RecordBoard 非表格主区（平面图 / 日历 / 资源墙）：与顶栏日程带衔接，去掉工具栏与内容区间距。
+   * `--floor-map-view` 仍可在仅平面图场景单独挂类；规则与 body-subview 一致。
+   */
+  &--body-subview &-toolbar,
   &--floor-map-view &-toolbar {
     margin-bottom: 0;
   }

package/lib/components/table/Table/SelectField/index.d.ts

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

package/lib/components/table/Table/tableConfig/summary/index.d.ts

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

package/lib/hooks/useResponsive.d.ts

@@ -1,4 +1,4 @@
 declare type ResponsiveConfig = Record<string, number>;
 export declare function configResponsive(config: ResponsiveConfig): void;
-export default function useResponsive(): "pc" | "ipad" | "phone";
+export default function useResponsive(): "pc" | "phone" | "ipad";
 export {};