@pisell/materials 1.0.1063 → 1.0.1065

package/es/components/pisellFloorMapLayout/components/ViewControls.js

@@ -1,9 +1,13 @@
-/**
- * ViewControls - 内置视图控制按钮：缩放（Stepper）、复位、区域定位
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ * ViewControls - 内置视图控制按钮：缩放（Stepper）、复位、区域定位
  */
 import React from 'react';
 import classNames from 'classnames';
-import { MinusOutlined, PlusOutlined, FullscreenOutlined, FullscreenExitOutlined } from '@ant-design/icons';
+import { MinusOutlined, PlusOutlined, FullscreenOutlined, FullscreenExitOutlined, BorderInnerOutlined } from '@ant-design/icons';
 import "./ViewControls.less";
 var PREFIX = 'pisell-floor-map-layout';
 
@@ -17,12 +21,17 @@ export function ViewControls(props) {
     scale = _props$scale === void 0 ? 1 : _props$scale,
     _props$isFullscreen = props.isFullscreen,
     isFullscreen = _props$isFullscreen === void 0 ? false : _props$isFullscreen,
-    className = props.className;
+    className = props.className,
+    _props$mapGridVisible = props.mapGridVisible,
+    mapGridVisible = _props$mapGridVisible === void 0 ? false : _props$mapGridVisible,
+    onToggleMapGrid = props.onToggleMapGrid;
   var showZoom = config.showZoom !== false;
   var showReset = config.showReset === true;
   var showFitBounds = config.showFitBounds === true;
   var showFullscreen = config.showFullscreen === true;
+  var showGridToggle = config.showGridToggle === true && typeof onToggleMapGrid === 'function';
   var scalePercent = Math.round(scale * 100);
+  var showToolsCapsule = showReset || showFitBounds || showFullscreen || showGridToggle;
   return /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(PREFIX, "-view-controls"), className)
   }, showZoom && /*#__PURE__*/React.createElement("div", {
@@ -43,27 +52,37 @@ export function ViewControls(props) {
       return api.zoomIn();
     },
     "aria-label": "\u653E\u5927"
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null))), showReset && /*#__PURE__*/React.createElement("button", {
+  }, /*#__PURE__*/React.createElement(PlusOutlined, null))), showToolsCapsule && /*#__PURE__*/React.createElement("div", {
+    className: "".concat(PREFIX, "-view-controls-tools-capsule")
+  }, showReset && /*#__PURE__*/React.createElement("button", {
     type: "button",
-    className: "".concat(PREFIX, "-view-controls-btn"),
+    className: "".concat(PREFIX, "-view-controls-tool-btn"),
     onClick: function onClick() {
       return api.resetTransform();
     },
     "aria-label": "\u590D\u4F4D"
   }, "\u27F2"), showFitBounds && api.fitBounds && /*#__PURE__*/React.createElement("button", {
     type: "button",
-    className: "".concat(PREFIX, "-view-controls-btn"),
+    className: "".concat(PREFIX, "-view-controls-tool-btn"),
     onClick: function onClick() {
       return api.fitBounds();
     },
     "aria-label": "\u533A\u57DF\u5B9A\u4F4D"
-  }, "\u229E"), showFullscreen && api.toggleFullscreen && /*#__PURE__*/React.createElement("button", {
+  }, "\u229E"), showGridToggle && /*#__PURE__*/React.createElement("button", {
     type: "button",
-    className: "".concat(PREFIX, "-view-controls-btn"),
+    className: classNames("".concat(PREFIX, "-view-controls-tool-btn"), _defineProperty({}, "".concat(PREFIX, "-view-controls-tool-btn--active"), mapGridVisible)),
+    onClick: function onClick() {
+      return onToggleMapGrid();
+    },
+    "aria-pressed": mapGridVisible,
+    "aria-label": mapGridVisible ? '隐藏网格' : '显示网格'
+  }, /*#__PURE__*/React.createElement(BorderInnerOutlined, null)), showFullscreen && api.toggleFullscreen && /*#__PURE__*/React.createElement("button", {
+    type: "button",
+    className: "".concat(PREFIX, "-view-controls-tool-btn"),
     onClick: function onClick() {
       return api.toggleFullscreen();
     },
     "aria-label": isFullscreen ? '退出全屏' : '全屏'
-  }, isFullscreen ? /*#__PURE__*/React.createElement(FullscreenExitOutlined, null) : /*#__PURE__*/React.createElement(FullscreenOutlined, null)));
+  }, isFullscreen ? /*#__PURE__*/React.createElement(FullscreenExitOutlined, null) : /*#__PURE__*/React.createElement(FullscreenOutlined, null))));
 }
 export default ViewControls;

