@pisell/materials 6.11.45 → 6.11.46

package/lib/components/pisellFloorMapLayout/components/FloorMapToolbar.d.ts

@@ -0,0 +1,35 @@
+/**
+ * FloorMapToolbar - 编辑态左侧侧边栏：按分类添加图元、绑定数据源与行；保存可选（默认用顶栏）
+ */
+import React from 'react';
+import type { FloorMapViewConfig, FloorMapDataSources, FloorMapMergedItem, FloorMapSceneElement, FloorMapPlaceMode } from '../types';
+import { type FloorMapPaletteDragPayload } from '../utils/floorMapDropUtils';
+import './FloorMapToolbar.less';
+export type { FloorMapPlaceMode as PlaceMode };
+export interface FloorMapToolbarProps {
+    config: FloorMapViewConfig;
+    dataSources: FloorMapDataSources;
+    dataSourceLabels?: Record<string, string>;
+    canCreate: boolean;
+    placeMode: FloorMapPlaceMode;
+    onPlaceModeChange: (mode: FloorMapPlaceMode) => void;
+    renderPreviewItem?: (item: FloorMapMergedItem) => React.ReactNode;
+    placementPreviewSize?: {
+        width: number;
+        height: number;
+    };
+    decorationPreviewSize?: number;
+    sceneElements?: FloorMapSceneElement[];
+    onSave?: () => void;
+    saving?: boolean;
+    saveError?: Error | string;
+    /** 布局草稿已相对持久化配置变更，提示用户点击本栏「保存」 */
+    layoutDirty?: boolean;
+    className?: string;
+    /** 触摸/笔：Pointer 拖拽落点（mouse 仍用 HTML5 DnD） */
+    onPaletteCardPointerDown?: (payload: FloorMapPaletteDragPayload, e: React.PointerEvent<HTMLButtonElement>) => void;
+    /** 触摸拖放结束后吞掉按钮 click，避免误触切换落点模式 */
+    consumeToolbarClickIfTouchDrag?: () => boolean;
+}
+export declare function FloorMapToolbar(props: FloorMapToolbarProps): JSX.Element;
+export default FloorMapToolbar;

package/lib/components/pisellFloorMapLayout/components/FloorMapToolbar.js

@@ -87,25 +87,6 @@ function buildScenePreviewMergedItem(kind, dataSourceKey, size) {
 }
 var STAGE_PREVIEW_SIZE = { width: 160, height: 64 };
 var IMAGE_PREVIEW_SIZE = { width: 140, height: 80 };
