@pisell/materials 6.11.20 → 6.11.21

package/es/components/pisellFloorMapLayout/components/EditableItemLayer.js

@@ -24,10 +24,13 @@ function isSceneLayoutTransformLocked(item) {
   return Boolean((_item$_sceneElement = item._sceneElement) === null || _item$_sceneElement === void 0 ? void 0 : _item$_sceneElement.layoutTransformLocked);
 }
 import { snapRect } from "../utils/snap";
+import { FloorMapEditQuickActions } from "./FloorMapEditQuickActions";
 import "./EditableItemLayer.less";
 var PREFIX = 'pisell-floor-map-layout';
 var DRAG_THRESHOLD = 4;
 var RESIZE_HANDLE_SIZE = 8;
+/** 选中图元抬升到该层级，保证快捷栏与缩放点不被其它图元（任意 item.zIndex）遮住 */
+var SELECTED_ITEM_STACK_Z = 1000000;
 function getItemKey(item, index, rowKey) {
   var _rowKey;
   if (!rowKey) return item.id;
@@ -73,7 +76,8 @@ export function EditableItemLayer(props) {
     scale = _props$scale === void 0 ? 1 : _props$scale,
     onInteractionChange = props.onInteractionChange,
     getMergedItemWrapperStyle = props.getMergedItemWrapperStyle,
-    className = props.className;
+    className = props.className,
+    editQuickBar = props.editQuickBar;
   var contentRef = useRef(null);
   var liveRectRef = useRef(null);
   var _useState = useState(null),
@@ -170,9 +174,6 @@ export function EditableItemLayer(props) {
       startItemY: style.top
     });
   }, [items, getItemStyle, onInteractionChange]);
-  var handleCanvasClick = useCallback(function (e) {
-    if (e.target === e.currentTarget) onSelect(null);
-  }, [onSelect]);
   React.useEffect(function () {
     if (!interaction) return;
     var onMove = function onMove(e) {
@@ -265,6 +266,7 @@ export function EditableItemLayer(props) {
   }, [interaction, scale, snapStep, onUpdateItem, onInteractionChange]);
   var handleItemClick = useCallback(function (e, item) {
     if (interaction) return;
+    e.stopPropagation();
     onSelect(item.id);
   }, [interaction, onSelect]);
   var itemNodes = useMemo(function () {
@@ -273,24 +275,27 @@ export function EditableItemLayer(props) {
       return ((_a$zIndex = a.zIndex) !== null && _a$zIndex !== void 0 ? _a$zIndex : 0) - ((_b$zIndex = b.zIndex) !== null && _b$zIndex !== void 0 ? _b$zIndex : 0);
     });
     return sorted.map(function (item, index) {
-      var _item$zIndex;
+      var _item$zIndex, _item$zIndex2;
       var key = getItemKey(item, index, rowKey);
       var merged = item;
       var style = getItemStyle(item, index);
       var shapeStyle = getShapeStyle(item.shape);
       var isSelected = selectedId === item.id;
+      var wrapperStyle = getMergedItemWrapperStyle === null || getMergedItemWrapperStyle === void 0 ? void 0 : getMergedItemWrapperStyle(item, index);
+      var baseZ = (wrapperStyle === null || wrapperStyle === void 0 ? void 0 : wrapperStyle.zIndex) !== undefined ? wrapperStyle.zIndex : (_item$zIndex = item.zIndex) !== null && _item$zIndex !== void 0 ? _item$zIndex : 0;
       return /*#__PURE__*/React.createElement("div", {
         key: key,
-        className: classNames("".concat(PREFIX, "-editable-item"), _defineProperty({}, "".concat(PREFIX, "-editable-item-selected"), isSelected)),
-        style: _objectSpread(_objectSpread({
+        className: classNames("".concat(PREFIX, "-editable-item"), _defineProperty(_defineProperty({}, "".concat(PREFIX, "-editable-item-selected"), isSelected), "".concat(PREFIX, "-editable-item-selected-lock"), isSelected && isSceneLayoutTransformLocked(merged))),
+        style: _objectSpread(_objectSpread(_objectSpread({
           position: 'absolute',
           left: style.left,
           top: style.top,
           width: style.width,
           height: style.height,
-          boxSizing: 'border-box',
-          zIndex: (_item$zIndex = item.zIndex) !== null && _item$zIndex !== void 0 ? _item$zIndex : 0
-        }, shapeStyle), getMergedItemWrapperStyle === null || getMergedItemWrapperStyle === void 0 ? void 0 : getMergedItemWrapperStyle(item, index)),
+          boxSizing: 'border-box'
+        }, shapeStyle), wrapperStyle), {}, {
+          zIndex: isSelected ? SELECTED_ITEM_STACK_Z + ((_item$zIndex2 = item.zIndex) !== null && _item$zIndex2 !== void 0 ? _item$zIndex2 : 0) : baseZ
+        }),
         onPointerDown: function onPointerDown(e) {
           return handlePointerDown(e, item, index);
         },
@@ -310,9 +315,15 @@ export function EditableItemLayer(props) {
             position: 'absolute'
           }
         });
-      })));
+      })), isSelected && editQuickBar ? /*#__PURE__*/React.createElement(FloorMapEditQuickActions, {
+        labels: editQuickBar.labels,
+        isLocked: editQuickBar.isLocked,
+        onToggleLock: editQuickBar.onToggleLock,
+        onDuplicate: editQuickBar.onDuplicate,
+        onDelete: editQuickBar.onDelete
+      }) : null);
     });
