@pisell/materials 6.11.42 → 6.11.44

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

@@ -0,0 +1,68 @@
+/**
+ * 平面图视口缓存：localStorage 读写、锁定态；供 useFloorMapTransformMetrics 使用。
+ */
+
+/** 平面图包围盒单侧默认外扩（像素）；过大会导致首屏大量空白 */
+export var DEFAULT_BOUNDING_PADDING = 56;
+
+/** 视口内与首屏对齐时，图元束左上与容器边缘的留白 */
+export var VIEWPORT_TOP_LEFT_MARGIN = 16;
+
+/** 平面图视口（缩放 + 平移）持久化到 localStorage 的 key 前缀 */
+export var VIEWPORT_STORAGE_PREFIX = 'pisell-floor-map-layout.viewport:';
+
+/** 视口锁定态持久化前缀（与视口位置分开存储） */
+export var VIEWPORT_LOCK_STORAGE_PREFIX = 'pisell-floor-map-layout.viewport-lock:';
+
+/** 视口持久化写入节流（避免拖动 / 缩放过程中高频写 localStorage） */
+export var VIEWPORT_PERSIST_DEBOUNCE_MS = 300;
+
+/** 判定当前 transform 是否处于「适配视口」结果时的容差 */
+export var FIT_BOUNDS_MATCH_POS_EPSILON = 0.5;
+export var FIT_BOUNDS_MATCH_SCALE_EPSILON = 0.005;
+export function readPersistedViewport(key) {
+  if (typeof window === 'undefined') return null;
+  try {
+    var raw = window.localStorage.getItem(VIEWPORT_STORAGE_PREFIX + key);
+    if (!raw) return null;
+    var 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;
+  }
+}
+export function writePersistedViewport(key, snapshot) {
+  if (typeof window === 'undefined') return;
+  try {
+    window.localStorage.setItem(VIEWPORT_STORAGE_PREFIX + key, JSON.stringify(snapshot));
+  } catch (_unused2) {
+    /** 隐私模式 / quota 超限等情况静默失败 */
+  }
+}
+export function readPersistedViewportLock(key) {
+  if (typeof window === 'undefined') return false;
+  try {
+    return window.localStorage.getItem(VIEWPORT_LOCK_STORAGE_PREFIX + key) === '1';
+  } catch (_unused3) {
+    return false;
+  }
+}
+export 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) {
+    /* noop */
+  }
+}

package/es/components/pisellFloorMapLayout/hooks/useDraftConfigHistory.d.ts

@@ -0,0 +1,18 @@
+export interface DraftHistoryCommitOptions {
+    /** 同一 groupId 在合并窗口内连续提交将合并为一条历史 */
+    groupId?: string;
+    /** 合并窗口（毫秒），默认 600 */
+    mergeWindowMs?: number;
+}
+export interface DraftHistory<T> {
+    present: T | null;
+    /** 写入并入栈（按 group/time 自动合并） */
+    commit: (next: T | null | ((prev: T | null) => T | null), options?: DraftHistoryCommitOptions) => void;
+    /** 重置（不入栈），清空历史；用于上游 props 同步 */
+    replace: (next: T | null) => void;
+    undo: () => void;
+    redo: () => void;
+    canUndo: boolean;
+    canRedo: boolean;
+}
+export declare function useDraftConfigHistory<T>(): DraftHistory<T>;

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

