@pisell/materials 6.11.42 → 6.11.44

package/es/components/pisellFloorMapLayout/utils/floorMapElementNameAsTitle.js

@@ -0,0 +1,74 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * 「将图元名作为资源标题」开关：通用读写 + 标题解析。
+ *
+ * - 持久化在 `sceneElement.extensions[NAME_AS_TITLE_EXT_KEY]`，避免污染顶层 schema、
+ *   不影响未启用该能力的旧 / 新 kind。
+ * - 是否在编辑面板「显示」该选项，由 `FloorMapElementKindConfig.nameAsTitleConfigurable`
+ *   控制；展示侧（业务卡片渲染）只读 extensions，不依赖 kindConfig，确保即便业务方
+ *   后续撤回 kindConfig 开关，已落库的偏好仍生效。
+ */
+
+/** 持久化字段名：固定字符串，跨包共用，勿改 */
+export var NAME_AS_TITLE_EXT_KEY = 'nameAsTitle';
+/** 安全读取「图元名作为标题」开关 */
+export function isElementNameAsTitleEnabled(el) {
+  var _el$extensions;
+  if (!el) return false;
+  var v = (_el$extensions = el.extensions) === null || _el$extensions === void 0 ? void 0 : _el$extensions[NAME_AS_TITLE_EXT_KEY];
+  return v === true;
+}
+
+/**
+ * 计算 `extensions` patch：返回值供调用方写入 `sceneElement.extensions`。
+ *
+ * - `enabled === true` 时写入 `true`；
+ * - `enabled === false` 时**移除**该 key（而非写 `false`），避免持久化里残留无意义字段；
+ * - 返回 `undefined` 表示「extensions 整体可清空」（仅当结果是空对象时）。
+ *
+ * @example
+ * const nextExt = buildNameAsTitleExtensionsPatch(el.extensions, true);
+ * onUpdate({ extensions: nextExt });
+ */
+export function buildNameAsTitleExtensionsPatch(prev, enabled) {
+  var base = _objectSpread({}, prev !== null && prev !== void 0 ? prev : {});
+  if (enabled) {
+    base[NAME_AS_TITLE_EXT_KEY] = true;
+  } else {
+    delete base[NAME_AS_TITLE_EXT_KEY];
+  }
+  return Object.keys(base).length > 0 ? base : undefined;
+}
+
+/**
+ * 通用图元标题解析：业务展示层（卡片标题、占位标题等）统一调用本函数，
+ * 让「图元名作为资源标题」这一偏好对所有接入方一致生效。
+ *
+ * 优先级：
+ *   1. 启用了 nameAsTitle 且 `el.name` 非空 → `el.name`
+ *   2. `recordTitle`（业务侧按自己规则算出来的，如预约页 `row.main_field` / `row.code`）
+ *   3. `el.name`（业务字段缺失时的兜底，与历史行为一致）
+ *   4. `fallback`（如 kindLabel）
+ *   5. 空串
+ *
+ * 不更改 `displayRoomTitleFromRow` / `record.name` 等业务函数本身，
+ * 业务方只需把"按业务字段"算出来的结果以 `recordTitle` 传入即可，
+ * `bookingDetailModal` 等下游不会被联动改坏。
+ */
+export function resolveSceneElementDisplayTitle(opts) {
+  var sceneElement = opts.sceneElement,
+    recordTitle = opts.recordTitle,
+    fallback = opts.fallback;
+  var elName = (sceneElement === null || sceneElement === void 0 ? void 0 : sceneElement.name) != null ? String(sceneElement.name).trim() : '';
+  var rt = recordTitle != null ? String(recordTitle).trim() : '';
+  var fb = fallback != null ? String(fallback).trim() : '';
+  if (isElementNameAsTitleEnabled(sceneElement) && elName) {
+    return elName;
+  }
+  return rt || elName || fb || '';
+}

package/es/components/pisellGridPro/ToolBar/index.less

@@ -37,7 +37,7 @@
     &-right {
       display: flex;
       flex-direction: row;
-      align-items: center;
+      justify-content: start;
       gap: 12px;
       flex-shrink: 0;
     }