-  }, [items, renderItem, rowKey, getItemStyle, selectedId, handlePointerDown, handleItemClick, handleResizePointerDown, getMergedItemWrapperStyle]);
+  }, [items, renderItem, rowKey, getItemStyle, selectedId, handlePointerDown, handleItemClick, handleResizePointerDown, getMergedItemWrapperStyle, editQuickBar]);
   return /*#__PURE__*/React.createElement("div", {
     ref: contentRef,
     className: classNames("".concat(PREFIX, "-editable-item-layer"), className),
@@ -324,8 +335,7 @@ export function EditableItemLayer(props) {
       height: contentHeight,
       minWidth: contentWidth,
       minHeight: contentHeight
-    },
-    onClick: handleCanvasClick
+    }
   }, contentOffsetX !== 0 || contentOffsetY !== 0 ? /*#__PURE__*/React.createElement("div", {
     style: {
       position: 'absolute',
@@ -334,8 +344,7 @@ export function EditableItemLayer(props) {
       width: contentWidth,
       height: contentHeight,
       transform: "translate(".concat(contentOffsetX, "px, ").concat(contentOffsetY, "px)")
-    },
-    onClick: handleCanvasClick
+    }
   }, itemNodes) : itemNodes);
 }
 export default EditableItemLayer;

package/es/components/pisellFloorMapLayout/components/EditableItemLayer.less