@@ -0,0 +1,104 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+/**
+ * 平面图草稿历史栈：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。
+ */
+import { useCallback, useMemo, useRef, useState } from 'react';
+/** 历史最大长度，超出从最旧端裁剪 */
+var HISTORY_LIMIT = 100;
+export function useDraftConfigHistory() {
+  var _useState = useState({
+      past: [],
+      present: null,
+      future: []
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    state = _useState2[0],
+    setState = _useState2[1];
+  var lastGroupRef = useRef(null);
+  var commit = useCallback(function (next, options) {
+    var _options$mergeWindowM;
+    var now = Date.now();
+    var last = lastGroupRef.current;
+    var inGroup = !!(options !== null && options !== 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(function (cur) {
+      var value = typeof next === 'function' ? next(cur.present) : next;
+      if (Object.is(value, cur.present)) return cur;
+      var nextPast = cur.past;
+      if (cur.present != null && !inGroup) {
+        nextPast = nextPast.length >= HISTORY_LIMIT ? [].concat(_toConsumableArray(nextPast.slice(1)), [cur.present]) : [].concat(_toConsumableArray(nextPast), [cur.present]);
+      }
+      return {
+        past: nextPast,
+        present: value,
+        future: []
+      };
+    });
+  }, []);
+  var replace = useCallback(function (next) {
+    lastGroupRef.current = null;
+    setState({
+      past: [],
+      present: next,
+      future: []
+    });
+  }, []);
+  var undo = useCallback(function () {
+    lastGroupRef.current = null;
+    setState(function (cur) {
+      if (cur.past.length === 0) return cur;
+      var prev = cur.past[cur.past.length - 1];
+      var nextFuture = cur.present != null ? [cur.present].concat(_toConsumableArray(cur.future)) : cur.future;
+      return {
+        past: cur.past.slice(0, -1),
+        present: prev,
+        future: nextFuture
+      };
+    });
+  }, []);
+  var redo = useCallback(function () {
+    lastGroupRef.current = null;
+    setState(function (cur) {
+      if (cur.future.length === 0) return cur;
+      var next = cur.future[0];
+      var nextPast = cur.present != null ? [].concat(_toConsumableArray(cur.past), [cur.present]) : cur.past;
+      return {
+        past: nextPast,
+        present: next,
+        future: cur.future.slice(1)
+      };
+    });
+  }, []);
+  return useMemo(function () {
+    return {
+      present: state.present,
+      commit: commit,
+      replace: replace,
+      undo: undo,
+      redo: redo,
+      canUndo: state.past.length > 0,
+      canRedo: state.future.length > 0
+    };
+  }, [state, commit, replace, undo, redo]);
+}

package/es/components/pisellFloorMapLayout/hooks/useFloorMapEditState.d.ts

@@ -41,6 +41,7 @@ export declare function useFloorMapEditState<T extends FloorMapItemBase>(params:
     }>) => void;
     handleCanvasPlaceClick: (e: MouseEvent<HTMLDivElement>) => void;
     handleSave: () => void;
+    discardDraft: () => void;
     placeSceneElementFromPaletteDrop: (contentX: number, contentY: number, scene: Extract<FloorMapPlaceMode, {
         type: 'scene';
     }>) => void;
@@ -63,4 +64,8 @@ export declare function useFloorMapEditState<T extends FloorMapItemBase>(params:
     toggleSelectedLayoutLock: () => void;
     duplicateSelectedElement: () => void;
     deleteSelectedElement: () => void;
+    undoDraft: () => void;
+    redoDraft: () => void;
+    canUndo: boolean;
+    canRedo: boolean;
 };

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

@@ -27,6 +27,7 @@ import useEngineContext from "../../../hooks/useEngineContext";
 import { createTranslationText } from "../../translation/utils";
 import { mergeCanvasItems } from "../utils/floorMapConfigMerge";
 import { STAGE_DECO_DEFAULT } from "../utils/floorMapStageDefaults";
+import { useDraftConfigHistory } from "./useDraftConfigHistory";
 import { floorMapViewConfigsEqual, normalizeFloorMapViewConfigFromProp } from "../utils/floorMapViewConfigDiff";
 import { getElementKindConfig, resolveDataBindingPolicy, isFloorMapImageElementKind } from "../utils/floorMapElementKindUtils";
 import { DEFAULT_CELL_SIZE } from "../utils/layoutMeasurements";
@@ -88,39 +89,48 @@ export function useFloorMapEditState(params) {
     showDataSourceRecordFormBlock = params.showDataSourceRecordFormBlock;
   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';
+
+  /**
+   * 草稿历史栈：所有可撤销的编辑操作都通过 `commitDraft` 写入；
+   * 上游 props 同步走 `replaceDraft`（不入栈、清空历史）。
+   */
+  var draftHistory = useDraftConfigHistory();
+  var draftConfig = draftHistory.present;
+  var commitDraft = draftHistory.commit;
+  var replaceDraft = draftHistory.replace;
+  var undoDraft = draftHistory.undo;
+  var redoDraft = draftHistory.redo;
+  var canUndo = draftHistory.canUndo;
+  var canRedo = draftHistory.canRedo;
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
-    draftConfig = _useState2[0],
-    setDraftConfig = _useState2[1];
+    currentCanvasId = _useState2[0],
+    setCurrentCanvasId = _useState2[1];
   var _useState3 = useState(null),
     _useState4 = _slicedToArray(_useState3, 2),
-    currentCanvasId = _useState4[0],
-    setCurrentCanvasId = _useState4[1];
+    selectedId = _useState4[0],
+    setSelectedId = _useState4[1];
   var _useState5 = useState(null),
     _useState6 = _slicedToArray(_useState5, 2),
-    selectedId = _useState6[0],
-    setSelectedId = _useState6[1];
-  var _useState7 = useState(null),
+    placeMode = _useState6[0],
+    setPlaceMode = _useState6[1];
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    placeMode = _useState8[0],
-    setPlaceMode = _useState8[1];
+    saving = _useState8[0],
+    setSaving = _useState8[1];
   var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    saving = _useState10[0],
-    setSaving = _useState10[1];
-  var _useState11 = useState(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    savingRecord = _useState12[0],
-    setSavingRecord = _useState12[1];
+    savingRecord = _useState10[0],
+    setSavingRecord = _useState10[1];
   /**
    * 本地“已提交保存”的基线快照：
    * - 点击「完成编辑/保存」后立即置为当前 draft，避免等待上游 props 回写期间仍显示“未持久化”提示；
    * - 用户后续再改动 draft 时，dirty 会再次为 true。
    */
-  var _useState13 = useState(null),
-    _useState14 = _slicedToArray(_useState13, 2),
-    savedBaselineConfig = _useState14[0],
-    setSavedBaselineConfig = _useState14[1];
+  var _useState11 = useState(null),
+    _useState12 = _slicedToArray(_useState11, 2),
+    savedBaselineConfig = _useState12[0],
+    setSavedBaselineConfig = _useState12[1];
   var config = isFloorMapView ? draftConfig !== null && draftConfig !== void 0 ? draftConfig : floorMapConfigProp : null;
   var configRef = useRef(config);
   configRef.current = config;
@@ -139,8 +149,11 @@ export function useFloorMapEditState(params) {
         });
       })
     });
