@pisell/materials 1.8.41 → 1.8.42

package/lib/components/pisellFloorMapLayout/components/FloorMapEditTopBar.less

@@ -49,6 +49,25 @@
     border-left: 1px solid #f0f0f0;
   }
 
+  /**
+   * 编辑态 compact / full：画布切换条上下收紧；操作区（含 undo/redo）左右收紧。
+   */
+  &--compact.pisell-floor-map-layout-read-canvas-tabs-bar,
+  &--full-chrome.pisell-floor-map-layout-read-canvas-tabs-bar {
+    min-height: 40px;
+
+    .pisell-floor-map-layout-edit-top-bar-canvas-tabs.pisell-floor-map-layout-canvas-tabs {
+      padding: 3px 6px;
+      gap: 6px;
+    }
+  }
+
+  &--compact > .pisell-floor-map-layout-edit-top-bar-actions,
+  &--full-chrome > .pisell-floor-map-layout-edit-top-bar-actions {
+    padding: 0 6px;
+    gap: 6px;
+  }
+
   &-error {
     max-width: 160px;
     font-size: 12px;
@@ -58,7 +77,7 @@
     text-overflow: ellipsis;
   }
 
-  /* 全屏顶栏：未保存标签在保存按钮左侧，单行对齐 */
+  /* 全屏顶栏右侧：取消 / 完成按钮组（未保存徽章已外提到 history 左侧，不再属于本组） */
 
   &-save-group {
     display: inline-flex;
@@ -67,6 +86,28 @@
     gap: 10px;
   }
 
+  /* 撤销 / 重做按钮组：作为 actions 区第一组元素显示 */
+  &-history {
+    display: inline-flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 4px;
+
+    /** 关闭 antd text 按钮的 hover / active 视觉反馈，避免顶栏闪动 */
+    .pisell-floor-map-layout-edit-top-bar-history-btn {
+      &.ant-btn-text:not(:disabled),
+      &.pisell-lowcode-btn-text:not(:disabled) {
+        &:hover,
+        &:focus-visible,
+        &:active {
+          color: rgba(0, 0, 0, 0.88);
+          background: transparent;
+          box-shadow: none;
+        }
+      }
+    }
+  }
+
   &-dirty-badge {
     display: inline-flex;
     align-items: center;
@@ -161,4 +202,57 @@
       background: transparent;
     }
   }
+
+  /**
+   * 与阅读态同一行的画布 Tab：多画布时不压缩胶囊，整行横向滑动（触摸友好）。
+   */
+  &.pisell-floor-map-layout-read-canvas-tabs-bar {
+    .pisell-floor-map-layout-edit-top-bar-tabs {
+      flex: 1;
+      min-width: 0;
+      /** 覆盖根级 &-tabs 的 overflow:hidden */
+      overflow-x: auto;
+      overflow-y: hidden;
+      -webkit-overflow-scrolling: touch;
+    }
+
+    .pisell-floor-map-layout-edit-top-bar-canvas-tabs.pisell-floor-map-layout-canvas-tabs {
+      flex: 0 0 auto;
+      width: max-content;
+      max-width: none;
+    }
+  }
+
+  /**
+   * 手机编辑：首行与阅读态 `read-canvas-tabs-bar` 一致（仅多 canEdit 能力）；
+   * 第二行放撤销/业务尾区/保存等，**左对齐**（不居中、不整行右对齐）。
+   */
+  &--phone-edit-canvas-row {
+    flex-direction: row;
+    align-items: center;
+    min-height: 0;
+    border-bottom: 1px solid #f0f0f0;
+  }
+
+  &--phone-actions-row {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    flex-shrink: 0;
+    min-height: 44px;
+    background: rgba(0, 0, 0, 0.04);
+    border-bottom: 1px solid #f0f0f0;
+    z-index: 3;
+
+    .pisell-floor-map-layout-edit-top-bar-actions {
+      flex: 1;
+      min-width: 0;
+      padding: 0 4px;
+      border-left: none;
+      flex-wrap: wrap;
+      justify-content: flex-start;
+      row-gap: 4px;
+      column-gap: 6px;
+    }
+  }
 }

package/lib/components/pisellFloorMapLayout/components/FloorMapOverview.js