@@ -45,19 +45,20 @@
 }
 
 /**
- * 手机版宽度：左侧区域与右侧区域换行，避免挤在一行
+ * 手机版宽度：左侧区域与右侧区域换行，避免挤在一行。
+ * RecordBoard（`.pisell-record-board-toolbar--grid`）顶栏单行布局见 `recordBoardToolbar.less`，此处排除。
  */
 @media (max-width: 768px) {
   .pisell-grid-pro-toolbar .toolbar-row {
     flex-wrap: wrap;
   }
 
-  .pisell-grid-pro-toolbar .toolbar-row-left {
+  .pisell-grid-pro-toolbar:not(.pisell-record-board-toolbar--grid) .toolbar-row-left {
     flex: 1 1 100%;
     min-width: 0;
   }
 
-  .pisell-grid-pro-toolbar .toolbar-row-right {
+  .pisell-grid-pro-toolbar:not(.pisell-record-board-toolbar--grid) .toolbar-row-right {
     flex: 1 1 100%;
     min-width: 0;
     justify-content: flex-start;

package/es/components/pisellInput/components/BankCard/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { InputProps } from 'antd';
 import { PisellContextType } from "../../../pisell-config-provider/context";
 import './index.less';

package/es/components/pisellInput/components/SecurityCode/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { InputProps } from 'antd';
 import './index.less';
 import { PisellContextType } from "../../../pisell-config-provider/context";

package/es/components/pisellLoading/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SpinProps } from 'antd';
 import './index.less';
 declare type MaskType = {

package/es/components/pisellModal/components/IpadModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PcModalProps } from '../PcModal';
 export interface IpadModalProps extends PcModalProps {
 }

package/es/components/pisellModal/components/MobileModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PcModalProps } from '../PcModal';
 import './index.less';
 export interface MobileModalProps extends PcModalProps {

package/es/components/pisellModal/components/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import IpadModal from './IpadModal';
 import MobileModal from './MobileModal';
 import PcModal from './PcModal';

package/es/components/pisellRecordBoard/PisellRecordBoard.js

@@ -91,7 +91,8 @@ function getDefaultRecordBoardContext(layoutType, selection, rowKey) {
     calendarProps: undefined,
     resourceWallProps: undefined,
     dataSources: undefined,
-    gridDataSourceKey: undefined
+    gridDataSourceKey: undefined,
+    paginationRender: undefined
   };
 }
 
@@ -327,9 +328,14 @@ var PisellRecordBoard = function PisellRecordBoard(props) {
       floorMapLayoutRef: floorMapLayoutRef,
       floorMapFooter: floorMapFooter,
       calendarProps: calendarProp,
-      resourceWallProps: resourceWallProp
+      resourceWallProps: resourceWallProp,
+      /**
+       * 业务方传入的自定义分页渲染：注入 ctx 后，shellFrame 内置的
+       * `<RecordBoardPagination />` 会优先使用它（详见 RecordBoardPagination 实现）。
+       */
+      paginationRender: props.paginationRender
     });
-  }, [layoutType, rowKeyProp, dataProp, dataSourcesProp, gridDataSourceKeyProp, loadingProp, totalProp, paginationProp, onPageChangeProp, searchParamsProp, onSearchProp, onResetProp, mergedChildComponentProps, internalSelectedKeys, internalSelectedRows, onSelectionChangeInternal, internalColumnVisibility, onColumnVisibilityChangeInternal, internalColumnOrder, onColumnOrderChangeInternal, fillHeight, scrollAreaHeight, filterResetKey, floorMapProp, floorMapLayoutContextProp, defaultBodyView, bodyViewSwitchable, floorMapLayoutRef, floorMapFooter, calendarProp, resourceWallProp, bodyView, setBodyView]);
+  }, [layoutType, rowKeyProp, dataProp, dataSourcesProp, gridDataSourceKeyProp, loadingProp, totalProp, paginationProp, onPageChangeProp, searchParamsProp, onSearchProp, onResetProp, mergedChildComponentProps, internalSelectedKeys, internalSelectedRows, onSelectionChangeInternal, internalColumnVisibility, onColumnVisibilityChangeInternal, internalColumnOrder, onColumnOrderChangeInternal, fillHeight, scrollAreaHeight, filterResetKey, floorMapProp, floorMapLayoutContextProp, defaultBodyView, bodyViewSwitchable, floorMapLayoutRef, floorMapFooter, calendarProp, resourceWallProp, bodyView, setBodyView, props.paginationRender]);
   var content = /*#__PURE__*/React.createElement(RecordBoardProvider, {
     value: contextValue
   }, children);

