@pisell/materials 1.8.41 → 1.8.43

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

@@ -0,0 +1,139 @@
+import { getContentSize, getPixelBoundingBox } from "./layoutMeasurements.js";
+//#region src/components/pisellFloorMapLayout/utils/floorMapCanvasStage.ts
+/**
+* 根据 items 计算内容区尺寸与偏移。
+* 算法与 {@link useFloorMapTransformMetrics} 内原 useMemo 一致（不含「撑满视口」扩展）。
+*/
+function computeFloorMapContentStage(params) {
+	const { items, cellSize, itemGap, itemUnit, boundingPadding, preferPixelBoundingBox = true } = params;
+	const padSingle = boundingPadding;
+	const pad = padSingle * 2;
+	const box = preferPixelBoundingBox && itemUnit === "pixel" && items.length > 0 ? getPixelBoundingBox(items, cellSize) : null;
+	if (box) return {
+		contentWidth: box.maxRight - box.minLeft + pad,
+		contentHeight: box.maxBottom - box.minTop + pad,
+		contentOffsetX: padSingle - box.minLeft,
+		contentOffsetY: padSingle - box.minTop,
+		alignPadSingle: padSingle
+	};
+	const fromItems = getContentSize(items, cellSize, itemGap, itemUnit);
+	return {
+		contentWidth: fromItems.contentWidth + pad,
+		contentHeight: fromItems.contentHeight + pad,
+		contentOffsetX: 0,
+		contentOffsetY: 0,
+		alignPadSingle: null
+	};
+}
+/**
+* 多画布 All 视图的紧凑装箱（Bottom-Left Fill, BLF）：
+*
+* - 保留输入顺序（与 Tab 顺序一致），不旋转、不缩放，原始尺寸即渲染尺寸；
+* - 对每张画布枚举候选落点 = `{(0,0)} ∪ 已放画布的{右侧, 下方}角`；过滤掉与已放冲突
+*   的位置，再挑 **y 最小、再 x 最小** 的位置落下——优先填低洼，自然会把矮 / 窄画布
+*   塞进高画布旁的空白；不会出现「等最高画布把整行撑满才换行」导致的大量空白；
+* - 目标外框宽度 `targetWidth = max(最宽画布, √(总面积 × {@link aspectBias}))`，
+*   令整体形状趋于 `aspectBias:1`（默认 2.5 → 宽:高 ≈ 2.5:1，轻微偏横）；
+*   单张画布若本身比 targetWidth 还宽，仍允许独自首行铺开，避免被截。
+*
+* 复杂度 O(n²)（每个画布对所有已放做候选 + 冲突校验），n 通常 < 20，性能足够。
+* 比旧的行装填（shelf packing）能显著减少长高画布旁的留白。
+*
+* @param boxes - 待装箱画布尺寸（保持顺序）
+* @param gap - 画布之间的像素间距（同时作为冲突检测的最小净距）
+* @param aspectBias - 目标宽高比偏置（width:height）；越大越横向，默认 2.5
+*   - `1.5` ~ `2`：接近正方形，仅略偏横
+*   - `2.5` ~ `3`：明显但温和的横向布局（推荐）
+*   - `>= 4`：强横向，画布数较多时易接近单行
+*/
+function packCanvasesIntoShelves(boxes, gap, aspectBias = 2.5) {
+	if (boxes.length === 0) return {
+		positions: [],
+		totalWidth: 0,
+		totalHeight: 0
+	};
+	const safeGap = Math.max(0, gap);
+	const safeBias = Number.isFinite(aspectBias) && aspectBias > 0 ? aspectBias : 1;
+	const totalArea = boxes.reduce((acc, b) => acc + Math.max(0, b.width) * Math.max(0, b.height), 0);
+	const widestBox = boxes.reduce((max, b) => Math.max(max, b.width), 0);
+	const targetWidth = Math.max(widestBox, Math.sqrt(totalArea * safeBias));
+	const placed = [];
+	const positions = new Array(boxes.length);
+	let totalWidth = 0;
+	let totalHeight = 0;
+	/**
+	* 两矩形（带 safeGap 净距）是否冲突。
+	* 不冲突条件：A 在 B 右侧 / 左侧 / 下方 / 上方 至少留 safeGap。
+	* 取反即为冲突条件（x 与 y 方向都「靠得太近」）。
+	*/
+	const conflicts = (x, y, w, h, p) => {
+		const xClash = x + w + safeGap > p.x && p.x + p.w + safeGap > x;
+		const yClash = y + h + safeGap > p.y && p.y + p.h + safeGap > y;
+		return xClash && yClash;
+	};
+	boxes.forEach((box, i) => {
+		/**
+		* 候选位置：原点 + 每张已放画布的「右侧角、下方角」。
+		* 简单角点集对 n<20 的常见场景已能贴合 MaxRects 的视觉效果。
+		*/
+		const candidates = [{
+			x: 0,
+			y: 0
+		}];
+		for (const p of placed) {
+			candidates.push({
+				x: p.x + p.w + safeGap,
+				y: p.y
+			});
+			candidates.push({
+				x: p.x,
+				y: p.y + p.h + safeGap
+			});
+		}
+		let bestX = Number.POSITIVE_INFINITY;
+		let bestY = Number.POSITIVE_INFINITY;
+		for (const cand of candidates) {
+			const { x, y } = cand;
+			/**
+			* 超出目标宽度的候选直接淘汰；除非：
+			* - 这是第一张画布（placed 为空），或
+			* - 这张画布本身就比 targetWidth 还宽（允许独占首行）。
+			*/
+			if (x + box.width > targetWidth && placed.length > 0 && box.width <= targetWidth) continue;
+			let clash = false;
+			for (const p of placed) if (conflicts(x, y, box.width, box.height, p)) {
+				clash = true;
+				break;
+			}
+			if (clash) continue;
+			if (y < bestY || y === bestY && x < bestX) {
+				bestX = x;
+				bestY = y;
+			}
+		}
+		if (!Number.isFinite(bestX)) {
+			/** 兜底：实在挤不下就堆到所有已放画布的最下方（极端宽画布场景） */
+			bestX = 0;
+			bestY = placed.reduce((m, p) => Math.max(m, p.y + p.h + safeGap), 0);
+		}
+		placed.push({
+			x: bestX,
+			y: bestY,
+			w: box.width,
+			h: box.height
+		});
+		positions[i] = {
+			x: bestX,
+			y: bestY
+		};
+		if (bestX + box.width > totalWidth) totalWidth = bestX + box.width;
+		if (bestY + box.height > totalHeight) totalHeight = bestY + box.height;
+	});
+	return {
+		positions,
+		totalWidth,
+		totalHeight
+	};
+}
+//#endregion
+export { computeFloorMapContentStage, packCanvasesIntoShelves };

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