@@ -0,0 +1,97 @@
+const require_runtime = require("../../../_virtual/_rolldown/runtime.js");
+const require_ItemLayer = require("./ItemLayer.js");
+const require_floorMapLayoutConstants = require("../floorMapLayoutConstants.js");
+const require_useEngineContext = require("../../../hooks/useEngineContext.js");
+const require_floorMapCanvasDisplay = require("../utils/floorMapCanvasDisplay.js");
+const require_mergeCanvasesForTabs = require("../utils/mergeCanvasesForTabs.js");
+let react = require("react");
+react = require_runtime.__toESM(react);
+let _pisell_utils = require("@pisell/utils");
+let classnames = require("classnames");
+classnames = require_runtime.__toESM(classnames);
+require("./FloorMapOverview.less");
+//#region src/components/pisellFloorMapLayout/components/FloorMapOverview.tsx
+/**
+* FloorMapOverview - 阅读态「All」全览视图（纯渲染版）
+*
+* 仅负责把 {@link OverviewLayout} 中各画布的图元渲染到对应的绝对定位区域里；
+* 由 PisellFloorMapLayout 在主 TransformWrapper 内挂载，与单画布共享同一套
+* 视口控件（缩放、平移、锁定、全屏、fitBounds、网格按钮等）。
+*
+* 设计要点：
+* - 不再自带 TransformWrapper / ResizeObserver / fit 算法；
+* - 每个画布作为独立区域，仅一条细边框作分隔，无背景色/网格；
+* - 区域左上角用小 chip 显示画布名；chip 不拦截图元交互；
+* - 仅渲染 ItemLayer（阅读态），与单画布的 hover/click 行为一致；编辑层不渲染。
+*/
+const I18N_EMPTY = "pisell-floor-map-layout.overview.empty";
+function FloorMapOverview(props) {
+	var _engineCtx$engine;
+	const { overviewLayout, config, itemUnit = "pixel", renderItem, viewportScale, enableHover = true, onItemClick, onItemHover, onItemLeave, getMergedItemWrapperStyle, readModeSelectedItemId, className } = props;
+	const engineCtx = require_useEngineContext.default();
+	const 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";
+	if (overviewLayout.areas.length === 0) return /* @__PURE__ */ react.default.createElement("div", {
+		className: (0, classnames.default)(`${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-overview`, `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-overview--empty`, className),
+		style: {
+			width: "100%",
+			height: "100%"
+		}
+	}, _pisell_utils.locales.getText(I18N_EMPTY));
+	/**
+	* 用 mergeCanvasesForTabs 构造 canvasId → displayName 的映射；
+	* 避免在循环里多次调用。
+	*/
+	const displayNameById = /* @__PURE__ */ new Map();
+	for (const canvas of require_mergeCanvasesForTabs.mergeCanvasesForTabs(config)) displayNameById.set(canvas.id, require_floorMapCanvasDisplay.getFloorMapCanvasDisplayName(canvas, engineLocale));
+	return /* @__PURE__ */ react.default.createElement("div", {
+		className: (0, classnames.default)(`${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-overview`, className),
+		style: {
+			position: "relative",
+			width: overviewLayout.totalWidth,
+			height: overviewLayout.totalHeight
+		}
+	}, overviewLayout.areas.map((area) => {
+		var _displayNameById$get;
+		const displayName = (_displayNameById$get = displayNameById.get(area.canvasId)) !== null && _displayNameById$get !== void 0 ? _displayNameById$get : area.canvasId;
+		const safeScale = viewportScale != null && Number.isFinite(viewportScale) && viewportScale > 0 ? viewportScale : 1;
+		const inverseScale = 1 / safeScale;
+		return /* @__PURE__ */ react.default.createElement("div", {
+			key: area.canvasId,
+			className: `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-overview-area`,
+			style: {
+				position: "absolute",
+				left: area.x,
+				top: area.y,
+				width: area.contentWidth,
+				height: area.contentHeight
+			}
+		}, /* @__PURE__ */ react.default.createElement("span", {
+			className: `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-overview-area-title`,
+			title: displayName,
+			style: {
+				transform: `scale(${inverseScale})`,
+				transformOrigin: "top left",
+				maxWidth: `calc((100% - 16px) * ${safeScale})`
+			}
+		}, displayName), /* @__PURE__ */ react.default.createElement(require_ItemLayer.default, {
+			items: area.items,
+			renderItem,
+			viewportScale,
+			cellSize: area.cellSize,
+			itemUnit,
+			contentWidth: area.contentWidth,
+			contentHeight: area.contentHeight,
+			contentOffsetX: area.contentOffsetX,
+			contentOffsetY: area.contentOffsetY,
+			enableHover,
+			itemHoverOutline: enableHover,
+			onItemClick,
+			onItemHover,
+			onItemLeave,
+			getMergedItemWrapperStyle,
+			readModeSelectedItemId
+		}));
+	}));
+}
+//#endregion
+exports.default = FloorMapOverview;

package/lib/components/pisellFloorMapLayout/components/FloorMapOverview.less

@@ -0,0 +1,65 @@
+/**
+ * 全览（All）视图：把所有启用画布的图元渲染在主 TransformWrapper 内的同一张
+ * 大画布里，每个画布占据各自的区域。仅用细边框区分区域，无背景色 / 网格。
+ *
+ * 视觉规则：
+ * - 大画布自身没有背景（沿用外层 map-area 背景）；
+ * - 每个区域只有一条细边框 + 圆角；
+ * - 区域左上角小 chip 显示画布名，半透明白底 + 模糊，不拦截图元交互。
+ */
+
+.pisell-floor-map-layout-overview {
+  &--empty {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: rgba(0, 0, 0, 0.45);
+    font-size: 14px;
+  }
+
+  &-area {
+    /**
+     * 区域边框：浅色外观深色描边，深色外观浅色描边；
+     * 都用 2px 粗描边，避免在大画布远缩放时被吃成 1 个亚像素而看不见。
+     * 自身不响应平移/缩放（由主 TransformWrapper 接管），仅作为区域边框；
+     * 内部 ItemLayer 的图元仍可点击/hover。
+     */
+    border: 2px solid rgba(0, 0, 0, 0.22);
+    border-radius: 8px;
+    box-sizing: border-box;
+
+    /**
+     * 深色外观下深色描边几乎贴近背景，区域分割不可见——切换到浅色描边。
+     * 选择器命中 PisellFloorMapLayout 根容器上的 `data-appearance-mode="dark"`，
+     * 该属性来源于外层 ResourceWallViewportToolbar 浅/深切换按钮。
+     */
+    [data-appearance-mode='dark'] & {
+      border-color: rgba(255, 255, 255, 0.32);
+    }
+  }
+
+  /**
+   * 区域标题：左上角 chip，半透明白底 + 模糊；不占独立行高。
+   * pointer-events: none 让标题不拦截图元交互（点击/拖拽）。
+   */
+  &-area-title {
+    position: absolute;
+    top: 8px;
+    left: 8px;
+    z-index: 2;
+    display: inline-block;
+    max-width: calc(100% - 16px);
+    padding: 2px 10px;
+    font-size: 12px;
+    line-height: 1.5;
+    color: rgba(0, 0, 0, 0.65);
+    background: rgba(255, 255, 255, 0.85);
+    backdrop-filter: blur(8px);
+    border-radius: 999px;
+    pointer-events: none;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    font-weight: 500;
+  }
+}

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