-    setDraftConfig(nextConfig);
-    /** 上游配置已刷新，以服务端/父级为准，清空本地临时保存基线 */
+    /**
+     * 上游配置变更：直接 replace（不进入历史栈），并清空 undo/redo；
+     * 同时清空本地临时保存基线，让 dirty/未保存提示与上游对齐。
+     */
+    replaceDraft(nextConfig);
     setSavedBaselineConfig(null);
     var enabled = nextConfig.canvases.filter(function (c) {
       return c.enabled;
@@ -153,6 +166,8 @@ export function useFloorMapEditState(params) {
         return c.id === prev;
       }) ? prev : (_enabled$0$id = (_enabled$ = enabled[0]) === null || _enabled$ === void 0 ? void 0 : _enabled$.id) !== null && _enabled$0$id !== void 0 ? _enabled$0$id : null;
     });
+    // replaceDraft 是稳定引用；故意只在上游 props 变时同步
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [floorMapConfigProp]);
 
   /** 当前草稿与上游持久化 `floorMapConfig`（经同等规范化）是否不一致 */
@@ -161,6 +176,38 @@ export function useFloorMapEditState(params) {
     var baseline = savedBaselineConfig !== null && savedBaselineConfig !== void 0 ? savedBaselineConfig : normalizeFloorMapViewConfigFromProp(floorMapConfigProp);
     return !floorMapViewConfigsEqual(draftConfig, baseline);
   }, [isFloorMapView, draftConfig, floorMapConfigProp, savedBaselineConfig]);
