@pisell/materials 6.11.212 → 6.11.214

package/es/components/productCard/lineItem/index.js

@@ -171,7 +171,7 @@ export var convertProductToLineItemProduct = function convertProductToLineItemPr
   return mapped;
 };
 var LineItem = function LineItem(props) {
-  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _dataSource$_extend2;
+  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _dataSource$_extend2, _dataSource$_extend4;
   var _props$dataSource = props.dataSource,
     dataSource = _props$dataSource === void 0 ? defaultValue.dataSource : _props$dataSource,
     itemType = props.itemType,
@@ -226,6 +226,13 @@ var LineItem = function LineItem(props) {
     if (!relatedProduct) return null;
     return convertProductToLineItemProduct(relatedProduct, translationOriginal, symbol);
   }, [relatedProduct, symbol, translationOriginal]);
+  var addTimeProductDataSources = useMemo(function () {
+    var _dataSource$_extend3;
+    var addTimeProducts = Array.isArray(dataSource === null || dataSource === void 0 || (_dataSource$_extend3 = dataSource._extend) === null || _dataSource$_extend3 === void 0 ? void 0 : _dataSource$_extend3.addTimeProduct) ? dataSource._extend.addTimeProduct : [];
+    return addTimeProducts.map(function (item) {
+      return convertProductToLineItemProduct(item, translationOriginal, symbol);
+    });
+  }, [dataSource === null || dataSource === void 0 || (_dataSource$_extend4 = dataSource._extend) === null || _dataSource$_extend4 === void 0 ? void 0 : _dataSource$_extend4.addTimeProduct, symbol, translationOriginal]);
   if (itemKind === 'product') {
     return /*#__PURE__*/React.createElement(CartSkuCard, _extends({}, other, {
       dataSource: productDataSource,
@@ -252,6 +259,7 @@ var LineItem = function LineItem(props) {
     cartSkuType: type,
     isShowBookingHeader: isShowBookingHeader,
     relatedProductDataSource: relatedProductDataSource,
+    addTimeProductDataSources: addTimeProductDataSources,
     rightActions: rightActions,
     escapeDom: escapeDom,
     isShowImage: isShowImage,

package/es/components/productCard/lineItem/index.less

@@ -223,6 +223,13 @@
     gap: 6px;
   }
 
+  &__add-time-products {
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+    padding: 6px 8px 8px;
+  }
+
   &__section-title {
     color: #101828;
     font-size: 12px;
@@ -240,4 +247,30 @@
       padding: 0;
     }
   }
+
+  &__add-time-product-card {
+    padding: 4px;
+    border: 1px solid var(--Gray-300, #d0d5dd);
+    border-radius: 8px;
+    background: var(--Base-White, #fff);
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+
+    .pisell-cart-sku-card__packages-wrap {
+      padding: 0;
+    }
+  }
+
+  &__add-time-products-toggle {
+    align-self: flex-start;
+    padding: 2px 0;
+    border: none;
+    background: transparent;
+    color: #1570ef;
+    font-size: 12px;
+    font-weight: 600;
+    line-height: 18px;
+    cursor: pointer;
+  }
 }

package/es/components/productCard/lineItem/locales.js

@@ -1,22 +1,37 @@
 export default {
   en: {
     'pisell2.line-item.resource': 'Resource',
-    'pisell2.line-item.time': 'Time'
+    'pisell2.line-item.time': 'Time',
+    'pisell2.line-item.add-time-products': 'Add time products',
+    'pisell2.line-item.show-all': 'Show all',
+    'pisell2.line-item.collapse': 'Collapse'
   },
   'zh-CN': {
     'pisell2.line-item.resource': '资源',
-    'pisell2.line-item.time': '时间'
+    'pisell2.line-item.time': '时间',
+    'pisell2.line-item.add-time-products': '加时商品',
+    'pisell2.line-item.show-all': '展示全部',
+    'pisell2.line-item.collapse': '收起'
   },
   'zh-HK': {
     'pisell2.line-item.resource': '資源',
-    'pisell2.line-item.time': '時間'
+    'pisell2.line-item.time': '時間',
+    'pisell2.line-item.add-time-products': '加時商品',
+    'pisell2.line-item.show-all': '展示全部',
+    'pisell2.line-item.collapse': '收起'
   },
   ja: {
     'pisell2.line-item.resource': 'リソース',
-    'pisell2.line-item.time': '時間'
+    'pisell2.line-item.time': '時間',
+    'pisell2.line-item.add-time-products': '追加時間の商品',
+    'pisell2.line-item.show-all': 'すべて表示',
+    'pisell2.line-item.collapse': '折りたたむ'
   },
   pt: {
     'pisell2.line-item.resource': 'Recurso',
-    'pisell2.line-item.time': 'Tempo'
+    'pisell2.line-item.time': 'Tempo',
+    'pisell2.line-item.add-time-products': 'Produtos de horário adicional',
+    'pisell2.line-item.show-all': 'Ver tudo',
+    'pisell2.line-item.collapse': 'Recolher'
   }
 };

package/es/index.d.ts

@@ -122,7 +122,7 @@ export { default as CustomSelect } from './components/customSelect';
 export { default as PisellUpload } from './components/pisellUpload';
 export { default as Translation } from './components/translation';
 export { PisellLookup } from './components/pisellLookup';
-export type { PisellLookupProps, PisellLookupRef, } from './components/pisellLookup';
+export type { PisellLookupProps, PisellLookupRef, LookupInputRenderContext, } from './components/pisellLookup';
 export { PisellFind } from './components/pisellFind';
 export type { PisellFindProps, PisellFindRef } from './components/pisellFind';
 export { default as DataSourceForm } from './components/dataSourceComponents/dataSourceForm';

package/lib/components/PisellTabbar/PisellTabbar.js

@@ -70,7 +70,8 @@ var PisellTabbar = (0, import_react.forwardRef)(
       levelConfig: customLevelConfig,
       expandConfig: customExpandConfig,
       maxLevel = 3,
-      onSearch
+      onSearch,
+      searchProps
     } = props;
     const containerRef = (0, import_react.useRef)(null);
     const tabbarIdRef = (0, import_react.useRef)(createTabbarId());
@@ -98,14 +99,17 @@ var PisellTabbar = (0, import_react.forwardRef)(
     }, [activeKey]);
     const { expand, toggleExpand, getExpand } = (0, import_hooks.useExpand)();
     const expandConfigData = customExpandConfig || (0, import_constants.getExpandConfig)();
+    const [isSearchOpen, setIsSearchOpen] = (0, import_react.useState)(false);
     const openSearchMode = (0, import_ahooks.useMemoizedFn)(() => {
       setCacheActiveKey(activeKey);
       _setActiveKey([]);
       onChange == null ? void 0 : onChange([]);
+      setIsSearchOpen(true);
     });
     const closeSearchMode = (0, import_ahooks.useMemoizedFn)(() => {
       onSearch == null ? void 0 : onSearch("");
       resetActiveKey();
+      setIsSearchOpen(false);
     });
     (0, import_react.useImperativeHandle)(ref, () => {
       var _a;
@@ -227,8 +231,14 @@ var PisellTabbar = (0, import_react.forwardRef)(
       [activeKey, getLevelConfig]
     );
     const level1DataSource = (0, import_react.useMemo)(
-      () => (0, import_utils.addDataSourceItemsByKey)(dataSource, import_constants.LEVEL_ADD_ITEMS.level1),
-      [dataSource]
+      () => {
+        const full = (0, import_utils.addDataSourceItemsByKey)(dataSource, import_constants.LEVEL_ADD_ITEMS.level1);
+        if (isSearchOpen) {
+          return full.filter((item) => (item == null ? void 0 : item.key) === "search");
+        }
+        return full;
+      },
+      [dataSource, isSearchOpen]
     );
     const level2Expand = getExpand("level2");
     const level3Expand = getExpand("level3");
@@ -432,6 +442,8 @@ var PisellTabbar = (0, import_react.forwardRef)(
           {
             showHistory: false,
             modalWidth: "100%",
+            ...searchProps,
+            enableScanner: Boolean(searchProps == null ? void 0 : searchProps.enableScanner) && isSearchOpen,
             ref: searchRef,
             onSearch: (e) => {
               onSearch == null ? void 0 : onSearch(e);
@@ -484,7 +496,7 @@ var PisellTabbar = (0, import_react.forwardRef)(
           }
         );
       },
-      [activeKey]
+      [activeKey, isSearchOpen]
     );
     const renderLevel1Item = (0, import_ahooks.useMemoizedFn)(
       (itemProps) => {

package/lib/components/PisellTabbar/template/Template1/PisellTabbar.js

@@ -54,7 +54,8 @@ var PisellTabbar = (props, ref) => {
     levelConfig: customLevelConfig,
     expandConfig: customExpandConfig,
     maxLevel = 3,
-    onSearch
+    onSearch,
+    searchProps
   } = props;
   const containerRef = (0, import_react.useRef)(null);
   const searchRef = (0, import_react.useRef)(null);
@@ -85,14 +86,17 @@ var PisellTabbar = (props, ref) => {
   const level3Value = (0, import_react.useMemo)(() => {
     return getActiveKey(2);
   }, [activeKey]);
+  const [isSearchOpen, setIsSearchOpen] = (0, import_react.useState)(false);
   const openSearchMode = () => {
     setCacheActiveKey(activeKey);
     _setActiveKey([]);
     onChange == null ? void 0 : onChange([]);
+    setIsSearchOpen(true);
   };
   const closeSearchMode = () => {
     onSearch == null ? void 0 : onSearch("");
     resetActiveKey();
+    setIsSearchOpen(false);
   };
   (0, import_react.useImperativeHandle)(ref, () => {
     var _a;
@@ -191,6 +195,8 @@ var PisellTabbar = (props, ref) => {
         {
           showHistory: false,
           modalWidth: "100%",
+          ...searchProps,
+          enableScanner: Boolean(searchProps == null ? void 0 : searchProps.enableScanner) && isSearchOpen,
           ref: searchRef,
           onSearch: (e) => {
             onSearch == null ? void 0 : onSearch(e);
@@ -243,7 +249,7 @@ var PisellTabbar = (props, ref) => {
         }
       );
     },
-    [activeKey, tabbarId]
+    [activeKey, tabbarId, isSearchOpen]
   );
   const renderNormalCard = (0, import_react.useCallback)(
     (cardProps, level) => {
@@ -284,8 +290,14 @@ var PisellTabbar = (props, ref) => {
     [getLevelConfig]
   );
   const level1DataSource = (0, import_react.useMemo)(
-    () => (0, import_utils.addDataSourceItemsByKey)(dataSource, import_constants.LEVEL_ADD_ITEMS.level1),
-    [dataSource]
+    () => {
+      const full = (0, import_utils.addDataSourceItemsByKey)(dataSource, import_constants.LEVEL_ADD_ITEMS.level1);
+      if (isSearchOpen) {
+        return full.filter((item) => (item == null ? void 0 : item.key) === "search");
+      }
+      return full;
+    },
+    [dataSource, isSearchOpen]
   );
   const renderLevel1Item = (0, import_react.useCallback)(
     (itemProps) => {

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

@@ -83,6 +83,8 @@ export interface PisellTabbarProps {
     /** 最大层级数 */
     maxLevel?: 1 | 2 | 3;
     onSearch?: (value: string) => void;
+    /** 透传给内部 PisellFind 的搜索配置（如 inputRender 插槽）。 */
+    searchProps?: Record<string, any>;
     __designMode?: boolean;
 }
 export interface PisellTabbarRef {

package/lib/components/pisellFind/index.d.ts

@@ -20,8 +20,11 @@ export interface PisellFindScannerData {
 export interface PisellFindProps extends PisellLookupProps {
     /**
      * 是否开启扫码枪监听
-     * 通过宿主 `app.pubsub.subscribe('nativeScanResult', ...)` 订阅；
-     * 切换 false 时会 unsubscribe，停止接收事件。
+     * - 优先：通过宿主 `appHelper.utils.acquireScanFocus` 接入「扫码焦点栈」，
+     *   保证同一页面存在多个 PisellFind 时，只有「栈顶」（最后开启监听的那个，
+     *   如列表上方拉起的弹窗）响应扫码，底层组件不响应；关闭/卸载时自动释放，焦点回退。
+     * - 回退：宿主未注册焦点栈时，退回到直连 `app.pubsub.subscribe('nativeScanResult', ...)`。
+     * 切换 false 时会释放焦点 / unsubscribe，停止接收事件。
      * @default false
      */
     enableScanner?: boolean;
@@ -46,8 +49,10 @@ export declare type PisellFindRef = PisellLookupRef;
  * - 默认不显示确认按钮（输入即搜索）
  * - 默认开启搜索历史
  * - 默认不展示结果区（结果在页面其他位置展示）
- * - 通过 `enableScanner` 接入扫码枪：使用宿主 `app.pubsub.subscribe(SCAN_RESULT_EVENT, ...)`，
- *   每次扫码直接覆盖输入框内容并触发 onSearch / onScannerData；切回 false 时自动 unsubscribe。
+ * - 通过 `enableScanner` 接入扫码枪：优先走宿主注入的「扫码焦点栈」
+ *   （`appHelper.utils.acquireScanFocus`），保证同页多个 PisellFind 只有栈顶响应；
+ *   宿主未注册时回退到直连 `app.pubsub.subscribe(SCAN_RESULT_EVENT, ...)`。
+ *   每次扫码直接覆盖输入框内容并触发 onSearch / onScannerData；切回 false 时自动释放 / unsubscribe。
  *
  * @example
  * ```tsx

package/lib/components/pisellFind/index.js

@@ -40,7 +40,7 @@ var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_locales = require("../../locales");
 var SCAN_RESULT_EVENT = "nativeScanResult";
 var PisellFind = (0, import_react.forwardRef)((props, ref) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const {
     triggerType = "button",
     buttonText = (() => {
@@ -95,25 +95,44 @@ var PisellFind = (0, import_react.forwardRef)((props, ref) => {
   const engineContext = (0, import_useEngineContext.default)();
   const getAppRef = (0, import_react.useRef)(void 0);
   getAppRef.current = typeof ((_b = (_a = engineContext == null ? void 0 : engineContext.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getApp) === "function" ? engineContext.appHelper.utils.getApp : void 0;
+  const acquireScanFocusRef = (0, import_react.useRef)(void 0);
+  const appHelperUtils = (_c = engineContext == null ? void 0 : engineContext.appHelper) == null ? void 0 : _c.utils;
+  acquireScanFocusRef.current = typeof (appHelperUtils == null ? void 0 : appHelperUtils.acquireScanFocus) === "function" ? appHelperUtils.acquireScanFocus : typeof ((_d = appHelperUtils == null ? void 0 : appHelperUtils.businessUtils) == null ? void 0 : _d.acquireScanFocus) === "function" ? appHelperUtils.businessUtils.acquireScanFocus : void 0;
   (0, import_react.useEffect)(() => {
     if (!enableScanner) return void 0;
-    const getApp = getAppRef.current;
-    if (typeof getApp !== "function") return void 0;
-    const app = getApp();
-    const pubsub = app == null ? void 0 : app.pubsub;
-    if (!pubsub || typeof pubsub.subscribe !== "function") {
-      return void 0;
-    }
     const onScan = (payload) => {
-      var _a2, _b2, _c;
+      var _a2, _b2, _c2;
       const data = payload == null ? void 0 : payload.data;
       if (typeof data !== "string" || data.length === 0) {
         return;
       }
       (_a2 = lookupRef.current) == null ? void 0 : _a2.setKeyword(data);
       (_b2 = onSearchRef.current) == null ? void 0 : _b2.call(onSearchRef, data);
-      (_c = onScannerDataRef.current) == null ? void 0 : _c.call(onScannerDataRef, payload);
+      (_c2 = onScannerDataRef.current) == null ? void 0 : _c2.call(onScannerDataRef, payload);
     };
+    const acquireScanFocus = acquireScanFocusRef.current;
+    if (typeof acquireScanFocus === "function") {
+      try {
+        const token = acquireScanFocus(onScan);
+        return () => {
+          var _a2;
+          try {
+            (_a2 = token == null ? void 0 : token.release) == null ? void 0 : _a2.call(token);
+          } catch (e) {
+            console.warn("[PisellFind] release scan focus failed:", e);
+          }
+        };
+      } catch (e) {
+        console.warn("[PisellFind] acquire scan focus failed, fallback to pubsub:", e);
+      }
+    }
+    const getApp = getAppRef.current;
+    if (typeof getApp !== "function") return void 0;
+    const app = getApp();
+    const pubsub = app == null ? void 0 : app.pubsub;
+    if (!pubsub || typeof pubsub.subscribe !== "function") {
+      return void 0;
+    }
     try {
       pubsub.subscribe(SCAN_RESULT_EVENT, onScan);
     } catch (e) {

package/lib/components/pisellLookup/PisellLookup.js

@@ -106,6 +106,8 @@ var PisellLookupComponent = (0, import_react.forwardRef)((props, ref) => {
     maskClosable,
     clearOnClose = false,
     autoFocusOnOpen = true,
+    // 输入栏插槽
+    inputRender,
     // 样式配置
     className,
     style,
@@ -319,6 +321,8 @@ var PisellLookupComponent = (0, import_react.forwardRef)((props, ref) => {
         confirmButtonText,
         showScan,
         value: keyword,
+        loading,
+        inputRender,
         onChange: handleInputChange,
         onClick: handleTriggerClick,
         onFocus: handleInputFocus,
@@ -365,7 +369,9 @@ var PisellLookupComponent = (0, import_react.forwardRef)((props, ref) => {
     return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lookup-result" }, resultRender(keyword, close));
   };
   const hasAuxiliaryContent = showHistory && history.length > 0 || showSuggestions && suggestions.length > 0 && !!keyword || showHotWords && hotWords.length > 0 && !keyword;
-  const hasResultsContent = Boolean(loading || keyword && resultRender);
+  const hasResultsContent = Boolean(
+    resultRender && (loading || keyword)
+  );
   const renderContent = () => {
     if (!hasAuxiliaryContent && !hasResultsContent) {
       return null;
@@ -423,6 +429,8 @@ var PisellLookupComponent = (0, import_react.forwardRef)((props, ref) => {
         confirmButtonText,
         showScan,
         value: keyword,
+        loading,
+        inputRender,
         onChange: handleInputChange,
         onConfirm: handleConfirm,
         onScan: handleScan,

package/lib/components/pisellLookup/components/LookupTrigger.js

@@ -59,6 +59,8 @@ var LookupTriggerComponent = (0, import_react.forwardRef)(
       confirmButtonText = (0, import_locales.getText)("pisell-lookup-confirm-button-text"),
       showScan = true,
       value,
+      loading,
+      inputRender,
       onChange,
       onClick,
       onFocus,
@@ -150,6 +152,21 @@ var LookupTriggerComponent = (0, import_react.forwardRef)(
       }
     };
     const renderInputTrigger = () => {
+      if (inputRender) {
+        return inputRender({
+          value: value ?? "",
+          placeholder,
+          disabled,
+          size,
+          loading,
+          onChange: (v) => onChange == null ? void 0 : onChange(v),
+          onConfirm: (v) => onConfirm == null ? void 0 : onConfirm(v ?? value ?? ""),
+          onClear: handleClear,
+          onScan: (code) => onScan == null ? void 0 : onScan(code),
+          onFocus,
+          onBlur
+        });
+      }
       const prefix = showPrefixIcon ? prefixIcon || /* @__PURE__ */ import_react.default.createElement(import_icons.SearchOutlined, null) : void 0;
       const suffix = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lookup-input-suffix" }, showClear && value && /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lookup-input-clear", onClick: handleClear }, /* @__PURE__ */ import_react.default.createElement(import_icons.CloseOutlined, null), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lookup-input-clear-text" }, (0, import_locales.getText)("pisell-lookup-clear"))), showScan && /* @__PURE__ */ import_react.default.createElement(
         import_iconfont.default,

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

@@ -40,6 +40,40 @@ export interface PisellLookupRef {
  * Drawer 位置
  */
 export declare type DrawerPlacement = 'left' | 'right' | 'top' | 'bottom';
+/**
+ * 输入栏插槽上下文
+ *
+ * 通过 `inputRender` 自定义「输入框」形态触发器时，组件会把内部已经接好的受控状态与回调
+ * 透传给插槽。插槽只需把这些值绑定到自定义输入控件上，即可完全复用 PisellLookup 的
+ * 搜索状态机（受控值 / 防抖实时搜索 / 确认搜索 / 历史 / inline·popup 聚焦展开等）。
+ *
+ * 仅在 `triggerType='input'`（或 modal/drawer 内置输入框）形态下生效；button/icon/text
+ * 触发器不会调用 `inputRender`。
+ */
+export interface LookupInputRenderContext {
+    /** 当前关键词（受控值） */
+    value: string;
+    /** 占位符 */
+    placeholder?: string;
+    /** 是否禁用 */
+    disabled?: boolean;
+    /** 尺寸 */
+    size?: SizeType;
+    /** 是否处于加载态（透传自 PisellLookup 的 loading） */
+    loading?: boolean;
+    /** 输入变化：写回关键词（受控） */
+    onChange: (value: string) => void;
+    /** 确认搜索：回车 / 点击搜索按钮时调用，可显式传入当前值 */
+    onConfirm: (value?: string) => void;
+    /** 清除：清空关键词并恢复结果 */
+    onClear: () => void;
+    /** 扫码结果回填 */
+    onScan?: (code: string) => void;
+    /** 聚焦：inline/popup 形态用于展开结果容器 */
+    onFocus?: () => void;
+    /** 失焦：inline/popup 形态用于延迟关闭结果容器 */
+    onBlur?: () => void;
+}
 /**
  * PisellLookup 组件 Props
  */
@@ -328,6 +362,27 @@ export interface PisellLookupProps {
      * @default true
      */
     autoFocusOnOpen?: boolean;
+    /**
+     * 输入栏插槽
+     *
+     * 自定义「输入框」形态的触发器渲染。传入后会**替换内置 antd Input**，但完整复用
+     * PisellLookup 的搜索状态机（受控值 / 实时·确认搜索 / 历史 / 容器形态）。
+     * 仅 input 形态生效（含 modal/drawer 内置输入框），button/icon/text 触发器不受影响。
+     *
+     * @example
+     * ```tsx
+     * <PisellLookup
+     *   inputRender={(ctx) => (
+     *     <MyInput
+     *       value={ctx.value}
+     *       onChange={ctx.onChange}
+     *       onSearch={ctx.onConfirm}
+     *     />
+     *   )}
+     * />
+     * ```
+     */
+    inputRender?: (ctx: LookupInputRenderContext) => React.ReactNode;
     /**
      * 自定义类名
      */
@@ -455,6 +510,14 @@ export interface LookupTriggerProps {
      * 是否自动聚焦
      */
     autoFocus?: boolean;
+    /**
+     * 加载态（透传给输入栏插槽 ctx.loading）
+     */
+    loading?: boolean;
+    /**
+     * 输入栏插槽：自定义 input 形态触发器渲染（仅 type='input' 生效）
+     */
+    inputRender?: (ctx: LookupInputRenderContext) => React.ReactNode;
     /**
      * 自定义类名
      */

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

@@ -30,7 +30,6 @@
     flex: 1;
     font-size: 16px !important;
     font-weight: 500 !important;
-    padding: 0 16px !important;
     box-sizing: border-box !important;
   }
 
@@ -42,6 +41,9 @@
     align-items: center !important;
     justify-content: center !important;
     line-height: normal !important;
+    /** 仅约束左右 6px，不覆盖 antd / lowcode 默认的上下 padding */
+    padding-left: 6px !important;
+    padding-right: 6px !important;
   }
 
   /** 低代码：选中背景与 antd Button primary / 编辑平面图同源 */
@@ -65,7 +67,7 @@
   flex-wrap: nowrap;
   align-items: center;
   width: 100%;
-  gap: 16px;
+  gap: 4px;
 
   .record-board-toolbar-find-wrap {
     flex: 1;
@@ -73,6 +75,11 @@
     display: flex;
     align-items: center;
 
+    /** RecordBoard 顶栏 SearchSection：仅此处 wrapper padding 5px，不改动组件默认 4px */
+    .comprehensive-search__search-input-wrapper {
+      padding: 5px;
+    }
+
     .ant-input,
     .ant-input-affix-wrapper {
       width: 100%;

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

@@ -131,6 +131,10 @@ var RecordBoardToolBar = (props) => {
     } = searchConfigRest;
     return rest;
   })() : {};
+  const searchEnableScannerConfigured = searchConfigRest && typeof searchConfigRest === "object" && searchConfigRest.enableScanner === true;
+  const [isFindSearchOpen, setIsFindSearchOpen] = (0, import_react.useState)(false);
+  const searchConfigOnOpen = searchConfigRest == null ? void 0 : searchConfigRest.onOpen;
+  const searchConfigOnClose = searchConfigRest == null ? void 0 : searchConfigRest.onClose;
   const searchNode = hideSearch ? null : isCompactNarrow ? /* @__PURE__ */ import_react.default.createElement(
     import_pisellFind.PisellFind,
     {
@@ -142,7 +146,16 @@ var RecordBoardToolBar = (props) => {
       size: barSize,
       triggerType: "icon",
       className: "record-board-toolbar-find-icon",
-      triggerIcon: /* @__PURE__ */ import_react.default.createElement(import_icons.SearchOutlined, { "aria-label": searchButtonText })
+      triggerIcon: /* @__PURE__ */ import_react.default.createElement(import_icons.SearchOutlined, { "aria-label": searchButtonText }),
+      enableScanner: searchEnableScannerConfigured && isFindSearchOpen,
+      onOpen: () => {
+        searchConfigOnOpen == null ? void 0 : searchConfigOnOpen();
+        setIsFindSearchOpen(true);
+      },
+      onClose: () => {
+        searchConfigOnClose == null ? void 0 : searchConfigOnClose();
+        setIsFindSearchOpen(false);
+      }
     }
   ) : /* @__PURE__ */ import_react.default.createElement(
     import_pisellFind.PisellFind,
@@ -215,8 +228,7 @@ var RecordBoardToolBar = (props) => {
       size: barSize,
       value: bodyView,
       onChange: (v) => setBodyView(v),
-      options: bodyViewSegmentedOptions,
-      style: { marginRight: 8 }
+      options: bodyViewSegmentedOptions
     }
   ) : null;
   const compactFloorMapToolbar = (bodyView === "floorMap" || bodyView === "calendar") && showTableFloorToggle;
@@ -371,7 +383,9 @@ var RecordBoardToolBar = (props) => {
     }
   );
   const showColumnSetting = slots.columnSetting !== false && bodyView !== "resourceWall" && Array.isArray(gridColumns) && gridColumns.length > 0;
-  const settingsGearPopoverContent = isCompactNarrow ? /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-settings-gear-popover" }, showColumnSetting ? /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-settings-gear-row" }, /* @__PURE__ */ import_react.default.createElement(import_ColumnSetting.default, null)) : null, sortNode ? /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-settings-gear-row" }, sortNode) : null, filterNode ? /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-settings-gear-row" }, filterNode) : null, bodyView !== "resourceWall" ? /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-settings-gear-row" }, /* @__PURE__ */ import_react.default.createElement(import_ToolBarReset.default, { size: barSize })) : null) : null;
+  const collapseActionsToGear = slots.collapseActions === "gear";
+  const shouldCollapseToGear = isCompactNarrow || collapseActionsToGear;
+  const settingsGearPopoverContent = shouldCollapseToGear ? /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-settings-gear-popover" }, showColumnSetting ? /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-settings-gear-row" }, /* @__PURE__ */ import_react.default.createElement(import_ColumnSetting.default, null)) : null, sortNode ? /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-settings-gear-row" }, sortNode) : null, filterNode ? /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-settings-gear-row" }, filterNode) : null, bodyView !== "resourceWall" ? /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-settings-gear-row" }, /* @__PURE__ */ import_react.default.createElement(import_ToolBarReset.default, { size: barSize })) : null) : null;
   const settingsGearTrigger = settingsGearPopoverContent != null ? /* @__PURE__ */ import_react.default.createElement(
     import_antd.Popover,
     {
@@ -381,7 +395,8 @@ var RecordBoardToolBar = (props) => {
       arrow: false,
       overlayClassName: (0, import_classnames.default)(
         "record-board-toolbar-settings-gear-overlay",
-        isCompactNarrow && "record-board-toolbar-settings-gear-overlay--compact-narrow"
+        isCompactNarrow && "record-board-toolbar-settings-gear-overlay--compact-narrow",
+        !isCompactNarrow && collapseActionsToGear && "record-board-toolbar-settings-gear-overlay--collapsed-actions"
       )
     },
     /* @__PURE__ */ import_react.default.createElement(
@@ -409,7 +424,7 @@ var RecordBoardToolBar = (props) => {
     settingsGearTrigger
   ) : null;
   const topLeft = compactFloorMapToolbar ? null : /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-top-left" }, !hideBodyViewToggleInToolbarRow ? bodyViewToggle : null, mergeQuickFilterWithCompactTrailing && quickFilterNode ? /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-hud-unified-quick-filter-row" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-quick-filter-slot" }, quickFilterNode), compactNarrowTrailingCluster) : quickFilterNode ? /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-quick-filter-slot" }, quickFilterNode) : null, searchNode && bodyView !== "resourceWall" && !isCompactNarrow ? /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-find-wrap" }, searchNode) : null, slots.topLeft ? /* @__PURE__ */ import_react.default.createElement("div", { className: "record-board-toolbar-extra-top-left" }, slots.topLeft) : null);
-  const topRight = compactFloorMapToolbar ? null : isCompactNarrow ? mergeQuickFilterWithCompactTrailing ? slots.topRight ?? null : /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { className: "record-board-toolbar-right-actions", size: 4 }, bodyView !== "resourceWall" && searchNode ? searchNode : null, settingsGearTrigger, slots.topRight) : /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { className: "record-board-toolbar-right-actions" }, showColumnSetting ? /* @__PURE__ */ import_react.default.createElement(import_ColumnSetting.default, null) : null, sortNode, filterNode, bodyView !== "resourceWall" ? /* @__PURE__ */ import_react.default.createElement(import_ToolBarReset.default, { size: barSize }) : null, slots.topRight);
+  const topRight = compactFloorMapToolbar ? null : isCompactNarrow ? mergeQuickFilterWithCompactTrailing ? slots.topRight ?? null : /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { className: "record-board-toolbar-right-actions", size: 4 }, bodyView !== "resourceWall" && searchNode ? searchNode : null, settingsGearTrigger, slots.topRight) : collapseActionsToGear && settingsGearTrigger ? /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { className: "record-board-toolbar-right-actions", size: 8 }, settingsGearTrigger, slots.topRight) : /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { className: "record-board-toolbar-right-actions" }, showColumnSetting ? /* @__PURE__ */ import_react.default.createElement(import_ColumnSetting.default, null) : null, sortNode, filterNode, bodyView !== "resourceWall" ? /* @__PURE__ */ import_react.default.createElement(import_ToolBarReset.default, { size: barSize }) : null, slots.topRight);
   return /* @__PURE__ */ import_react.default.createElement(
     import_ToolBar.default,
     {