@@ -1,13 +1,16 @@
 const require_runtime = require("../../../_virtual/_rolldown/runtime.js");
 const require_objectSpread2 = require("../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js");
 const require_types = require("../types.js");
+const require_floorMapBuiltinShapes = require("../utils/floorMapBuiltinShapes.js");
 const require_floorMapElementKindUtils = require("../utils/floorMapElementKindUtils.js");
 const require_floorMapDropUtils = require("../utils/floorMapDropUtils.js");
 const require_floorMapDataRecordLabel = require("../utils/floorMapDataRecordLabel.js");
+const require_floorMapLayoutConstants = require("../floorMapLayoutConstants.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
 let _pisell_utils = require("@pisell/utils");
 let antd = require("antd");
+let _ant_design_icons = require("@ant-design/icons");
 let classnames = require("classnames");
 classnames = require_runtime.__toESM(classnames);
 require("./FloorMapToolbar.less");
@@ -15,7 +18,6 @@ require("./FloorMapToolbar.less");
 /**
 * FloorMapToolbar - 编辑态左侧侧边栏：按分类添加图元、绑定数据源与行；保存可选（默认用顶栏）
 */
-const PREFIX = "pisell-floor-map-layout";
 const I18N_TB = "pisell-floor-map-layout.toolbar";
 const I18N_EP_DS = "pisell-floor-map-layout.edit-panel.ph-data-source";
 const DEFAULT_PLACEMENT_SIZE = {
@@ -31,8 +33,9 @@ function getUnplacedRecordsForKey(dataSourceKey, dataSources, elements) {
 	}).map((e) => e.dataBinding.recordId));
 	return ((_dataSources$dataSour = dataSources[dataSourceKey]) !== null && _dataSources$dataSour !== void 0 ? _dataSources$dataSour : []).filter((r) => r && typeof r.id === "string" && !used.has(r.id));
 }