+
+  /**
+   * 撤销/重做后：若选中的图元已不存在于新草稿（如撤回了刚复制/新建的元素），
+   * 自动清理 selectedId，避免侧栏/快捷栏停留在「悬空选中」状态。
+   */
+  useEffect(function () {
+    var _draftConfig$sceneEle;
+    if (!selectedId || !draftConfig) return;
+    var exists = ((_draftConfig$sceneEle = draftConfig.sceneElements) !== null && _draftConfig$sceneEle !== void 0 ? _draftConfig$sceneEle : []).some(function (e) {
+      return e.instanceId === selectedId;
+    });
+    if (!exists) setSelectedId(null);
+  }, [selectedId, draftConfig]);
+
+  /**
+   * 撤销/重做后：若当前画布在新草稿中已被删除或禁用，回退到第一张启用画布。
+   */
+  useEffect(function () {
+    var _enabled$0$id2, _enabled$2;
+    if (!draftConfig) return;
+    if (!currentCanvasId) return;
+    var stillUsable = draftConfig.canvases.some(function (c) {
+      return c.id === currentCanvasId && c.enabled;
+    });
+    if (stillUsable) return;
+    var enabled = draftConfig.canvases.filter(function (c) {
+      return c.enabled;
+    }).sort(function (a, b) {
+      return a.order - b.order;
+    });
+    setCurrentCanvasId((_enabled$0$id2 = (_enabled$2 = enabled[0]) === null || _enabled$2 === void 0 ? void 0 : _enabled$2.id) !== null && _enabled$0$id2 !== void 0 ? _enabled$0$id2 : null);
+  }, [currentCanvasId, draftConfig]);
   var handleAddCanvas = useCallback(function () {
     initFloorMapLayoutLocales(engineLocale);
     var label = locales.getText('pisell-floor-map-layout.canvas-tabs.default-new-canvas-name');
@@ -172,7 +219,7 @@ export function useFloorMapEditState(params) {
       order: 0,
       enabled: true
     };
-    setDraftConfig(function (prev) {
+    commitDraft(function (prev) {
       if (!prev) return prev;
       var list = prev.canvases.filter(function (c) {
         return c.enabled;
@@ -189,7 +236,7 @@ export function useFloorMapEditState(params) {
     setCurrentCanvasId(newId);
   }, [engineLocale]);
   var handleRemoveCanvas = useCallback(function (canvasId) {
-    setDraftConfig(function (prev) {
+    commitDraft(function (prev) {
       var _prev$sceneElements;
       if (!prev) return prev;
       var nextCanvases = prev.canvases.filter(function (c) {
@@ -204,7 +251,7 @@ export function useFloorMapEditState(params) {
       });
     });
     setCurrentCanvasId(function (prev) {
-      var _enabled$0$id2, _enabled$2;
+      var _enabled$0$id3, _enabled$3;
       if (prev !== canvasId) return prev;
       var cfg = configRef.current;
       if (!cfg) return prev;
@@ -213,14 +260,14 @@ export function useFloorMapEditState(params) {
       }).sort(function (a, b) {
         return a.order - b.order;
       });
-      return (_enabled$0$id2 = (_enabled$2 = enabled[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 = enabled[0]) === null || _enabled$3 === void 0 ? void 0 : _enabled$3.id) !== null && _enabled$0$id3 !== void 0 ? _enabled$0$id3 : null;
     });
   }, []);
   var handleRenameCanvas = useCallback(function (canvasId, name) {
     if (typeof name === 'string') {
       var trimmed = name.trim();
       if (!trimmed) return;
-      setDraftConfig(function (prev) {
+      commitDraft(function (prev) {
         if (!prev) return prev;
         return _objectSpread(_objectSpread({}, prev), {}, {
           canvases: prev.canvases.map(function (c) {
@@ -237,7 +284,7 @@ export function useFloorMapEditState(params) {
       return typeof s === 'string' && s.trim();
     });
     if (!hasAny) return;
-    setDraftConfig(function (prev) {
+    commitDraft(function (prev) {
       if (!prev) return prev;
       return _objectSpread(_objectSpread({}, prev), {}, {
         canvases: prev.canvases.map(function (c) {
@@ -255,7 +302,7 @@ export function useFloorMapEditState(params) {
   }, [isFloorMapView, config, currentCanvasId, cellSizeProp]);
   var items = isFloorMapView ? mergedItems : itemsProp;
   var updateDraftSceneElement = useCallback(function (instanceId, patch) {
-    setDraftConfig(function (prev) {
+    commitDraft(function (prev) {
       var _prev$sceneElements2, _prev$sceneElements3;
       if (!prev) return prev;
       var current = ((_prev$sceneElements2 = prev.sceneElements) !== null && _prev$sceneElements2 !== void 0 ? _prev$sceneElements2 : []).find(function (e) {
@@ -401,7 +448,7 @@ export function useFloorMapEditState(params) {
           message.warning('没有可落位的记录');
           return false;
         }
-        setDraftConfig(function (prev) {
+        commitDraft(function (prev) {
           var _prev$sceneElements4;
           return prev ? _objectSpread(_objectSpread({}, prev), {}, {
             sceneElements: [].concat(_toConsumableArray((_prev$sceneElements4 = prev.sceneElements) !== null && _prev$sceneElements4 !== void 0 ? _prev$sceneElements4 : []), newEls)
@@ -425,7 +472,7 @@ export 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 : '';
     }();
     var newEl = buildOneElement(dataBinding, contentX, contentY, placementName);
-    setDraftConfig(function (prev) {
+    commitDraft(function (prev) {
       var _prev$sceneElements5;
       return prev ? _objectSpread(_objectSpread({}, prev), {}, {
         sceneElements: [].concat(_toConsumableArray((_prev$sceneElements5 = prev.sceneElements) !== null && _prev$sceneElements5 !== void 0 ? _prev$sceneElements5 : []), [newEl])
@@ -465,9 +512,44 @@ export function useFloorMapEditState(params) {
     }
   }, [draftConfig, onSave]);
 
+  /**
+   * 丢弃所有未保存的草稿改动，把 `draftConfig` 重置回上游 `floorMapConfigProp` 的当前值。
+   *
+   * 用途：编辑态下点击「取消编辑」（不保存退出）时调用，否则 `config` 仍取
+   * `draftConfig ?? floorMapConfigProp`，回到阅读态会继续看到编辑后的脏数据。
+   *
+   * 实现要点：
+   * - 与上游 props 同步 effect（line 165）使用相同的规范化路径与 `replaceDraft`，
+   *   保证「取消」后状态等价于「上游 props 重新落地一次」；
+   * - `replaceDraft` 内部已清空 undo/redo 历史栈，避免取消后又能 redo 出旧 draft；
+   * - 同步清空 `savedBaselineConfig`，让 dirty 判定回到「以上游 props 为基线」。
+   */
+  var discardDraft = useCallback(function () {
+    if (!floorMapConfigProp) {
+      replaceDraft(null);
+      setSavedBaselineConfig(null);
+      return;
+    }
+    var baseConfig = normalizeFloorMapViewConfigFromProp(floorMapConfigProp);
+    var nextConfig = _objectSpread(_objectSpread({}, baseConfig), {}, {
+      canvases: baseConfig.canvases.map(function (canvas) {
+        var _canvas$mapLayer2;
+        var stored = readStoredGridVisible(canvas.id);
+        if (stored == null) return canvas;
+        return _objectSpread(_objectSpread({}, canvas), {}, {
+          mapLayer: _objectSpread(_objectSpread({}, (_canvas$mapLayer2 = canvas.mapLayer) !== null && _canvas$mapLayer2 !== void 0 ? _canvas$mapLayer2 : {}), {}, {
+            showGrid: stored
+          })
+        });
+      })
+    });
+    replaceDraft(nextConfig);
+    setSavedBaselineConfig(null);
+  }, [floorMapConfigProp, replaceDraft]);
+
   /** 切换当前画布草稿中的 mapLayer.showGrid（随布局保存持久化） */
   var toggleDraftCanvasShowGrid = useCallback(function () {
-    setDraftConfig(function (prev) {
+    commitDraft(function (prev) {
       if (!prev || !currentCanvasId) return prev;
       return _objectSpread(_objectSpread({}, prev), {}, {
         canvases: prev.canvases.map(function (c) {
@@ -506,7 +588,7 @@ export function useFloorMapEditState(params) {
   }, [onDataSourceRecordSave]);
   var handleEditPanelDelete = useCallback(function () {
     if (!selectedId) return;
-    setDraftConfig(function (prev) {
+    commitDraft(function (prev) {
       var _prev$sceneElements6;
       if (!prev) return prev;
       return _objectSpread(_objectSpread({}, prev), {}, {
@@ -550,7 +632,7 @@ export function useFloorMapEditState(params) {
       dataBinding: undefined,
       layoutTransformLocked: false
     });
-    setDraftConfig(_objectSpread(_objectSpread({}, prev), {}, {
+    commitDraft(_objectSpread(_objectSpread({}, prev), {}, {
       sceneElements: [].concat(_toConsumableArray((_prev$sceneElements8 = prev.sceneElements) !== null && _prev$sceneElements8 !== void 0 ? _prev$sceneElements8 : []), [copy])
     }));
     setSelectedId(newId);
@@ -593,6 +675,7 @@ export function useFloorMapEditState(params) {
     handleUpdateItem: handleUpdateItem,
     handleCanvasPlaceClick: handleCanvasPlaceClick,
     handleSave: handleSave,
+    discardDraft: discardDraft,
     placeSceneElementFromPaletteDrop: placeSceneElementFromPaletteDrop,
     editPanelParams: editPanelParams,
     placeOverlayClass: placeOverlayClass,
@@ -600,6 +683,10 @@ export function useFloorMapEditState(params) {
     toggleDraftCanvasShowGrid: toggleDraftCanvasShowGrid,
     toggleSelectedLayoutLock: toggleSelectedLayoutLock,
     duplicateSelectedElement: duplicateSelectedElement,
-    deleteSelectedElement: handleEditPanelDelete
+    deleteSelectedElement: handleEditPanelDelete,
+    undoDraft: undoDraft,
+    redoDraft: redoDraft,
+    canUndo: canUndo,
+    canRedo: canRedo
   };
 }

package/es/components/pisellFloorMapLayout/hooks/useFloorMapTransformMetrics.d.ts

@@ -5,7 +5,14 @@ export declare type FloorMapTransformContext = {
     zoomIn: () => void;
     zoomOut: () => void;
     resetTransform: () => void;
-    setTransform: (x: number, y: number, scale: number) => void;
+    /**
+     * react-zoom-pan-pinch v3 实际签名：(x, y, scale, animationTime?, animationType?)
+     * 默认 animationTime≈200ms；传 0 立即落点，避免被前一次动画吃掉或与之冲突
+     * （restore / 缓存恢复路径应使用 0 立即覆盖已在缓动中的 fit 动画）。
+     * 这里只暴露我们用到的前 4 参；库 animationType 是 `keyof typeof animations` 联合，
+     * 暴露过来反而限制传入对象的兼容性，我们也确实不传它。
+     */
+    setTransform: (x: number, y: number, scale: number, animationTime?: number) => void;
 } | null;
 export interface UseFloorMapTransformMetricsParams<T extends FloorMapItemBase> {
     items: T[];
@@ -28,6 +35,14 @@ export interface UseFloorMapTransformMetricsParams<T extends FloorMapItemBase> {
      * 不传则不跑「异步加载图元后的首次左上对齐」逻辑。
      */
     frameResetKey?: string;
+    /**
+     * 视口持久化标识（通常拼自 canvasId）。传入后：
+     *   - 切换 / 挂载时若 localStorage 中有缓存，自动恢复 transform 并跳过本帧 autoFit；
+     *   - 用户拖动 / 缩放时（节流 300ms）写回缓存；
+     *   - 主动 fitBounds / 进入伪全屏后由 fitBounds 触发的写入也会同步保存。
+     * 不传则完全不读不写 localStorage。
+     */
+    viewportPersistKey?: string;
 }
 export declare function useFloorMapTransformMetrics<T extends FloorMapItemBase>(params: UseFloorMapTransformMetricsParams<T>): {
     containerRef: import("react").RefObject<HTMLDivElement>;
@@ -57,6 +72,10 @@ export declare function useFloorMapTransformMetrics<T extends FloorMapItemBase>(
     isFullscreen: boolean;
     toggleFullscreen: () => void;
     fitBounds: () => boolean;
+    isAtFitBounds: boolean;
+    notifyTransformed: (x: number, y: number, nextScale: number) => void;
+    persistCurrentViewport: () => void;
+    attachTransformContext: (ctx: NonNullable<FloorMapTransformContext>) => void;
     lastTransformRef: MutableRefObject<{
         x: number;
         y: number;
@@ -64,4 +83,7 @@ export declare function useFloorMapTransformMetrics<T extends FloorMapItemBase>(
     }>;
     isInteractingWithElement: boolean;
     setIsInteractingWithElement: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    viewportLocked: boolean;
+    setViewportLocked: (next: boolean) => void;
+    toggleViewportLocked: () => void;
 };