package/es/components/pisellRecordBoard/shellFrame/Calendar/utils/BookingCalendarStyle.d.ts

@@ -2,7 +2,7 @@ import { type CalendarBookingSegmentInput } from './bookingCalendarDateUtils';
 export declare function getDrawerStatusTheme(item: CalendarBookingSegmentInput, dateKey: string): "bg-red-700/88 border-b-4 border-red-300/55" | "bg-zinc-700/88 border-b-4 border-zinc-400/45" | "bg-zinc-700/88 border-b-4 border-red-400/75" | "bg-violet-700/92 border-b-4 border-amber-400/95" | "bg-violet-700/92 border-b-4 border-zinc-300/45" | "bg-violet-700/92 border-b-4 border-violet-300/30";
 export declare function paymentTagClass(label: string, isLight?: boolean): "theme-success-chip border" | "bg-emerald-500 text-white" | "theme-warning-chip border" | "bg-amber-500 text-white" | "theme-info-chip border" | "bg-sky-500 text-white" | "theme-danger-chip border" | "bg-red-500 text-white";
 export declare function fulfillmentTagClass(label: string, isLight?: boolean): "theme-success-chip border" | "theme-warning-chip border" | "bg-amber-500 text-white" | "theme-info-chip border" | "theme-danger-chip border" | "bg-emerald-600 text-white" | "bg-cyan-500 text-white" | "bg-red-600 text-white" | "border border-[var(--border-strong)] bg-[var(--bg-input)] theme-text-soft" | "bg-zinc-600 text-white" | "border border-[var(--brand-light)] bg-[var(--brand-surface)] theme-brand-text" | "bg-violet-600 text-white";
-export declare function getBookingStateClasses(item: CalendarBookingSegmentInput, dateKey: string): "bg-red-700/70 text-red-100" | "bg-violet-700/90 text-violet-50" | "bg-zinc-700/55 border border-zinc-500/70 text-zinc-100 grayscale-[0.2]" | "bg-zinc-700/55 border border-red-500/70 text-zinc-200 grayscale-[0.15]" | "bg-violet-700/90 border border-amber-400/80 text-violet-50";
+export declare function getBookingStateClasses(item: CalendarBookingSegmentInput, dateKey: string): "bg-zinc-700/55 border border-zinc-500/70 text-zinc-100 grayscale-[0.2]" | "bg-zinc-700/55 border border-red-500/70 text-zinc-200 grayscale-[0.15]" | "bg-violet-700/90 border border-amber-400/80 text-violet-50" | "bg-red-700/70 text-red-100" | "bg-violet-700/90 text-violet-50";
 /**
  * 月 / 周紧凑格：不按签到/取消/迟到等状态变色，仅区分 booking（默认紫）与 block（红）。
  * 与 {@link getBookingStateClasses} 在无状态分支时一致，但不读取 `dateKey`。

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

@@ -13,7 +13,8 @@ import "./index.less";
 var RecordBoardColumnSetting = function RecordBoardColumnSetting() {
   var _ctx$childComponentPr, _ctx$childComponentPr2, _ctx$columnVisibility, _ctx$columnOrder;
   var ctx = useRecordBoardContext();
-  var 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';
+  var 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;
+  var compactToolbar = density === 'compact' || density === 'compact-narrow';
   var 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;
   var columnVisibility = (_ctx$columnVisibility = ctx.columnVisibility) !== null && _ctx$columnVisibility !== void 0 ? _ctx$columnVisibility : {};
   var onColumnVisibilityChange = ctx.onColumnVisibilityChange;

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

@@ -36,8 +36,15 @@ var RecordBoardPagination = function RecordBoardPagination(props) {
       onChange: ctx.onPageChange
     }, (_ctx$childComponentPr = (_ctx$childComponentPr2 = ctx.childComponentProps) === null || _ctx$childComponentPr2 === void 0 ? void 0 : _ctx$childComponentPr2.pagination) !== null && _ctx$childComponentPr !== void 0 ? _ctx$childComponentPr : {});
   }, [pagination.pageNumber, pagination.pageSize, ctx.total, ctx.onPageChange, (_ctx$childComponentPr3 = ctx.childComponentProps) === null || _ctx$childComponentPr3 === void 0 ? void 0 : _ctx$childComponentPr3.pagination]);
-  if (typeof render === 'function') {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, render(_objectSpread(_objectSpread({}, ctx), rest)));
+
+  /**
+   * 渲染优先级：组件 `render` prop > 容器根 props 透传过来的 `ctx.paginationRender` > 默认 materials Pagination。
+   * 这样业务方（如 reservation hud 抽屉）只需在 `<PisellRecordBoard paginationRender={...} />`
+   * 就能彻底替换默认分页（含外层 50px 高边框容器、Previous/Next 大按钮）为 antd 原生 small Pagination。
+   */
+  var effectiveRender = render !== null && render !== void 0 ? render : ctx.paginationRender;
+  if (typeof effectiveRender === 'function') {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, effectiveRender(_objectSpread(_objectSpread({}, ctx), rest)));
   }
 
   // 无数据时不展示分页控件，但保留占位避免高度计算异常

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