-function buildScenePreviewMergedItem(kind, dataSourceKey, size) {
-	const el = require_objectSpread2._objectSpread2({
+function buildScenePreviewMergedItem(kind, dataSourceKey, size, builtinShapeKey) {
+	var _FLOOR_MAP_BUILTIN_SH;
+	const el = require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({
 		instanceId: `preview_${kind.value}`,
 		canvasId: "",
 		x: 0,
@@ -45,7 +48,7 @@ function buildScenePreviewMergedItem(kind, dataSourceKey, size) {
 			dataSourceKey,
 			recordId: ""
 		} : void 0
-	}, kind.value === "floorMapImage" ? { imageUrl: "" } : {});
+	}, kind.value === "floorMapImage" ? { imageUrl: "" } : {}), kind.value === "floorMapBuiltinShape" ? { builtinShapeKey: builtinShapeKey !== null && builtinShapeKey !== void 0 ? builtinShapeKey : (_FLOOR_MAP_BUILTIN_SH = require_floorMapBuiltinShapes.FLOOR_MAP_BUILTIN_SHAPES[0]) === null || _FLOOR_MAP_BUILTIN_SH === void 0 ? void 0 : _FLOOR_MAP_BUILTIN_SH.key } : {});
 	return {
 		id: el.instanceId,
 		instanceId: el.instanceId,
@@ -66,8 +69,21 @@ const IMAGE_PREVIEW_SIZE = {
 	width: 140,
 	height: 80
 };
+/** 内置图形预览：略小于图片，正方形便于 5 种图形（厕所/柱子/沙发/大门/分隔）通用展示 */
+const BUILTIN_SHAPE_PREVIEW_SIZE = {
+	width: 96,
+	height: 96
+};
 function FloorMapToolbar(props) {
-	const { config, dataSources, dataSourceLabels = {}, canCreate, placeMode, onPlaceModeChange, renderPreviewItem, placementPreviewSize = DEFAULT_PLACEMENT_SIZE, decorationPreviewSize = DEFAULT_DECORATION_SIZE, sceneElements = [], onSave, saving, saveError, layoutDirty, className, onPaletteCardPointerDown, consumeToolbarClickIfTouchDrag } = props;
+	const { config, dataSources, dataSourceLabels = {}, canCreate, placeMode, onPlaceModeChange, renderPreviewItem, placementPreviewSize = DEFAULT_PLACEMENT_SIZE, decorationPreviewSize = DEFAULT_DECORATION_SIZE, sceneElements = [], onSave, saving, saveError, layoutDirty, className, onPaletteCardPointerDown, consumeToolbarClickIfTouchDrag, phoneLayout = false, defaultCollapsed = false, onRequestPlaceAtCanvasCenter } = props;
+	/**
+	* 侧栏收起 / 展开：仅会话内状态，**不写入 localStorage**。
+	* 桌面默认展开；手机编辑态可由 `defaultCollapsed` 默认收起。
+	*/
+	const [collapsed, setCollapsed] = (0, react.useState)(() => defaultCollapsed === true);
+	const handleToggleCollapsed = (0, react.useCallback)(() => {
+		setCollapsed((prev) => !prev);
+	}, []);
 	const paletteKinds = (0, react.useMemo)(() => {
 		var _config$elementKinds;
 		return ((_config$elementKinds = config.elementKinds) !== null && _config$elementKinds !== void 0 ? _config$elementKinds : []).filter((k) => k.showInPalette !== false);
@@ -98,7 +114,6 @@ function FloorMapToolbar(props) {
 		return map;
 	}, [categories, paletteKinds]);
 	const handleSelectKind = (kind) => {
-		require_floorMapElementKindUtils.resolveDataBindingPolicy(kind);
 		const next = {
 			type: "scene",
 			elementKind: kind.value,
@@ -122,35 +137,55 @@ function FloorMapToolbar(props) {
 			recordId: void 0
 		}));
 	};
+	/**
+	* 内置图形 kind：用户在侧栏 Select 切换形状（与资源类切换 dataSource 同款 UX）。
+	* 不清掉 placeMode 本身，仅替换 `builtinShapeKey`；落点 / 拖拽时透传。
+	*/
+	const handleBuiltinShapeKeyChange = (mode, key) => {
+		onPlaceModeChange(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, mode), {}, { builtinShapeKey: key }));
+	};
 	const cancelPlaceMode = () => onPlaceModeChange(null);
 	const renderKindCard = (k) => {
-		var _k$allowedDataSourceK;
+		var _placeMode$builtinSha, _FLOOR_MAP_BUILTIN_SH2, _FLOOR_MAP_BUILTIN_SH3, _k$allowedDataSourceK, _FLOOR_MAP_BUILTIN_SH4, _placeMode$builtinSha2, _FLOOR_MAP_BUILTIN_SH5;
 		const policy = require_floorMapElementKindUtils.resolveDataBindingPolicy(k);
 		const isStage = k.value === require_types.FLOOR_MAP_STAGE_ELEMENT_KIND;
 		const isImageKind = k.value === require_types.FLOOR_MAP_IMAGE_ELEMENT_KIND;
-		const placementLike = policy !== "none" && !isStage || isImageKind;
-		const size = isStage ? STAGE_PREVIEW_SIZE : placementLike ? isImageKind ? IMAGE_PREVIEW_SIZE : placementPreviewSize : {
+		const isBuiltinShapeKind = k.value === require_types.FLOOR_MAP_BUILTIN_SHAPE_ELEMENT_KIND;
+		/** 与图片图元同档：无数据绑定但展示一个完整视觉单体，按 placement 大卡片预览 */
+		const placementLike = policy !== "none" && !isStage || isImageKind || isBuiltinShapeKind;
+		const size = isStage ? STAGE_PREVIEW_SIZE : placementLike ? isImageKind ? IMAGE_PREVIEW_SIZE : isBuiltinShapeKind ? BUILTIN_SHAPE_PREVIEW_SIZE : placementPreviewSize : {
 			width: decorationPreviewSize,
 			height: decorationPreviewSize
 		};
-		const item = buildScenePreviewMergedItem(k, (placeMode === null || placeMode === void 0 ? void 0 : placeMode.type) === "scene" && placeMode.elementKind === k.value ? placeMode.dataSourceKey : void 0, size);
+		const activeDs = (placeMode === null || placeMode === void 0 ? void 0 : placeMode.type) === "scene" && placeMode.elementKind === k.value ? placeMode.dataSourceKey : void 0;
+		/**
+		* 内置图形 kind：侧栏 Select 当前选中的图形 key。读 `placeMode.builtinShapeKey`，
+		* 未选时回退枚举首项，让 palette 预览缩略图与 Select 默认值始终一致。
+		*/
+		const activeBuiltinShapeKey = isBuiltinShapeKind ? (placeMode === null || placeMode === void 0 ? void 0 : placeMode.type) === "scene" && placeMode.elementKind === k.value ? (_placeMode$builtinSha = placeMode.builtinShapeKey) !== null && _placeMode$builtinSha !== void 0 ? _placeMode$builtinSha : (_FLOOR_MAP_BUILTIN_SH2 = require_floorMapBuiltinShapes.FLOOR_MAP_BUILTIN_SHAPES[0]) === null || _FLOOR_MAP_BUILTIN_SH2 === void 0 ? void 0 : _FLOOR_MAP_BUILTIN_SH2.key : (_FLOOR_MAP_BUILTIN_SH3 = require_floorMapBuiltinShapes.FLOOR_MAP_BUILTIN_SHAPES[0]) === null || _FLOOR_MAP_BUILTIN_SH3 === void 0 ? void 0 : _FLOOR_MAP_BUILTIN_SH3.key : void 0;
+		const item = buildScenePreviewMergedItem(k, activeDs, size, activeBuiltinShapeKey);
 		const isActive = (placeMode === null || placeMode === void 0 ? void 0 : placeMode.type) === "scene" && placeMode.elementKind === k.value;
+		/**
+		* 预览缩略图尺寸：配合 sidebar 124px 抽屉宽度。
+		* stage 92×40、placement-like 80×54、装饰类按 props.decorationPreviewSize（默认 48）。
+		* placeScale / stageScale 都基于 cellW/cellH 推导，改尺寸时缩放因子自动适配。
+		*/
 		const cellW = isStage ? 92 : placementLike ? 80 : decorationPreviewSize;
 		const cellH = isStage ? 40 : placementLike ? 54 : decorationPreviewSize;
-		const previewW = isImageKind ? IMAGE_PREVIEW_SIZE.width : placementPreviewSize.width;
-		const previewH = isImageKind ? IMAGE_PREVIEW_SIZE.height : placementPreviewSize.height;
+		const previewW = isImageKind ? IMAGE_PREVIEW_SIZE.width : isBuiltinShapeKind ? BUILTIN_SHAPE_PREVIEW_SIZE.width : placementPreviewSize.width;
+		const previewH = isImageKind ? IMAGE_PREVIEW_SIZE.height : isBuiltinShapeKind ? BUILTIN_SHAPE_PREVIEW_SIZE.height : placementPreviewSize.height;
 		const placeScale = placementLike ? Math.min(cellW / previewW, cellH / previewH) : 1;
 		const stageScale = isStage ? Math.min(cellW / item.width, cellH / item.height, 1) : 1;
 		const allKeys = Object.keys(dataSources);
 		const allowedKeys = ((_k$allowedDataSourceK = k.allowedDataSourceKeys) === null || _k$allowedDataSourceK === void 0 ? void 0 : _k$allowedDataSourceK.length) ? k.allowedDataSourceKeys.filter((x) => allKeys.includes(x)) : allKeys;
-		const paletteDragPayload = require_objectSpread2._objectSpread2({ elementKind: k.value }, (placeMode === null || placeMode === void 0 ? void 0 : placeMode.type) === "scene" && placeMode.elementKind === k.value ? require_objectSpread2._objectSpread2({ dataSourceKey: placeMode.dataSourceKey }, placeMode.recordIds && placeMode.recordIds.length > 0 ? { recordIds: placeMode.recordIds } : placeMode.recordId ? { recordId: placeMode.recordId } : {}) : {});
+		const paletteDragPayload = require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({ elementKind: k.value }, (placeMode === null || placeMode === void 0 ? void 0 : placeMode.type) === "scene" && placeMode.elementKind === k.value ? require_objectSpread2._objectSpread2({ dataSourceKey: placeMode.dataSourceKey }, placeMode.recordIds && placeMode.recordIds.length > 0 ? { recordIds: placeMode.recordIds } : placeMode.recordId ? { recordId: placeMode.recordId } : {}) : {}), isBuiltinShapeKind ? { builtinShapeKey: activeBuiltinShapeKey !== null && activeBuiltinShapeKey !== void 0 ? activeBuiltinShapeKey : (_FLOOR_MAP_BUILTIN_SH4 = require_floorMapBuiltinShapes.FLOOR_MAP_BUILTIN_SHAPES[0]) === null || _FLOOR_MAP_BUILTIN_SH4 === void 0 ? void 0 : _FLOOR_MAP_BUILTIN_SH4.key } : {});
 		return /* @__PURE__ */ react.default.createElement("div", {
 			key: k.value,
-			className: `${PREFIX}-toolbar-preview-card-wrap`
+			className: `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-preview-card-wrap`
 		}, /* @__PURE__ */ react.default.createElement("button", {
 			type: "button",
 			draggable: true,
-			className: (0, classnames.default)(`${PREFIX}-toolbar-preview-card`, !placementLike ? `${PREFIX}-toolbar-preview-card-deco` : void 0, { [`${PREFIX}-toolbar-preview-card-active`]: isActive }),
+			className: (0, classnames.default)(`${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-preview-card`, !placementLike ? `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-preview-card-deco` : void 0, { [`${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-preview-card-active`]: isActive }),
 			onClick: () => {
 				if (consumeToolbarClickIfTouchDrag === null || consumeToolbarClickIfTouchDrag === void 0 ? void 0 : consumeToolbarClickIfTouchDrag()) return;
 				handleSelectKind(k);
@@ -162,13 +197,13 @@ function FloorMapToolbar(props) {
 			},
 			title: _pisell_utils.locales.getText(`${I18N_TB}.palette-card-title`).replace(/\{name\}/g, k.label)
 		}, /* @__PURE__ */ react.default.createElement("div", {
-			className: `${PREFIX}-toolbar-preview-cell`,
+			className: `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-preview-cell`,
 			style: {
 				width: cellW,
 				height: cellH
 			}
 		}, renderPreviewItem ? /* @__PURE__ */ react.default.createElement("div", {
-			className: `${PREFIX}-toolbar-preview-content`,
+			className: `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-preview-content`,
 			style: placementLike ? {
 				width: previewW,
 				height: previewH,
@@ -180,7 +215,7 @@ function FloorMapToolbar(props) {
 				transform: `scale(${stageScale})`,
 				transformOrigin: "top left"
 			} : void 0
-		}, renderPreviewItem(item)) : /* @__PURE__ */ react.default.createElement("span", { className: `${PREFIX}-toolbar-preview-fallback` }, k.label)), /* @__PURE__ */ react.default.createElement("span", { className: `${PREFIX}-toolbar-preview-card-label` }, k.label)), isActive && policy !== "none" && /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, allowedKeys.length >= 1 && /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-toolbar-record-pick` }, /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-toolbar-record-pick-label` }, _pisell_utils.locales.getText(`${I18N_TB}.data-binding-optional`)), /* @__PURE__ */ react.default.createElement(antd.Select, {
+		}, renderPreviewItem(item)) : /* @__PURE__ */ react.default.createElement("span", { className: `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-preview-fallback` }, k.label)), /* @__PURE__ */ react.default.createElement("span", { className: `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-preview-card-label` }, k.label)), isActive && policy !== "none" && /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, allowedKeys.length >= 1 && /* @__PURE__ */ react.default.createElement("div", { className: `pisell-floor-map-layout-toolbar-record-pick` }, /* @__PURE__ */ react.default.createElement("div", { className: `pisell-floor-map-layout-toolbar-record-pick-label` }, _pisell_utils.locales.getText(`${I18N_TB}.data-binding-optional`)), /* @__PURE__ */ react.default.createElement(antd.Select, {
 			placeholder: _pisell_utils.locales.getText(I18N_EP_DS),
 			allowClear: true,
 			value: placeMode.type === "scene" ? placeMode.dataSourceKey : void 0,
@@ -195,13 +230,14 @@ function FloorMapToolbar(props) {
 				if ((placeMode === null || placeMode === void 0 ? void 0 : placeMode.type) === "scene") handleDsChange(placeMode, v);
 			},
 			size: "large",
-			style: { width: "100%" }
+			style: { width: "100%" },
+			popupMatchSelectWidth: false
 		}), (() => {
 			const mode = (placeMode === null || placeMode === void 0 ? void 0 : placeMode.type) === "scene" ? placeMode : null;
 			const key = mode === null || mode === void 0 ? void 0 : mode.dataSourceKey;
-			if (!key) return /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-toolbar-record-pick-hint` }, _pisell_utils.locales.getText(`${I18N_TB}.hint-after-select-ds`));
+			if (!key) return /* @__PURE__ */ react.default.createElement("div", { className: `pisell-floor-map-layout-toolbar-record-pick-hint` }, _pisell_utils.locales.getText(`${I18N_TB}.hint-after-select-ds`));
 			const unplaced = getUnplacedRecordsForKey(key, dataSources, sceneElements);
-			if (unplaced.length === 0) return /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-toolbar-record-pick-hint` }, _pisell_utils.locales.getText(`${I18N_TB}.hint-no-unplaced-rows`));
+			if (unplaced.length === 0) return /* @__PURE__ */ react.default.createElement("div", { className: `pisell-floor-map-layout-toolbar-record-pick-hint` }, _pisell_utils.locales.getText(`${I18N_TB}.hint-no-unplaced-rows`));
 			const recordValue = (mode === null || mode === void 0 ? void 0 : mode.recordIds) && mode.recordIds.length > 0 ? mode.recordIds : (mode === null || mode === void 0 ? void 0 : mode.recordId) ? [mode.recordId] : void 0;
 			return /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, /* @__PURE__ */ react.default.createElement(antd.Select, {
 				mode: "multiple",
@@ -220,35 +256,114 @@ function FloorMapToolbar(props) {
 				style: {
 					width: "100%",
 					marginTop: 4
-				}
-			}), /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-toolbar-record-pick-hint` }, _pisell_utils.locales.getText(`${I18N_TB}.hint-multi-drop`)));
-		})()), allowedKeys.length === 0 && /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-toolbar-record-hint` }, _pisell_utils.locales.getText(`${I18N_TB}.no-data-sources`)), /* @__PURE__ */ react.default.createElement("button", {
+				},
+				popupMatchSelectWidth: false
+			}), /* @__PURE__ */ react.default.createElement("div", { className: `pisell-floor-map-layout-toolbar-record-pick-hint` }, _pisell_utils.locales.getText(`${I18N_TB}.hint-multi-drop`)));
+		})()), allowedKeys.length === 0 && /* @__PURE__ */ react.default.createElement("div", { className: `pisell-floor-map-layout-toolbar-record-hint` }, _pisell_utils.locales.getText(`${I18N_TB}.no-data-sources`)), phoneLayout && onRequestPlaceAtCanvasCenter ? /* @__PURE__ */ react.default.createElement("button", {
 			type: "button",
-			className: `${PREFIX}-toolbar-btn cancel-inline`,
+			className: (0, classnames.default)(`pisell-floor-map-layout-toolbar-btn`, "primary"),
+			onClick: onRequestPlaceAtCanvasCenter
+		}, _pisell_utils.locales.getText(`${I18N_TB}.add-to-canvas`)) : null, /* @__PURE__ */ react.default.createElement("button", {
+			type: "button",
+			className: `pisell-floor-map-layout-toolbar-btn cancel-inline`,
 			onClick: cancelPlaceMode
-		}, _pisell_utils.locales.getText(`${I18N_TB}.cancel-place`))), isActive && policy === "none" && /* @__PURE__ */ react.default.createElement("button", {
+		}, _pisell_utils.locales.getText(`${I18N_TB}.cancel-place`))), isActive && policy === "none" && /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, isBuiltinShapeKind && /* @__PURE__ */ react.default.createElement(
+			"div",
+			/**
+			* 内置图形 kind：在「点击 / 拖拽落点」之前，先在这里选好要落的图形
+			* （厕所 / 分隔 / 柱子 / 沙发 / 大门 等）。落点的初始 builtinShapeKey
+			* 即取自当前 Select 值；落点后仍可在右侧编辑面板再切换。
+			*
+			* 与资源类 kind 的「dataSource + records」预选 UX 同款，避免必须先落
+			* 一个默认图形再到编辑面板里改。
+			*/
+			{ className: `pisell-floor-map-layout-toolbar-record-pick` },
+			/* @__PURE__ */ react.default.createElement("div", { className: `pisell-floor-map-layout-toolbar-record-pick-label` }, _pisell_utils.locales.getText("pisell-floor-map-layout.builtin-shape.palette-pick-label")),
+			/* @__PURE__ */ react.default.createElement(antd.Select, {
+				placeholder: _pisell_utils.locales.getText("pisell-floor-map-layout.edit-panel.ph-builtin-shape"),
+				value: (placeMode === null || placeMode === void 0 ? void 0 : placeMode.type) === "scene" ? (_placeMode$builtinSha2 = placeMode.builtinShapeKey) !== null && _placeMode$builtinSha2 !== void 0 ? _placeMode$builtinSha2 : (_FLOOR_MAP_BUILTIN_SH5 = require_floorMapBuiltinShapes.FLOOR_MAP_BUILTIN_SHAPES[0]) === null || _FLOOR_MAP_BUILTIN_SH5 === void 0 ? void 0 : _FLOOR_MAP_BUILTIN_SH5.key : void 0,
+				options: require_floorMapBuiltinShapes.FLOOR_MAP_BUILTIN_SHAPES.map((s) => ({
+					value: s.key,
+					label: _pisell_utils.locales.getText(s.labelKey)
+				})),
+				onChange: (v) => {
+					if ((placeMode === null || placeMode === void 0 ? void 0 : placeMode.type) === "scene") handleBuiltinShapeKeyChange(placeMode, v);
+				},
+				size: "large",
+				style: { width: "100%" },
+				popupMatchSelectWidth: false
+			})
+		), phoneLayout && onRequestPlaceAtCanvasCenter ? /* @__PURE__ */ react.default.createElement("button", {
+			type: "button",
+			className: (0, classnames.default)(`pisell-floor-map-layout-toolbar-btn`, "primary"),
+			onClick: onRequestPlaceAtCanvasCenter
+		}, _pisell_utils.locales.getText(`${I18N_TB}.add-to-canvas`)) : null, /* @__PURE__ */ react.default.createElement("button", {
 			type: "button",
-			className: `${PREFIX}-toolbar-btn cancel-inline`,
+			className: `pisell-floor-map-layout-toolbar-btn cancel-inline`,
 			onClick: cancelPlaceMode
-		}, _pisell_utils.locales.getText(`${I18N_TB}.cancel-place`)));
+		}, _pisell_utils.locales.getText(`${I18N_TB}.cancel-place`))));
 	};
