@pisell/materials 1.8.41 → 1.8.42

package/lib/components/pisellFloorMapLayout/floorMapLayoutConstants.js

@@ -0,0 +1,25 @@
+//#region src/components/pisellFloorMapLayout/floorMapLayoutConstants.ts
+/**
+* 平面图布局根节点 BEM 前缀，与 `PisellFloorMapLayout.less` 中主 class 一致。
+*/
+const FLOOR_MAP_LAYOUT_CLASS_PREFIX = "pisell-floor-map-layout";
+/** 手机左侧图元栏 Drawer，低于右侧属性抽屉 */
+const FLOOR_MAP_PHONE_TOOLBAR_DRAWER_Z_INDEX = 2001;
+/** 手机右侧图元详情 Drawer */
+const FLOOR_MAP_PHONE_EDIT_DRAWER_Z_INDEX = 2002;
+/**
+* 高于 {@link FLOOR_MAP_PHONE_EDIT_DRAWER_Z_INDEX}，用于面板内 Popconfirm 等，避免被抽屉挡住。
+*/
+const FLOOR_MAP_CONFIRM_OVERLAY_Z_INDEX = 2100;
+/**
+* 「全览」伪画布 Tab id。
+* 仅在阅读态、启用画布 > 1 时插入到画布 Tab 列表最前，用来承载「同时查看所有画布」的入口。
+* 不会写入 `config.canvases`，也不参与视口持久化、items 计算等真实画布逻辑。
+*/
+const FLOOR_MAP_OVERVIEW_TAB_ID = "__pisell_floor_map_overview__";
+//#endregion
+exports.FLOOR_MAP_CONFIRM_OVERLAY_Z_INDEX = FLOOR_MAP_CONFIRM_OVERLAY_Z_INDEX;
+exports.FLOOR_MAP_LAYOUT_CLASS_PREFIX = FLOOR_MAP_LAYOUT_CLASS_PREFIX;
+exports.FLOOR_MAP_OVERVIEW_TAB_ID = FLOOR_MAP_OVERVIEW_TAB_ID;
+exports.FLOOR_MAP_PHONE_EDIT_DRAWER_Z_INDEX = FLOOR_MAP_PHONE_EDIT_DRAWER_Z_INDEX;
+exports.FLOOR_MAP_PHONE_TOOLBAR_DRAWER_Z_INDEX = FLOOR_MAP_PHONE_TOOLBAR_DRAWER_Z_INDEX;

package/lib/components/pisellFloorMapLayout/hooks/floorMapViewportPersistence.js

@@ -0,0 +1,52 @@
+//#region src/components/pisellFloorMapLayout/hooks/floorMapViewportPersistence.ts
+/** 平面图视口（缩放 + 平移）持久化到 localStorage 的 key 前缀 */
+const VIEWPORT_STORAGE_PREFIX = "pisell-floor-map-layout.viewport:";
+/** 视口锁定态持久化前缀（与视口位置分开存储） */
+const VIEWPORT_LOCK_STORAGE_PREFIX = "pisell-floor-map-layout.viewport-lock:";
+/** 判定当前 transform 是否处于「适配视口」结果时的容差 */
+const FIT_BOUNDS_MATCH_POS_EPSILON = .5;
+const FIT_BOUNDS_MATCH_SCALE_EPSILON = .005;
+function readPersistedViewport(key) {
+	if (typeof window === "undefined") return null;
+	try {
+		const raw = window.localStorage.getItem(VIEWPORT_STORAGE_PREFIX + key);
+		if (!raw) return null;
+		const parsed = JSON.parse(raw);
+		if (!parsed || typeof parsed.x !== "number" || typeof parsed.y !== "number" || typeof parsed.scale !== "number" || !Number.isFinite(parsed.x) || !Number.isFinite(parsed.y) || !Number.isFinite(parsed.scale) || parsed.scale <= 0) return null;
+		return {
+			x: parsed.x,
+			y: parsed.y,
+			scale: parsed.scale
+		};
+	} catch (_unused) {
+		return null;
+	}
+}
+function writePersistedViewport(key, snapshot) {
+	if (typeof window === "undefined") return;
+	try {
+		window.localStorage.setItem(VIEWPORT_STORAGE_PREFIX + key, JSON.stringify(snapshot));
+	} catch (_unused2) {}
+}
+function readPersistedViewportLock(key) {
+	if (typeof window === "undefined") return false;
+	try {
+		return window.localStorage.getItem(VIEWPORT_LOCK_STORAGE_PREFIX + key) === "1";
+	} catch (_unused3) {
+		return false;
+	}
+}
+function writePersistedViewportLock(key, locked) {
+	if (typeof window === "undefined") return;
+	try {
+		if (locked) window.localStorage.setItem(VIEWPORT_LOCK_STORAGE_PREFIX + key, "1");
+		else window.localStorage.removeItem(VIEWPORT_LOCK_STORAGE_PREFIX + key);
+	} catch (_unused4) {}
+}
+//#endregion
+exports.FIT_BOUNDS_MATCH_POS_EPSILON = FIT_BOUNDS_MATCH_POS_EPSILON;
+exports.FIT_BOUNDS_MATCH_SCALE_EPSILON = FIT_BOUNDS_MATCH_SCALE_EPSILON;
+exports.readPersistedViewport = readPersistedViewport;
+exports.readPersistedViewportLock = readPersistedViewportLock;
+exports.writePersistedViewport = writePersistedViewport;
+exports.writePersistedViewportLock = writePersistedViewportLock;