@@ -1,5 +1,6 @@
 import { _objectSpread2 } from "../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import "../types.js";
+import { getFloorMapBuiltinShapeDef } from "./floorMapBuiltinShapes.js";
 import { getElementKindConfig } from "./floorMapElementKindUtils.js";
 //#region src/components/pisellFloorMapLayout/utils/floorMapConfigMerge.ts
 const DEFAULT_SIZE = 48;
@@ -7,12 +8,20 @@ const IMAGE_KIND_DEFAULT_SIZE = {
 	width: 400,
 	height: 240
 };
-function getDefaultSize(elementKind, elementKinds) {
+const BUILTIN_SHAPE_FALLBACK_SIZE = {
+	width: 96,
+	height: 96
+};
+function getDefaultSize(elementKind, elementKinds, element) {
 	if (!elementKind) return {
 		width: DEFAULT_SIZE,
 		height: DEFAULT_SIZE
 	};
 	if (elementKind === "floorMapImage") return _objectSpread2({}, IMAGE_KIND_DEFAULT_SIZE);
+	if (elementKind === "floorMapBuiltinShape") {
+		const def = getFloorMapBuiltinShapeDef(element === null || element === void 0 ? void 0 : element.builtinShapeKey);
+		return def ? _objectSpread2({}, def.defaultSize) : _objectSpread2({}, BUILTIN_SHAPE_FALLBACK_SIZE);
+	}
 	if (!elementKinds.find((k) => k.value === elementKind)) return {
 		width: DEFAULT_SIZE,
 		height: DEFAULT_SIZE
@@ -31,7 +40,7 @@ function mergeCanvasItems(canvasId, config, defaultCellSize = DEFAULT_SIZE) {
 	const onCanvas = sceneElements.filter((el) => el.canvasId === canvasId);
 	for (const el of onCanvas) {
 		var _ref, _el$width, _ref2, _el$height, _el$shape;
-		const size = getDefaultSize(el.elementKind, elementKinds);
+		const size = getDefaultSize(el.elementKind, elementKinds, el);
 		const w = (_ref = (_el$width = el.width) !== null && _el$width !== void 0 ? _el$width : size.width) !== null && _ref !== void 0 ? _ref : defaultCellSize;
 		const h = (_ref2 = (_el$height = el.height) !== null && _el$height !== void 0 ? _el$height : size.height) !== null && _ref2 !== void 0 ? _ref2 : defaultCellSize;
 		const kindConfig = getElementKindConfig({ elementKinds }, el.elementKind);

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

@@ -39,11 +39,13 @@ function parsePaletteDragPayload(dt) {
 			recordIds = rawIds.filter((x) => typeof x === "string" && x);
 			if (recordIds.length === 0) recordIds = void 0;
 		}
+		const builtinShapeKey = typeof rec.builtinShapeKey === "string" && rec.builtinShapeKey ? rec.builtinShapeKey : void 0;
 		return {
 			elementKind,
 			dataSourceKey,
 			recordId,
-			recordIds
+			recordIds,
+			builtinShapeKey
 		};
 	} catch (_unused) {
 		return null;

package/es/components/pisellFloorMapLayout/utils/floorMapElementKindUtils.d.ts

@@ -1,5 +1,7 @@
 //#region src/components/pisellFloorMapLayout/utils/floorMapElementKindUtils.d.ts
 /** 与 RecordBoard Story 一致：`floorMapImage` */
 declare function isFloorMapImageElementKind(kind: string | undefined): boolean;
+/** 内置图形图元：与 image 类似的「无数据源 + 视觉填充」单体 kind */
+declare function isFloorMapBuiltinShapeElementKind(kind: string | undefined): boolean;
 //#endregion
-export { isFloorMapImageElementKind };
+export { isFloorMapBuiltinShapeElementKind, isFloorMapImageElementKind };

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

@@ -1,11 +1,16 @@
-import { FLOOR_MAP_IMAGE_ELEMENT_KIND, FLOOR_MAP_STAGE_ELEMENT_KIND } from "../types.js";
+import { FLOOR_MAP_BUILTIN_SHAPE_ELEMENT_KIND, FLOOR_MAP_IMAGE_ELEMENT_KIND, FLOOR_MAP_STAGE_ELEMENT_KIND } from "../types.js";
 import { STAGE_DECO_DEFAULT } from "./floorMapStageDefaults.js";
+import { FLOOR_MAP_BUILTIN_SHAPES, getFloorMapBuiltinShapeDef } from "./floorMapBuiltinShapes.js";
 import { locales } from "@pisell/utils";
 //#region src/components/pisellFloorMapLayout/utils/floorMapElementKindUtils.ts
 /** 与 RecordBoard Story 一致：`floorMapImage` */
 function isFloorMapImageElementKind(kind) {
 	return kind === FLOOR_MAP_IMAGE_ELEMENT_KIND;
 }
+/** 内置图形图元：与 image 类似的「无数据源 + 视觉填充」单体 kind */
+function isFloorMapBuiltinShapeElementKind(kind) {
+	return kind === FLOOR_MAP_BUILTIN_SHAPE_ELEMENT_KIND;
+}
 /** dataBindingPolicy 缺省视为 none */
 function resolveDataBindingPolicy(kind) {
 	var _kind$dataBindingPoli;
@@ -35,6 +40,8 @@ function getSwappableElementKindsInSameCategory(config, elementKind) {
 		if (k.showInPalette === false) return false;
 		if (k.value === "stage") return false;
 		if (k.value === "floorMapImage") return false;
+		/** 内置图形与图片图元同属「视觉单体」，不参与同分类的 kind 切换下拉 */
+		if (k.value === "floorMapBuiltinShape") return false;
 		return ((_k$categoryId = k.categoryId) !== null && _k$categoryId !== void 0 ? _k$categoryId : fallbackId) === cid;
 	});
 }
@@ -43,29 +50,37 @@ const DEFAULT_PLACE_H = 120;
 const IMAGE_PLACE_W = 400;
 const IMAGE_PLACE_H = 240;
 const DECO_SIZE = 48;
+/** 内置图形落点默认尺寸（未选 key 时用），具体 key 选定后会按 def.defaultSize 取代 */
+const BUILTIN_SHAPE_PLACE_W = 96;
+const BUILTIN_SHAPE_PLACE_H = 96;
 /**
 * 在右侧编辑面板将图元改为同分类下的另一种 kind 时的草稿 patch（绑定不兼容则清空）
 */
 function patchSceneElementForKindSwitch(config, element, nextKindValue) {
-	var _nextCfg$allowedDataS, _element$width, _element$width2, _element$height, _element$height2, _nextCfg$defaultPrese;
+	var _nextCfg$allowedDataS, _builtinDef$defaultSi, _builtinDef$defaultSi2, _element$width, _element$width2, _element$height, _element$height2, _nextCfg$defaultPrese;
 	const nextCfg = getElementKindConfig(config, nextKindValue);
 	const nextPol = resolveDataBindingPolicy(nextCfg);
 	const binding = element.dataBinding;
 	const isNextImage = isFloorMapImageElementKind(nextKindValue);
 	const isNextStage = nextKindValue === FLOOR_MAP_STAGE_ELEMENT_KIND;
+	const isNextBuiltinShape = isFloorMapBuiltinShapeElementKind(nextKindValue);
 	let clearBinding = false;
 	if (nextPol === "none") clearBinding = true;
 	else if (binding && (nextCfg === null || nextCfg === void 0 || (_nextCfg$allowedDataS = nextCfg.allowedDataSourceKeys) === null || _nextCfg$allowedDataS === void 0 ? void 0 : _nextCfg$allowedDataS.length)) {
 		if (!nextCfg.allowedDataSourceKeys.includes(binding.dataSourceKey)) clearBinding = true;
 	}
-	const nextW = isNextImage ? IMAGE_PLACE_W : isNextStage ? STAGE_DECO_DEFAULT.width : DEFAULT_PLACE_W;
-	const nextH = isNextImage ? IMAGE_PLACE_H : isNextStage ? STAGE_DECO_DEFAULT.height : DEFAULT_PLACE_H;
-	const useDecoSize = nextPol === "none" && nextKindValue !== "stage" && !isNextImage;
+	/** 切到内置图形：尺寸用「当前 key 的 defaultSize」，无 key 时给一个保底正方形 */
+	const builtinDef = isNextBuiltinShape ? getFloorMapBuiltinShapeDef(element.builtinShapeKey) : void 0;
+	const builtinW = (_builtinDef$defaultSi = builtinDef === null || builtinDef === void 0 ? void 0 : builtinDef.defaultSize.width) !== null && _builtinDef$defaultSi !== void 0 ? _builtinDef$defaultSi : BUILTIN_SHAPE_PLACE_W;
+	const builtinH = (_builtinDef$defaultSi2 = builtinDef === null || builtinDef === void 0 ? void 0 : builtinDef.defaultSize.height) !== null && _builtinDef$defaultSi2 !== void 0 ? _builtinDef$defaultSi2 : BUILTIN_SHAPE_PLACE_H;
+	const nextW = isNextImage ? IMAGE_PLACE_W : isNextStage ? STAGE_DECO_DEFAULT.width : isNextBuiltinShape ? builtinW : DEFAULT_PLACE_W;
+	const nextH = isNextImage ? IMAGE_PLACE_H : isNextStage ? STAGE_DECO_DEFAULT.height : isNextBuiltinShape ? builtinH : DEFAULT_PLACE_H;
+	const useDecoSize = nextPol === "none" && nextKindValue !== "stage" && !isNextImage && !isNextBuiltinShape;
 	const width = useDecoSize ? Math.max((_element$width = element.width) !== null && _element$width !== void 0 ? _element$width : DECO_SIZE, DECO_SIZE) : Math.max((_element$width2 = element.width) !== null && _element$width2 !== void 0 ? _element$width2 : nextW, nextW);
 	const height = useDecoSize ? Math.max((_element$height = element.height) !== null && _element$height !== void 0 ? _element$height : DECO_SIZE, DECO_SIZE) : Math.max((_element$height2 = element.height) !== null && _element$height2 !== void 0 ? _element$height2 : nextH, nextH);
 	const patch = {
 		elementKind: nextKindValue,
-		shape: isNextStage || isNextImage ? "rect" : nextCfg === null || nextCfg === void 0 ? void 0 : nextCfg.defaultShape,
+		shape: isNextStage || isNextImage || isNextBuiltinShape ? "rect" : nextCfg === null || nextCfg === void 0 ? void 0 : nextCfg.defaultShape,
 		width,
 		height,
 		name: (nextCfg === null || nextCfg === void 0 || (_nextCfg$defaultPrese = nextCfg.defaultPresentation) === null || _nextCfg$defaultPrese === void 0 ? void 0 : _nextCfg$defaultPrese.title) != null && String(nextCfg.defaultPresentation.title).trim() !== "" ? String(nextCfg.defaultPresentation.title) : element.name
@@ -75,6 +90,15 @@ function patchSceneElementForKindSwitch(config, element, nextKindValue) {
 		var _element$imageUrl;
 		patch.imageUrl = (_element$imageUrl = element.imageUrl) !== null && _element$imageUrl !== void 0 ? _element$imageUrl : "";
 	} else patch.imageUrl = void 0;
+	if (isNextBuiltinShape) {
+		var _ref, _keep$key, _FLOOR_MAP_BUILTIN_SH;
+		/**
+		* 切到内置图形：保留已有 key（若有效），否则用预设里的第一项作为缺省。
+		* 这样调色板拖入 / 同分类切换都能立刻看到图形，而不是占位文案。
+		*/
+		const keep = getFloorMapBuiltinShapeDef(element.builtinShapeKey);
+		patch.builtinShapeKey = (_ref = (_keep$key = keep === null || keep === void 0 ? void 0 : keep.key) !== null && _keep$key !== void 0 ? _keep$key : (_FLOOR_MAP_BUILTIN_SH = FLOOR_MAP_BUILTIN_SHAPES[0]) === null || _FLOOR_MAP_BUILTIN_SH === void 0 ? void 0 : _FLOOR_MAP_BUILTIN_SH.key) !== null && _ref !== void 0 ? _ref : void 0;
+	} else patch.builtinShapeKey = void 0;
 	return patch;
 }
 /**
@@ -103,4 +127,4 @@ function getSceneElementRenderIssue(element, kind, dataSources) {
 	return null;
 }
 //#endregion
-export { getElementKindConfig, getSceneElementRenderIssue, getSwappableElementKindsInSameCategory, isFloorMapImageElementKind, patchSceneElementForKindSwitch, resolveDataBindingPolicy };
+export { getElementKindConfig, getSceneElementRenderIssue, getSwappableElementKindsInSameCategory, isFloorMapBuiltinShapeElementKind, isFloorMapImageElementKind, patchSceneElementForKindSwitch, resolveDataBindingPolicy };

package/es/components/pisellFloorMapLayout/utils/floorMapElementNameAsTitle.d.ts

@@ -0,0 +1,52 @@
+//#region src/components/pisellFloorMapLayout/utils/floorMapElementNameAsTitle.d.ts
+/**
+ * 「将图元名作为资源标题」开关：通用读写 + 标题解析。
+ *
+ * - 持久化在 `sceneElement.extensions[NAME_AS_TITLE_EXT_KEY]`，避免污染顶层 schema、
+ *   不影响未启用该能力的旧 / 新 kind。
+ * - 是否在编辑面板「显示」该选项，由 `FloorMapElementKindConfig.nameAsTitleConfigurable`
+ *   控制；展示侧（业务卡片渲染）只读 extensions，不依赖 kindConfig，确保即便业务方
+ *   后续撤回 kindConfig 开关，已落库的偏好仍生效。
+ */
+/** 持久化字段名：固定字符串，跨包共用，勿改 */
+declare const NAME_AS_TITLE_EXT_KEY: "nameAsTitle";
+interface ElementWithExtensions {
+  name?: string;
+  extensions?: Record<string, unknown>;
+}
+/** 安全读取「图元名作为标题」开关 */
+declare function isElementNameAsTitleEnabled(el: ElementWithExtensions | null | undefined): boolean;
+/**
+ * 计算 `extensions` patch：返回值供调用方写入 `sceneElement.extensions`。
+ *
+ * - `enabled === true` 时写入 `true`；
+ * - `enabled === false` 时**移除**该 key（而非写 `false`），避免持久化里残留无意义字段；
+ * - 返回 `undefined` 表示「extensions 整体可清空」（仅当结果是空对象时）。
+ *
+ * @example
+ * const nextExt = buildNameAsTitleExtensionsPatch(el.extensions, true);
+ * onUpdate({ extensions: nextExt });
+ */
+declare function buildNameAsTitleExtensionsPatch(prev: Record<string, unknown> | undefined, enabled: boolean): Record<string, unknown> | undefined;
+/**
+ * 通用图元标题解析：业务展示层（卡片标题、占位标题等）统一调用本函数，
+ * 让「图元名作为资源标题」这一偏好对所有接入方一致生效。
+ *
+ * 优先级：
+ *   1. 启用了 nameAsTitle 且 `el.name` 非空 → `el.name`
+ *   2. `recordTitle`（业务侧按自己规则算出来的，如预约页 `row.main_field` / `row.code`）
+ *   3. `el.name`（业务字段缺失时的兜底，与历史行为一致）
+ *   4. `fallback`（如 kindLabel）
+ *   5. 空串
+ *
+ * 不更改 `displayRoomTitleFromRow` / `record.name` 等业务函数本身，
+ * 业务方只需把"按业务字段"算出来的结果以 `recordTitle` 传入即可，
+ * `bookingDetailModal` 等下游不会被联动改坏。
+ */
+declare function resolveSceneElementDisplayTitle(opts: {
+  sceneElement?: ElementWithExtensions | null;
+  recordTitle?: string;
+  fallback?: string;
+}): string;
+//#endregion
+export { NAME_AS_TITLE_EXT_KEY, buildNameAsTitleExtensionsPatch, isElementNameAsTitleEnabled, resolveSceneElementDisplayTitle };

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

@@ -0,0 +1,61 @@
+import { _objectSpread2 } from "../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
+//#region src/components/pisellFloorMapLayout/utils/floorMapElementNameAsTitle.ts
+/**
+* 「将图元名作为资源标题」开关：通用读写 + 标题解析。
+*
+* - 持久化在 `sceneElement.extensions[NAME_AS_TITLE_EXT_KEY]`，避免污染顶层 schema、
+*   不影响未启用该能力的旧 / 新 kind。
+* - 是否在编辑面板「显示」该选项，由 `FloorMapElementKindConfig.nameAsTitleConfigurable`
+*   控制；展示侧（业务卡片渲染）只读 extensions，不依赖 kindConfig，确保即便业务方
+*   后续撤回 kindConfig 开关，已落库的偏好仍生效。
+*/
+/** 持久化字段名：固定字符串，跨包共用，勿改 */
+const NAME_AS_TITLE_EXT_KEY = "nameAsTitle";
+/** 安全读取「图元名作为标题」开关 */
+function isElementNameAsTitleEnabled(el) {
+	var _el$extensions;
+	if (!el) return false;
+	return ((_el$extensions = el.extensions) === null || _el$extensions === void 0 ? void 0 : _el$extensions[NAME_AS_TITLE_EXT_KEY]) === true;
+}
+/**
+* 计算 `extensions` patch：返回值供调用方写入 `sceneElement.extensions`。
+*
+* - `enabled === true` 时写入 `true`；
+* - `enabled === false` 时**移除**该 key（而非写 `false`），避免持久化里残留无意义字段；
+* - 返回 `undefined` 表示「extensions 整体可清空」（仅当结果是空对象时）。
+*
+* @example
+* const nextExt = buildNameAsTitleExtensionsPatch(el.extensions, true);
+* onUpdate({ extensions: nextExt });
+*/
+function buildNameAsTitleExtensionsPatch(prev, enabled) {
+	const base = _objectSpread2({}, prev !== null && prev !== void 0 ? prev : {});
+	if (enabled) base[NAME_AS_TITLE_EXT_KEY] = true;
+	else delete base[NAME_AS_TITLE_EXT_KEY];
+	return Object.keys(base).length > 0 ? base : void 0;
+}
+/**
+* 通用图元标题解析：业务展示层（卡片标题、占位标题等）统一调用本函数，
+* 让「图元名作为资源标题」这一偏好对所有接入方一致生效。
+*
+* 优先级：
+*   1. 启用了 nameAsTitle 且 `el.name` 非空 → `el.name`
+*   2. `recordTitle`（业务侧按自己规则算出来的，如预约页 `row.main_field` / `row.code`）
+*   3. `el.name`（业务字段缺失时的兜底，与历史行为一致）
+*   4. `fallback`（如 kindLabel）
+*   5. 空串
+*
+* 不更改 `displayRoomTitleFromRow` / `record.name` 等业务函数本身，
+* 业务方只需把"按业务字段"算出来的结果以 `recordTitle` 传入即可，
+* `bookingDetailModal` 等下游不会被联动改坏。
+*/
+function resolveSceneElementDisplayTitle(opts) {
+	const { sceneElement, recordTitle, fallback } = opts;
+	const elName = (sceneElement === null || sceneElement === void 0 ? void 0 : sceneElement.name) != null ? String(sceneElement.name).trim() : "";
+	const rt = recordTitle != null ? String(recordTitle).trim() : "";
+	const fb = fallback != null ? String(fallback).trim() : "";
+	if (isElementNameAsTitleEnabled(sceneElement) && elName) return elName;
+	return rt || elName || fb || "";
+}
+//#endregion
+export { NAME_AS_TITLE_EXT_KEY, buildNameAsTitleExtensionsPatch, isElementNameAsTitleEnabled, resolveSceneElementDisplayTitle };

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

@@ -1,7 +1,8 @@
 import { FLOOR_MAP_STAGE_ELEMENT_KIND } from "../types.js";
 import { STAGE_DECO_DEFAULT } from "./floorMapStageDefaults.js";
-import { isFloorMapImageElementKind } from "./floorMapElementKindUtils.js";
+import { isFloorMapBuiltinShapeElementKind, isFloorMapImageElementKind } from "./floorMapElementKindUtils.js";
 import { FloorMapImageElement } from "../components/FloorMapImageElement.js";
+import { FloorMapBuiltinShapeElement } from "../components/FloorMapBuiltinShapeElement.js";
 import React from "react";
 //#region src/components/pisellFloorMapLayout/utils/floorMapFallbackRender.tsx
 /**
@@ -42,6 +43,16 @@ function renderFloorMapFallbackPlaceholder(item) {
 			name: (_item$name = item.name) !== null && _item$name !== void 0 ? _item$name : (_item$_sceneElement2 = item._sceneElement) === null || _item$_sceneElement2 === void 0 ? void 0 : _item$_sceneElement2.name
 		});
 	}
+	if (isFloorMapBuiltinShapeElementKind(kind)) {
+		var _item$name2;
+		const el = item._sceneElement;
+		return /* @__PURE__ */ React.createElement(FloorMapBuiltinShapeElement, {
+			builtinShapeKey: el === null || el === void 0 ? void 0 : el.builtinShapeKey,
+			name: (_item$name2 = item.name) !== null && _item$name2 !== void 0 ? _item$name2 : el === null || el === void 0 ? void 0 : el.name,
+			fillColor: el === null || el === void 0 ? void 0 : el.fillColor,
+			strokeColor: el === null || el === void 0 ? void 0 : el.strokeColor
+		});
+	}
 	if (isStage) {
 		const display = nameText || STAGE_DECO_DEFAULT.name;
 		return /* @__PURE__ */ React.createElement("div", { style: {

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

@@ -0,0 +1,64 @@
+import { _objectSpread2 } from "../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
+import { mergeCanvasesForTabs } from "./mergeCanvasesForTabs.js";
+import { mergeCanvasItems } from "./floorMapConfigMerge.js";
+import { gapToPx } from "./layoutMeasurements.js";
+import { computeFloorMapContentStage, packCanvasesIntoShelves } from "./floorMapCanvasStage.js";
+//#region src/components/pisellFloorMapLayout/utils/floorMapOverviewLayout.ts
+/**
+* 「All」全览视图布局：把所有启用画布按各自原始尺寸（同一比例尺）紧凑装箱，
+* 产出整体宽高 + 每个画布区域在大画布坐标系下的位置与图元，供 PisellFloorMapLayout
+* 在主 TransformWrapper 内复用渲染（共享 ViewControls / 视口锁定 / 全屏 / fitBounds）。
+*
+* 不依赖 React，仅数据计算，便于单测与缓存。
+*/
+/**
+* 构造 All 视图布局。
+*
+* - 顺序：按 `canvas.order` 升序，与顶部 Tab 顺序一致；
+* - 尺寸：每个画布按 {@link computeFloorMapContentStage}（含其自己的 boundingPadding）
+*   推导内容尺寸，所有画布共享同一比例尺，不缩放；
+* - 装箱：{@link packCanvasesIntoShelves} 行装填，目标行宽 ≈ √总面积。
+*/
+function buildFloorMapOverviewLayout(params) {
+	const { config, globalMapLayer, cellSize, itemUnit, areaGap } = params;
+	const stageList = mergeCanvasesForTabs(config).filter((c) => c.enabled).sort((a, b) => a.order - b.order).map((canvas) => {
+		var _effectiveMapLayer$bo;
+		const items = mergeCanvasItems(canvas.id, config, cellSize);
+		const effectiveMapLayer = canvas.mapLayer ? _objectSpread2(_objectSpread2({}, globalMapLayer !== null && globalMapLayer !== void 0 ? globalMapLayer : {}), canvas.mapLayer) : globalMapLayer;
+		const boundingPadding = (_effectiveMapLayer$bo = effectiveMapLayer === null || effectiveMapLayer === void 0 ? void 0 : effectiveMapLayer.boundingPadding) !== null && _effectiveMapLayer$bo !== void 0 ? _effectiveMapLayer$bo : 56;
+		const stage = computeFloorMapContentStage({
+			items,
+			cellSize,
+			itemGap: gapToPx(effectiveMapLayer === null || effectiveMapLayer === void 0 ? void 0 : effectiveMapLayer.gap),
+			itemUnit,
+			boundingPadding,
+			preferPixelBoundingBox: true
+		});
+		return {
+			canvasId: canvas.id,
+			items,
+			contentWidth: stage.contentWidth,
+			contentHeight: stage.contentHeight,
+			contentOffsetX: stage.contentOffsetX,
+			contentOffsetY: stage.contentOffsetY,
+			cellSize
+		};
+	});
+	const pack = packCanvasesIntoShelves(stageList.map((s) => ({
+		width: s.contentWidth,
+		height: s.contentHeight
+	})), areaGap);
+	return {
+		areas: stageList.map((s, i) => {
+			var _pack$positions$i$x, _pack$positions$i, _pack$positions$i$y, _pack$positions$i2;
+			return _objectSpread2(_objectSpread2({}, s), {}, {
+				x: (_pack$positions$i$x = (_pack$positions$i = pack.positions[i]) === null || _pack$positions$i === void 0 ? void 0 : _pack$positions$i.x) !== null && _pack$positions$i$x !== void 0 ? _pack$positions$i$x : 0,
+				y: (_pack$positions$i$y = (_pack$positions$i2 = pack.positions[i]) === null || _pack$positions$i2 === void 0 ? void 0 : _pack$positions$i2.y) !== null && _pack$positions$i$y !== void 0 ? _pack$positions$i$y : 0
+			});
+		}),
+		totalWidth: pack.totalWidth,
+		totalHeight: pack.totalHeight
+	};
+}
+//#endregion
+export { buildFloorMapOverviewLayout };

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

@@ -1,5 +1,6 @@
 import { _objectSpread2 } from "../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectSpread2.js";
 import { FLOOR_MAP_IMAGE_ELEMENT_KIND, FLOOR_MAP_STAGE_ELEMENT_KIND } from "../types.js";
+import cloneDeep from "lodash/cloneDeep";
 import isEqual from "lodash/isEqual";
 //#region src/components/pisellFloorMapLayout/utils/floorMapViewConfigDiff.ts
 /**
@@ -12,7 +13,7 @@ import isEqual from "lodash/isEqual";
 function normalizeFloorMapViewConfigFromProp(floorMapConfigProp) {
 	var _src$canCreate, _src$canEdit;
 	const src = floorMapConfigProp;
-	const base = src.canvasUi != null ? structuredClone(src) : structuredClone(_objectSpread2(_objectSpread2({}, src), {}, { canvasUi: {
+	const base = src.canvasUi != null ? cloneDeep(src) : cloneDeep(_objectSpread2(_objectSpread2({}, src), {}, { canvasUi: {
 		canCreate: (_src$canCreate = src.canCreate) !== null && _src$canCreate !== void 0 ? _src$canCreate : false,
 		canEdit: (_src$canEdit = src.canEdit) !== null && _src$canEdit !== void 0 ? _src$canEdit : false
 	} }));
@@ -71,7 +72,7 @@ function normalizeFloorMapViewConfigFromProp(floorMapConfigProp) {
 }
 function sortStableForCompare(config) {
 	var _c$sceneElements, _c$elementKinds, _c$elementKindCategor, _c$edges;
-	const c = structuredClone(config);
+	const c = cloneDeep(config);
 	c.canvases = [...c.canvases].sort((a, b) => String(a.id).localeCompare(String(b.id)));
 	c.sceneElements = [...(_c$sceneElements = c.sceneElements) !== null && _c$sceneElements !== void 0 ? _c$sceneElements : []].sort((a, b) => String(a.instanceId).localeCompare(String(b.instanceId)));
 	if ((_c$elementKinds = c.elementKinds) === null || _c$elementKinds === void 0 ? void 0 : _c$elementKinds.length) c.elementKinds = [...c.elementKinds].sort((a, b) => String(a.value).localeCompare(String(b.value)));

package/es/components/pisellGoodPassCard/index.less

@@ -29,6 +29,7 @@
     }
 
     .item-content {
+      color: var(--, #8157d5);
       font-size: 16px;
       font-style: normal;
       font-weight: 400;