-	return /* @__PURE__ */ react.default.createElement("div", { className: (0, classnames.default)(`${PREFIX}-toolbar`, `${PREFIX}-toolbar-sidebar`, className) }, /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-toolbar-body` }, canCreate && /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, categories.map((cat) => {
+	const collapseBtn = /* @__PURE__ */ react.default.createElement("button", {
+		type: "button",
+		className: (0, classnames.default)(`${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-collapse-handle`, phoneLayout && `pisell-floor-map-layout-toolbar-collapse-handle--in-drawer`),
+		onClick: handleToggleCollapsed,
+		"aria-label": collapsed ? _pisell_utils.locales.getText(`${I18N_TB}.expand`) : _pisell_utils.locales.getText(`${I18N_TB}.collapse`),
+		title: collapsed ? _pisell_utils.locales.getText(`${I18N_TB}.expand`) : _pisell_utils.locales.getText(`${I18N_TB}.collapse`)
+	}, collapsed ? /* @__PURE__ */ react.default.createElement(_ant_design_icons.RightOutlined, null) : /* @__PURE__ */ react.default.createElement(_ant_design_icons.LeftOutlined, null));
+	/**
+	* 内层容器：实际承载 body / footer，并在动画过程中负责水平裁剪。
+	* 桌面：宽度跟随 sidebar（100%）伸缩；手机：antd Drawer 承载内容 + 边缘折叠柄。
+	*/
+	const toolbarInner = /* @__PURE__ */ react.default.createElement("div", { className: `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-inner` }, /* @__PURE__ */ react.default.createElement("div", { className: `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-body` }, canCreate && /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, categories.map((cat) => {
 		var _kindsByCategory$get;
 		const kinds = (_kindsByCategory$get = kindsByCategory.get(cat.id)) !== null && _kindsByCategory$get !== void 0 ? _kindsByCategory$get : [];
 		if (!kinds.length) return null;
 		return /* @__PURE__ */ react.default.createElement("section", {
 			key: cat.id,
-			className: `${PREFIX}-toolbar-section`
-		}, /* @__PURE__ */ react.default.createElement("h3", { className: `${PREFIX}-toolbar-section-title` }, cat.label), /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-toolbar-preview-list` }, /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-toolbar-preview-group` }, kinds.map((k) => renderKindCard(k)))));
-	}))), onSave && config.canvasUi.canEdit && /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-toolbar-footer` }, layoutDirty ? /* @__PURE__ */ react.default.createElement("span", {
-		className: `${PREFIX}-toolbar-dirty-hint`,
+			className: `pisell-floor-map-layout-toolbar-section`
+		}, /* @__PURE__ */ react.default.createElement("h3", { className: `pisell-floor-map-layout-toolbar-section-title` }, cat.label), /* @__PURE__ */ react.default.createElement("div", { className: `pisell-floor-map-layout-toolbar-preview-list` }, /* @__PURE__ */ react.default.createElement("div", { className: `pisell-floor-map-layout-toolbar-preview-group` }, kinds.map((k) => renderKindCard(k)))));
+	}))), onSave && config.canvasUi.canEdit && /* @__PURE__ */ react.default.createElement("div", { className: `pisell-floor-map-layout-toolbar-footer` }, layoutDirty ? /* @__PURE__ */ react.default.createElement("span", {
+		className: `pisell-floor-map-layout-toolbar-dirty-hint`,
 		role: "status"
-	}, _pisell_utils.locales.getText(`${I18N_TB}.layout-dirty-hint`)) : null, saveError && /* @__PURE__ */ react.default.createElement("span", { className: `${PREFIX}-toolbar-error` }, typeof saveError === "string" ? saveError : saveError === null || saveError === void 0 ? void 0 : saveError.message), /* @__PURE__ */ react.default.createElement("button", {
+	}, _pisell_utils.locales.getText(`${I18N_TB}.layout-dirty-hint`)) : null, saveError && /* @__PURE__ */ react.default.createElement("span", { className: `pisell-floor-map-layout-toolbar-error` }, typeof saveError === "string" ? saveError : saveError === null || saveError === void 0 ? void 0 : saveError.message), /* @__PURE__ */ react.default.createElement("button", {
 		type: "button",
-		className: (0, classnames.default)(`${PREFIX}-toolbar-btn`, "primary", { [`${PREFIX}-toolbar-save-dirty`]: layoutDirty }),
+		className: (0, classnames.default)(`pisell-floor-map-layout-toolbar-btn`, "primary", { [`pisell-floor-map-layout-toolbar-save-dirty`]: layoutDirty }),
 		disabled: saving,
 		onClick: onSave
 	}, saving ? _pisell_utils.locales.getText(`${I18N_TB}.saving`) : _pisell_utils.locales.getText(`${I18N_TB}.save`))));