package/es/components/pisellFloorMapLayout/components/ViewControls.less

@@ -10,6 +10,7 @@
   gap: 6px;
 
   /* Stepper：胶囊形 [减] 数值% [加] */
+
   &-zoom-stepper {
     display: flex;
     align-items: center;
@@ -52,26 +53,49 @@
     color: #101828;
   }
 
-  &-btn {
-    width: 32px;
-    height: 32px;
+  /* 复位 / 区域定位 / 全屏 / 网格：与 Stepper 同系胶囊条 */
+
+  &-tools-capsule {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 4px;
+    min-height: 56px;
+    padding: 2px 6px;
+    background: #fff;
+    border: 1px solid #98a2b3;
+    border-radius: 100px;
+    box-shadow: 0 12px 16px -4px rgba(16, 24, 40, 0.08), 0 4px 6px -2px rgba(16, 24, 40, 0.03);
+  }
+
+  &-tool-btn {
+    width: 52px;
+    height: 52px;
     display: flex;
     align-items: center;
     justify-content: center;
     padding: 0;
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: 4px;
-    background: #fff;
+    border: none;
+    border-radius: 50%;
+    background: transparent;
     cursor: pointer;
-    font-size: 18px;
+    color: #101828;
+    font-size: 20px;
     line-height: 1;
-    color: rgba(0, 0, 0, 0.65);
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
 
     &:hover {
-      color: #1890ff;
-      border-color: #1890ff;
-      background: #e6f7ff;
+      background: #f2f4f7;
+      color: #101828;
+    }
+  }
+
+  &-tool-btn--active {
+    background: #fff4ed;
+    color: #ff692e;
+
+    &:hover {
+      background: #ffe8d9;
+      color: #ff692e;
     }
   }
 }

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

@@ -7,5 +7,7 @@ export interface ViewControlsWithZoomProps {
     fitBounds: () => void;
     /** 未传时不展示全屏按钮（如编辑态 floorMapFullscreenMode 为 disabled） */
     toggleFullscreen?: () => void;
+    mapGridVisible?: boolean;
+    onToggleMapGrid?: () => void;
 }
 export declare function ViewControlsWithZoom(props: ViewControlsWithZoomProps): JSX.Element;

package/es/components/pisellFloorMapLayout/components/ViewControlsWithZoom.js

@@ -22,6 +22,8 @@ export function ViewControlsWithZoom(props) {
     api: api,
     config: props.config,
     scale: props.scale,
-    isFullscreen: props.isFullscreen
+    isFullscreen: props.isFullscreen,
+    mapGridVisible: props.mapGridVisible,
+    onToggleMapGrid: props.onToggleMapGrid
   });
 }

package/es/components/pisellFloorMapLayout/context/mergeFloorMapLayoutContext.js

@@ -4,8 +4,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-/**
- * 将 `FloorMapLayoutContext` 与 Layout props 合并：各字段 props ?? ctx，props 显式值优先。
+/**
+ * 将 `FloorMapLayoutContext` 与 Layout props 合并：各字段 props ?? ctx，props 显式值优先。
  */
 export function mergeFloorMapLayoutPropsFromContext(props, ctx) {
   var _props$floorMapConfig, _props$dataSources, _props$onSave, _props$onDataSourceRe, _props$dataSourceLabe, _props$dataSourceForm, _props$dataSourceReco, _props$loading, _props$saveError, _props$onElementRende, _props$toolbarShowSav, _props$floorMapFullsc, _props$showDataSource;

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

@@ -59,4 +59,5 @@ export declare function useFloorMapEditState<T extends FloorMapItemBase>(params:
     } | null;
     placeOverlayClass: string;
     isLayoutDirty: boolean;
+    toggleDraftCanvasShowGrid: () => void;
 };

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