package/lib/components/pisellFloorMapLayout/hooks/useDraftConfigHistory.js

@@ -0,0 +1,96 @@
+require("../../../_virtual/_rolldown/runtime.js");
+let react = require("react");
+//#region src/components/pisellFloorMapLayout/hooks/useDraftConfigHistory.ts
+/**
+* 平面图草稿历史栈：past/present/future + commit/replace/undo/redo
+*
+* 设计：
+* - `commit(value, opts?)`：写入新值并入栈（覆盖 future）。同一 `groupId` 在
+*   `mergeWindowMs` 内的多次提交会合并为同一条历史，避免高频微调污染栈。
+*   实际项目里 `EditableItemLayer` 只在 mouseup 时回调一次，因此默认场景下不会
+*   触发合并；保留 group 能力是为后续如「输入框边输入边写草稿」等连续操作准备。
+* - `replace(value)`：直接重置 present 并清空历史；用于上游 props 同步落地，避免
+*   把"上游回写"也变成可撤销项。
+* - `undo` / `redo`：在 past/future 栈内迁移 present。
+*/
+/** 历史最大长度，超出从最旧端裁剪 */
+const HISTORY_LIMIT = 100;
+function useDraftConfigHistory() {
+	const [state, setState] = (0, react.useState)({
+		past: [],
+		present: null,
+		future: []
+	});
+	const lastGroupRef = (0, react.useRef)(null);
+	const commit = (0, react.useCallback)((next, options) => {
+		var _options$mergeWindowM;
+		const now = Date.now();
+		const last = lastGroupRef.current;
+		const inGroup = !!((options === null || options === void 0 ? void 0 : options.groupId) && last && last.id === options.groupId && now - last.at <= ((_options$mergeWindowM = options.mergeWindowMs) !== null && _options$mergeWindowM !== void 0 ? _options$mergeWindowM : 600));
+		lastGroupRef.current = {
+			id: options === null || options === void 0 ? void 0 : options.groupId,
+			at: now
+		};
+		setState((cur) => {
+			const value = typeof next === "function" ? next(cur.present) : next;
+			if (Object.is(value, cur.present)) return cur;
+			let nextPast = cur.past;
+			if (cur.present != null && !inGroup) nextPast = nextPast.length >= HISTORY_LIMIT ? [...nextPast.slice(1), cur.present] : [...nextPast, cur.present];
+			return {
+				past: nextPast,
+				present: value,
+				future: []
+			};
+		});
+	}, []);
+	const replace = (0, react.useCallback)((next) => {
+		lastGroupRef.current = null;
+		setState({
+			past: [],
+			present: next,
+			future: []
+		});
+	}, []);
+	const undo = (0, react.useCallback)(() => {
+		lastGroupRef.current = null;
+		setState((cur) => {
+			if (cur.past.length === 0) return cur;
+			const prev = cur.past[cur.past.length - 1];
+			const nextFuture = cur.present != null ? [cur.present, ...cur.future] : cur.future;
+			return {
+				past: cur.past.slice(0, -1),
+				present: prev,
+				future: nextFuture
+			};
+		});
+	}, []);
+	const redo = (0, react.useCallback)(() => {
+		lastGroupRef.current = null;
+		setState((cur) => {
+			if (cur.future.length === 0) return cur;
+			const next = cur.future[0];
+			return {
+				past: cur.present != null ? [...cur.past, cur.present] : cur.past,
+				present: next,
+				future: cur.future.slice(1)
+			};
+		});
+	}, []);
+	return (0, react.useMemo)(() => ({
+		present: state.present,
+		commit,
+		replace,
+		undo,
+		redo,
+		canUndo: state.past.length > 0,
+		canRedo: state.future.length > 0
+	}), [
+		state,
+		commit,
+		replace,
+		undo,
+		redo
+	]);
+}
+//#endregion
+exports.useDraftConfigHistory = useDraftConfigHistory;

