@pisell/materials 1.8.41 → 1.8.42

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

@@ -0,0 +1,170 @@
+import { getText } from "../../../../locales/index.js";
+import { _objectSpread2 } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
+//#region src/components/pisellRecordBoard/shellFrame/ResourceWall/venueWallUtils.ts
+const VENUE_WALL_STATUS_KEYS = [
+	"inUse",
+	"endingSoon",
+	"expired",
+	"available",
+	"boardingSoon",
+	"late"
+];
+/**
+* 六态默认色与占位英文；`getVenueWallStatusToneMap` 会将 label/note 换为 i18n，此处仅作 merge 基底。
+*/
+const VENUE_WALL_STATUS_COLOR_MAP = {
+	inUse: {
+		key: "inUse",
+		label: "In Use",
+		note: "This court is currently in use.",
+		color: "#6f4ae6",
+		noteBg: "rgba(111,74,230,0.92)"
+	},
+	endingSoon: {
+		key: "endingSoon",
+		label: "Ending Soon",
+		note: "Please leave on time to avoid overtime charges.",
+		color: "#f59e0b",
+		noteBg: "rgba(245,158,11,0.96)"
+	},
+	expired: {
+		key: "expired",
+		label: "Expired",
+		note: "This booking has ended. Please clear the court.",
+		color: "#ef4444",
+		noteBg: "rgba(239,68,68,0.96)"
+	},
+	available: {
+		key: "available",
+		label: "Available",
+		note: "This court is now available.",
+		color: "#94a3b8",
+		noteBg: "rgba(148,163,184,0.22)"
+	},
+	boardingSoon: {
+		key: "boardingSoon",
+		label: "Boarding Soon",
+		note: "Please check in to start.",
+		color: "#6f4ae6",
+		noteBg: "rgba(111,74,230,0.18)"
+	},
+	late: {
+		key: "late",
+		label: "Late",
+		note: "Please check in as soon as possible.",
+		color: "#ef4444",
+		noteBg: "rgba(239,68,68,0.22)"
+	}
+};
+/** 将 `#RGB` / `#RRGGBB` 转为 `rgba(...)`，供渐变与半透明底 */
+function alphaColor(hex, alpha) {
+	const clean = hex.replace("#", "");
+	const full = clean.length === 3 ? clean.split("").map((c) => c + c).join("") : clean;
+	const num = parseInt(full, 16);
+	return `rgba(${num >> 16 & 255}, ${num >> 8 & 255}, ${num & 255}, ${alpha})`;
+}
+/** 将数值限制在 [min, max]（布局行列、主文案比例等） */
+const clamp = (value, min, max) => Math.max(min, Math.min(max, value));
+/** 由卡片字段推导状态键（与演示页 test.tsx 规则一致） */
+function deriveVenueWallStatus(card) {
+	const s = card.status;
+	if (s === "available") return "available";
+	if (s === "boardingSoon") return "boardingSoon";
+	if (s === "late") return "late";
+	if (s === "endingSoon") return "endingSoon";
+	if (s === "expired") return "expired";
+	if (s === "inUse") return "inUse";
+	/** 兼容旧数据：无 status 时退回 remainingMin 推断（不再看 light 字段） */
+	if (card.currentBooking === "Available to Book") return "available";
+	const rm = card.remainingMin;
+	if (rm != null && rm <= 0) return "expired";
+	if (rm != null && rm <= 10) return "endingSoon";
+	return "inUse";
+}
+/**
+* ToolBar Sort 写入的 `searchParams.sort`（如 `status:asc:string`）拆出字段名与升降序。
+*/
+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
+	};
+}
+/** 当 Sort 字段名匹配这些 key（忽略大小写）时，资源墙按占用态重排卡片 */
+const 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);
+}
+/**
+* 用于资源墙排序：占用/将结/已结束为 1，其余为 0（与 {@link deriveVenueWallStatus} 一致）。
+* asc → 空闲侧在前；desc → 占用侧在前。
+*/
+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;
+	/** `11h 28m`：h 与分钟之间加空格，避免 `11h28m` 连成一体难读 */
+	return `${h}h ${String(m).padStart(2, "0")}m`;
+}
+/**
+* 将「剩余/超支分钟数」格式化为跑码条/主副标题用短文案（走 i18n 模板，负值表示 overtime）。
+*/
+function formatVenueWallCountdown(min) {
+	if (min < 0) {
+		const n = formatDurationHM(Math.abs(min));
+		return getText("pisell-resource-wall-countdown-overtime").replace("{n}", n);
+	}
+	if (min === 0) return getText("pisell-resource-wall-countdown-ending-now");
+	return getText("pisell-resource-wall-countdown-left").replace("{n}", formatDurationHM(min));
+}
+function cloneTone(t) {
+	return _objectSpread2({}, t);
+}
+/**
+* 合并默认六态配色与业务覆盖，供 {@link VenueWallCard} 与 Control Panel 表单初值共用。
+*/
+function getVenueWallStatusToneMap(overrides) {
+	const out = {};
+	for (const key of VENUE_WALL_STATUS_KEYS) {
+		const base = cloneTone(VENUE_WALL_STATUS_COLOR_MAP[key]);
+		base.label = getText(`pisell-resource-wall-tone-${key}-label`);
+		base.note = getText(`pisell-resource-wall-tone-${key}-note`);
+		const patch = overrides === null || overrides === void 0 ? void 0 : overrides[key];
+		out[key] = patch ? _objectSpread2(_objectSpread2(_objectSpread2({}, base), patch), {}, { key }) : base;
+	}
+	return out;
+}
+/**
+* 将编辑后的完整六态表压成「相对默认」的 overrides，便于持久化与 props 传递。
+*/
+function diffVenueWallStatusToneOverrides(draft) {
+	const defaults = getVenueWallStatusToneMap();
+	const out = {};
+	for (const k of VENUE_WALL_STATUS_KEYS) {
+		const d = draft[k];
+		const b = defaults[k];
+		const patch = {};
+		if (d.label !== b.label) patch.label = d.label;
+		if (d.note !== b.note) patch.note = d.note;
+		if (d.color !== b.color) patch.color = d.color;
+		if (d.noteBg !== b.noteBg) patch.noteBg = d.noteBg;
+		if (Object.keys(patch).length > 0) out[k] = patch;
+	}
+	return out;
+}
+//#endregion
+export { DEFAULT_RESOURCE_WALL_STATUS_SORT_FIELD_KEYS, VENUE_WALL_STATUS_KEYS, alphaColor, clamp, deriveVenueWallStatus, diffVenueWallStatusToneOverrides, formatDurationHM, formatVenueWallCountdown, getVenueWallStatusToneMap, matchesResourceWallStatusSortField, parseRecordBoardToolbarSortParam, venueWallOccupiedSortRank };

