@pisell/materials 1.8.38 → 1.8.41

package/es/components/pisellRecordBoard/shellFrame/Calendar/PisellRecordBoardCalendarView.d.ts

@@ -4,11 +4,7 @@ import React from "react";
 //#region src/components/pisellRecordBoard/shellFrame/Calendar/PisellRecordBoardCalendarView.d.ts
 type PisellRecordBoardCalendarViewProps = RecordBoardCalendarProps;
 /**
- * RecordBoard 日历视图：内嵌 `BookingCalendar`（Tailwind 由包入口 `pisell-materials.tw.css` 注入）。
- *
- * **布局分工**：外层 Shell 上 `pisell-record-board-calendar-viewport`（flex:1 / min-height:0 / overflow:hidden）
- * 只做「占位与裁剪高度」；本组件根节点负责在同一 flex 列里向下传递 **min-height:0**，避免 `BookingCalendar`
- * 撑破壳层（一层即可，历史上曾双包一层重复 flex+overflow）。
+ * RecordBoard 日历视图：内嵌 BookingCalendarDemo（Tailwind 样式由包入口 `pisell-materials.tw.css` 注入）。
  */
 declare function PisellRecordBoardCalendarView(props: PisellRecordBoardCalendarViewProps): React.JSX.Element;
 //#endregion

package/es/components/pisellRecordBoard/shellFrame/Calendar/PisellRecordBoardCalendarView.js

@@ -1,9 +1,8 @@
 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 { CalendarPersistProvider } from "./calendarPersistGuard.js";
-import BookingCalendar from "./BookingCalendar.js";
+import BookingCalendarDemo from "./BookingCalendarDemo.js";
 import React from "react";
-import classNames from "classnames";
 //#region src/components/pisellRecordBoard/shellFrame/Calendar/PisellRecordBoardCalendarView.tsx
 const _excluded = [
 	"persistGuard",
@@ -11,22 +10,21 @@ const _excluded = [
 	"style"
 ];
 /**
-* RecordBoard 日历视图：内嵌 `BookingCalendar`（Tailwind 由包入口 `pisell-materials.tw.css` 注入）。
-*
-* **布局分工**：外层 Shell 上 `pisell-record-board-calendar-viewport`（flex:1 / min-height:0 / overflow:hidden）
-* 只做「占位与裁剪高度」；本组件根节点负责在同一 flex 列里向下传递 **min-height:0**，避免 `BookingCalendar`
-* 撑破壳层（一层即可，历史上曾双包一层重复 flex+overflow）。
+* RecordBoard 日历视图：内嵌 BookingCalendarDemo（Tailwind 样式由包入口 `pisell-materials.tw.css` 注入）。
 */
 function PisellRecordBoardCalendarView(props) {
 	const { persistGuard, className, style } = props, rest = _objectWithoutProperties(props, _excluded);
 	return /* @__PURE__ */ React.createElement(CalendarPersistProvider, { value: persistGuard }, /* @__PURE__ */ React.createElement("div", {
 		id: "pisell-record-board-calendar-root",
-		className: classNames(className, "flex min-h-0 flex-1 flex-col overflow-hidden"),
+		className,
 		style: _objectSpread2({
 			height: "100%",
-			minHeight: 0
+			minHeight: 0,
+			display: "flex",
+			flexDirection: "column",
+			overflow: "hidden"
 		}, style)
-	}, /* @__PURE__ */ React.createElement(BookingCalendar, rest)));
+	}, /* @__PURE__ */ React.createElement("div", { className: "flex min-h-0 flex-1 flex-col overflow-hidden" }, /* @__PURE__ */ React.createElement(BookingCalendarDemo, rest))));
 }
 //#endregion
 export { PisellRecordBoardCalendarView };

package/es/components/pisellRecordBoard/shellFrame/Calendar/calendarPersistGuard.d.ts

@@ -2,7 +2,7 @@ import React from "react";
 
 //#region src/components/pisellRecordBoard/shellFrame/Calendar/calendarPersistGuard.d.ts
 /** 日历内会改本地预约数据的动作类型，供业务层拦截（如平面图未支持写接口时 toast） */