@@ -1,7 +1,7 @@
-/* 根节点不拦截事件，空白区域 mousedown 可透传到下层，让 react-zoom-pan-pinch 正常平移画布 */
+/* 根节点需可命中图元；点空白取消选中由 PisellFloorMapLayout 的 map-area onClick 处理 */
 .pisell-floor-map-layout-editable-item-layer {
   cursor: default;
-  pointer-events: none;
+  pointer-events: auto;
 }
 
 .pisell-floor-map-layout-editable-item {
@@ -12,14 +12,25 @@
   touch-action: none;
 
   &-selected {
-    box-shadow: 0 0 0 2px #1677ff;
-    z-index: 2;
+    /* 实际层级由 TSX 内联 zIndex（SELECTED_ITEM_STACK_Z + item.zIndex）控制 */
+    outline: 3px solid var(--fmap-primary, #1677ff);
+    outline-offset: 0;
+    box-shadow: 0 0 0 1px color-mix(in srgb, var(--fmap-primary, #1677ff) 25%, transparent);
+  }
+
+  /** 已锁定：选中描边改为警告色，与未锁定区分 */
+
+  &-selected-lock {
+    outline-color: #d48806;
+    box-shadow: 0 0 0 1px rgba(212, 136, 6, 0.28);
   }
 
   &-inner {
     width: 100%;
     height: 100%;
     pointer-events: none;
+    overflow: hidden;
+    border-radius: inherit;
   }
 }
 
@@ -27,7 +38,7 @@
   width: 10px;
   height: 10px;
   margin: -5px;
-  background: #1677ff;
+  background: var(--fmap-primary, #1677ff);
   border: 1px solid #fff;
   border-radius: 2px;
   cursor: nwse-resize;
@@ -87,3 +98,48 @@
     cursor: ew-resize;
   }
 }
+
+.pisell-floor-map-layout-edit-quick-actions {
+  position: absolute;
+  left: 50%;
+  top: 100%;
+  transform: translate(-50%, 10px);
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 10px 12px;
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.12);
+  border: 1px solid #e8eaed;
+  /* 高于同图元内缩放点 (3)，并贴近选中项栈顶，避免被内部子 stacking 盖住 */
+  z-index: 100000;
+  pointer-events: auto;
+  touch-action: manipulation;
+
+  &--locked {
+    border-color: rgba(212, 136, 6, 0.45);
+    background: #fffbf0;
+  }
+
+  /* 无边框、更大图标按钮（antd 类名在运行环境可能为 pisell-lowcode-*） */
+
+  .pisell-lowcode-btn,
+  .ant-btn {
+    width: 44px;
+    height: 44px;
+    min-width: 44px;
+    padding: 0;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    border: none !important;
+    box-shadow: none !important;
+    line-height: 1;
+
+    .pisell-lowcode-btn-icon,
+    .anticon {
+      font-size: 22px;
+    }
+  }
+}

package/es/components/pisellFloorMapLayout/components/FigmaTableCard.d.ts

@@ -1,8 +1,4 @@
-/**
- * Figma 样式餐桌/圆桌卡片：上下小条 + 白底卡片 + 状态色边框
- * 供 Floor Map Story 与 Sales Grid 平面图复用
- */
-import React from 'react';
+/// <reference types="react" />
 import type { FloorMapMergedItem, FloorMapDataSources } from '../types';
 export declare type FigmaTableStatus = 'available' | 'reserved' | 'waiting' | 'dining' | 'billed' | 'availableSoon';
 /** 方桌/圆桌卡片展示用数据结构（与 Figma 设计一致，支持桌号/状态/人数/区域等） */
@@ -34,10 +30,10 @@ export interface FigmaTableCardItem {
 /** 从 merged item + dataSources 得到卡片数据 */
 export declare function getFigmaTableCardFromMerged(item: FloorMapMergedItem, dataSources: FloorMapDataSources): FigmaTableCardItem;
 /** 渲染 Figma 样式的方桌卡片（上下小条 + 白底卡片 + 状态边框） */
-export declare function renderFigmaStyleTableCard(cardItem: FigmaTableCardItem): React.JSX.Element;
+export declare function renderFigmaStyleTableCard(cardItem: FigmaTableCardItem): JSX.Element;
 /** 渲染 Figma 样式的圆桌卡片（圆形轮廓，展示桌号/状态/人数/区域） */
-export declare function renderFigmaStyleRoundTableCard(cardItem: FigmaTableCardItem): React.JSX.Element;
+export declare function renderFigmaStyleRoundTableCard(cardItem: FigmaTableCardItem): JSX.Element;
 /** 返回用于 renderItemByKind.table 的渲染函数（方桌） */
-export declare function getRenderItemByKindTable(dataSources: FloorMapDataSources): (item: unknown) => React.JSX.Element;
+export declare function getRenderItemByKindTable(dataSources: FloorMapDataSources): (item: unknown) => JSX.Element;
 /** 返回用于 renderItemByKind.roundTable 的渲染函数（圆桌） */
-export declare function getRenderItemByKindRoundTable(dataSources: FloorMapDataSources): (item: unknown) => React.JSX.Element;
+export declare function getRenderItemByKindRoundTable(dataSources: FloorMapDataSources): (item: unknown) => JSX.Element;

package/es/components/pisellFloorMapLayout/components/FloorMapDataForm.d.ts

@@ -1,8 +1,4 @@
-/**
- * FloorMapDataForm - 数据源落位的数据表单，调用 onDataSourceRecordSave
- * 支持通过 columns 配置列标签与控件类型（string/number/select），与表格列一致
- */
-import React from 'react';
+/// <reference types="react" />
 import type { FloorMapDataSources, DataSourceFormColumn } from '../types';
 import './FloorMapDataForm.less';
 export interface FloorMapDataFormProps {
@@ -17,5 +13,5 @@ export interface FloorMapDataFormProps {
     className?: string;
 }
 /** 简单通用表单：可编辑记录中的字段；支持 columns 配置标签与控件类型 */
-export declare function FloorMapDataForm(props: FloorMapDataFormProps): React.JSX.Element;
+export declare function FloorMapDataForm(props: FloorMapDataFormProps): JSX.Element;
 export default FloorMapDataForm;

package/es/components/pisellFloorMapLayout/components/FloorMapEditPanel.d.ts

@@ -1,7 +1,4 @@
-/**
- * FloorMapEditPanel - 选中图元后的编辑面板：画布属性 + 可选数据绑定 + 数据源记录表单
- */
-import React from 'react';
+/// <reference types="react" />
 import type { FloorMapEditPanelParams, FloorMapViewConfig, FloorMapDataSources } from '../types';
 import './FloorMapEditPanel.less';
 export interface FloorMapEditPanelProps extends FloorMapEditPanelParams {
@@ -10,5 +7,5 @@ export interface FloorMapEditPanelProps extends FloorMapEditPanelParams {
     savingRecord?: boolean;
     className?: string;
 }
-export declare function FloorMapEditPanel(props: FloorMapEditPanelProps): React.JSX.Element;
+export declare function FloorMapEditPanel(props: FloorMapEditPanelProps): JSX.Element;
 export default FloorMapEditPanel;

package/es/components/pisellFloorMapLayout/components/FloorMapEditQuickActions.d.ts

@@ -0,0 +1,21 @@
+/// <reference types="react" />
+export interface FloorMapEditQuickActionLabels {
+    lock: string;
+    unlock: string;
+    duplicate: string;
+    delete: string;
+    popTitle: string;
+    popDesc: string;
+    cancel: string;
+    okDelete: string;
+    ariaToolbar: string;
+}
+export interface FloorMapEditQuickActionsProps {
+    className?: string;
+    labels: FloorMapEditQuickActionLabels;
+    isLocked: boolean;
+    onToggleLock: () => void;
+    onDuplicate: () => void;
+    onDelete: () => void;
+}
+export declare function FloorMapEditQuickActions(props: FloorMapEditQuickActionsProps): JSX.Element;

package/es/components/pisellFloorMapLayout/components/FloorMapEditQuickActions.js

@@ -0,0 +1,67 @@
+/**
+ * 编辑态选中图元旁的快捷操作：锁定 / 复制 / 删除（与侧栏同源逻辑）
+ */
+import React, { useCallback } from 'react';
+import classNames from 'classnames';
+import { Button, Popconfirm, Tooltip } from 'antd';
+import { CopyOutlined, DeleteOutlined, LockOutlined, UnlockOutlined } from '@ant-design/icons';
+var PREFIX = 'pisell-floor-map-layout';
+export function FloorMapEditQuickActions(props) {
+  var className = props.className,
+    labels = props.labels,
+    isLocked = props.isLocked,
+    onToggleLock = props.onToggleLock,
+    onDuplicate = props.onDuplicate,
+    onDelete = props.onDelete;
+  var stopBubble = useCallback(function (e) {
+    e.stopPropagation();
+  }, []);
+  return /*#__PURE__*/React.createElement("div", {
+    role: "toolbar",
+    "aria-label": labels.ariaToolbar,
+    className: classNames("".concat(PREFIX, "-edit-quick-actions"), isLocked && "".concat(PREFIX, "-edit-quick-actions--locked"), className),
+    onPointerDown: function onPointerDown(e) {
+      return e.stopPropagation();
+    }
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    title: isLocked ? labels.unlock : labels.lock
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "text",
+    size: "large",
+    icon: isLocked ? /*#__PURE__*/React.createElement(LockOutlined, null) : /*#__PURE__*/React.createElement(UnlockOutlined, null),
+    onClick: function onClick(e) {
+      stopBubble(e);
+      onToggleLock();
+    },
+    "aria-pressed": isLocked
+  })), /*#__PURE__*/React.createElement(Tooltip, {
+    title: labels.duplicate
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "text",
+    size: "large",
+    icon: /*#__PURE__*/React.createElement(CopyOutlined, null),
+    onClick: function onClick(e) {
+      stopBubble(e);
+      onDuplicate();
+    }
+  })), /*#__PURE__*/React.createElement(Popconfirm, {
+    title: labels.popTitle,
+    description: labels.popDesc,
+    onConfirm: function onConfirm() {
+      return onDelete();
+    },
+    okText: labels.okDelete,
+    cancelText: labels.cancel,
+    okButtonProps: {
+      danger: true
+    }
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    title: labels.delete
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "text",
+    danger: true,
+    size: "large",
+    icon: /*#__PURE__*/React.createElement(DeleteOutlined, null),
+    onClick: stopBubble
+  }))));
+}