-var TOOLBAR_COLLAPSED_STORAGE_KEY = "pisell-floor-map-layout.toolbar.leftbar-collapsed.v1";
-function readToolbarCollapsedPreference() {
-  if (typeof window === "undefined") return false;
-  try {
-    return window.localStorage.getItem(TOOLBAR_COLLAPSED_STORAGE_KEY) === "1";
-  } catch {
-    return false;
-  }
-}
-function writeToolbarCollapsedPreference(collapsed) {
-  if (typeof window === "undefined") return;
-  try {
-    window.localStorage.setItem(
-      TOOLBAR_COLLAPSED_STORAGE_KEY,
-      collapsed ? "1" : "0"
-    );
-  } catch {
-  }
-}
 function FloorMapToolbar(props) {
   const {
     config,
@@ -126,12 +107,7 @@ function FloorMapToolbar(props) {
     onPaletteCardPointerDown,
     consumeToolbarClickIfTouchDrag
   } = props;
-  const [collapsed, setCollapsed] = (0, import_react.useState)(
-    () => readToolbarCollapsedPreference()
-  );
-  (0, import_react.useEffect)(() => {
-    writeToolbarCollapsedPreference(collapsed);
-  }, [collapsed]);
+  const [collapsed, setCollapsed] = (0, import_react.useState)(false);
   const handleToggleCollapsed = (0, import_react.useCallback)(() => {
     setCollapsed((prev) => !prev);
   }, []);

package/lib/components/pisellFloorMapLayout/components/FloorMapToolbar.less

@@ -46,15 +46,15 @@
   }
 
   /**
-   * 收起 / 展开按钮：固定挂在容器右边垂直居中，外突大半个按钮宽度。
-   * 124px 抽屉下整体视觉更宽松，handle 用 28×72 配合放大的箭头，
-   * 在窄边栏旁仍然显眼、易点（之前 16×48 几乎看不见，参考用户截图）。
-   * 收起态下容器宽度为 0，按钮仍能完整露出（z-index 高于地图区遮罩）。
+   * 收起 / 展开按钮：左缘与侧栏**右缘对齐**（`left: 100%`），整体仍在侧栏外，不与图元预览重叠；
+   * 旧写法 `right: -22px` + `width: 28` 会让按钮左缘落在侧栏内约 6px 压到卡片。
+   * 收起态下容器宽度为 0，100% 仍锚在右缘，按钮仍能完整露出（z-index 高于地图区遮罩）。
    */
   &-collapse-handle {
     position: absolute;
     top: 50%;
-    right: -22px;
+    left: 100%;
+    right: auto;
     transform: translateY(-50%);
     width: 28px;
     height: 72px;

package/lib/components/pisellFloorMapLayout/components/ViewControls.d.ts

@@ -0,0 +1,55 @@
+/**
+ * ViewControls - 内置视图控制：默认仅缩放；可选复位、区域定位、全屏等
+ * 平面图（dockChrome）：Dock 折叠入口 + 展开条（含业务插槽、空闲自动收起）
+ * 非平面图：单条横栏，缩放与工具始终同排（无 Menu 折叠）
+ */
+import React from 'react';
+import type { FloorMapControlsConfig } from '../types';
+import './ViewControls.less';
+/** 从 react-zoom-pan-pinch 拿到的控制 API（由主组件传入） */
+export interface ViewControlsApi {
+    zoomIn: () => void;
+    zoomOut: () => void;
+    resetTransform: () => void;
+    /** 区域定位，可能由主组件基于 items 计算后封装 */
+    fitBounds?: () => void;
+    /** 切换全屏（requestFullscreen / exitFullscreen） */
+    toggleFullscreen?: () => void;
+}
+export interface ViewControlsProps {
+    /** 控制 API */
+    api: ViewControlsApi;
+    /** 显隐配置 */
+    config?: FloorMapControlsConfig;
+    /** 当前缩放比例（1 = 100%），用于 Stepper 展示 */
+    scale?: number;
+    /** 当前是否处于全屏 */
+    isFullscreen?: boolean;
+    /** 当前 transform 是否处于「适配视口」结果（用于按钮激活态） */
+    fitBoundsActive?: boolean;
+    className?: string;
+    /** 与 config.showGridToggle 联用：当前画布是否显示网格 */
+    mapGridVisible?: boolean;
+    /** 切换当前画布 draft 的 mapLayer.showGrid */
+    onToggleMapGrid?: () => void;
+    /**
+     * 视口锁定态：true 时显示「已锁定」图标，并禁用所有改变视角的按钮
+     * （zoom +/- / reset / fitBounds）。pan / wheel / pinch 由调用方在 TransformWrapper 上同步关闭。
+     */
+    viewportLocked?: boolean;
+    /** 切换视口锁定；未传时不展示锁定按钮 */
+    onToggleViewportLock?: () => void;
+    /**
+     * 平面图 Dock：圆角浅底样式，默认折叠为单入口；展开后含缩放、工具、全屏与 dockExpandedTrailing
+     */
+    dockChrome?: boolean;
+    /** Dock 展开区最右侧业务插槽（如「编辑画布」） */
+    dockExpandedTrailing?: React.ReactNode;
+    /**
+     * Dock 展开后无操作自动收起（毫秒）；0 表示不自动收起
+     * @default 10000
+     */
+    autoCollapseDockMs?: number;
+}
+export declare function ViewControls(props: ViewControlsProps): JSX.Element | null;
+export default ViewControls;

package/lib/components/pisellFloorMapLayout/components/ViewControls.js

@@ -63,16 +63,12 @@ function ViewControls(props) {
   const showGridToggle = config.showGridToggle === true && typeof onToggleMapGrid === "function";
   const showViewportLock = config.showViewportLock === true && typeof onToggleViewportLock === "function";
   const horizontalAlign = config.horizontalAlign ?? "start";
-  const isDockAlignEnd = horizontalAlign === "end";
   const scalePercent = Math.round(scale * 100);
   const showTools = showReset || showFitBounds || showFullscreen || showGridToggle || showViewportLock;
   const hasTrailingSlot = dockExpandedTrailing != null && dockExpandedTrailing !== false;
   const dockHasExpandable = dockChrome && (showTools || hasTrailingSlot);
   const showBar = showZoom || showTools || dockChrome && hasTrailingSlot;
   const [dockExpanded, setDockExpanded] = (0, import_react.useState)(false);
-  const [dockPanelMounted, setDockPanelMounted] = (0, import_react.useState)(false);
-  const dockExpandedRef = (0, import_react.useRef)(dockExpanded);
-  dockExpandedRef.current = dockExpanded;
   const idleTimerRef = (0, import_react.useRef)(null);
   const clearIdleTimer = (0, import_react.useCallback)(() => {
     if (idleTimerRef.current != null) {
@@ -104,24 +100,8 @@ function ViewControls(props) {
       scheduleDockCollapse();
     }
   }, [dockExpanded, dockHasExpandable, scheduleDockCollapse]);
-  const handleDockSlideTransitionEnd = (0, import_react.useCallback)(
-    (e) => {
-      if (e.propertyName !== "max-width" || e.target !== e.currentTarget) {
-        return;
-      }
-      if (!dockExpandedRef.current) {
-        setDockPanelMounted(false);
-      }
-    },
-    []
-  );
   const handleDockExpand = (0, import_react.useCallback)(() => {
-    setDockPanelMounted(true);
-    requestAnimationFrame(() => {
-      requestAnimationFrame(() => {
-        setDockExpanded(true);
-      });
-    });
+    setDockExpanded(true);
   }, []);
   const handleDockCollapseClick = (0, import_react.useCallback)(() => {
     clearIdleTimer();
@@ -207,8 +187,23 @@ function ViewControls(props) {
       isFullscreen ? /* @__PURE__ */ import_react.default.createElement(import_icons.FullscreenExitOutlined, null) : /* @__PURE__ */ import_react.default.createElement(import_icons.FullscreenOutlined, null)
     ) : null);
   };
-  const dockExpandedBarHasToolButtons = showReset || showFitBounds && Boolean(api.fitBounds) && !isDockAlignEnd || showGridToggle || showViewportLock && !isDockAlignEnd || showFullscreen && Boolean(api.toggleFullscreen);
-  const renderDockExpandableBarContents = () => /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showZoom ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
+  const dockExpandedBarHasToolButtons = showReset || showGridToggle || showFullscreen && Boolean(api.toggleFullscreen);
+  const renderDockToggleButton = () => /* @__PURE__ */ import_react.default.createElement(
+    "button",
+    {
+      type: "button",
+      className: (0, import_classnames.default)(`${PREFIX}-view-controls-dock-toggle-btn`, {
+        [`${PREFIX}-view-controls-dock-toggle-btn--panel-open`]: dockExpanded
+      }),
+      onClick: dockExpanded ? handleDockCollapseClick : handleDockExpand,
+      "aria-expanded": dockExpanded,
+      "aria-label": import_utils.locales.getText(
+        dockExpanded ? `${I18N_VC}.collapse-tools-aria` : `${I18N_VC}.expand-tools-aria`
+      )
+    },
+    dockExpanded ? /* @__PURE__ */ import_react.default.createElement(import_icons.RightOutlined, null) : /* @__PURE__ */ import_react.default.createElement(import_icons.LeftOutlined, null)
+  );
+  const renderDockExpandableBarContents = () => /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, renderDockToggleButton(), showZoom ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "button",
     {
       type: "button",
@@ -231,19 +226,9 @@ function ViewControls(props) {
     },
     /* @__PURE__ */ import_react.default.createElement(import_icons.PlusOutlined, null)
   )) : null, showZoom && (dockExpandedBarHasToolButtons || hasTrailingSlot) ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}-view-controls-bar-divider`, "aria-hidden": true }) : null, dockExpandedBarHasToolButtons ? renderToolButtons({
-    omitViewportLock: isDockAlignEnd,
-    omitFitBounds: isDockAlignEnd
-  }) : null, hasTrailingSlot ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}-view-controls-dock-trailing` }, dockExpandedTrailing) : null, /* @__PURE__ */ import_react.default.createElement(
-    "button",
-    {
-      type: "button",
-      className: `${PREFIX}-view-controls-tool-btn`,
-      onClick: handleDockCollapseClick,
-      "aria-expanded": dockExpanded,
-      "aria-label": import_utils.locales.getText(`${I18N_VC}.collapse-tools-aria`)
-    },
-    isDockAlignEnd ? /* @__PURE__ */ import_react.default.createElement(import_icons.RightOutlined, null) : /* @__PURE__ */ import_react.default.createElement(import_icons.LeftOutlined, null)
-  ));
+    omitViewportLock: true,
+    omitFitBounds: true
+  }) : null, hasTrailingSlot ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}-view-controls-dock-trailing` }, dockExpandedTrailing) : null);
   if (!showBar) {
     return null;
   }
@@ -251,96 +236,66 @@ function ViewControls(props) {
     const showLockChip = showViewportLock;
     const showFitChip = showFitBounds && Boolean(api.fitBounds);
     if (!showLockChip && !showFitChip) return null;
-    const collapseExtras = dockExpanded && !isDockAlignEnd;
-    return /* @__PURE__ */ import_react.default.createElement(
-      "div",
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}-view-controls-dock-collapsed-extras` }, showLockChip ? /* @__PURE__ */ import_react.default.createElement(
+      "button",
       {
+        type: "button",
         className: (0, import_classnames.default)(
-          `${PREFIX}-view-controls-dock-collapsed-extras`,
+          `${PREFIX}-view-controls-tool-btn`,
+          `${PREFIX}-view-controls-dock-collapsed-extras-btn`,
           {
-            [`${PREFIX}-view-controls-dock-collapsed-extras--panel-open`]: collapseExtras
+            [`${PREFIX}-view-controls-tool-btn--active`]: viewportLocked
           }
         ),
-        "aria-hidden": collapseExtras
+        onClick: () => onToggleViewportLock(),
+        "aria-pressed": viewportLocked,
+        "aria-label": import_utils.locales.getText(
+          viewportLocked ? `${I18N_VC}.viewport-unlock-aria` : `${I18N_VC}.viewport-lock-aria`
+        ),
+        title: import_utils.locales.getText(
+          viewportLocked ? `${I18N_VC}.viewport-unlock-aria` : `${I18N_VC}.viewport-lock-aria`
+        )
       },
-      showLockChip ? /* @__PURE__ */ import_react.default.createElement(
-        "button",
-        {
-          type: "button",
-          className: (0, import_classnames.default)(
-            `${PREFIX}-view-controls-tool-btn`,
-            `${PREFIX}-view-controls-dock-collapsed-extras-btn`,
-            {
-              [`${PREFIX}-view-controls-tool-btn--active`]: viewportLocked
-            }
-          ),
-          onClick: () => onToggleViewportLock(),
-          tabIndex: collapseExtras ? -1 : 0,
-          "aria-pressed": viewportLocked,
-          "aria-label": import_utils.locales.getText(
-            viewportLocked ? `${I18N_VC}.viewport-unlock-aria` : `${I18N_VC}.viewport-lock-aria`
-          ),
-          title: import_utils.locales.getText(
-            viewportLocked ? `${I18N_VC}.viewport-unlock-aria` : `${I18N_VC}.viewport-lock-aria`
-          )
-        },
-        viewportLocked ? /* @__PURE__ */ import_react.default.createElement(import_icons.LockOutlined, null) : /* @__PURE__ */ import_react.default.createElement(import_icons.UnlockOutlined, null)
-      ) : null,
-      showFitChip ? /* @__PURE__ */ import_react.default.createElement(
-        "button",
-        {
-          type: "button",
-          className: (0, import_classnames.default)(
-            `${PREFIX}-view-controls-tool-btn`,
-            `${PREFIX}-view-controls-dock-collapsed-extras-btn`,
-            {
-              [`${PREFIX}-view-controls-tool-btn--active`]: fitBoundsActive && !viewportLocked
-            }
-          ),
-          onClick: () => api.fitBounds(),
-          disabled: viewportLocked,
-          "aria-disabled": viewportLocked,
-          "aria-pressed": fitBoundsActive,
-          tabIndex: collapseExtras ? -1 : 0,
-          "aria-label": import_utils.locales.getText(`${I18N_VC}.fit-bounds-aria`),
-          title: import_utils.locales.getText(`${I18N_VC}.fit-bounds-aria`)
-        },
-        /* @__PURE__ */ import_react.default.createElement(import_icons.ExpandOutlined, null)
-      ) : null
-    );
+      viewportLocked ? /* @__PURE__ */ import_react.default.createElement(import_icons.LockOutlined, null) : /* @__PURE__ */ import_react.default.createElement(import_icons.UnlockOutlined, null)
+    ) : null, showFitChip ? /* @__PURE__ */ import_react.default.createElement(
+      "button",
+      {
+        type: "button",
+        className: (0, import_classnames.default)(
+          `${PREFIX}-view-controls-tool-btn`,
+          `${PREFIX}-view-controls-dock-collapsed-extras-btn`,
+          {
+            [`${PREFIX}-view-controls-tool-btn--active`]: fitBoundsActive && !viewportLocked
+          }
+        ),
+        onClick: () => api.fitBounds(),
+        disabled: viewportLocked,
+        "aria-disabled": viewportLocked,
+        "aria-pressed": fitBoundsActive,
+        "aria-label": import_utils.locales.getText(`${I18N_VC}.fit-bounds-aria`),
+        title: import_utils.locales.getText(`${I18N_VC}.fit-bounds-aria`)
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_icons.ExpandOutlined, null)
+    ) : null);
   };
   if (dockChrome && dockHasExpandable) {
-    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
+    return /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: (0, import_classnames.default)(
           `${PREFIX}-view-controls`,
           `${PREFIX}-view-controls--dock`,
-          horizontalAlign === "end" && `${PREFIX}-view-controls--align-end`,
+          /* dockChrome 始终右下；保留 --align-end 类以复用既有 CSS */
+          `${PREFIX}-view-controls--align-end`,
           className
         )
       },
       /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}-view-controls-dock-row` }, renderDockCollapsedExtras(), /* @__PURE__ */ import_react.default.createElement(
-        "button",
-        {
-          type: "button",
-          className: (0, import_classnames.default)(`${PREFIX}-view-controls-dock-expand-btn`, {
-            [`${PREFIX}-view-controls-dock-expand-btn--panel-open`]: dockExpanded
-          }),
-          onClick: handleDockExpand,
-          "aria-expanded": dockExpanded,
-          "aria-hidden": dockExpanded,
-          tabIndex: dockExpanded ? -1 : 0,
-          "aria-label": import_utils.locales.getText(`${I18N_VC}.expand-tools-aria`)
-        },
-        isDockAlignEnd ? /* @__PURE__ */ import_react.default.createElement(import_icons.LeftOutlined, null) : /* @__PURE__ */ import_react.default.createElement(import_icons.RightOutlined, null)
-      ), dockPanelMounted ? /* @__PURE__ */ import_react.default.createElement(
         "div",
         {
           className: (0, import_classnames.default)(`${PREFIX}-view-controls-dock-slide`, {
             [`${PREFIX}-view-controls-dock-slide--open`]: dockExpanded
-          }),
-          onTransitionEnd: handleDockSlideTransitionEnd
+          })
         },
         /* @__PURE__ */ import_react.default.createElement(
           "div",
@@ -354,8 +309,8 @@ function ViewControls(props) {
           },
           renderDockExpandableBarContents()
         )
-      ) : null)
-    ));
+      ))
+    );
   }
   const barClass = (0, import_classnames.default)(`${PREFIX}-view-controls-bar`, {
     [`${PREFIX}-view-controls-bar--dock`]: dockChrome

package/lib/components/pisellFloorMapLayout/components/ViewControls.less

@@ -195,9 +195,15 @@
      */
     .pisell-floor-map-layout-view-controls-dock-slide {
       box-sizing: border-box;
-      max-width: 0;
+      /**
+       * 折叠态必须露出 slide 内首位的合并 toggle（42px）+ bar 左 padding（12px）≈ 54px。
+       * 历史上曾用 max-width:0 + 外层覆写，但与 `&--align-end &-dock-slide` 同优先级时
+       * 打包顺序可能导致 0 压过 54px → slide 宽度为 0、toggle 整块被裁掉。
+       */
+      max-width: 54px;
       overflow: hidden;
       min-width: 0;
+      flex-shrink: 0;
       display: flex;
       flex-direction: row;
       align-items: center;
@@ -279,82 +285,10 @@
     }
   }
 
-  &-dock-expand-btn {
-    box-sizing: border-box;
-    width: @dock-chrome-outer;
-    height: @dock-chrome-outer;
-    min-width: @dock-chrome-outer;
-    min-height: @dock-chrome-outer;
-    padding: 0;
-    margin: 0;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    border: 1px solid transparent;
-    border-radius: 14px;
-    /**
-     * 主题色背景：与左下「Today sales」chip 同步走 antd primary 变量；
-     * 兜底 #5d3f9f 跟随项目其它主色 token，主题改色时自动同步。
-     * 边框透明保留圆角，避免主题色与浅灰描边混色。
-     */
-    background: var(--color-primary, var(--ant-color-primary, #5d3f9f));
-    box-shadow: 0 4px 16px rgba(15, 23, 42, 0.22);
-    cursor: pointer;
-    color: #fff;
-    font-size: @dock-icon-px;
-    line-height: 0;
-    appearance: none;
-    flex-shrink: 0;
-    overflow: hidden;
-    transition: width @dock-slide-ms linear,
-      min-width @dock-slide-ms linear,
-      max-width @dock-slide-ms linear,
-      opacity @dock-slide-ms linear,
-      border-color @dock-slide-ms linear,
-      box-shadow @dock-slide-ms linear,
-      filter @dock-slide-ms linear,
-      margin @dock-slide-ms linear;
-
-    /** 与右侧条带同时：条带变长时入口收起为 0 宽；收起条带时入口从 0 拉回到正方形 */
-
-    &--panel-open {
-      width: 0;
-      min-width: 0;
-      max-width: 0;
-      margin: 0;
-      opacity: 0;
-      border-color: transparent;
-      box-shadow: none;
-      pointer-events: none;
-      cursor: default;
-    }
-
-    &:hover {
-      /** 与 Today chip 一致：主题色上用 brightness 让 hover 永远比静态色暗一档 */
-      filter: brightness(0.92);
-    }
-
-    .anticon {
-      font-size: @dock-icon-px !important;
-      line-height: 0;
-      display: inline-flex;
-      align-items: center;
-      justify-content: center;
-    }
-
-    .anticon svg {
-      width: @dock-icon-px !important;
-      height: @dock-icon-px !important;
-      display: block;
-    }
-  }
-
   /**
-   * Dock 收起态额外按钮 pill：
-   * - 折叠时 DOM 在 expand-btn 之前（屏缘一侧），与展开入口并排；
-   * - dockExpanded 时与 expand-btn 同步 width→0、opacity→0，让位给 dock-slide 横向展开；
-   * - 默认 align（左下）：extras 在左缘，用 margin-right:8px 与 expand-btn 留缝；
-   * - align-end（右下）row-reverse 后 extras 贴右缘，用 margin-left:8px 与左侧 expand 留缝。
+   * dockChrome 屏右缘常驻 pill：「锁 / 全览」。
+   * 整组与 slide 共用同一外壳（dock-row 提供 border / radius / shadow），
+   * 左侧留 padding，与左侧展开条 / toggle 拉开，避免贴太紧；右侧保留与屏缘的呼吸。
    */
   &-dock-collapsed-extras {
     box-sizing: border-box;
@@ -364,38 +298,27 @@
     align-items: center;
     justify-content: center;
     gap: 5px;
-    padding: 0 10px;
-    margin-right: 8px;
-    border: 1px solid #e8eaed;
-    border-radius: 14px;
+    padding: 0 10px 0 10px;
     background: #fff;
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 0.12);
     flex-shrink: 0;
-    overflow: hidden;
-    transition: max-width @dock-slide-ms linear,
-      opacity @dock-slide-ms linear,
-      border-color @dock-slide-ms linear,
-      box-shadow @dock-slide-ms linear,
-      margin @dock-slide-ms linear,
-      padding @dock-slide-ms linear;
     max-width: 240px;
   }
 
   /**
-   * 右下 dock：row-reverse 后 DOM [extras][expand][slide] 呈 [slide][expand][extras]，
+   * 右下 dock：row-reverse 后 DOM [extras][slide] 呈 [slide][extras]，
    * extras 贴右缘。本场景下整组按钮做成「连体 pill」：
    *
-   *   - 折叠态视觉：[紫色 expand-btn][锁定/全览 extras]
+   *   - 折叠态视觉：[slide 内紫色 toggle][锁定/全览 extras]
    *   - 展开态视觉：[slide-bar 工具条][锁定/全览 extras]
-   *   - 展开方向：slide max-width 由 0 → 720px，由于父级锚定 `right:14px`，
+   *   - 展开方向：slide max-width 由 54 → 720px，由于父级锚定 `right:14px`，
    *     整组横向"从右往左"伸长，视觉上工具条从 extras 左侧扩出来。
    *
    * 实现方式：把 box-shadow / border / border-radius 统一挂到外层 `dock-row` 容器上，
-   * 内层 slide-bar / expand-btn / extras 全部去掉自己的边框圆角与投影，
+   * 内层 slide-bar / extras 全部去掉自己的边框圆角与投影，
    * 由 `overflow: hidden` 的外壳负责整体裁剪。这样：
    *   - 整组只有一道阴影，无相邻拼接处的接缝阴影；
    *   - 子元素切换宽度（max-width / width）时阴影边界跟随容器自然增长，无需 clip-path 修补；
-   *   - 紫色 expand-btn / 白色 extras / 白色 slide-bar 在同一个外壳里平铺，自动呈现连体观感。
+   *   - 紫色 toggle / 白色 extras / 白色 slide-bar 在同一个外壳里平铺，自动呈现连体观感。
    */
   &--align-end .pisell-floor-map-layout-view-controls-dock-row {
     border: 1px solid #e8eaed;
@@ -427,35 +350,58 @@
     padding-right: 0;
   }
 
-  /** 紫色入口：去掉自身投影圆角与边框，仅保留紫色底色，由外壳裁出连体圆角 */
-  &--align-end &-dock-expand-btn {
-    border: 0;
-    border-radius: 0;
-    box-shadow: none;
-  }
-
   /**
-   * 锁定 / 全览 extras：去掉自身边框圆角阴影与外边距，背景仍为白，贴外壳右缘排布；
-   * 贴邻 slide-bar / expand-btn 那一侧（DOM 内的左侧）padding 清零，避免接缝空隙。
+   * 合并入口：紫底白 icon，主题色与原 `dock-expand-btn` 一致。
+   * 尺寸对齐 dock 内其他工具按钮（@dock-btn-size），由外壳负责连体圆角与阴影。
    */
-  &--align-end &-dock-collapsed-extras {
+  &-dock-toggle-btn {
+    box-sizing: border-box;
+    width: @dock-btn-size;
+    min-width: @dock-btn-size;
+    max-width: @dock-btn-size;
+    height: @dock-btn-size;
+    min-height: @dock-btn-size !important;
+    max-height: @dock-btn-size !important;
+    flex-shrink: 0;
+    padding: 0;
     margin: 0;
-    border: 0;
-    border-radius: 0;
-    box-shadow: none;
-    padding-left: 0;
-  }
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    border: none;
+    border-radius: 8px;
+    background: var(--color-primary, var(--ant-color-primary, #5d3f9f));
+    color: #fff;
+    font-size: @dock-icon-px;
+    line-height: 0;
+    cursor: pointer;
+    appearance: none;
+    transition: filter @dock-slide-ms linear;
 
-  /** 展开态保留 extras 显示在右侧（覆盖通用 panel-open 的收起规则） */
-  &--align-end &-dock-collapsed-extras--panel-open {
-    max-width: 240px;
-    margin: 0;
-    padding: 0 10px 0 0;
-    opacity: 1;
-    border: 0;
-    border-radius: 0;
-    box-shadow: none;
-    pointer-events: auto;
+    &:hover {
+      /** 与原 expand-btn 一致：主题色上用 brightness 让 hover 暗一档 */
+      filter: brightness(0.92);
+      background: var(--color-primary, var(--ant-color-primary, #5d3f9f));
+      color: #fff;
+    }
+
+    .anticon,
+    .pisell-lowcode-icon,
+    span[role='img'] {
+      font-size: @dock-icon-px !important;
+      line-height: 0;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    .anticon svg,
+    .pisell-lowcode-icon svg,
+    span[role='img'] svg {
+      width: @dock-icon-px !important;
+      height: @dock-icon-px !important;
+      display: block;
+    }
   }
 
   &-dock-collapsed-extras-btn {
@@ -488,17 +434,6 @@
     }
   }
 
-  &-dock-collapsed-extras--panel-open {
-    max-width: 0;
-    margin-left: 0;
-    margin-right: 0;
-    padding: 0;
-    opacity: 0;
-    border-color: transparent;
-    box-shadow: none;
-    pointer-events: none;
-  }
-
   &-dock-trailing {
     display: inline-flex;
     align-items: center;
@@ -521,8 +456,7 @@
 
 @media (prefers-reduced-motion: reduce) {
   .pisell-floor-map-layout-view-controls--dock .pisell-floor-map-layout-view-controls-dock-slide,
-  .pisell-floor-map-layout-view-controls--dock .pisell-floor-map-layout-view-controls-dock-expand-btn,
-  .pisell-floor-map-layout-view-controls--dock .pisell-floor-map-layout-view-controls-dock-collapsed-extras {
+  .pisell-floor-map-layout-view-controls--dock .pisell-floor-map-layout-view-controls-dock-toggle-btn {
     transition-duration: 0.01ms;
   }
 }

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

@@ -213,7 +213,7 @@ var RecordBoardToolBar = (props) => {
       String
     ) : [];
     const allowedKeys = [
-      ...DEFAULT_RESOURCE_WALL_STATUS_SORT_FIELD_KEYS.map(String),
+      ...import_venueWallUtils.DEFAULT_RESOURCE_WALL_STATUS_SORT_FIELD_KEYS.map(String),
       ...extraWallKeys
     ];
     const filtered = base.filter(