@@ -1,6 +1,5 @@
-var _excluded = ["resourceWallSortFieldKeys", "list"];
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+var _excluded = ["trigger", "triggerType", "displayType", "triggerText", "triggerIcon", "buttonText"],
+  _excluded2 = ["resourceWallSortFieldKeys", "list"];
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -8,15 +7,18 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import React, { useCallback, useMemo } from 'react';
 import classNames from 'classnames';
-import { Button, Space, Segmented } from 'antd';
+import { Button, Space, Segmented, Popover } from 'antd';
+import { SettingOutlined, SearchOutlined } from '@ant-design/icons';
 import SwitchVertical01 from '@pisell/icon/es/SwitchVertical01';
 import PisellToolBar from "../../../pisellGridPro/ToolBar";
 import { PisellFind } from "../../../pisellFind";
@@ -27,86 +29,14 @@ import ToolBarQuickFilter from "../ToolBarQuickFilter";
 import RecordBoardColumnSetting from "../ColumnSetting";
 import { useRecordBoardShellBodyMeta } from "../ShellBodyMetaContext";
 import { useRecordBoardContext } from "../../hooks/useRecordBoardContext";
-import { locales as utilsLocales } from '@pisell/utils';
 import { getText } from "../../../../locales";
 import { deriveFilterFromColumns, deriveSortFromColumns } from "../../utils/recordBoardColumns";
-import { DEFAULT_RESOURCE_WALL_STATUS_SORT_FIELD_KEYS, matchesResourceWallStatusSortField } from "../ResourceWall/venueWallUtils";
+import { matchesResourceWallStatusSortField } from "../ResourceWall/venueWallUtils";
+import { DEFAULT_SEARCH_FIELD, FILTER_PARAMS_FIELD, RESOURCE_WALL_QUICK_FILTER_KEY, SORT_PARAMS_FIELD } from "./recordBoardToolBarConstants";
+import { buildResourceWallStatusSortFallbackItem, getDefaultFilterValue, getSortButtonText, getViewCalendarLabel, getViewFloorMapLabel, getViewGridLabel, getViewResourceWallLabel } from "./recordBoardToolBarI18n";
 import "./ToolBarFilter.less";
 import "./recordBoardToolbar.less";
 