package/es/components/pisellFloorMapLayout/components/FloorMapEditTopBar.d.ts

@@ -1,7 +1,7 @@
 /**
  * FloorMapEditTopBar - 编辑态顶栏
- * - `mode="compact"`：画布 Tab + 可选 `canvasTabsBarTrailing` + 全屏入口（非全屏；保存多在侧栏）
- * - `mode="full"`：画布 Tab + `canvasTabsBarTrailing` + 保存（仅非浏览器全屏时）+ 全屏退出 + 扩展操作
+ * - `mode="compact"`：画布 Tab + 可选 `canvasTabsBarTrailing`（全屏入口在左下 Dock）
+ * - `mode="full"`：画布 Tab + `canvasTabsBarTrailing` + 保存（仅非浏览器全屏时）+ 扩展操作
  */
 import React from 'react';
 import type { CanvasTabsProps } from './CanvasTabs';
@@ -9,7 +9,7 @@ import type { FloorMapControlsConfig, FloorMapViewConfig } from '../types';
 import './FloorMapEditTopBar.less';
 export declare type FloorMapEditTopBarMode = 'full' | 'compact';
 export interface FloorMapEditTopBarProps {
-    /** full：全屏时的完整顶栏；compact：非全屏时 Tab + 全屏入口 */
+    /** full：全屏时的完整顶栏；compact：非全屏时 Tab + 扩展区 */
     mode?: FloorMapEditTopBarMode;
     config: FloorMapViewConfig;
     canvases: CanvasTabsProps['canvases'];
@@ -23,14 +23,16 @@ export interface FloorMapEditTopBarProps {
     saving?: boolean;
     saveError?: Error | string;
     layoutDirty?: boolean;
-    toggleFullscreen?: () => void;
+    /** full 模式：浏览器全屏时为 true，顶栏不展示保存（改由侧栏） */
     isFullscreen?: boolean;
     controls?: FloorMapControlsConfig;
     /** 顶栏右侧扩展（如「区域定位」等），仅 full 模式 */
     extraActions?: React.ReactNode;
-    /** 画布 Tab 同排最右侧业务区（在「进入全屏」/「退出全屏」与保存等之前） */
+    /** 画布 Tab 同排最右侧业务区 */
     canvasTabsBarTrailing?: React.ReactNode;
+    /** 启用画布仅 1 个时隐藏 Tab 行，仅保留右侧操作区（全屏顶栏保存等） */
+    hideCanvasTabs?: boolean;
     className?: string;
 }
-export declare function FloorMapEditTopBar(props: FloorMapEditTopBarProps): React.JSX.Element;
+export declare function FloorMapEditTopBar(props: FloorMapEditTopBarProps): JSX.Element | null;
 export default FloorMapEditTopBar;

package/es/components/pisellFloorMapLayout/components/FloorMapEditTopBar.js

@@ -1,11 +1,10 @@
 /**
  * FloorMapEditTopBar - 编辑态顶栏
- * - `mode="compact"`：画布 Tab + 可选 `canvasTabsBarTrailing` + 全屏入口（非全屏；保存多在侧栏）
- * - `mode="full"`：画布 Tab + `canvasTabsBarTrailing` + 保存（仅非浏览器全屏时）+ 全屏退出 + 扩展操作
+ * - `mode="compact"`：画布 Tab + 可选 `canvasTabsBarTrailing`（全屏入口在左下 Dock）
+ * - `mode="full"`：画布 Tab + `canvasTabsBarTrailing` + 保存（仅非浏览器全屏时）+ 扩展操作
  */
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
-import { FullscreenExitOutlined, FullscreenOutlined } from '@ant-design/icons';
 import { locales } from '@pisell/utils';
 import useEngineContext from "../../../hooks/useEngineContext";
 import { initFloorMapLayoutLocales } from "../utils/floorMapCanvasDisplay";
@@ -30,13 +29,12 @@ export function FloorMapEditTopBar(props) {
     saving = props.saving,
     saveError = props.saveError,
     layoutDirty = props.layoutDirty,
-    toggleFullscreen = props.toggleFullscreen,
     _props$isFullscreen = props.isFullscreen,
     isFullscreen = _props$isFullscreen === void 0 ? false : _props$isFullscreen,
-    _props$controls = props.controls,
-    controls = _props$controls === void 0 ? {} : _props$controls,
     extraActions = props.extraActions,
     canvasTabsBarTrailing = props.canvasTabsBarTrailing,
+    _props$hideCanvasTabs = props.hideCanvasTabs,
+    hideCanvasTabs = _props$hideCanvasTabs === void 0 ? false : _props$hideCanvasTabs,
     className = props.className;
   var engineCtx = useEngineContext();
   var engineLocale = (engineCtx === null || engineCtx === void 0 || (_engineCtx$engine = engineCtx.engine) === null || _engineCtx$engine === void 0 || (_engineCtx$engine = _engineCtx$engine.props) === null || _engineCtx$engine === void 0 ? void 0 : _engineCtx$engine.locale) || 'zh-CN';
@@ -44,10 +42,6 @@ export function FloorMapEditTopBar(props) {
     initFloorMapLayoutLocales(engineLocale);
     return {
       aria: locales.getText("".concat(I18N_TB, ".aria")),
-      fsEnterAria: locales.getText("".concat(I18N_TB, ".fullscreen-enter-aria")),
-      fsEnterTitle: locales.getText("".concat(I18N_TB, ".fullscreen-enter-title")),
-      fsExitAria: locales.getText("".concat(I18N_TB, ".fullscreen-exit-aria")),
-      fsExitTitle: locales.getText("".concat(I18N_TB, ".fullscreen-exit-title")),
       unsaved: locales.getText("".concat(I18N_TB, ".unsaved")),
       save: locales.getText("".concat(I18N_TB, ".save")),
       saving: locales.getText("".concat(I18N_TB, ".saving"))
@@ -56,19 +50,16 @@ export function FloorMapEditTopBar(props) {
 
   /** 浏览器全屏时顶栏不展示保存，改由侧栏承担（见 PisellFloorMapLayout 对 Toolbar onSave 的互斥逻辑） */
   var showSave = Boolean(onSave && config.canvasUi.canEdit) && !isFullscreen;
-  /** compact：有 toggle 时展示「进入全屏」 */
-  var showFullscreenEnter = Boolean(toggleFullscreen);
-  /** full 模式在全屏态下展示「退出全屏」 */
-  var showFullscreenExit = mode === 'full' && isFullscreen && Boolean(toggleFullscreen);
   var hasTrailing = canvasTabsBarTrailing != null && canvasTabsBarTrailing !== false;
-  var hasFullActions = showSave || showFullscreenExit || Boolean(saveError) || extraActions != null && extraActions !== false || hasTrailing;
+  var hasFullActions = showSave || Boolean(saveError) || extraActions != null && extraActions !== false || hasTrailing;
+  var tabsHiddenClass = hideCanvasTabs ? "".concat(PREFIX, "-edit-top-bar--tabs-hidden") : undefined;
   if (mode === 'compact') {
-    var showCompactActions = hasTrailing || showFullscreenEnter;
+    var showCompactActions = hasTrailing;
     return /*#__PURE__*/React.createElement("div", {
-      className: classNames("".concat(PREFIX, "-edit-top-bar"), "".concat(PREFIX, "-edit-top-bar--compact"), className),
+      className: classNames("".concat(PREFIX, "-edit-top-bar"), "".concat(PREFIX, "-edit-top-bar--compact"), tabsHiddenClass, className),
       role: "toolbar",
       "aria-label": topBarLabels.aria
-    }, /*#__PURE__*/React.createElement("div", {
+    }, !hideCanvasTabs ? /*#__PURE__*/React.createElement("div", {
       className: "".concat(PREFIX, "-edit-top-bar-tabs")
     }, /*#__PURE__*/React.createElement(CanvasTabs, {
       canvases: canvases,
@@ -79,23 +70,18 @@ export function FloorMapEditTopBar(props) {
       onRemoveCanvas: onRemoveCanvas,
       onRenameCanvas: onRenameCanvas,
       className: "".concat(PREFIX, "-edit-top-bar-canvas-tabs")
-    })), showCompactActions ? /*#__PURE__*/React.createElement("div", {
+    })) : null, showCompactActions ? /*#__PURE__*/React.createElement("div", {
       className: "".concat(PREFIX, "-edit-top-bar-actions")
-    }, canvasTabsBarTrailing, showFullscreenEnter ? /*#__PURE__*/React.createElement("button", {
-      type: "button",
-      className: classNames("".concat(PREFIX, "-edit-top-bar-btn"), "".concat(PREFIX, "-edit-top-bar-btn-ghost")),
-      onClick: function onClick() {
-        return toggleFullscreen === null || toggleFullscreen === void 0 ? void 0 : toggleFullscreen();
-      },
-      "aria-label": topBarLabels.fsEnterAria,
-      title: topBarLabels.fsEnterTitle
-    }, /*#__PURE__*/React.createElement(FullscreenOutlined, null)) : null) : null);
+    }, canvasTabsBarTrailing) : null);
+  }
+  if (hideCanvasTabs && !hasFullActions) {
+    return null;
   }
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames("".concat(PREFIX, "-edit-top-bar"), "".concat(PREFIX, "-edit-top-bar--full-chrome"), className),
+    className: classNames("".concat(PREFIX, "-edit-top-bar"), "".concat(PREFIX, "-edit-top-bar--full-chrome"), tabsHiddenClass, className),
     role: "toolbar",
     "aria-label": topBarLabels.aria
-  }, /*#__PURE__*/React.createElement("div", {
+  }, !hideCanvasTabs ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(PREFIX, "-edit-top-bar-tabs")
   }, /*#__PURE__*/React.createElement(CanvasTabs, {
     canvases: canvases,
@@ -106,20 +92,12 @@ export function FloorMapEditTopBar(props) {
     onRemoveCanvas: onRemoveCanvas,
     onRenameCanvas: onRenameCanvas,
     className: "".concat(PREFIX, "-edit-top-bar-canvas-tabs")
-  })), hasFullActions ? /*#__PURE__*/React.createElement("div", {
+  })) : null, hasFullActions ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(PREFIX, "-edit-top-bar-actions")
   }, saveError ? /*#__PURE__*/React.createElement("span", {
     className: "".concat(PREFIX, "-edit-top-bar-error"),
     title: typeof saveError === 'string' ? saveError : saveError === null || saveError === void 0 ? void 0 : saveError.message
-  }, typeof saveError === 'string' ? saveError : saveError === null || saveError === void 0 ? void 0 : saveError.message) : null, canvasTabsBarTrailing, extraActions, showFullscreenExit ? /*#__PURE__*/React.createElement("button", {
-    type: "button",
-    className: classNames("".concat(PREFIX, "-edit-top-bar-btn"), "".concat(PREFIX, "-edit-top-bar-btn-ghost")),
-    onClick: function onClick() {
-      return toggleFullscreen === null || toggleFullscreen === void 0 ? void 0 : toggleFullscreen();
-    },
-    "aria-label": topBarLabels.fsExitAria,
-    title: topBarLabels.fsExitTitle
-  }, /*#__PURE__*/React.createElement(FullscreenExitOutlined, null)) : null, showSave ? /*#__PURE__*/React.createElement("div", {
+  }, typeof saveError === 'string' ? saveError : saveError === null || saveError === void 0 ? void 0 : saveError.message) : null, canvasTabsBarTrailing, extraActions, showSave ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(PREFIX, "-edit-top-bar-save-group")
   }, layoutDirty ? /*#__PURE__*/React.createElement("span", {
     className: "".concat(PREFIX, "-edit-top-bar-dirty-badge"),

package/es/components/pisellFloorMapLayout/components/FloorMapEditTopBar.less

@@ -1,4 +1,4 @@
-/* 编辑态单行顶栏：画布 Tab + 保存 / 全屏 */
+/* 编辑态单行顶栏：画布 Tab + 保存 / 扩展操作 */
 .pisell-floor-map-layout-edit-top-bar {
   display: flex;
   flex-direction: row;
@@ -9,6 +9,16 @@
   border-bottom: 1px solid #f0f0f0;
   z-index: 3;
 
+  /** 单画布：无 Tab 区时操作区靠右，去掉左侧竖线 */
+
+  &--tabs-hidden {
+    justify-content: flex-end;
+
+    .pisell-floor-map-layout-edit-top-bar-actions {
+      border-left: none;
+    }
+  }
+
   &-tabs {
     flex: 1;
     min-width: 0;
@@ -100,8 +110,8 @@
     transition: border-color 0.2s, background 0.2s;
 
     &:hover:not(:disabled) {
-      border-color: #1677ff;
-      color: #1677ff;
+      border-color: var(--fmap-primary, #1677ff);
+      color: var(--fmap-primary, #1677ff);
     }
 
     &:disabled {
@@ -111,12 +121,16 @@
 
     &.primary {
       color: #fff;
-      background: #1677ff;
-      border-color: #1677ff;
+      background: var(--fmap-primary, #1677ff);
+      border-color: var(--fmap-primary, #1677ff);
 
       &:hover:not(:disabled) {
-        background: #4096ff;
-        border-color: #4096ff;
+        background: color-mix(in srgb,
+        var(--fmap-primary, #1677ff) 88%,
+        #fff);
+        border-color: color-mix(in srgb,
+        var(--fmap-primary, #1677ff) 88%,
+        #fff);
         color: #fff;
       }
     }

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

@@ -31,5 +31,5 @@ export interface FloorMapToolbarProps {
     /** 触摸拖放结束后吞掉按钮 click，避免误触切换落点模式 */
     consumeToolbarClickIfTouchDrag?: () => boolean;
 }
-export declare function FloorMapToolbar(props: FloorMapToolbarProps): React.JSX.Element;
+export declare function FloorMapToolbar(props: FloorMapToolbarProps): JSX.Element;
 export default FloorMapToolbar;

package/es/components/pisellFloorMapLayout/components/FloorMapToolbar.less

@@ -78,9 +78,11 @@
     }
 
     &.pisell-floor-map-layout-toolbar-preview-card-active {
-      background: #e6f4ff;
-      border-color: #1677ff;
-      box-shadow: 0 0 0 1px #1677ff;
+      background: color-mix(in srgb,
+      var(--fmap-primary, #1677ff) 12%,
+      #fff);
+      border-color: var(--fmap-primary, #1677ff);
+      box-shadow: 0 0 0 1px var(--fmap-primary, #1677ff);
     }
 
     &.pisell-floor-map-layout-toolbar-preview-card-deco {
@@ -141,9 +143,11 @@
     cursor: pointer;
 
     &:hover {
-      color: #1677ff;
-      border-color: #1677ff;
-      background: #e6f4ff;
+      color: var(--fmap-primary, #1677ff);
+      border-color: var(--fmap-primary, #1677ff);
+      background: color-mix(in srgb,
+      var(--fmap-primary, #1677ff) 12%,
+      #fff);
     }
 
     &.cancel {
@@ -161,12 +165,16 @@
 
     &.primary {
       color: #fff;
-      background: #1677ff;
-      border-color: #1677ff;
+      background: var(--fmap-primary, #1677ff);
+      border-color: var(--fmap-primary, #1677ff);
 
       &:hover:not(:disabled) {
-        background: #4096ff;
-        border-color: #4096ff;
+        background: color-mix(in srgb,
+        var(--fmap-primary, #1677ff) 88%,
+        #fff);
+        border-color: color-mix(in srgb,
+        var(--fmap-primary, #1677ff) 88%,
+        #fff);
       }
 
       &:disabled {

package/es/components/pisellFloorMapLayout/components/ItemLayer.d.ts

@@ -29,6 +29,11 @@ export interface ItemLayerProps<T extends FloorMapItemBase> {
     contentOffsetY?: number;
     /** 是否启用 hover 事件 */
     enableHover?: boolean;
+    /**
+     * 是否在 hover 时显示外沿描边（选中感高亮）。默认 true。
+     * 平面图只读态可由布局关闭，仅去掉描边，不影响 onItemHover。
+     */
+    itemHoverOutline?: boolean;
     /** 点击回调 */
     onItemClick?: (item: T, index: number, e: React.MouseEvent<HTMLElement>) => void;
     /** hover 进入 */
@@ -44,5 +49,5 @@ export interface ItemLayerProps<T extends FloorMapItemBase> {
     onInteractionChange?: (active: boolean) => void;
     className?: string;
 }
-export declare function ItemLayer<T extends FloorMapItemBase>(props: ItemLayerProps<T>): React.JSX.Element;
+export declare function ItemLayer<T extends FloorMapItemBase>(props: ItemLayerProps<T>): JSX.Element;
 export default ItemLayer;