package/es/components/pisellRecordBoard/shellFrame/Search/index.js

@@ -1,6 +1,6 @@
 import { _objectSpread2 } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
-import { useRecordBoardContext } from "../../hooks/useRecordBoardContext.js";
 import { PisellFind } from "../../../pisellFind/index.js";
+import { useRecordBoardContext } from "../../hooks/useRecordBoardContext.js";
 import React, { useCallback } from "react";
 //#region src/components/pisellRecordBoard/shellFrame/Search/index.tsx
 /** 与 context.searchParams 对应的默认搜索参数字段名 */

package/es/components/pisellRecordBoard/shellFrame/ShellBodyMetaContext.d.ts

@@ -1,4 +1,4 @@
-import { RecordBoardCalendarProps, RecordBoardFloorMapProps } from "../types.js";
+import { RecordBoardCalendarProps, RecordBoardFloorMapProps, RecordBoardResourceWallProps } from "../types.js";
 import React from "react";
 
 //#region src/components/pisellRecordBoard/shellFrame/ShellBodyMetaContext.d.ts
@@ -17,6 +17,10 @@ interface RecordBoardShellBodyMeta {
   hasFloorMapSlot: boolean;
   /** 合并后是否存在可渲染的日历配置 */
   hasCalendarSlot: boolean;
+  /** 子组件 ResourceWall props 与根级 resourceWall 合并后的结果（子优先） */
+  effectiveResourceWallProps?: RecordBoardResourceWallProps;
+  /** 合并后是否存在大屏资源墙槽（根级或子节点声明即 true） */
+  hasResourceWallSlot: boolean;
 }
 declare function useRecordBoardShellBodyMeta(): RecordBoardShellBodyMeta | undefined;
 //#endregion

package/es/components/pisellRecordBoard/shellFrame/ToolBar/ToolBarFilter.less

@@ -88,12 +88,23 @@
     line-height: 30px;
   }
 
+  /**
+   * 与 Find（PisellLookup min-height 50px）、右侧 Filter/Sort（50px）同高；
+   * 原先 48px 会在桌面 Table 顶栏快筛里显得比 Find 矮一截。
+   */
   .MuiInputBase-root {
-    height: 48px !important;
+    height: 50px !important;
+    min-height: 50px !important;
     border-radius: 8px !important;
+    box-sizing: border-box;
+  }
 
-    input {
-      //height: 48px !important;
+  .record-board-toolbar-find-wrap {
+    .pisell-lookup-trigger-input.ant-input-affix-wrapper,
+    .pisell-lookup-trigger-input.pisell-lowcode-input-affix-wrapper {
+      height: 50px;
+      min-height: 50px;
+      box-sizing: border-box;
     }
   }
 }
@@ -102,6 +113,16 @@
   display: inline-flex;
   flex-wrap: nowrap;
   align-items: center;