+	if (phoneLayout)
+ /**
+	* 必须包在 `${PREFIX}-toolbar` 根下，否则 Less 里 `.pisell-floor-map-layout-toolbar &-collapse-handle`
+	* 等选择器无法命中，展开态右侧折叠柄会失去定位与样式。
+	*/
+	return /* @__PURE__ */ react.default.createElement("div", { className: (0, classnames.default)(`${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar`, className) }, /* @__PURE__ */ react.default.createElement(antd.Drawer, {
+		placement: "left",
+		open: !collapsed,
+		onClose: () => setCollapsed(true),
+		width: "min(320px, 88vw)",
+		zIndex: require_floorMapLayoutConstants.FLOOR_MAP_PHONE_TOOLBAR_DRAWER_Z_INDEX,
+		maskClosable: true,
+		destroyOnClose: false,
+		closable: false,
+		forceRender: false,
+		rootClassName: `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-phone-drawer-root`,
+		classNames: { body: `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-phone-drawer-body` },
+		styles: { body: {
+			padding: 0,
+			overflow: "visible",
+			display: "flex",
+			flexDirection: "column",
+			height: "100%"
+		} },
+		getContainer: typeof document !== "undefined" ? () => document.body : void 0
+	}, /* @__PURE__ */ react.default.createElement("div", { className: `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-phone-drawer-inner` }, toolbarInner, collapseBtn)), collapsed ? /* @__PURE__ */ react.default.createElement("button", {
+		type: "button",
+		className: `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-phone-peek-trigger`,
+		onClick: () => setCollapsed(false),
+		"aria-label": _pisell_utils.locales.getText(`${I18N_TB}.expand`),
+		title: _pisell_utils.locales.getText(`${I18N_TB}.expand`)
+	}, /* @__PURE__ */ react.default.createElement(_ant_design_icons.RightOutlined, null)) : null);
+	return /* @__PURE__ */ react.default.createElement("div", { className: (0, classnames.default)(`${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar`, `${require_floorMapLayoutConstants.FLOOR_MAP_LAYOUT_CLASS_PREFIX}-toolbar-sidebar`, collapsed && `pisell-floor-map-layout-toolbar-sidebar--collapsed`, className) }, collapseBtn, toolbarInner);
 }
 //#endregion
 exports.default = FloorMapToolbar;