package/lib/components/pisellFloorMapLayout/hooks/useFloorMapEditState.js

@@ -3,11 +3,13 @@ const require_objectSpread2 = require("../../../_virtual/_@oxc-project_runtime@0
 const require_objectWithoutProperties = require("../../../_virtual/_@oxc-project_runtime@0.122.0/helpers/objectWithoutProperties.js");
 const require_types = require("../types.js");
 const require_floorMapStageDefaults = require("../utils/floorMapStageDefaults.js");
+const require_floorMapBuiltinShapes = require("../utils/floorMapBuiltinShapes.js");
 const require_floorMapElementKindUtils = require("../utils/floorMapElementKindUtils.js");
 const require_useEngineContext = require("../../../hooks/useEngineContext.js");
 const require_utils = require("../../translation/utils.js");
 const require_floorMapCanvasDisplay = require("../utils/floorMapCanvasDisplay.js");
 const require_floorMapConfigMerge = require("../utils/floorMapConfigMerge.js");
+const require_useDraftConfigHistory = require("./useDraftConfigHistory.js");
 const require_floorMapViewConfigDiff = require("../utils/floorMapViewConfigDiff.js");
 let react = require("react");
 let _pisell_utils = require("@pisell/utils");
@@ -27,6 +29,11 @@ const IMAGE_PLACE_DEFAULT = {
 	width: 400,
 	height: 240
 };
+/** 内置图形落点缺省尺寸（落点时若已选 builtinShapeKey 会按预设 defaultSize 替换） */
+const BUILTIN_SHAPE_PLACE_DEFAULT = {
+	width: 96,
+	height: 96
+};
 const I18N_PLACEMENT_FALLBACK_IMAGE = "pisell-floor-map-layout.placement.fallback-image-name";
 const GRID_VIS_STORAGE_PREFIX = "pisell-floor-map-layout.grid-visible";
 function getGridVisStorageKey(canvasId) {
@@ -64,7 +71,18 @@ function useFloorMapEditState(params) {
 	const { floorMapConfigProp, isFloorMapView, itemsProp, cellSizeProp, dataSources, onSave, onDataSourceRecordSave, dataSourceFormColumns, dataSourceRecordForm, dataSourceLabels, layoutPrefix, contentOffsetRef, showDataSourceRecordFormBlock } = params;
 	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";
-	const [draftConfig, setDraftConfig] = (0, react.useState)(null);
+	/**
+	* 草稿历史栈：所有可撤销的编辑操作都通过 `commitDraft` 写入；
+	* 上游 props 同步走 `replaceDraft`（不入栈、清空历史）。
+	*/
+	const draftHistory = require_useDraftConfigHistory.useDraftConfigHistory();
+	const draftConfig = draftHistory.present;
+	const commitDraft = draftHistory.commit;
+	const replaceDraft = draftHistory.replace;
+	const undoDraft = draftHistory.undo;
+	const redoDraft = draftHistory.redo;
+	const canUndo = draftHistory.canUndo;
+	const canRedo = draftHistory.canRedo;
 	const [currentCanvasId, setCurrentCanvasId] = (0, react.useState)(null);
 	const [selectedId, setSelectedId] = (0, react.useState)(null);
 	const [placeMode, setPlaceMode] = (0, react.useState)(null);
@@ -88,8 +106,11 @@ function useFloorMapEditState(params) {
 			if (stored == null) return canvas;
 			return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, canvas), {}, { mapLayer: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, (_canvas$mapLayer = canvas.mapLayer) !== null && _canvas$mapLayer !== void 0 ? _canvas$mapLayer : {}), {}, { showGrid: stored }) });
 		}) });