-/** 与 Quick Filter 同源：优先 utils，若 utils 返回 key（未命中）则用 materials 再回退 */
-function getSortButtonText() {
-  var key = 'pisell2.recordBoard.toolbar.sort';
-  var u = utilsLocales.getText(key);
-  return u && u !== key ? u : getText(key) || getText('sort-button-text');
-}
-/** 资源墙无状态列派生项时注入：下拉仅「状态 → 空闲优先 / 占用优先」，仍渲染排序按钮 */
-function buildResourceWallStatusSortFallbackItem(sortConfig) {
-  var extras = _typeof(sortConfig) === 'object' && sortConfig !== null && Array.isArray(sortConfig.resourceWallSortFieldKeys) ? sortConfig.resourceWallSortFieldKeys.map(function (x) {
-    return String(x).trim();
-  }).filter(Boolean) : [];
-  var primaryKey = extras.length > 0 ? extras[0] : DEFAULT_RESOURCE_WALL_STATUS_SORT_FIELD_KEYS[0];
-  return {
-    name: primaryKey,
-    label: getText('pisell2.recordBoard.toolbar.sortStatus'),
-    isCustom: true,
-    getSortItems: function getSortItems() {
-      return [{
-        key: "".concat(primaryKey, ":asc:option"),
-        label: getText('pisell2.recordBoard.toolbar.sortStatusFreeFirst')
-      }, {
-        key: "".concat(primaryKey, ":desc:option"),
-        label: getText('pisell2.recordBoard.toolbar.sortStatusOccupiedFirst')
-      }];
-    }
-  };
-}
-function getFilterButtonText() {
-  var key = 'pisell2.recordBoard.toolbar.filter';
-  var u = utilsLocales.getText(key);
-  return u && u !== key ? u : getText(key) || getText('table-action-filter-button');
-}
-function getViewGridLabel() {
-  var key = 'pisell2.recordBoard.toolbar.viewGrid';
-  var u = utilsLocales.getText(key);
-  return u && u !== key ? u : getText(key) || 'Table';
-}
-function getViewFloorMapLabel() {
-  var key = 'pisell2.recordBoard.toolbar.viewFloorMap';
-  var u = utilsLocales.getText(key);
-  return u && u !== key ? u : getText(key) || 'Floor map';
-}
-function getViewCalendarLabel() {
-  var key = 'pisell2.recordBoard.toolbar.viewCalendar';
-  var u = utilsLocales.getText(key);
-  return u && u !== key ? u : getText(key) || 'Calendar';
-}
-function getViewResourceWallLabel() {
-  var key = 'pisell2.recordBoard.toolbar.viewResourceWall';
-  var u = utilsLocales.getText(key);
-  return u && u !== key ? u : getText(key) || 'Wall';
-}
-
-/** 默认搜索参数字段名，与 context.searchParams 对应 */
-var DEFAULT_SEARCH_FIELD = 'keyword';
-
-/** 筛选在 searchParams 中的字段名 */
-var FILTER_PARAMS_FIELD = 'filter';
-
-/** 排序在 searchParams 中的字段名 */
-var SORT_PARAMS_FIELD = 'sort';
-
-/** 与 ResourceWall 默认 `filterFieldKey` 一致；预约等场景下快筛仅此一项时仅服务资源墙视图 */
-var RESOURCE_WALL_QUICK_FILTER_KEY = 'resource_wall_resource_ids';
-
-/** 筛选无值时使用的默认筛选项，避免点开为空；业务可通过 childComponentProps.toolBar.filter.defaultFilterValue 覆盖。文案通过 getText 多语言。 */
-function getDefaultFilterValue() {
-  return {
-    quickFilter: [],
-    otherFilter: []
-  };
-}
-
 /**
  * RecordBoard 下的工具栏：使用 PisellToolBar。
  * 左侧默认 PisellFind（inline）；右侧默认 PisellFilter。通过 childComponentProps.toolBar.search / toolBar.filter 为对象时透传对应组件 props，为 false 时不渲染。
@@ -140,8 +70,12 @@ var RecordBoardToolBar = function RecordBoardToolBar(props) {
   var allowBodyViewToggle = showTableFloorToggle && ctx.bodyViewSwitchable !== false;
   var slots = (_ctx$childComponentPr = (_ctx$childComponentPr2 = ctx.childComponentProps) === null || _ctx$childComponentPr2 === void 0 ? void 0 : _ctx$childComponentPr2.toolBar) !== null && _ctx$childComponentPr !== void 0 ? _ctx$childComponentPr : {};
   var toolbarDensity = (_slots$toolbarDensity = slots.toolbarDensity) !== null && _slots$toolbarDensity !== void 0 ? _slots$toolbarDensity : 'default';
-  /** compact 用 middle：比 50px Figma 略紧凑，又比 small 更易点按；与下方 Less 中 ~38px 工具栏样式一致 */
-  var barSize = toolbarDensity === 'compact' ? 'middle' : 'large';
+  var isCompactNarrow = toolbarDensity === 'compact-narrow';
+  /**
+   * compact 用 middle：比 50px Figma 略紧凑，又比 small 更易点按；与下方 Less 中 ~38px 工具栏样式一致。
+   * compact-narrow 进一步缩到 small：极窄抽屉内顶栏右侧为 search 图标 + 齿轮（列/排序/筛选/重置在齿轮内）。
+   */
+  var barSize = isCompactNarrow ? 'small' : toolbarDensity === 'compact' ? 'middle' : 'large';
   var keyword = (_searchParams$DEFAULT = searchParams === null || searchParams === void 0 ? void 0 : searchParams[DEFAULT_SEARCH_FIELD]) !== null && _searchParams$DEFAULT !== void 0 ? _searchParams$DEFAULT : '';
   var handleSearch = useCallback(function (value) {
     onSearch(_objectSpread(_objectSpread({}, searchParams), {}, _defineProperty({}, DEFAULT_SEARCH_FIELD, value || undefined)));
@@ -156,8 +90,40 @@ var RecordBoardToolBar = function RecordBoardToolBar(props) {
   var searchConfig = slots.search;
   var hideSearch = searchConfig === false;
 
-  /** 默认 inline：triggerType="input" + displayType="inline"，放在 toolbar 左侧。showConfirmButton 优先取 toolBar.search，未配置时默认 true。 */
-  var searchNode = hideSearch ? null : /*#__PURE__*/React.createElement(PisellFind, _extends({
+  /**
+   * - 默认：inline 模式（triggerType="input" + displayType="inline"），常驻输入框
+   * - compact-narrow：仅图标触发器（无 Find 文案），放在顶栏右侧与齿轮并排；
+   *   Reset 收入齿轮 Popover。传 `trigger={<Button .../>}` 由 PisellLookup 注入 onClick。
+   */
+  var searchButtonText = getText('pisell2.recordBoard.toolbar.find') || 'Find';
+  /**
+   * compact-narrow：业务侧 `toolBar.search` 常带 `triggerType=input` / `displayType=inline`，
+   * 整对象 spread 在 `triggerType=icon` 之后会把它覆盖回输入框；这里剔除会劫持展示形态的字段。
+   */
+  var compactNarrowSearchRest = _typeof(searchConfig) === 'object' && searchConfig !== null ? function () {
+    var _ref = searchConfig,
+      _tr = _ref.trigger,
+      _tt = _ref.triggerType,
+      _dt = _ref.displayType,
+      _tx = _ref.triggerText,
+      _ti = _ref.triggerIcon,
+      _btn = _ref.buttonText,
+      rest = _objectWithoutProperties(_ref, _excluded);
+    return rest;
+  }() : {};
+  var searchNode = hideSearch ? null : isCompactNarrow ? /*#__PURE__*/React.createElement(PisellFind, _extends({}, compactNarrowSearchRest, {
+    value: keyword,
+    onChange: function onChange(v) {
+      return 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, _extends({
     triggerType: "input",
     displayType: "inline",
     showConfirmButton: _typeof(searchConfig) === 'object' && searchConfig !== null && 'showConfirmButton' in searchConfig ? searchConfig.showConfirmButton : true,
@@ -173,10 +139,10 @@ var RecordBoardToolBar = function RecordBoardToolBar(props) {
   // 快筛统一放在左侧 QuickFilter；右侧 Filter 弹层只保留高级筛选，不展示快筛
   var quickFilterConfig = slots.quickFilter;
   var quickFilterList = useMemo(function () {
-    var _ref;
+    var _ref2;
     if (quickFilterConfig === false) return [];
     var fromConfig = _typeof(quickFilterConfig) === 'object' && quickFilterConfig !== null && Array.isArray(quickFilterConfig.filterList) ? quickFilterConfig.filterList : null;
-    var list = (_ref = fromConfig !== null && fromConfig !== void 0 ? fromConfig : derivedFilterFromColumns === null || derivedFilterFromColumns === void 0 ? void 0 : derivedFilterFromColumns.quickFilter) !== null && _ref !== void 0 ? _ref : [];
+    var list = (_ref2 = fromConfig !== null && fromConfig !== void 0 ? fromConfig : derivedFilterFromColumns === null || derivedFilterFromColumns === void 0 ? void 0 : derivedFilterFromColumns.quickFilter) !== null && _ref2 !== void 0 ? _ref2 : [];
     var 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) {
       var hideSet = new Set(hideNames.map(String));
@@ -195,8 +161,8 @@ var RecordBoardToolBar = function RecordBoardToolBar(props) {
    */
   var leftBarQuickFilterList = useMemo(function () {
     var withoutWall = quickFilterList.filter(function (item) {
-      var _ref2, _item$key;
-      return ((_ref2 = (_item$key = item.key) !== null && _item$key !== void 0 ? _item$key : item.name) !== null && _ref2 !== void 0 ? _ref2 : '') !== resourceWallFilterFieldKey;
+      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;
@@ -254,7 +220,7 @@ var RecordBoardToolBar = function RecordBoardToolBar(props) {
     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' ? /*#__PURE__*/React.createElement("div", {
+  }, 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"
@@ -281,10 +247,10 @@ var RecordBoardToolBar = function RecordBoardToolBar(props) {
     return [buildResourceWallStatusSortFallbackItem(sortConfig)];
   }, [sortConfig, derivedSortFromColumnsList, bodyView]);
   var sortSpreadRest = _typeof(sortConfig) === 'object' && sortConfig !== null ? function () {
-    var _ref3 = sortConfig,
-      _w = _ref3.resourceWallSortFieldKeys,
-      _omitList = _ref3.list,
-      rest = _objectWithoutProperties(_ref3, _excluded);
+    var _ref4 = sortConfig,
+      _w = _ref4.resourceWallSortFieldKeys,
+      _omitList = _ref4.list,
+      rest = _objectWithoutProperties(_ref4, _excluded2);
     return rest;
   }() : {};
   var sortNode = hideSort ? null : /*#__PURE__*/React.createElement(Sort, _extends({}, sortSpreadRest, {
@@ -313,12 +279,12 @@ var RecordBoardToolBar = function RecordBoardToolBar(props) {
     // 若 otherFilter 来自 base（如 sessionStorage 恢复），JSON 会丢失函数（如 other.component），导致 custom 项空白；用 config 同 key 项补回 component/label 等
     if (otherFilter === base.otherFilter && Array.isArray(defaultFilterFromConfig === null || defaultFilterFromConfig === void 0 ? void 0 : defaultFilterFromConfig.otherFilter) && defaultFilterFromConfig.otherFilter.length > 0) {
       var configMap = new Map(defaultFilterFromConfig.otherFilter.map(function (c) {
-        var _ref4, _c$key;
-        return [(_ref4 = (_c$key = c.key) !== null && _c$key !== void 0 ? _c$key : c.name) !== null && _ref4 !== void 0 ? _ref4 : '', 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(function (item) {
-        var _ref5, _item$key2, _configItem$label, _configItem$other$pla, _configItem$other, _item$other;
-        var key = (_ref5 = (_item$key2 = item.key) !== null && _item$key2 !== void 0 ? _item$key2 : item.name) !== null && _ref5 !== void 0 ? _ref5 : '';
+        var _ref6, _item$key2, _configItem$label, _configItem$other$pla, _configItem$other, _item$other;
+        var key = (_ref6 = (_item$key2 = item.key) !== null && _item$key2 !== void 0 ? _item$key2 : item.name) !== null && _ref6 !== void 0 ? _ref6 : '';
         var configItem = configMap.get(key);
         if (!configItem) return item;
         // 优先用 config 的 label/placeholder（当前语言），避免 session 恢复的旧语言覆盖
@@ -339,8 +305,8 @@ var RecordBoardToolBar = function RecordBoardToolBar(props) {
     if (bodyView === 'resourceWall') {
       outQuick = [];
       outOther = quickFilterList.filter(function (item) {
-        var _ref6, _item$key3;
-        return ((_ref6 = (_item$key3 = item.key) !== null && _item$key3 !== void 0 ? _item$key3 : item.name) !== null && _ref6 !== void 0 ? _ref6 : '') === resourceWallFilterFieldKey;
+        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(function (item) {
         return _objectSpread({}, item);
       });
@@ -383,13 +349,45 @@ var RecordBoardToolBar = function RecordBoardToolBar(props) {
     buttonClassName: "record-board-toolbar-filter-btn"
   }));
   var showColumnSetting = slots.columnSetting !== false && bodyView !== 'resourceWall' && Array.isArray(gridColumns) && gridColumns.length > 0;
-  var topRight = compactFloorMapToolbar ? null : /*#__PURE__*/React.createElement(Space, {
+
+  /**
+   * compact-narrow：列显示 / 排序 / 筛选 / 重置 收入齿轮 Popover；顶栏右侧仅保留搜索图标 + 齿轮。
+   */
+  var 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;
+  var 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);
   return /*#__PURE__*/React.createElement(PisellToolBar, {
-    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', 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: topLeft,

package/es/components/pisellRecordBoard/shellFrame/ToolBar/recordBoardToolBarConstants.d.ts

@@ -0,0 +1,8 @@
+/** 与 RecordBoard ToolBar 行为绑定的 searchParams 字段名 */
+export declare const DEFAULT_SEARCH_FIELD = "keyword";
+/** 筛选在 searchParams 中的字段名 */
+export declare const FILTER_PARAMS_FIELD = "filter";
+/** 排序在 searchParams 中的字段名 */
+export declare const SORT_PARAMS_FIELD = "sort";
+/** 与 ResourceWall 默认 `filterFieldKey` 一致 */
+export declare const RESOURCE_WALL_QUICK_FILTER_KEY = "resource_wall_resource_ids";

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

@@ -0,0 +1,12 @@
+/** 与 RecordBoard ToolBar 行为绑定的 searchParams 字段名 */
+
+export var DEFAULT_SEARCH_FIELD = 'keyword';
+
+/** 筛选在 searchParams 中的字段名 */
+export var FILTER_PARAMS_FIELD = 'filter';
+
+/** 排序在 searchParams 中的字段名 */
+export var SORT_PARAMS_FIELD = 'sort';
+
+/** 与 ResourceWall 默认 `filterFieldKey` 一致 */
+export var RESOURCE_WALL_QUICK_FILTER_KEY = 'resource_wall_resource_ids';

package/es/components/pisellRecordBoard/shellFrame/ToolBar/recordBoardToolBarI18n.d.ts

@@ -0,0 +1,13 @@
+import type { SortItemProps } from '../../../sort/types';
+import type { FilterValueType } from '../../../filter/components/FilterButton/types';
+/** 与 Quick Filter 同源：优先 utils，若 utils 返回 key（未命中）则用 materials 再回退 */
+export declare function getSortButtonText(): string;
+/** 资源墙无状态列派生项时注入：下拉仅「状态 → 空闲优先 / 占用优先」，仍渲染排序按钮 */
+export declare function buildResourceWallStatusSortFallbackItem(sortConfig: unknown): SortItemProps;
+export declare function getFilterButtonText(): string;
+export declare function getViewGridLabel(): string;
+export declare function getViewFloorMapLabel(): string;
+export declare function getViewCalendarLabel(): string;
+export declare function getViewResourceWallLabel(): string;
+/** 筛选无值时使用的默认筛选项；业务可通过 childComponentProps.toolBar.filter.defaultFilterValue 覆盖 */
+export declare function getDefaultFilterValue(): FilterValueType;