@@ -2,15 +2,15 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 var _excluded = ["x", "y", "zIndex", "width", "height"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-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); }
@@ -28,14 +28,39 @@ import { createTranslationText } from "../../translation/utils";
 import { mergeCanvasItems } from "../utils/floorMapConfigMerge";
 import { STAGE_DECO_DEFAULT } from "../utils/floorMapStageDefaults";
 import { floorMapViewConfigsEqual, normalizeFloorMapViewConfigFromProp } from "../utils/floorMapViewConfigDiff";
-import { getElementKindConfig, resolveDataBindingPolicy } from "../utils/floorMapElementKindUtils";
+import { getElementKindConfig, resolveDataBindingPolicy, isFloorMapImageElementKind } from "../utils/floorMapElementKindUtils";
 import { DEFAULT_CELL_SIZE } from "../utils/layoutMeasurements";
 import { initFloorMapLayoutLocales } from "../utils/floorMapCanvasDisplay";
-import { FLOOR_MAP_IMAGE_ELEMENT_KIND, FLOOR_MAP_STAGE_ELEMENT_KIND } from "../types";
+import { FLOOR_MAP_STAGE_ELEMENT_KIND } from "../types";
 var IMAGE_PLACE_DEFAULT = {
   width: 400,
   height: 240
 };
+var GRID_VIS_STORAGE_PREFIX = 'pisell-floor-map-layout.grid-visible';
+function getGridVisStorageKey(canvasId) {
+  return "".concat(GRID_VIS_STORAGE_PREFIX, ":").concat(canvasId);
+}
+function readStoredGridVisible(canvasId) {
+  try {
+    var raw = localStorage.getItem(getGridVisStorageKey(canvasId));
+    if (raw == null) return null;
+    if (raw === '1') return true;
+    if (raw === '0') return false;
+    return null;
+  } catch (_unused) {
+    return null;
+  }
+}
+function writeStoredGridVisible(canvasId, visible) {
+  try {
+    localStorage.setItem(getGridVisStorageKey(canvasId), visible ? '1' : '0');
+  } catch (_unused2) {
+    // ignore localStorage failure (private mode / quota / sandbox)
+  }
+}
+
+/** 批量落位时每条相对上一条的偏移（内容坐标） */
+var BATCH_PLACE_OFFSET = 16;
 function newInstanceId() {
   return "elm_".concat(Date.now(), "_").concat(Math.random().toString(36).slice(2, 9));
 }