+
+  .ant-form-item,
+  .pisell-lowcode-form-item {
+    margin-bottom: 0;
+  }
+
+  .ant-form-item-row,
+  .pisell-lowcode-form-item-row {
+    align-items: center;
+  }
 }
 
 /**
@@ -197,9 +218,15 @@
     }
   }
 
+  .record-board-toolbar-top-left .MuiInputBase-root {
+    height: 38px !important;
+    min-height: 38px !important;
+  }
+
   .record-board-toolbar-find-wrap {
     .pisell-lookup-trigger-input.ant-input-affix-wrapper,
     .pisell-lookup-trigger-input.pisell-lowcode-input-affix-wrapper {
+      height: 38px !important;
       min-height: 38px !important;
       padding: 3px 6px 3px 12px !important;
 

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

@@ -1,84 +1,72 @@
 import { getText } from "../../../../locales/index.js";
 import { _objectSpread2 } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
+import { _objectWithoutProperties } from "../../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectWithoutProperties.js";
+import { PisellFind } from "../../../pisellFind/index.js";
 import Sort from "../../../sort/index.js";
 import Toolbar from "../../../pisellGridPro/ToolBar/index.js";
 import { deriveFilterFromColumns, deriveSortFromColumns } from "../../utils/recordBoardColumns.js";
 import { useRecordBoardContext } from "../../hooks/useRecordBoardContext.js";
-import { PisellFind } from "../../../pisellFind/index.js";
 import PisellFilter from "../../../pisellFilter/index.js";
 import ToolBarReset from "../ToolBarReset/index.js";
 import ToolBarQuickFilter from "../ToolBarQuickFilter/index.js";
 import RecordBoardColumnSetting from "../ColumnSetting/index.js";
 import { useRecordBoardShellBodyMeta } from "../ShellBodyMetaContext.js";
+import { DEFAULT_RESOURCE_WALL_STATUS_SORT_FIELD_KEYS, matchesResourceWallStatusSortField } from "../ResourceWall/venueWallUtils.js";
+import { DEFAULT_SEARCH_FIELD, FILTER_PARAMS_FIELD, RESOURCE_WALL_QUICK_FILTER_KEY, SORT_PARAMS_FIELD } from "./recordBoardToolBarConstants.js";
+import { buildResourceWallStatusSortFallbackItem, getDefaultFilterValue, getSortButtonText, getViewCalendarLabel, getViewFloorMapLabel, getViewGridLabel, getViewResourceWallLabel } from "./recordBoardToolBarI18n.js";
 import React, { useCallback, useMemo } from "react";
-import { locales } from "@pisell/utils";
-import { Button, Segmented, Space } from "antd";
+import { Button, Popover, Segmented, Space } from "antd";
+import { SearchOutlined, SettingOutlined } from "@ant-design/icons";
 import classNames from "classnames";
 import SwitchVertical01 from "@pisell/icon/es/SwitchVertical01";
 import "./ToolBarFilter.less";
 import "./recordBoardToolbar.less";
 //#region src/components/pisellRecordBoard/shellFrame/ToolBar/index.tsx
-/** 与 Quick Filter 同源：优先 utils，若 utils 返回 key（未命中）则用 materials 再回退 */
-function getSortButtonText() {
-	const key = "pisell2.recordBoard.toolbar.sort";
-	const u = locales.getText(key);
-	return u && u !== key ? u : getText(key) || getText("sort-button-text");
-}
-function getViewGridLabel() {
-	const key = "pisell2.recordBoard.toolbar.viewGrid";
-	const u = locales.getText(key);
-	return u && u !== key ? u : getText(key) || "Table";
-}
-function getViewFloorMapLabel() {
-	const key = "pisell2.recordBoard.toolbar.viewFloorMap";
-	const u = locales.getText(key);
-	return u && u !== key ? u : getText(key) || "Floor map";
-}
-function getViewCalendarLabel() {
-	const key = "pisell2.recordBoard.toolbar.viewCalendar";
-	const u = locales.getText(key);
-	return u && u !== key ? u : getText(key) || "Calendar";
-}
-/** 默认搜索参数字段名，与 context.searchParams 对应 */
-const DEFAULT_SEARCH_FIELD = "keyword";
-/** 筛选在 searchParams 中的字段名 */
-const FILTER_PARAMS_FIELD = "filter";
-/** 排序在 searchParams 中的字段名 */
-const SORT_PARAMS_FIELD = "sort";
-/** 筛选无值时使用的默认筛选项，避免点开为空；业务可通过 childComponentProps.toolBar.filter.defaultFilterValue 覆盖。文案通过 getText 多语言。 */
-function getDefaultFilterValue() {
-	return {
-		quickFilter: [],
-		otherFilter: []
-	};
-}
+const _excluded = [
+	"trigger",
+	"triggerType",
+	"displayType",
+	"triggerText",
+	"triggerIcon",
+	"buttonText"
+], _excluded2 = ["resourceWallSortFieldKeys", "list"];
 /**
 * RecordBoard 下的工具栏：使用 PisellToolBar。
 * 左侧默认 PisellFind（inline）；右侧默认 PisellFilter。通过 childComponentProps.toolBar.search / toolBar.filter 为对象时透传对应组件 props，为 false 时不渲染。
 * 可透传 topLeft、topRight、bottomLeft、bottomRight、tabs。
 */
 const RecordBoardToolBar = (props) => {
-	var _shellMeta$hasGridCon, _shellMeta$hasFloorMa, _shellMeta$hasCalenda, _shellMeta$effectiveF, _ctx$childComponentPr, _ctx$childComponentPr2, _slots$toolbarDensity, _searchParams$DEFAULT, _ctx$childComponentPr3, _formFiltersPrefix, _filterResetKey;
+	var _ctx$resourceWallProp, _ctx$resourceWallProp2, _shellMeta$hasGridCon, _shellMeta$hasFloorMa, _shellMeta$hasCalenda, _shellMeta$hasResourc, _shellMeta$effectiveF, _ctx$childComponentPr, _ctx$childComponentPr2, _slots$toolbarDensity, _searchParams$DEFAULT, _ctx$childComponentPr3, _formFiltersPrefix, _filterResetKey, _slots$topRight;
 	const ctx = useRecordBoardContext({ displayName: "toolBar" });
 	const shellMeta = useRecordBoardShellBodyMeta();
 	const { searchParams, onSearch, bodyView, setBodyView } = ctx;
+	const resourceWallFilterFieldKey = (_ctx$resourceWallProp = (_ctx$resourceWallProp2 = ctx.resourceWallProps) === null || _ctx$resourceWallProp2 === void 0 ? void 0 : _ctx$resourceWallProp2.filterFieldKey) !== null && _ctx$resourceWallProp !== void 0 ? _ctx$resourceWallProp : RESOURCE_WALL_QUICK_FILTER_KEY;
 	/** ShellFrame 内解析：多子视图（表格 / 平面图 / 日历）时渲染 Segmented */
 	const hasGridInShell = (_shellMeta$hasGridCon = shellMeta === null || shellMeta === void 0 ? void 0 : shellMeta.hasGridContent) !== null && _shellMeta$hasGridCon !== void 0 ? _shellMeta$hasGridCon : true;
 	const hasFloorInShell = (_shellMeta$hasFloorMa = shellMeta === null || shellMeta === void 0 ? void 0 : shellMeta.hasFloorMapSlot) !== null && _shellMeta$hasFloorMa !== void 0 ? _shellMeta$hasFloorMa : ctx.floorMapProps != null;
 	const hasCalendarInShell = (_shellMeta$hasCalenda = shellMeta === null || shellMeta === void 0 ? void 0 : shellMeta.hasCalendarSlot) !== null && _shellMeta$hasCalenda !== void 0 ? _shellMeta$hasCalenda : ctx.calendarProps != null;
+	const hasResourceWallInShell = (_shellMeta$hasResourc = shellMeta === null || shellMeta === void 0 ? void 0 : shellMeta.hasResourceWallSlot) !== null && _shellMeta$hasResourc !== void 0 ? _shellMeta$hasResourc : ctx.resourceWallProps != null;
 	const floorForToggle = (_shellMeta$effectiveF = shellMeta === null || shellMeta === void 0 ? void 0 : shellMeta.effectiveFloorMapProps) !== null && _shellMeta$effectiveF !== void 0 ? _shellMeta$effectiveF : ctx.floorMapProps;
 	const canFloor = hasFloorInShell && floorForToggle != null;
 	const canCalendar = hasCalendarInShell;
+	const canResourceWall = hasResourceWallInShell;
 	const canGrid = hasGridInShell;
 	/** 至少两种主区时出现切换器（兼容原「仅表格+平面图」） */
-	const showTableFloorToggle = (canGrid ? 1 : 0) + (canFloor ? 1 : 0) + (canCalendar ? 1 : 0) >= 2;
+	const showTableFloorToggle = (canGrid ? 1 : 0) + (canFloor ? 1 : 0) + (canCalendar ? 1 : 0) + (canResourceWall ? 1 : 0) >= 2;
 	/** 业务可关闭多视图切换（如场控仅平面图），此时不渲染 Segmented */
 	const allowBodyViewToggle = showTableFloorToggle && ctx.bodyViewSwitchable !== false;
 	const slots = (_ctx$childComponentPr = (_ctx$childComponentPr2 = ctx.childComponentProps) === null || _ctx$childComponentPr2 === void 0 ? void 0 : _ctx$childComponentPr2.toolBar) !== null && _ctx$childComponentPr !== void 0 ? _ctx$childComponentPr : {};
 	const toolbarDensity = (_slots$toolbarDensity = slots.toolbarDensity) !== null && _slots$toolbarDensity !== void 0 ? _slots$toolbarDensity : "default";
-	/** compact 用 middle：比 50px Figma 略紧凑，又比 small 更易点按；与下方 Less 中 ~38px 工具栏样式一致 */
-	const barSize = toolbarDensity === "compact" ? "middle" : "large";
-	const keyword = (_searchParams$DEFAULT = searchParams === null || searchParams === void 0 ? void 0 : searchParams[DEFAULT_SEARCH_FIELD]) !== null && _searchParams$DEFAULT !== void 0 ? _searchParams$DEFAULT : "";
+	const isCompactNarrow = toolbarDensity === "compact-narrow";
+	/**
+	* compact 用 middle：比 50px Figma 略紧凑，又比 small 更易点按；与下方 Less 中 ~38px 工具栏样式一致。
+	* compact-narrow 进一步缩到 small：极窄抽屉内顶栏右侧为 search 图标 + 齿轮（列/排序/筛选/重置在齿轮内）。
+	*/
+	const barSize = isCompactNarrow ? "small" : toolbarDensity === "compact" ? "middle" : "large";
+	const filterConfig = slots.filter;
+	/** 与 PisellFilter 一致：用于顶栏快筛内 FilterItem（如手机端 orderDate 换 antd-mobile） */
+	const filterPhoneLayout = typeof filterConfig === "object" && filterConfig !== null && "phoneLayout" in filterConfig ? Boolean(filterConfig.phoneLayout) : isCompactNarrow;
+	const keyword = (_searchParams$DEFAULT = searchParams === null || searchParams === void 0 ? void 0 : searchParams["keyword"]) !== null && _searchParams$DEFAULT !== void 0 ? _searchParams$DEFAULT : "";
 	const handleSearch = useCallback((value) => {
 		onSearch(_objectSpread2(_objectSpread2({}, searchParams), {}, { [DEFAULT_SEARCH_FIELD]: value || void 0 }));
 	}, [onSearch, searchParams]);
@@ -86,8 +74,30 @@ const RecordBoardToolBar = (props) => {
 	const derivedFilterFromColumns = useMemo(() => Array.isArray(gridColumns) && gridColumns.length > 0 ? deriveFilterFromColumns(gridColumns) : null, [gridColumns]);
 	const derivedSortFromColumnsList = useMemo(() => Array.isArray(gridColumns) && gridColumns.length > 0 ? deriveSortFromColumns(gridColumns) : [], [gridColumns]);
 	const searchConfig = slots.search;
-	/** 默认 inline：triggerType="input" + displayType="inline"，放在 toolbar 左侧。showConfirmButton 优先取 toolBar.search，未配置时默认 true。 */
-	const searchNode = searchConfig === false ? null : /* @__PURE__ */ React.createElement(PisellFind, _objectSpread2(_objectSpread2({
+	const hideSearch = searchConfig === false;
+	/**
+	* - 默认：inline 模式（triggerType="input" + displayType="inline"），常驻输入框
+	* - compact-narrow：仅图标触发器（无 Find 文案），放在顶栏右侧与齿轮并排；
+	*   Reset 收入齿轮 Popover。传 `trigger={<Button .../>}` 由 PisellLookup 注入 onClick。
+	*/
+	const searchButtonText = getText("pisell2.recordBoard.toolbar.find") || "Find";
+	/**
+	* compact-narrow：业务侧 `toolBar.search` 常带 `triggerType=input` / `displayType=inline`，
+	* 整对象 spread 在 `triggerType=icon` 之后会把它覆盖回输入框；这里剔除会劫持展示形态的字段。
+	*/
+	const compactNarrowSearchRest = typeof searchConfig === "object" && searchConfig !== null ? (() => {
+		const _ref = searchConfig, { trigger: _tr, triggerType: _tt, displayType: _dt, triggerText: _tx, triggerIcon: _ti, buttonText: _btn } = _ref;
+		return _objectWithoutProperties(_ref, _excluded);
+	})() : {};
+	const searchNode = hideSearch ? null : isCompactNarrow ? /* @__PURE__ */ React.createElement(PisellFind, _objectSpread2(_objectSpread2({}, compactNarrowSearchRest), {}, {
+		value: keyword,
+		onChange: (v) => handleSearch(v),
+		onSearch: handleSearch,
+		size: barSize,
+		triggerType: "icon",
+		className: "record-board-toolbar-find-icon",
+		triggerIcon: /* @__PURE__ */ React.createElement(SearchOutlined, { "aria-label": searchButtonText })
+	})) : /* @__PURE__ */ React.createElement(PisellFind, _objectSpread2(_objectSpread2({
 		triggerType: "input",
 		displayType: "inline",
 		showConfirmButton: typeof searchConfig === "object" && searchConfig !== null && "showConfirmButton" in searchConfig ? searchConfig.showConfirmButton : true,
@@ -97,12 +107,12 @@ const RecordBoardToolBar = (props) => {
 	}, typeof searchConfig === "object" && searchConfig !== null ? searchConfig : {}), {}, { size: toolbarDensity === "compact" ? barSize : typeof searchConfig === "object" && searchConfig !== null && "size" in searchConfig && searchConfig.size != null ? searchConfig.size : barSize }));
 	const quickFilterConfig = slots.quickFilter;
 	const quickFilterList = useMemo(() => {
-		var _ref;
+		var _ref2;
 		if (quickFilterConfig === false) return [];
 		const fromConfig = typeof quickFilterConfig === "object" && quickFilterConfig !== null && Array.isArray(quickFilterConfig.filterList) ? quickFilterConfig.filterList : null;
-		let list = (_ref = fromConfig !== null && fromConfig !== void 0 ? fromConfig : derivedFilterFromColumns === null || derivedFilterFromColumns === void 0 ? void 0 : derivedFilterFromColumns.quickFilter) !== null && _ref !== void 0 ? _ref : [];
+		let list = (_ref2 = fromConfig !== null && fromConfig !== void 0 ? fromConfig : derivedFilterFromColumns === null || derivedFilterFromColumns === void 0 ? void 0 : derivedFilterFromColumns.quickFilter) !== null && _ref2 !== void 0 ? _ref2 : [];
 		const hideNames = typeof quickFilterConfig === "object" && quickFilterConfig !== null && Array.isArray(quickFilterConfig.hideFilterNamesOnFloorMap) ? quickFilterConfig.hideFilterNamesOnFloorMap : null;
-		if ((bodyView === "floorMap" || bodyView === "calendar") && showTableFloorToggle && hideNames != null && hideNames.length > 0) {
+		if ((bodyView === "floorMap" || bodyView === "calendar" || bodyView === "resourceWall") && showTableFloorToggle && hideNames != null && hideNames.length > 0) {
 			const hideSet = new Set(hideNames.map(String));
 			list = list.filter((item) => {
 				var _item$name;
@@ -117,10 +127,29 @@ const RecordBoardToolBar = (props) => {
 		bodyView,
 		showTableFloorToggle
 	]);
-	const quickFilterNode = quickFilterList.length > 0 ? /* @__PURE__ */ React.createElement(ToolBarQuickFilter, {
-		filterList: quickFilterList,
+	/**
+	* 资源墙专用快筛不占用顶栏；resourceWall 时顶栏快筛整行收起（改走右侧 Filter）。
+	* 资源墙顶栏仅保留 Sort + Filter（Find / Reset 隐藏）。
+	* 其它视图从顶栏剔除该字段，避免与表格/平面图等共用 toolBar.quickFilter 时误展示。
+	*/
+	const leftBarQuickFilterList = useMemo(() => {
+		const withoutWall = quickFilterList.filter((item) => {
+			var _ref3, _item$key;
+			return ((_ref3 = (_item$key = item.key) !== null && _item$key !== void 0 ? _item$key : item.name) !== null && _ref3 !== void 0 ? _ref3 : "") !== resourceWallFilterFieldKey;
+		});
+		if (bodyView === "resourceWall") return [];
+		return withoutWall;
+	}, [
+		bodyView,
+		quickFilterList,
+		resourceWallFilterFieldKey
+	]);
+	const showQuickFilterLeft = leftBarQuickFilterList.length > 0;
+	const quickFilterNode = showQuickFilterLeft ? /* @__PURE__ */ React.createElement(ToolBarQuickFilter, {
+		filterList: leftBarQuickFilterList,
 		formFiltersPrefix: typeof quickFilterConfig === "object" && quickFilterConfig !== null ? (_formFiltersPrefix = quickFilterConfig.formFiltersPrefix) !== null && _formFiltersPrefix !== void 0 ? _formFiltersPrefix : "" : "",
-		size: typeof quickFilterConfig === "object" && quickFilterConfig !== null ? quickFilterConfig.size : void 0
+		size: typeof quickFilterConfig === "object" && quickFilterConfig !== null ? quickFilterConfig.size : void 0,
+		phoneLayout: filterPhoneLayout
 	}) : null;
 	const bodyViewSegmentedOptions = useMemo(() => {
 		const opts = [];
@@ -132,6 +161,10 @@ const RecordBoardToolBar = (props) => {
 			label: getViewCalendarLabel(),
 			value: "calendar"
 		});
+		if (canResourceWall) opts.push({
+			label: getViewResourceWallLabel(),
+			value: "resourceWall"
+		});
 		if (canGrid) opts.push({
 			label: getViewGridLabel(),
 			value: "grid"
@@ -140,6 +173,7 @@ const RecordBoardToolBar = (props) => {
 	}, [
 		canFloor,
 		canCalendar,
+		canResourceWall,
 		canGrid
 	]);
 	const bodyViewToggle = allowBodyViewToggle ? /* @__PURE__ */ React.createElement(Segmented, {
@@ -153,11 +187,10 @@ const RecordBoardToolBar = (props) => {
 	/** 平面图 / 日历模式：第二行工具（搜索/筛选等）收起；切换器在业务方 tabs 内（如预约 ScheduleBand） */
 	const compactFloorMapToolbar = (bodyView === "floorMap" || bodyView === "calendar") && showTableFloorToggle;
 	/**
-	* 仅非表格且 tabs 内含 ScheduleBand 时隐藏顶行切换器；表格视图 tabs 无 ScheduleBand，
+	* 仅非表格且 tabs 内含 ScheduleBand（平面图 / 日历）时隐藏顶行切换器；表格 / 资源墙 tabs 无 ScheduleBand，
 	* 切换器回到 Find 左侧（与 PisellReservation 表格态一致）。
 	*/
-	const hideBodyViewToggleInToolbarRow = allowBodyViewToggle && Boolean(slots.tabs) && (bodyView === "floorMap" || bodyView === "calendar");
-	const topLeft = compactFloorMapToolbar ? null : /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-top-left" }, !hideBodyViewToggleInToolbarRow ? bodyViewToggle : null, quickFilterNode ? /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-quick-filter-slot" }, quickFilterNode) : null, searchNode ? /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-find-wrap" }, searchNode) : null, slots.topLeft ? /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-extra-top-left" }, slots.topLeft) : null);
+	const hideBodyViewToggleInToolbarRow = slots.hideBodyViewToggle === true || allowBodyViewToggle && Boolean(slots.tabs) && (bodyView === "floorMap" || bodyView === "calendar");
 	const sortConfig = slots.sort;
 	const hideSort = sortConfig === false;
 	const sortValue = searchParams === null || searchParams === void 0 ? void 0 : searchParams[SORT_PARAMS_FIELD];
@@ -165,10 +198,25 @@ const RecordBoardToolBar = (props) => {
 		onSearch(_objectSpread2(_objectSpread2({}, searchParams), {}, { [SORT_PARAMS_FIELD]: val || void 0 }));
 	}, [onSearch, searchParams]);
 	const sortList = useMemo(() => {
-		const fromConfig = typeof sortConfig === "object" && sortConfig !== null && Array.isArray(sortConfig.list) ? sortConfig.list : null;
-		return fromConfig !== null && fromConfig !== void 0 ? fromConfig : derivedSortFromColumnsList;
-	}, [sortConfig, derivedSortFromColumnsList]);
-	const sortNode = hideSort ? null : /* @__PURE__ */ React.createElement(Sort, _objectSpread2(_objectSpread2({}, typeof sortConfig === "object" && sortConfig !== null ? sortConfig : {}), {}, {
+		/** `list: []` 若为 `??` 左值会得到空数组，无法回落到列派生；此处显式在非空时使用配置项 */
+		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 = [...DEFAULT_RESOURCE_WALL_STATUS_SORT_FIELD_KEYS.map(String), ...extraWallKeys];
+		const filtered = base.filter((item) => item.name != null && 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 _ref4 = sortConfig, { resourceWallSortFieldKeys: _w, list: _omitList } = _ref4;
+		return _objectWithoutProperties(_ref4, _excluded2);
+	})() : {};
+	const sortNode = hideSort ? null : /* @__PURE__ */ React.createElement(Sort, _objectSpread2(_objectSpread2({}, sortSpreadRest), {}, {
 		list: sortList,
 		value: sortValue,
 		onChange: handleSortChange,
@@ -179,7 +227,6 @@ const RecordBoardToolBar = (props) => {
 			size: barSize
 		}, getSortButtonText())
 	}));
-	const filterConfig = slots.filter;
 	const hideFilter = filterConfig === false;
 	const filterValue = searchParams === null || searchParams === void 0 ? void 0 : searchParams[FILTER_PARAMS_FIELD];
 	const hasFilterList = Array.isArray(filterValue === null || filterValue === void 0 ? void 0 : filterValue.quickFilter) && filterValue.quickFilter.length > 0 || Array.isArray(filterValue === null || filterValue === void 0 ? void 0 : filterValue.otherFilter) && filterValue.otherFilter.length > 0;
@@ -193,12 +240,12 @@ const RecordBoardToolBar = (props) => {
 		let otherFilter = Array.isArray(base.otherFilter) && base.otherFilter.length > 0 ? base.otherFilter : (_defaultFilterFromCon2 = defaultFilterFromConfig === null || defaultFilterFromConfig === void 0 ? void 0 : defaultFilterFromConfig.otherFilter) !== null && _defaultFilterFromCon2 !== void 0 ? _defaultFilterFromCon2 : [];
 		if (otherFilter === base.otherFilter && Array.isArray(defaultFilterFromConfig === null || defaultFilterFromConfig === void 0 ? void 0 : defaultFilterFromConfig.otherFilter) && defaultFilterFromConfig.otherFilter.length > 0) {
 			const configMap = new Map(defaultFilterFromConfig.otherFilter.map((c) => {
-				var _ref2, _c$key;
-				return [(_ref2 = (_c$key = c.key) !== null && _c$key !== void 0 ? _c$key : c.name) !== null && _ref2 !== void 0 ? _ref2 : "", c];
+				var _ref5, _c$key;
+				return [(_ref5 = (_c$key = c.key) !== null && _c$key !== void 0 ? _c$key : c.name) !== null && _ref5 !== void 0 ? _ref5 : "", c];
 			}));
 			otherFilter = otherFilter.map((item) => {
-				var _ref3, _item$key, _configItem$label, _configItem$other$pla, _configItem$other, _item$other;
-				const key = (_ref3 = (_item$key = item.key) !== null && _item$key !== void 0 ? _item$key : item.name) !== null && _ref3 !== void 0 ? _ref3 : "";
+				var _ref6, _item$key2, _configItem$label, _configItem$other$pla, _configItem$other, _item$other;
+				const key = (_ref6 = (_item$key2 = item.key) !== null && _item$key2 !== void 0 ? _item$key2 : item.name) !== null && _ref6 !== void 0 ? _ref6 : "";
 				const configItem = configMap.get(key);
 				if (!configItem) return item;
 				return _objectSpread2(_objectSpread2(_objectSpread2({}, configItem), item), {}, {
@@ -207,16 +254,31 @@ const RecordBoardToolBar = (props) => {
 				});
 			});
 		}
+		let outQuick = quickFilter;
+		let outOther = otherFilter;
+		/**
+		* 资源墙：Filter 弹层只保留「大屏资源多选」一项（与顶栏 quickFilter.filterList 中
+		* `resource_wall_resource_ids` 对应），不混入日期快筛 / 业务 otherFilter。
+		*/
+		if (bodyView === "resourceWall") {
+			outQuick = [];
+			outOther = quickFilterList.filter((item) => {
+				var _ref7, _item$key3;
+				return ((_ref7 = (_item$key3 = item.key) !== null && _item$key3 !== void 0 ? _item$key3 : item.name) !== null && _ref7 !== void 0 ? _ref7 : "") === resourceWallFilterFieldKey;
+			}).map((item) => _objectSpread2({}, item));
+		}
 		return _objectSpread2(_objectSpread2({}, base), {}, {
-			quickFilter,
-			otherFilter,
+			quickFilter: outQuick,
+			otherFilter: outOther,
 			values: (_base$values = base.values) !== null && _base$values !== void 0 ? _base$values : {}
 		});
 	}, [
 		filterValue,
 		hasFilterItems,
 		defaultFilterFromConfig,
-		derivedFilterFromColumns
+		derivedFilterFromColumns,
+		bodyView,
+		quickFilterList
 	]);
 	const filterValueForPisellFilter = useMemo(() => _objectSpread2(_objectSpread2({}, effectiveFilterValue), {}, { quickFilter: [] }), [effectiveFilterValue]);
 	const handleFilterChange = useCallback((value) => {
@@ -238,13 +300,40 @@ const RecordBoardToolBar = (props) => {
 		hiddenQuickFilter: true,
 		placement: "bottomLeft"
 	}, typeof filterConfig === "object" && filterConfig !== null ? filterConfig : {}), {}, {
+		phoneLayout: filterPhoneLayout,
 		size: barSize,
 		buttonClassName: "record-board-toolbar-filter-btn"
 	}));
-	const showColumnSetting = slots.columnSetting !== false && Array.isArray(gridColumns) && gridColumns.length > 0;
-	const topRight = compactFloorMapToolbar ? null : /* @__PURE__ */ React.createElement(Space, { className: "record-board-toolbar-right-actions" }, showColumnSetting ? /* @__PURE__ */ React.createElement(RecordBoardColumnSetting, null) : null, sortNode, filterNode, /* @__PURE__ */ React.createElement(ToolBarReset, { size: barSize }), slots.topRight);
+	const showColumnSetting = slots.columnSetting !== false && bodyView !== "resourceWall" && Array.isArray(gridColumns) && gridColumns.length > 0;
+	/**
+	* compact-narrow：列显示 / 排序 / 筛选 / 重置 收入齿轮 Popover；顶栏右侧仅保留搜索图标 + 齿轮。
+	*/
+	const settingsGearPopoverContent = isCompactNarrow ? /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-settings-gear-popover" }, showColumnSetting ? /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-settings-gear-row" }, /* @__PURE__ */ React.createElement(RecordBoardColumnSetting, null)) : null, sortNode ? /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-settings-gear-row" }, sortNode) : null, filterNode ? /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-settings-gear-row" }, filterNode) : null, bodyView !== "resourceWall" ? /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-settings-gear-row" }, /* @__PURE__ */ React.createElement(ToolBarReset, { size: barSize })) : null) : null;
+	const settingsGearTrigger = settingsGearPopoverContent != null ? /* @__PURE__ */ React.createElement(Popover, {
+		content: settingsGearPopoverContent,
+		trigger: "click",
+		placement: "bottomRight",
+		arrow: false,
+		overlayClassName: classNames("record-board-toolbar-settings-gear-overlay", isCompactNarrow && "record-board-toolbar-settings-gear-overlay--compact-narrow")
+	}, /* @__PURE__ */ React.createElement(Button, {
+		className: "record-board-toolbar-settings-gear-btn",
+		icon: /* @__PURE__ */ React.createElement(SettingOutlined, null),
+		size: barSize,
+		type: "text",
+		"aria-label": getText("pisell2.recordBoard.toolbar.moreSettings") || "More settings"
+	})) : null;
+	const mergeQuickFilterWithCompactTrailing = isCompactNarrow && slots.mergeCompactNarrowTrailingWithQuickFilterRow === true && showQuickFilterLeft;
+	const compactNarrowTrailingCluster = isCompactNarrow ? /* @__PURE__ */ React.createElement(Space, {
+		className: classNames("record-board-toolbar-right-actions", mergeQuickFilterWithCompactTrailing && "record-board-toolbar-hud-trailing-cluster"),
+		size: 4
+	}, bodyView !== "resourceWall" && searchNode ? searchNode : null, settingsGearTrigger) : null;
+	const topLeft = compactFloorMapToolbar ? null : /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-top-left" }, !hideBodyViewToggleInToolbarRow ? bodyViewToggle : null, mergeQuickFilterWithCompactTrailing && quickFilterNode ? /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-hud-unified-quick-filter-row" }, /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-quick-filter-slot" }, quickFilterNode), compactNarrowTrailingCluster) : quickFilterNode ? /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-quick-filter-slot" }, quickFilterNode) : null, searchNode && bodyView !== "resourceWall" && !isCompactNarrow ? /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-find-wrap" }, searchNode) : null, slots.topLeft ? /* @__PURE__ */ React.createElement("div", { className: "record-board-toolbar-extra-top-left" }, slots.topLeft) : null);
+	const topRight = compactFloorMapToolbar ? null : isCompactNarrow ? mergeQuickFilterWithCompactTrailing ? (_slots$topRight = slots.topRight) !== null && _slots$topRight !== void 0 ? _slots$topRight : null : /* @__PURE__ */ React.createElement(Space, {
+		className: "record-board-toolbar-right-actions",
+		size: 4
+	}, bodyView !== "resourceWall" && searchNode ? searchNode : null, settingsGearTrigger, slots.topRight) : /* @__PURE__ */ React.createElement(Space, { className: "record-board-toolbar-right-actions" }, showColumnSetting ? /* @__PURE__ */ React.createElement(RecordBoardColumnSetting, null) : null, sortNode, filterNode, bodyView !== "resourceWall" ? /* @__PURE__ */ React.createElement(ToolBarReset, { size: barSize }) : null, slots.topRight);
 	return /* @__PURE__ */ React.createElement(Toolbar, {
-		className: classNames(bodyView === "floorMap" && "pisell-record-board-toolbar--floor-map", bodyView === "calendar" && "pisell-record-board-toolbar--calendar", bodyView === "grid" && "pisell-record-board-toolbar--grid", toolbarDensity === "compact" && "pisell-record-board-toolbar--compact", slots.className),
+		className: classNames(bodyView === "floorMap" && "pisell-record-board-toolbar--floor-map", bodyView === "calendar" && "pisell-record-board-toolbar--calendar", bodyView === "resourceWall" && "pisell-record-board-toolbar--resource-wall", bodyView === "grid" && "pisell-record-board-toolbar--grid", toolbarDensity === "compact" && "pisell-record-board-toolbar--compact", isCompactNarrow && "pisell-record-board-toolbar--compact pisell-record-board-toolbar--compact-narrow", slots.className),
 		style: slots.style,
 		tabs: slots.tabs,
 		topLeft,

package/es/components/pisellRecordBoard/shellFrame/ToolBar/recordBoardToolBarConstants.js

@@ -0,0 +1,11 @@
+//#region src/components/pisellRecordBoard/shellFrame/ToolBar/recordBoardToolBarConstants.ts
+/** 与 RecordBoard ToolBar 行为绑定的 searchParams 字段名 */
+const DEFAULT_SEARCH_FIELD = "keyword";
+/** 筛选在 searchParams 中的字段名 */
+const FILTER_PARAMS_FIELD = "filter";
+/** 排序在 searchParams 中的字段名 */
+const SORT_PARAMS_FIELD = "sort";
+/** 与 ResourceWall 默认 `filterFieldKey` 一致 */
+const RESOURCE_WALL_QUICK_FILTER_KEY = "resource_wall_resource_ids";
+//#endregion
+export { DEFAULT_SEARCH_FIELD, FILTER_PARAMS_FIELD, RESOURCE_WALL_QUICK_FILTER_KEY, SORT_PARAMS_FIELD };