-type CalendarPersistKind = 'moveBooking' | 'createBooking' | 'removeBlocks' | 'createBlock' | 'checkin' | 'checkinReschedule' | 'mergeOrder' | 'other';
+type CalendarPersistKind = 'moveBooking' | 'applyConflictMove' | 'createBooking' | 'removeBlocks' | 'createBlock' | 'confirmBlockWithConflicts' | 'checkin' | 'checkinReschedule' | 'mergeOrder' | 'other';
 interface CalendarPersistContextValue {
   /**
    * 返回 false 时日历组件应取消本次本地数据变更（由调用方决定是否已 toast）。

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

@@ -13,8 +13,7 @@ import "./index.less";
 const RecordBoardColumnSetting = () => {
 	var _ctx$childComponentPr, _ctx$childComponentPr2, _ctx$columnVisibility, _ctx$columnOrder;
 	const ctx = useRecordBoardContext();
-	const density = (_ctx$childComponentPr = ctx.childComponentProps) === null || _ctx$childComponentPr === void 0 || (_ctx$childComponentPr = _ctx$childComponentPr.toolBar) === null || _ctx$childComponentPr === void 0 ? void 0 : _ctx$childComponentPr.toolbarDensity;
-	const compactToolbar = density === "compact" || density === "compact-narrow";
+	const compactToolbar = ((_ctx$childComponentPr = ctx.childComponentProps) === null || _ctx$childComponentPr === void 0 || (_ctx$childComponentPr = _ctx$childComponentPr.toolBar) === null || _ctx$childComponentPr === void 0 ? void 0 : _ctx$childComponentPr.toolbarDensity) === "compact";
 	const gridColumns = (_ctx$childComponentPr2 = ctx.childComponentProps) === null || _ctx$childComponentPr2 === void 0 || (_ctx$childComponentPr2 = _ctx$childComponentPr2.grid) === null || _ctx$childComponentPr2 === void 0 ? void 0 : _ctx$childComponentPr2.columns;
 	const columnVisibility = (_ctx$columnVisibility = ctx.columnVisibility) !== null && _ctx$columnVisibility !== void 0 ? _ctx$columnVisibility : {};
 	const onColumnVisibilityChange = ctx.onColumnVisibilityChange;

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

@@ -34,13 +34,7 @@ const RecordBoardPagination = (props) => {
 		ctx.onPageChange,
 		(_ctx$childComponentPr3 = ctx.childComponentProps) === null || _ctx$childComponentPr3 === void 0 ? void 0 : _ctx$childComponentPr3.pagination
 	]);
-	/**
-	* 渲染优先级：组件 `render` prop > 容器根 props 透传过来的 `ctx.paginationRender` > 默认 materials Pagination。
-	* 这样业务方（如 reservation hud 抽屉）只需在 `<PisellRecordBoard paginationRender={...} />`
-	* 就能彻底替换默认分页（含外层 50px 高边框容器、Previous/Next 大按钮）为 antd 原生 small Pagination。
-	*/
-	const effectiveRender = render !== null && render !== void 0 ? render : ctx.paginationRender;
-	if (typeof effectiveRender === "function") return /* @__PURE__ */ React.createElement(React.Fragment, null, effectiveRender(_objectSpread2(_objectSpread2({}, ctx), rest)));
+	if (typeof render === "function") return /* @__PURE__ */ React.createElement(React.Fragment, null, render(_objectSpread2(_objectSpread2({}, ctx), rest)));
 	if (ctx.total === 0) return /* @__PURE__ */ React.createElement("div", {
 		"data-layout-slot": "pagination",
 		className: "record-board-shell-frame-pagination record-board-shell-frame-pagination-placeholder",

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 { PisellFind } from "../../../pisellFind/index.js";
 import { useRecordBoardContext } from "../../hooks/useRecordBoardContext.js";
+import { PisellFind } from "../../../pisellFind/index.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, RecordBoardResourceWallProps } from "../types.js";
+import { RecordBoardCalendarProps, RecordBoardFloorMapProps } from "../types.js";
 import React from "react";
 
 //#region src/components/pisellRecordBoard/shellFrame/ShellBodyMetaContext.d.ts
@@ -17,10 +17,6 @@ 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/index.js

@@ -1,69 +1,84 @@
 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 { Button, Popover, Segmented, Space } from "antd";
-import { SearchOutlined, SettingOutlined } from "@ant-design/icons";
+import { locales } from "@pisell/utils";
+import { Button, Segmented, Space } from "antd";
 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
-const _excluded = [
-	"trigger",
-	"triggerType",
-	"displayType",
-	"triggerText",
-	"triggerIcon",
-	"buttonText"
-], _excluded2 = ["resourceWallSortFieldKeys", "list"];
+/** 与 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: []
+	};
+}
 /**
 * RecordBoard 下的工具栏：使用 PisellToolBar。
 * 左侧默认 PisellFind（inline）；右侧默认 PisellFilter。通过 childComponentProps.toolBar.search / toolBar.filter 为对象时透传对应组件 props，为 false 时不渲染。
 * 可透传 topLeft、topRight、bottomLeft、bottomRight、tabs。
 */
 const RecordBoardToolBar = (props) => {
-	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;
+	var _shellMeta$hasGridCon, _shellMeta$hasFloorMa, _shellMeta$hasCalenda, _shellMeta$effectiveF, _ctx$childComponentPr, _ctx$childComponentPr2, _slots$toolbarDensity, _searchParams$DEFAULT, _ctx$childComponentPr3, _formFiltersPrefix, _filterResetKey;
 	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) + (canResourceWall ? 1 : 0) >= 2;
+	const showTableFloorToggle = (canGrid ? 1 : 0) + (canFloor ? 1 : 0) + (canCalendar ? 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";
-	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 keyword = (_searchParams$DEFAULT = searchParams === null || searchParams === void 0 ? void 0 : searchParams["keyword"]) !== null && _searchParams$DEFAULT !== void 0 ? _searchParams$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 handleSearch = useCallback((value) => {
 		onSearch(_objectSpread2(_objectSpread2({}, searchParams), {}, { [DEFAULT_SEARCH_FIELD]: value || void 0 }));
 	}, [onSearch, searchParams]);
@@ -71,30 +86,8 @@ 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;
-	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({
+	/** 默认 inline：triggerType="input" + displayType="inline"，放在 toolbar 左侧。showConfirmButton 优先取 toolBar.search，未配置时默认 true。 */
+	const searchNode = searchConfig === false ? null : /* @__PURE__ */ React.createElement(PisellFind, _objectSpread2(_objectSpread2({
 		triggerType: "input",
 		displayType: "inline",
 		showConfirmButton: typeof searchConfig === "object" && searchConfig !== null && "showConfirmButton" in searchConfig ? searchConfig.showConfirmButton : true,
@@ -104,12 +97,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 _ref2;
+		var _ref;
 		if (quickFilterConfig === false) return [];
 		const fromConfig = typeof quickFilterConfig === "object" && quickFilterConfig !== null && Array.isArray(quickFilterConfig.filterList) ? quickFilterConfig.filterList : null;
-		let list = (_ref2 = fromConfig !== null && fromConfig !== void 0 ? fromConfig : derivedFilterFromColumns === null || derivedFilterFromColumns === void 0 ? void 0 : derivedFilterFromColumns.quickFilter) !== null && _ref2 !== void 0 ? _ref2 : [];
+		let list = (_ref = fromConfig !== null && fromConfig !== void 0 ? fromConfig : derivedFilterFromColumns === null || derivedFilterFromColumns === void 0 ? void 0 : derivedFilterFromColumns.quickFilter) !== null && _ref !== void 0 ? _ref : [];
 		const hideNames = typeof quickFilterConfig === "object" && quickFilterConfig !== null && Array.isArray(quickFilterConfig.hideFilterNamesOnFloorMap) ? quickFilterConfig.hideFilterNamesOnFloorMap : null;
-		if ((bodyView === "floorMap" || bodyView === "calendar" || bodyView === "resourceWall") && showTableFloorToggle && hideNames != null && hideNames.length > 0) {
+		if ((bodyView === "floorMap" || bodyView === "calendar") && showTableFloorToggle && hideNames != null && hideNames.length > 0) {
 			const hideSet = new Set(hideNames.map(String));
 			list = list.filter((item) => {
 				var _item$name;
@@ -124,25 +117,8 @@ const RecordBoardToolBar = (props) => {
 		bodyView,
 		showTableFloorToggle
 	]);
-	/**
-	* 资源墙专用快筛不占用顶栏；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 quickFilterNode = leftBarQuickFilterList.length > 0 ? /* @__PURE__ */ React.createElement(ToolBarQuickFilter, {
-		filterList: leftBarQuickFilterList,
+	const quickFilterNode = quickFilterList.length > 0 ? /* @__PURE__ */ React.createElement(ToolBarQuickFilter, {
+		filterList: quickFilterList,
 		formFiltersPrefix: typeof quickFilterConfig === "object" && quickFilterConfig !== null ? (_formFiltersPrefix = quickFilterConfig.formFiltersPrefix) !== null && _formFiltersPrefix !== void 0 ? _formFiltersPrefix : "" : "",
 		size: typeof quickFilterConfig === "object" && quickFilterConfig !== null ? quickFilterConfig.size : void 0
 	}) : null;
@@ -156,10 +132,6 @@ const RecordBoardToolBar = (props) => {
 			label: getViewCalendarLabel(),
 			value: "calendar"
 		});
-		if (canResourceWall) opts.push({
-			label: getViewResourceWallLabel(),
-			value: "resourceWall"
-		});
 		if (canGrid) opts.push({
 			label: getViewGridLabel(),
 			value: "grid"
@@ -168,7 +140,6 @@ const RecordBoardToolBar = (props) => {
 	}, [
 		canFloor,
 		canCalendar,
-		canResourceWall,
 		canGrid
 	]);
 	const bodyViewToggle = allowBodyViewToggle ? /* @__PURE__ */ React.createElement(Segmented, {
@@ -182,11 +153,11 @@ 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 && 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 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 sortConfig = slots.sort;
 	const hideSort = sortConfig === false;
 	const sortValue = searchParams === null || searchParams === void 0 ? void 0 : searchParams[SORT_PARAMS_FIELD];
@@ -194,25 +165,10 @@ const RecordBoardToolBar = (props) => {
 		onSearch(_objectSpread2(_objectSpread2({}, searchParams), {}, { [SORT_PARAMS_FIELD]: val || void 0 }));
 	}, [onSearch, searchParams]);
 	const sortList = useMemo(() => {
-		/** `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), {}, {
+		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: sortList,
 		value: sortValue,
 		onChange: handleSortChange,
@@ -237,12 +193,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 _ref5, _c$key;
-				return [(_ref5 = (_c$key = c.key) !== null && _c$key !== void 0 ? _c$key : c.name) !== null && _ref5 !== void 0 ? _ref5 : "", 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];
 			}));
 			otherFilter = otherFilter.map((item) => {
-				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 : "";
+				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 : "";
 				const configItem = configMap.get(key);
 				if (!configItem) return item;
 				return _objectSpread2(_objectSpread2(_objectSpread2({}, configItem), item), {}, {
@@ -251,31 +207,16 @@ 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: outQuick,
-			otherFilter: outOther,
+			quickFilter,
+			otherFilter,
 			values: (_base$values = base.values) !== null && _base$values !== void 0 ? _base$values : {}
 		});
 	}, [
 		filterValue,
 		hasFilterItems,
 		defaultFilterFromConfig,
-		derivedFilterFromColumns,
-		bodyView,
-		quickFilterList
+		derivedFilterFromColumns
 	]);
 	const filterValueForPisellFilter = useMemo(() => _objectSpread2(_objectSpread2({}, effectiveFilterValue), {}, { quickFilter: [] }), [effectiveFilterValue]);
 	const handleFilterChange = useCallback((value) => {
@@ -300,29 +241,10 @@ const RecordBoardToolBar = (props) => {
 		size: barSize,
 		buttonClassName: "record-board-toolbar-filter-btn"
 	}));
-	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 topRight = compactFloorMapToolbar ? null : isCompactNarrow ? /* @__PURE__ */ React.createElement(Space, {
-		className: "record-board-toolbar-right-actions",
-		size: 4
-	}, bodyView !== "resourceWall" && searchNode ? searchNode : null, settingsGearPopoverContent ? /* @__PURE__ */ React.createElement(Popover, {
-		content: settingsGearPopoverContent,
-		trigger: "click",
-		placement: "bottomRight",
-		arrow: false,
-		overlayClassName: "record-board-toolbar-settings-gear-overlay"
-	}, /* @__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, 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);
+	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);
 	return /* @__PURE__ */ React.createElement(Toolbar, {
-		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),
+		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),
 		style: slots.style,
 		tabs: slots.tabs,
 		topLeft,