@@ -86,13 +111,36 @@ export function useFloorMapEditState(params) {
     _useState12 = _slicedToArray(_useState11, 2),
     savingRecord = _useState12[0],
     setSavingRecord = _useState12[1];
+  /**
+   * 本地“已提交保存”的基线快照：
+   * - 点击「完成编辑/保存」后立即置为当前 draft，避免等待上游 props 回写期间仍显示“未持久化”提示；
+   * - 用户后续再改动 draft 时，dirty 会再次为 true。
+   */
+  var _useState13 = useState(null),
+    _useState14 = _slicedToArray(_useState13, 2),
+    savedBaselineConfig = _useState14[0],
+    setSavedBaselineConfig = _useState14[1];
   var config = isFloorMapView ? draftConfig !== null && draftConfig !== void 0 ? draftConfig : floorMapConfigProp : null;
   var configRef = useRef(config);
   configRef.current = config;
   useEffect(function () {
     if (!floorMapConfigProp) return;
-    var nextConfig = normalizeFloorMapViewConfigFromProp(floorMapConfigProp);
+    var baseConfig = normalizeFloorMapViewConfigFromProp(floorMapConfigProp);
+    var nextConfig = _objectSpread(_objectSpread({}, baseConfig), {}, {
+      canvases: baseConfig.canvases.map(function (canvas) {
+        var _canvas$mapLayer;
+        var stored = readStoredGridVisible(canvas.id);
+        if (stored == null) return canvas;
+        return _objectSpread(_objectSpread({}, canvas), {}, {
+          mapLayer: _objectSpread(_objectSpread({}, (_canvas$mapLayer = canvas.mapLayer) !== null && _canvas$mapLayer !== void 0 ? _canvas$mapLayer : {}), {}, {
+            showGrid: stored
+          })
+        });
+      })
+    });
     setDraftConfig(nextConfig);
+    /** 上游配置已刷新，以服务端/父级为准，清空本地临时保存基线 */
+    setSavedBaselineConfig(null);
     var enabled = nextConfig.canvases.filter(function (c) {
       return c.enabled;
     }).sort(function (a, b) {
@@ -109,9 +157,9 @@ export function useFloorMapEditState(params) {
   /** 当前草稿与上游持久化 `floorMapConfig`（经同等规范化）是否不一致 */
   var isLayoutDirty = useMemo(function () {
     if (!isFloorMapView || !draftConfig || !floorMapConfigProp) return false;
-    var baseline = normalizeFloorMapViewConfigFromProp(floorMapConfigProp);
+    var baseline = savedBaselineConfig !== null && savedBaselineConfig !== void 0 ? savedBaselineConfig : normalizeFloorMapViewConfigFromProp(floorMapConfigProp);
     return !floorMapViewConfigsEqual(draftConfig, baseline);
-  }, [isFloorMapView, draftConfig, floorMapConfigProp]);
+  }, [isFloorMapView, draftConfig, floorMapConfigProp, savedBaselineConfig]);
   var handleAddCanvas = useCallback(function () {
     initFloorMapLayoutLocales(engineLocale);
     var label = locales.getText('pisell-floor-map-layout.canvas-tabs.default-new-canvas-name');
@@ -242,7 +290,7 @@ export function useFloorMapEditState(params) {
   var placeOverlayClass = "".concat(layoutPrefix, "-place-overlay");
 
   /**
-   * 在内容坐标系下按「新建图元」模式落一条 sceneElement（点击落点与侧栏拖拽共用）
+   * 在内容坐标系下按「新建图元」模式落 sceneElement（支持 recordIds 批量；点击与拖拽共用）
    * @returns 是否已成功写入草稿（校验失败时为 false）
    */
   var applyScenePlacementAtCoords = useCallback(function (contentX, contentY, scene) {
@@ -258,6 +306,29 @@ export function useFloorMapEditState(params) {
       return allKeys.includes(k);
     }) : allKeys;
     var pickKey = (_ref = (_scene$dataSourceKey = scene.dataSourceKey) !== null && _scene$dataSourceKey !== void 0 ? _scene$dataSourceKey : allowedKeys[0]) !== null && _ref !== void 0 ? _ref : allKeys[0];
+    var recordIdsToPlace = scene.recordIds && scene.recordIds.length > 0 ? scene.recordIds : scene.recordId ? [scene.recordId] : [];
+    var isStage = scene.elementKind === FLOOR_MAP_STAGE_ELEMENT_KIND;
+    var isImage = isFloorMapImageElementKind(scene.elementKind);
+    var w = isImage ? IMAGE_PLACE_DEFAULT.width : isStage ? STAGE_DECO_DEFAULT.width : defaultPlacementWidth;
+    var h = isImage ? IMAGE_PLACE_DEFAULT.height : isStage ? STAGE_DECO_DEFAULT.height : defaultPlacementHeight;
+    var useDecoSize = policy === 'none' && scene.elementKind !== FLOOR_MAP_STAGE_ELEMENT_KIND && !isImage;
+    var buildOneElement = function buildOneElement(dataBinding, x, y, name) {
+      return _objectSpread({
+        instanceId: newInstanceId(),
+        canvasId: currentCanvasId,
+        x: x,
+        y: y,
+        name: name,
+        zIndex: isImage ? -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,
+        dataBinding: dataBinding
+      }, isImage ? {
+        imageUrl: ''
+      } : {});
+    };
     var dataBinding;
     if (policy !== 'none' && pickKey) {
       var _dataSources$pickKey;
@@ -267,14 +338,15 @@ export function useFloorMapEditState(params) {
           dataSourceKey: pickKey,
           recordId: "new_".concat(Date.now())
         };
-      } else if (!scene.recordId) {
+      } else if (recordIdsToPlace.length === 0) {
         if (policy === 'required') {
           message.warning('请先在侧栏选择数据源与数据行，再落位');
           return false;
         }
-      } else {
+      } else if (recordIdsToPlace.length === 1) {
+        var rid = recordIdsToPlace[0];
         var record = dsList.find(function (r) {
-          return r.id === scene.recordId;
+          return r.id === rid;
         });
         if (!record) {
           message.error('所选记录不存在，请重新选择数据行');
@@ -282,52 +354,80 @@ export function useFloorMapEditState(params) {
         }
         var cand = {
           dataSourceKey: pickKey,
-          recordId: scene.recordId
+          recordId: rid
         };
         if (duplicateBinding(config.sceneElements, cand)) {
           message.warning('该数据记录已在平面图中绑定，请勿重复添加');
           return false;
         }
         dataBinding = cand;
+      } else {
+        var newEls = [];
+        var skippedDup = 0;
+        var skippedMissing = 0;
+        var placeIndex = 0;
+        var seenInBatch = new Set();
+        recordIdsToPlace.forEach(function (rid) {
+          var _row$name;
+          var record = dsList.find(function (r) {
+            return r.id === rid;
+          });
+          if (!record) {
+            skippedMissing += 1;
+            return;
+          }
+          var cand = {
+            dataSourceKey: pickKey,
+            recordId: rid
+          };
+          if (seenInBatch.has(rid) || duplicateBinding(config.sceneElements, cand)) {
+            skippedDup += 1;
+            return;
+          }
+          seenInBatch.add(rid);
+          var row = record;
+          var placementName = String((_row$name = row === null || row === void 0 ? void 0 : row.name) !== null && _row$name !== void 0 ? _row$name : rid);
+          newEls.push(buildOneElement(cand, contentX + placeIndex * BATCH_PLACE_OFFSET, contentY + placeIndex * BATCH_PLACE_OFFSET, placementName));
+          placeIndex += 1;
+        });
+        if (skippedDup > 0) {
+          message.warning("\u5DF2\u8DF3\u8FC7 ".concat(skippedDup, " \u6761\u5DF2\u5728\u5E73\u9762\u56FE\u4E2D\u7ED1\u5B9A\u7684\u8BB0\u5F55"));
+        }
+        if (skippedMissing > 0) {
+          message.warning("\u6709 ".concat(skippedMissing, " \u6761\u8BB0\u5F55\u4E0D\u5B58\u5728\uFF0C\u5DF2\u8DF3\u8FC7"));
+        }
+        if (newEls.length === 0) {
+          message.warning('没有可落位的记录');
+          return false;
+        }
+        setDraftConfig(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)
+          }) : prev;
+        });
+        return true;
       }
     }
-    var isStage = scene.elementKind === FLOOR_MAP_STAGE_ELEMENT_KIND;
-    var isImage = scene.elementKind === FLOOR_MAP_IMAGE_ELEMENT_KIND;
-    var w = isImage ? IMAGE_PLACE_DEFAULT.width : isStage ? STAGE_DECO_DEFAULT.width : defaultPlacementWidth;
-    var h = isImage ? IMAGE_PLACE_DEFAULT.height : isStage ? STAGE_DECO_DEFAULT.height : defaultPlacementHeight;
-    var useDecoSize = policy === 'none' && scene.elementKind !== FLOOR_MAP_STAGE_ELEMENT_KIND && !isImage;
     var placementName = function (_kindConfig$defaultPr, _kindConfig$defaultPr2) {
       if (isStage) return STAGE_DECO_DEFAULT.name;
       if (isImage) return '底图';
       var db = dataBinding;
-      if (db && scene.recordId) {
-        var _dataSources$db$dataS, _row$name;
+      var rid = recordIdsToPlace[0];
+      if (db && rid) {
+        var _dataSources$db$dataS, _row$name2;
         var row = dataSources === null || dataSources === void 0 || (_dataSources$db$dataS = dataSources[db.dataSourceKey]) === null || _dataSources$db$dataS === void 0 ? void 0 : _dataSources$db$dataS.find(function (r) {
-          return r.id === db.recordId;
+          return r.id === rid;
         });
-        return String((_row$name = row === null || row === void 0 ? void 0 : row.name) !== null && _row$name !== void 0 ? _row$name : db.recordId);
+        return String((_row$name2 = row === null || row === void 0 ? void 0 : row.name) !== null && _row$name2 !== void 0 ? _row$name2 : rid);
       }
       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 = _objectSpread({
-      instanceId: newInstanceId(),
-      canvasId: currentCanvasId,
-      x: contentX,
-      y: contentY,
-      name: placementName,
-      zIndex: isImage ? -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,
-      dataBinding: dataBinding
-    }, isImage ? {
-      imageUrl: ''
-    } : {});
+    var newEl = buildOneElement(dataBinding, contentX, contentY, placementName);
     setDraftConfig(function (prev) {
-      var _prev$sceneElements4;
+      var _prev$sceneElements5;
       return prev ? _objectSpread(_objectSpread({}, prev), {}, {
-        sceneElements: [].concat(_toConsumableArray((_prev$sceneElements4 = prev.sceneElements) !== null && _prev$sceneElements4 !== void 0 ? _prev$sceneElements4 : []), [newEl])
+        sceneElements: [].concat(_toConsumableArray((_prev$sceneElements5 = prev.sceneElements) !== null && _prev$sceneElements5 !== void 0 ? _prev$sceneElements5 : []), [newEl])
       }) : prev;
     });
     return true;
@@ -357,10 +457,32 @@ export function useFloorMapEditState(params) {
     setSaving(true);
     try {
       onSave(draftConfig);
+      /** 先本地确认“已提交保存”，让提示即时消失；后续以 props 回写为准 */
+      setSavedBaselineConfig(draftConfig);
     } finally {
       setSaving(false);
     }
   }, [draftConfig, onSave]);
+
+  /** 切换当前画布草稿中的 mapLayer.showGrid（随布局保存持久化） */
+  var toggleDraftCanvasShowGrid = useCallback(function () {
+    setDraftConfig(function (prev) {
+      if (!prev || !currentCanvasId) return prev;
+      return _objectSpread(_objectSpread({}, prev), {}, {
+        canvases: prev.canvases.map(function (c) {
+          var _c$mapLayer;
+          if (c.id !== currentCanvasId) return c;
+          var nextShow = !Boolean((_c$mapLayer = c.mapLayer) === null || _c$mapLayer === void 0 ? void 0 : _c$mapLayer.showGrid);
+          writeStoredGridVisible(currentCanvasId, nextShow);
+          return _objectSpread(_objectSpread({}, c), {}, {
+            mapLayer: _objectSpread(_objectSpread({}, c.mapLayer), {}, {
+              showGrid: nextShow
+            })
+          });
+        })
+      });
+    });
+  }, [currentCanvasId]);
   var handleEditPanelUpdate = useCallback(function (patch) {
     if (!selectedId) return;
     var bindingPatch = patch.dataBinding;
@@ -384,10 +506,10 @@ export function useFloorMapEditState(params) {
   var handleEditPanelDelete = useCallback(function () {
     if (!selectedId) return;
     setDraftConfig(function (prev) {
-      var _prev$sceneElements5;
+      var _prev$sceneElements6;
       if (!prev) return prev;
       return _objectSpread(_objectSpread({}, prev), {}, {
-        sceneElements: ((_prev$sceneElements5 = prev.sceneElements) !== null && _prev$sceneElements5 !== void 0 ? _prev$sceneElements5 : []).filter(function (e) {
+        sceneElements: ((_prev$sceneElements6 = prev.sceneElements) !== null && _prev$sceneElements6 !== void 0 ? _prev$sceneElements6 : []).filter(function (e) {
           return e.instanceId !== selectedId;
         })
       });
@@ -433,6 +555,7 @@ export function useFloorMapEditState(params) {
     placeSceneElementFromPaletteDrop: placeSceneElementFromPaletteDrop,
     editPanelParams: editPanelParams,
     placeOverlayClass: placeOverlayClass,
-    isLayoutDirty: isLayoutDirty
+    isLayoutDirty: isLayoutDirty,
+    toggleDraftCanvasShowGrid: toggleDraftCanvasShowGrid
   };
 }

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

@@ -56,7 +56,7 @@ export declare function useFloorMapTransformMetrics<T extends FloorMapItemBase>(
     setScale: import("react").Dispatch<import("react").SetStateAction<number>>;
     isFullscreen: boolean;
     toggleFullscreen: () => void;
-    fitBounds: () => void;
+    fitBounds: () => boolean;
     lastTransformRef: MutableRefObject<{
         x: number;
         y: number;