-		setDraftConfig(nextConfig);
-		/** 上游配置已刷新，以服务端/父级为准，清空本地临时保存基线 */
+		/**
+		* 上游配置变更：直接 replace（不进入历史栈），并清空 undo/redo；
+		* 同时清空本地临时保存基线，让 dirty/未保存提示与上游对齐。
+		*/
+		replaceDraft(nextConfig);
 		setSavedBaselineConfig(null);
 		const enabled = nextConfig.canvases.filter((c) => c.enabled).sort((a, b) => a.order - b.order);
 		setCurrentCanvasId((prev) => {
@@ -107,6 +128,25 @@ function useFloorMapEditState(params) {
 		floorMapConfigProp,
 		savedBaselineConfig
 	]);
+	/**
+	* 撤销/重做后：若选中的图元已不存在于新草稿（如撤回了刚复制/新建的元素），
+	* 自动清理 selectedId，避免侧栏/快捷栏停留在「悬空选中」状态。
+	*/
+	(0, react.useEffect)(() => {
+		var _draftConfig$sceneEle;
+		if (!selectedId || !draftConfig) return;
+		if (!((_draftConfig$sceneEle = draftConfig.sceneElements) !== null && _draftConfig$sceneEle !== void 0 ? _draftConfig$sceneEle : []).some((e) => e.instanceId === selectedId)) setSelectedId(null);
+	}, [selectedId, draftConfig]);
+	/**
+	* 撤销/重做后：若当前画布在新草稿中已被删除或禁用，回退到第一张启用画布。
+	*/
+	(0, react.useEffect)(() => {
+		var _enabled$0$id2, _enabled$2;
+		if (!draftConfig) return;
+		if (!currentCanvasId) return;
+		if (draftConfig.canvases.some((c) => c.id === currentCanvasId && c.enabled)) return;
+		setCurrentCanvasId((_enabled$0$id2 = (_enabled$2 = draftConfig.canvases.filter((c) => c.enabled).sort((a, b) => a.order - b.order)[0]) === null || _enabled$2 === void 0 ? void 0 : _enabled$2.id) !== null && _enabled$0$id2 !== void 0 ? _enabled$0$id2 : null);
+	}, [currentCanvasId, draftConfig]);
 	const handleAddCanvas = (0, react.useCallback)(() => {
 		require_floorMapCanvasDisplay.initFloorMapLayoutLocales(engineLocale);
 		const defaultName = require_utils.createTranslationText(_pisell_utils.locales.getText("pisell-floor-map-layout.canvas-tabs.default-new-canvas-name"), true);
@@ -117,7 +157,7 @@ function useFloorMapEditState(params) {
 			order: 0,
 			enabled: true
 		};
-		setDraftConfig((prev) => {
+		commitDraft((prev) => {
 			if (!prev) return prev;
 			const list = prev.canvases.filter((c) => c.enabled).sort((a, b) => a.order - b.order);
 			newCanvas.order = list.length > 0 ? Math.max(...list.map((c) => c.order)) + 1 : 0;
@@ -126,7 +166,7 @@ function useFloorMapEditState(params) {
 		setCurrentCanvasId(newId);
 	}, [engineLocale]);
 	const handleRemoveCanvas = (0, react.useCallback)((canvasId) => {
-		setDraftConfig((prev) => {
+		commitDraft((prev) => {
 			var _prev$sceneElements;
 			if (!prev) return prev;
 			const nextCanvases = prev.canvases.filter((c) => c.id !== canvasId);
@@ -137,18 +177,18 @@ function useFloorMapEditState(params) {
 			});
 		});
 		setCurrentCanvasId((prev) => {
-			var _enabled$0$id2, _enabled$2;
+			var _enabled$0$id3, _enabled$3;
 			if (prev !== canvasId) return prev;
 			const cfg = configRef.current;
 			if (!cfg) return prev;
-			return (_enabled$0$id2 = (_enabled$2 = cfg.canvases.filter((c) => c.id !== canvasId && c.enabled).sort((a, b) => a.order - b.order)[0]) === null || _enabled$2 === void 0 ? void 0 : _enabled$2.id) !== null && _enabled$0$id2 !== void 0 ? _enabled$0$id2 : null;
+			return (_enabled$0$id3 = (_enabled$3 = cfg.canvases.filter((c) => c.id !== canvasId && c.enabled).sort((a, b) => a.order - b.order)[0]) === null || _enabled$3 === void 0 ? void 0 : _enabled$3.id) !== null && _enabled$0$id3 !== void 0 ? _enabled$0$id3 : null;
 		});
 	}, []);
 	const handleRenameCanvas = (0, react.useCallback)((canvasId, name) => {
 		if (typeof name === "string") {
 			const trimmed = name.trim();
 			if (!trimmed) return;
-			setDraftConfig((prev) => {
+			commitDraft((prev) => {
 				if (!prev) return prev;
 				return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, prev), {}, { canvases: prev.canvases.map((c) => c.id === canvasId ? require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, c), {}, {
 					name: trimmed,
@@ -158,7 +198,7 @@ function useFloorMapEditState(params) {
 			return;
 		}
 		if (!Object.values(name).some((s) => typeof s === "string" && s.trim())) return;
-		setDraftConfig((prev) => {
+		commitDraft((prev) => {
 			if (!prev) return prev;
 			return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, prev), {}, { canvases: prev.canvases.map((c) => c.id === canvasId ? require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, c), {}, {
 				name,
@@ -177,7 +217,7 @@ function useFloorMapEditState(params) {
 	]);
 	const items = isFloorMapView ? mergedItems : itemsProp;
 	const updateDraftSceneElement = (0, react.useCallback)((instanceId, patch) => {
-		setDraftConfig((prev) => {
+		commitDraft((prev) => {
 			var _prev$sceneElements2, _prev$sceneElements3;
 			if (!prev) return prev;
 			const current = ((_prev$sceneElements2 = prev.sceneElements) !== null && _prev$sceneElements2 !== void 0 ? _prev$sceneElements2 : []).find((e) => e.instanceId === instanceId);
@@ -204,7 +244,7 @@ function useFloorMapEditState(params) {
 	* @returns 是否已成功写入草稿（校验失败时为 false）
 	*/
 	const applyScenePlacementAtCoords = (0, react.useCallback)((contentX, contentY, scene) => {
-		var _kindConfig$allowedDa, _ref, _scene$dataSourceKey;
+		var _kindConfig$allowedDa, _ref, _scene$dataSourceKey, _scene$builtinShapeKe, _FLOOR_MAP_BUILTIN_SH, _builtinDef$defaultSi, _builtinDef$defaultSi2;
 		if (!config || !currentCanvasId) return false;
 		const defaultPlacementWidth = 180;
 		const defaultPlacementHeight = 120;
@@ -217,22 +257,30 @@ function useFloorMapEditState(params) {
 		const recordIdsToPlace = scene.recordIds && scene.recordIds.length > 0 ? scene.recordIds : scene.recordId ? [scene.recordId] : [];
 		const isStage = scene.elementKind === require_types.FLOOR_MAP_STAGE_ELEMENT_KIND;
 		const isImage = require_floorMapElementKindUtils.isFloorMapImageElementKind(scene.elementKind);
-		const w = isImage ? IMAGE_PLACE_DEFAULT.width : isStage ? require_floorMapStageDefaults.STAGE_DECO_DEFAULT.width : defaultPlacementWidth;
-		const h = isImage ? IMAGE_PLACE_DEFAULT.height : isStage ? require_floorMapStageDefaults.STAGE_DECO_DEFAULT.height : defaultPlacementHeight;
-		const useDecoSize = policy === "none" && scene.elementKind !== "stage" && !isImage;
-		const buildOneElement = (dataBinding, x, y, name) => require_objectSpread2._objectSpread2({
+		const isBuiltinShape = require_floorMapElementKindUtils.isFloorMapBuiltinShapeElementKind(scene.elementKind);
+		/**
+		* 内置图形 kind 的初始 `builtinShapeKey`：优先用侧栏 Select 预选的 key
+		* （`scene.builtinShapeKey`，由 toolbar 写入 placeMode / drag payload 透传），
+		* 未预选时回退为枚举首项，避免空白占位。
+		*/
+		const initialBuiltinShapeKey = isBuiltinShape ? (_scene$builtinShapeKe = scene.builtinShapeKey) !== null && _scene$builtinShapeKe !== void 0 ? _scene$builtinShapeKe : (_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 : void 0;
+		const builtinDef = isBuiltinShape ? require_floorMapBuiltinShapes.getFloorMapBuiltinShapeDef(initialBuiltinShapeKey) : void 0;
+		const w = isImage ? IMAGE_PLACE_DEFAULT.width : isStage ? require_floorMapStageDefaults.STAGE_DECO_DEFAULT.width : isBuiltinShape ? (_builtinDef$defaultSi = builtinDef === null || builtinDef === void 0 ? void 0 : builtinDef.defaultSize.width) !== null && _builtinDef$defaultSi !== void 0 ? _builtinDef$defaultSi : BUILTIN_SHAPE_PLACE_DEFAULT.width : defaultPlacementWidth;
+		const h = isImage ? IMAGE_PLACE_DEFAULT.height : isStage ? require_floorMapStageDefaults.STAGE_DECO_DEFAULT.height : isBuiltinShape ? (_builtinDef$defaultSi2 = builtinDef === null || builtinDef === void 0 ? void 0 : builtinDef.defaultSize.height) !== null && _builtinDef$defaultSi2 !== void 0 ? _builtinDef$defaultSi2 : BUILTIN_SHAPE_PLACE_DEFAULT.height : defaultPlacementHeight;
+		const useDecoSize = policy === "none" && scene.elementKind !== "stage" && !isImage && !isBuiltinShape;
+		const buildOneElement = (dataBinding, x, y, name) => require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({
 			instanceId: newInstanceId(),
 			canvasId: currentCanvasId,
 			x,
 			y,
 			name,
-			zIndex: isImage ? -5 : 0,
+			zIndex: isImage || isBuiltinShape ? -5 : 0,
 			width: useDecoSize ? defaultDecoSize : w,
 			height: useDecoSize ? defaultDecoSize : h,
 			elementKind: scene.elementKind,
-			shape: isStage || isImage ? "rect" : kindConfig === null || kindConfig === void 0 ? void 0 : kindConfig.defaultShape,
+			shape: isStage || isImage || isBuiltinShape ? "rect" : kindConfig === null || kindConfig === void 0 ? void 0 : kindConfig.defaultShape,
 			dataBinding
-		}, isImage ? { imageUrl: "" } : {});
+		}, isImage ? { imageUrl: "" } : {}), isBuiltinShape ? { builtinShapeKey: initialBuiltinShapeKey } : {});
 		let dataBinding;
 		if (policy !== "none" && pickKey) {
 			var _dataSources$pickKey;
@@ -294,7 +342,7 @@ function useFloorMapEditState(params) {
 					antd.message.warning("没有可落位的记录");
 					return false;
 				}
-				setDraftConfig((prev) => {
+				commitDraft((prev) => {
 					var _prev$sceneElements4;
 					return prev ? require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, prev), {}, { sceneElements: [...(_prev$sceneElements4 = prev.sceneElements) !== null && _prev$sceneElements4 !== void 0 ? _prev$sceneElements4 : [], ...newEls] }) : prev;
 				});
@@ -315,7 +363,7 @@ function useFloorMapEditState(params) {
 			return (_kindConfig$defaultPr = kindConfig === null || kindConfig === void 0 || (_kindConfig$defaultPr2 = kindConfig.defaultPresentation) === null || _kindConfig$defaultPr2 === void 0 ? void 0 : _kindConfig$defaultPr2.title) !== null && _kindConfig$defaultPr !== void 0 ? _kindConfig$defaultPr : "";
 		})();
 		const newEl = buildOneElement(dataBinding, contentX, contentY, placementName);
-		setDraftConfig((prev) => {
+		commitDraft((prev) => {
 			var _prev$sceneElements5;
 			return prev ? require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, prev), {}, { sceneElements: [...(_prev$sceneElements5 = prev.sceneElements) !== null && _prev$sceneElements5 !== void 0 ? _prev$sceneElements5 : [], newEl] }) : prev;
 		});
@@ -352,9 +400,36 @@ function useFloorMapEditState(params) {
 			setSaving(false);
 		}
 	}, [draftConfig, onSave]);
+	/**
+	* 丢弃所有未保存的草稿改动，把 `draftConfig` 重置回上游 `floorMapConfigProp` 的当前值。
+	*
+	* 用途：编辑态下点击「取消编辑」（不保存退出）时调用，否则 `config` 仍取
+	* `draftConfig ?? floorMapConfigProp`，回到阅读态会继续看到编辑后的脏数据。
+	*
+	* 实现要点：
+	* - 与上游 props 同步 effect（line 165）使用相同的规范化路径与 `replaceDraft`，
+	*   保证「取消」后状态等价于「上游 props 重新落地一次」；
+	* - `replaceDraft` 内部已清空 undo/redo 历史栈，避免取消后又能 redo 出旧 draft；
+	* - 同步清空 `savedBaselineConfig`，让 dirty 判定回到「以上游 props 为基线」。
+	*/
+	const discardDraft = (0, react.useCallback)(() => {
+		if (!floorMapConfigProp) {
+			replaceDraft(null);
+			setSavedBaselineConfig(null);
+			return;
+		}
+		const baseConfig = require_floorMapViewConfigDiff.normalizeFloorMapViewConfigFromProp(floorMapConfigProp);
+		replaceDraft(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, baseConfig), {}, { canvases: baseConfig.canvases.map((canvas) => {
+			var _canvas$mapLayer2;
+			const stored = readStoredGridVisible(canvas.id);
+			if (stored == null) return canvas;
+			return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, canvas), {}, { mapLayer: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, (_canvas$mapLayer2 = canvas.mapLayer) !== null && _canvas$mapLayer2 !== void 0 ? _canvas$mapLayer2 : {}), {}, { showGrid: stored }) });
+		}) }));
+		setSavedBaselineConfig(null);
+	}, [floorMapConfigProp, replaceDraft]);
 	/** 切换当前画布草稿中的 mapLayer.showGrid（随布局保存持久化） */
 	const toggleDraftCanvasShowGrid = (0, react.useCallback)(() => {
-		setDraftConfig((prev) => {
+		commitDraft((prev) => {
 			if (!prev || !currentCanvasId) return prev;
 			return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, prev), {}, { canvases: prev.canvases.map((c) => {
 				var _c$mapLayer;
@@ -385,7 +460,7 @@ function useFloorMapEditState(params) {
 	}, [onDataSourceRecordSave]);
 	const handleEditPanelDelete = (0, react.useCallback)(() => {
 		if (!selectedId) return;
-		setDraftConfig((prev) => {
+		commitDraft((prev) => {
 			var _prev$sceneElements6;
 			if (!prev) return prev;
 			return require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, prev), {}, { sceneElements: ((_prev$sceneElements6 = prev.sceneElements) !== null && _prev$sceneElements6 !== void 0 ? _prev$sceneElements6 : []).filter((e) => e.instanceId !== selectedId) });
@@ -417,7 +492,7 @@ function useFloorMapEditState(params) {
 			dataBinding: void 0,
 			layoutTransformLocked: false
 		});
-		setDraftConfig(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, prev), {}, { sceneElements: [...(_prev$sceneElements8 = prev.sceneElements) !== null && _prev$sceneElements8 !== void 0 ? _prev$sceneElements8 : [], copy] }));
+		commitDraft(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({}, prev), {}, { sceneElements: [...(_prev$sceneElements8 = prev.sceneElements) !== null && _prev$sceneElements8 !== void 0 ? _prev$sceneElements8 : [], copy] }));
 		setSelectedId(newId);
 	}, [selectedId]);
 	const selectedItem = selectedId ? mergedItems.find((m) => m.id === selectedId) : null;
@@ -439,6 +514,7 @@ function useFloorMapEditState(params) {
 		handleUpdateItem,
 		handleCanvasPlaceClick,
 		handleSave,
+		discardDraft,
 		placeSceneElementFromPaletteDrop,
 		editPanelParams: selectedItem && config && selectedId && !((_selectedItem$_sceneE = selectedItem._sceneElement) === null || _selectedItem$_sceneE === void 0 ? void 0 : _selectedItem$_sceneE.layoutTransformLocked) ? {
 			itemId: selectedId,
@@ -458,7 +534,11 @@ function useFloorMapEditState(params) {
 		toggleDraftCanvasShowGrid,
 		toggleSelectedLayoutLock,
 		duplicateSelectedElement,
-		deleteSelectedElement: handleEditPanelDelete
+		deleteSelectedElement: handleEditPanelDelete,
+		undoDraft,
+		redoDraft,
+		canUndo,
+		canRedo
 	};
 }
 //#endregion