@pisell/materials 1.8.38 → 1.8.41

package/lib/components/pisellFloorMapLayout/components/FloorMapEditTopBar.js

@@ -1,12 +1,10 @@
 const require_runtime = require("../../../_virtual/_rolldown/runtime.js");
-const require_HistoryIcons = require("./HistoryIcons.js");
 const require_useEngineContext = require("../../../hooks/useEngineContext.js");
 const require_floorMapCanvasDisplay = require("../utils/floorMapCanvasDisplay.js");
 const require_CanvasTabs = require("./CanvasTabs.js");
 let react = require("react");
 react = require_runtime.__toESM(react);
 let _pisell_utils = require("@pisell/utils");
-let antd = require("antd");
 let classnames = require("classnames");
 classnames = require_runtime.__toESM(classnames);
 require("./FloorMapEditTopBar.less");
@@ -18,16 +16,9 @@ require("./FloorMapEditTopBar.less");
 */
 const PREFIX = "pisell-floor-map-layout";
 const I18N_TB = "pisell-floor-map-layout.edit-top-bar";
-/** 检测 macOS / iPad，决定快捷键提示用 ⌘ 还是 Ctrl */
-function detectIsMacLike() {
-	if (typeof navigator === "undefined") return false;
-	const p = navigator.platform || "";
-	const ua = navigator.userAgent || "";
-	return /Mac|iPhone|iPad|iPod/i.test(p) || /Macintosh/i.test(ua);
-}
 function FloorMapEditTopBar(props) {
 	var _engineCtx$engine;
-	const { mode = "full", config, canvases, currentCanvasId, onTabChange, canEditTabs = false, onAddCanvas, onRemoveCanvas, onRenameCanvas, onSave, saving, saveError, layoutDirty, isFullscreen = false, extraActions, canvasTabsBarTrailing, hideCanvasTabs = false, onUndo, onRedo, canUndo = false, canRedo = false, onExitEdit, onCancelEdit, className } = props;
+	const { mode = "full", config, canvases, currentCanvasId, onTabChange, canEditTabs = false, onAddCanvas, onRemoveCanvas, onRenameCanvas, onSave, saving, saveError, layoutDirty, isFullscreen = false, extraActions, canvasTabsBarTrailing, hideCanvasTabs = false, className } = props;
 	const engineCtx = require_useEngineContext.default();
 	const engineLocale = (engineCtx === null || engineCtx === void 0 || (_engineCtx$engine = engineCtx.engine) === null || _engineCtx$engine === void 0 || (_engineCtx$engine = _engineCtx$engine.props) === null || _engineCtx$engine === void 0 ? void 0 : _engineCtx$engine.locale) || "zh-CN";
 	const topBarLabels = (0, react.useMemo)(() => {
@@ -36,112 +27,16 @@ function FloorMapEditTopBar(props) {
 			aria: _pisell_utils.locales.getText(`${I18N_TB}.aria`),
 			unsaved: _pisell_utils.locales.getText(`${I18N_TB}.unsaved`),
 			save: _pisell_utils.locales.getText(`${I18N_TB}.save`),
-			saving: _pisell_utils.locales.getText(`${I18N_TB}.saving`),
-			undo: _pisell_utils.locales.getText(`${I18N_TB}.undo`),
-			redo: _pisell_utils.locales.getText(`${I18N_TB}.redo`),
-			cancelEdit: _pisell_utils.locales.getText(`${I18N_TB}.cancel-edit`),
-			finishEdit: _pisell_utils.locales.getText(`${I18N_TB}.finish-edit`),
-			cancelConfirmTitle: _pisell_utils.locales.getText(`${I18N_TB}.cancel-confirm-title`),
-			cancelConfirmContent: _pisell_utils.locales.getText(`${I18N_TB}.cancel-confirm-content`),
-			cancelConfirmOk: _pisell_utils.locales.getText(`${I18N_TB}.cancel-confirm-ok`),
-			cancelConfirmCancel: _pisell_utils.locales.getText(`${I18N_TB}.cancel-confirm-cancel`)
+			saving: _pisell_utils.locales.getText(`${I18N_TB}.saving`)
 		};
 	}, [engineLocale]);
-	const showHistory = Boolean(onUndo || onRedo);
-	/** 历史按钮组（撤销/重做）：full、compact 共用同一段渲染 */
-	const historyGroup = (0, react.useMemo)(() => {
-		if (!showHistory) return null;
-		const cmd = detectIsMacLike() ? "⌘" : "Ctrl";
-		const undoTitle = `${topBarLabels.undo} (${cmd}+Z)`;
-		const redoTitle = `${topBarLabels.redo} (${cmd}+Shift+Z)`;
-		return /* @__PURE__ */ react.default.createElement("div", {
-			className: `${PREFIX}-edit-top-bar-history`,
-			role: "group",
-			"aria-label": `${topBarLabels.undo} / ${topBarLabels.redo}`
-		}, /* @__PURE__ */ react.default.createElement(antd.Button, {
-			type: "text",
-			size: "small",
-			icon: /* @__PURE__ */ react.default.createElement(require_HistoryIcons.UndoHistoryIcon, null),
-			disabled: !canUndo,
-			onClick: onUndo,
-			"aria-label": undoTitle
-		}, topBarLabels.undo), /* @__PURE__ */ react.default.createElement(antd.Button, {
-			type: "text",
-			size: "small",
-			icon: /* @__PURE__ */ react.default.createElement(require_HistoryIcons.RedoHistoryIcon, null),
-			disabled: !canRedo,
-			onClick: onRedo,
-			"aria-label": redoTitle
-		}, topBarLabels.redo));
-	}, [
-		showHistory,
-		topBarLabels.undo,
-		topBarLabels.redo,
-		canUndo,
-		canRedo,
-		onUndo,
-		onRedo
-	]);
 	/** 浏览器全屏时顶栏不展示保存，改由侧栏承担（见 PisellFloorMapLayout 对 Toolbar onSave 的互斥逻辑） */
 	const showSave = Boolean(onSave && config.canvasUi.canEdit) && !isFullscreen;
-	/**
-	* 业务层提供 onExitEdit 时改用「取消编辑 + 完成」组合，
-	* 此时不再展示独立的「保存」按钮（完成 = 保存 + 退出，避免冗余）。
-	*/
-	const showExitGroup = Boolean(onExitEdit && config.canvasUi.canEdit);
-	/**
-	* 「未保存」徽章独立成一段：放到 undo / redo 左边，与「编辑历史」视觉上同属一个状态区。
-	* 触发条件保持原样：必须 layoutDirty 且当前确实有保存通道（showSave 或 showExitGroup），
-	* 否则纯阅读态出现「未保存」会让用户困惑。
-	*/
-	const dirtyBadge = layoutDirty && (showExitGroup || showSave) ? /* @__PURE__ */ react.default.createElement("span", {
-		className: `${PREFIX}-edit-top-bar-dirty-badge`,
-		role: "status",
-		"aria-live": "polite"
-	}, topBarLabels.unsaved) : null;
-	/**
-	* 取消编辑：layoutDirty 时弹二次确认，避免误触丢失草稿；
-	* 干净状态直接走原本的退出路径，不打扰用户。
-	* onOk 里复用「优先 onCancelEdit，回退 onExitEdit」的语义，与保存按钮链路对称。
-	*
-	* 走 {@link Modal.useModal} 拿到的实例 + 同级渲染的 `modalContextHolder`，确保：
-	* - OK 按钮颜色继承当前 ConfigProvider 主题主色（静态 `Modal.confirm` 不会继承）；
-	* - 不依赖外层是否包了 PisellConfigProvider/`App` —— 这个组件可能被低代码引擎
-	*   单独挂在画布层，并不一定有上述 Provider，原先走 `PisellModal.confirm`
-	*   会因为 `setModal` 没被调用拿到 `undefined.confirm` 直接抛错。
-	*/
-	const [modalApi, modalContextHolder] = antd.Modal.useModal();
-	const performCancel = (0, react.useCallback)(() => {
-		if (onCancelEdit) onCancelEdit();
-		else onExitEdit === null || onExitEdit === void 0 || onExitEdit();
-	}, [onCancelEdit, onExitEdit]);
-	const handleCancelClick = (0, react.useCallback)(() => {
-		if (!layoutDirty) {
-			performCancel();
-			return;
-		}
-		modalApi.confirm({
-			title: topBarLabels.cancelConfirmTitle,
-			content: topBarLabels.cancelConfirmContent,
-			okText: topBarLabels.cancelConfirmOk,
-			cancelText: topBarLabels.cancelConfirmCancel,
-			onOk: () => performCancel(),
-			autoFocusButton: "cancel"
-		});
-	}, [
-		layoutDirty,
-		performCancel,
-		modalApi,
-		topBarLabels.cancelConfirmTitle,
-		topBarLabels.cancelConfirmContent,
-		topBarLabels.cancelConfirmOk,
-		topBarLabels.cancelConfirmCancel
-	]);
 	const hasTrailing = canvasTabsBarTrailing != null && canvasTabsBarTrailing !== false;
-	const hasFullActions = showSave || showExitGroup || Boolean(saveError) || extraActions != null && extraActions !== false || hasTrailing || showHistory;
+	const hasFullActions = showSave || Boolean(saveError) || extraActions != null && extraActions !== false || hasTrailing;
 	const tabsHiddenClass = hideCanvasTabs ? `${PREFIX}-edit-top-bar--tabs-hidden` : void 0;
 	if (mode === "compact") {
-		const showCompactActions = hasTrailing || showHistory;
+		const showCompactActions = hasTrailing;
 		return /* @__PURE__ */ react.default.createElement("div", {
 			className: (0, classnames.default)(`${PREFIX}-edit-top-bar`, `${PREFIX}-edit-top-bar--compact`, tabsHiddenClass, className),
 			role: "toolbar",
@@ -155,7 +50,7 @@ function FloorMapEditTopBar(props) {
 			onRemoveCanvas,
 			onRenameCanvas,
 			className: `${PREFIX}-edit-top-bar-canvas-tabs`
-		})) : null, showCompactActions ? /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-edit-top-bar-actions` }, historyGroup, canvasTabsBarTrailing) : null, modalContextHolder);
+		})) : null, showCompactActions ? /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-edit-top-bar-actions` }, canvasTabsBarTrailing) : null);
 	}
 	if (hideCanvasTabs && !hasFullActions) return null;
 	return /* @__PURE__ */ react.default.createElement("div", {
@@ -174,30 +69,16 @@ function FloorMapEditTopBar(props) {
 	})) : null, hasFullActions ? /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-edit-top-bar-actions` }, saveError ? /* @__PURE__ */ react.default.createElement("span", {
 		className: `${PREFIX}-edit-top-bar-error`,
 		title: typeof saveError === "string" ? saveError : saveError === null || saveError === void 0 ? void 0 : saveError.message
-	}, typeof saveError === "string" ? saveError : saveError === null || saveError === void 0 ? void 0 : saveError.message) : null, dirtyBadge, historyGroup, canvasTabsBarTrailing, extraActions, showExitGroup ? /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-edit-top-bar-save-group` }, /* @__PURE__ */ react.default.createElement("button", {
-		type: "button",
-		className: `${PREFIX}-edit-top-bar-btn`,
-		disabled: saving,
-		onClick: handleCancelClick
-	}, topBarLabels.cancelEdit), /* @__PURE__ */ react.default.createElement("button", {
-		type: "button",
-		className: (0, classnames.default)(`${PREFIX}-edit-top-bar-btn`, "primary"),
-		disabled: saving,
-		onClick: () => {
-			/**
-			* 完成 = 保存 + 退出；保存按 onSave 同步触发，
-			* 即便 onSave 是异步上报也立即调 onExitEdit，
-			* 业务层若需「保存成功后再退出」可在自身 onExitEdit 内做控制。
-			*/
-			onSave === null || onSave === void 0 || onSave();
-			onExitEdit === null || onExitEdit === void 0 || onExitEdit();
-		}
-	}, saving ? topBarLabels.saving : topBarLabels.finishEdit)) : showSave ? /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-edit-top-bar-save-group` }, /* @__PURE__ */ react.default.createElement("button", {
+	}, typeof saveError === "string" ? saveError : saveError === null || saveError === void 0 ? void 0 : saveError.message) : null, canvasTabsBarTrailing, extraActions, showSave ? /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-edit-top-bar-save-group` }, layoutDirty ? /* @__PURE__ */ react.default.createElement("span", {
+		className: `${PREFIX}-edit-top-bar-dirty-badge`,
+		role: "status",
+		"aria-live": "polite"
+	}, topBarLabels.unsaved) : null, /* @__PURE__ */ react.default.createElement("button", {
 		type: "button",
 		className: (0, classnames.default)(`${PREFIX}-edit-top-bar-btn`, "primary"),
 		disabled: saving,
 		onClick: onSave
-	}, saving ? topBarLabels.saving : topBarLabels.save)) : null) : null, modalContextHolder);
+	}, saving ? topBarLabels.saving : topBarLabels.save)) : null) : null);
 }
 //#endregion
 exports.default = FloorMapEditTopBar;

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

@@ -58,7 +58,7 @@
     text-overflow: ellipsis;
   }
 
-  /* 全屏顶栏右侧：取消 / 完成按钮组（未保存徽章已外提到 history 左侧，不再属于本组） */
+  /* 全屏顶栏：未保存标签在保存按钮左侧，单行对齐 */
 
   &-save-group {
     display: inline-flex;
@@ -67,14 +67,6 @@
     gap: 10px;
   }
 
-  /* 撤销 / 重做按钮组：作为 actions 区第一组元素显示 */
-  &-history {
-    display: inline-flex;
-    flex-direction: row;
-    align-items: center;
-    gap: 4px;
-  }
-
   &-dirty-badge {
     display: inline-flex;
     align-items: center;

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

@@ -8,7 +8,6 @@ let react = require("react");
 react = require_runtime.__toESM(react);
 let _pisell_utils = require("@pisell/utils");
 let antd = require("antd");
-let _ant_design_icons = require("@ant-design/icons");
 let classnames = require("classnames");
 classnames = require_runtime.__toESM(classnames);
 require("./FloorMapToolbar.less");
@@ -69,15 +68,6 @@ const IMAGE_PREVIEW_SIZE = {
 };
 function FloorMapToolbar(props) {
 	const { config, dataSources, dataSourceLabels = {}, canCreate, placeMode, onPlaceModeChange, renderPreviewItem, placementPreviewSize = DEFAULT_PLACEMENT_SIZE, decorationPreviewSize = DEFAULT_DECORATION_SIZE, sceneElements = [], onSave, saving, saveError, layoutDirty, className, onPaletteCardPointerDown, consumeToolbarClickIfTouchDrag } = props;
-	/**
-	* 侧栏收起 / 展开：仅会话内状态，**不写入 localStorage**；每次进入编辑（组件挂载）默认展开。
-	* 收起后整个 body / footer 隐藏、容器宽度收缩到一条；
-	* 切换按钮挂在容器右边垂直居中，外突半个按钮宽度。
-	*/
-	const [collapsed, setCollapsed] = (0, react.useState)(false);
-	const handleToggleCollapsed = (0, react.useCallback)(() => {
-		setCollapsed((prev) => !prev);
-	}, []);
 	const paletteKinds = (0, react.useMemo)(() => {
 		var _config$elementKinds;
 		return ((_config$elementKinds = config.elementKinds) !== null && _config$elementKinds !== void 0 ? _config$elementKinds : []).filter((k) => k.showInPalette !== false);
@@ -145,11 +135,6 @@ function FloorMapToolbar(props) {
 		};
 		const item = buildScenePreviewMergedItem(k, (placeMode === null || placeMode === void 0 ? void 0 : placeMode.type) === "scene" && placeMode.elementKind === k.value ? placeMode.dataSourceKey : void 0, size);
 		const isActive = (placeMode === null || placeMode === void 0 ? void 0 : placeMode.type) === "scene" && placeMode.elementKind === k.value;
-		/**
-		* 预览缩略图尺寸：配合 sidebar 124px 抽屉宽度。
-		* stage 92×40、placement-like 80×54、装饰类按 props.decorationPreviewSize（默认 48）。
-		* placeScale / stageScale 都基于 cellW/cellH 推导，改尺寸时缩放因子自动适配。
-		*/
 		const cellW = isStage ? 92 : placementLike ? 80 : decorationPreviewSize;
 		const cellH = isStage ? 40 : placementLike ? 54 : decorationPreviewSize;
 		const previewW = isImageKind ? IMAGE_PREVIEW_SIZE.width : placementPreviewSize.width;
@@ -247,13 +232,7 @@ function FloorMapToolbar(props) {
 			onClick: cancelPlaceMode
 		}, _pisell_utils.locales.getText(`${I18N_TB}.cancel-place`)));
 	};
-	return /* @__PURE__ */ react.default.createElement("div", { className: (0, classnames.default)(`${PREFIX}-toolbar`, `${PREFIX}-toolbar-sidebar`, collapsed && `${PREFIX}-toolbar-sidebar--collapsed`, className) }, /* @__PURE__ */ react.default.createElement("button", {
-		type: "button",
-		className: `${PREFIX}-toolbar-collapse-handle`,
-		onClick: handleToggleCollapsed,
-		"aria-label": collapsed ? _pisell_utils.locales.getText(`${I18N_TB}.expand`) : _pisell_utils.locales.getText(`${I18N_TB}.collapse`),
-		title: collapsed ? _pisell_utils.locales.getText(`${I18N_TB}.expand`) : _pisell_utils.locales.getText(`${I18N_TB}.collapse`)
-	}, collapsed ? /* @__PURE__ */ react.default.createElement(_ant_design_icons.RightOutlined, null) : /* @__PURE__ */ react.default.createElement(_ant_design_icons.LeftOutlined, null)), /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-toolbar-inner` }, /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-toolbar-body` }, canCreate && /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, categories.map((cat) => {
+	return /* @__PURE__ */ react.default.createElement("div", { className: (0, classnames.default)(`${PREFIX}-toolbar`, `${PREFIX}-toolbar-sidebar`, className) }, /* @__PURE__ */ react.default.createElement("div", { className: `${PREFIX}-toolbar-body` }, canCreate && /* @__PURE__ */ react.default.createElement(react.default.Fragment, null, categories.map((cat) => {
 		var _kindsByCategory$get;
 		const kinds = (_kindsByCategory$get = kindsByCategory.get(cat.id)) !== null && _kindsByCategory$get !== void 0 ? _kindsByCategory$get : [];
 		if (!kinds.length) return null;
@@ -269,7 +248,7 @@ function FloorMapToolbar(props) {
 		className: (0, classnames.default)(`${PREFIX}-toolbar-btn`, "primary", { [`${PREFIX}-toolbar-save-dirty`]: layoutDirty }),
 		disabled: saving,
 		onClick: onSave
-	}, saving ? _pisell_utils.locales.getText(`${I18N_TB}.saving`) : _pisell_utils.locales.getText(`${I18N_TB}.save`)))));
+	}, saving ? _pisell_utils.locales.getText(`${I18N_TB}.saving`) : _pisell_utils.locales.getText(`${I18N_TB}.save`))));
 }
 //#endregion
 exports.default = FloorMapToolbar;

package/lib/components/pisellFloorMapLayout/components/FloorMapToolbar.less

@@ -2,108 +2,20 @@
 .pisell-floor-map-layout-toolbar {
   &.pisell-floor-map-layout-toolbar-sidebar {
     position: relative;
-    /**
-     * 中等宽度抽屉：248px → 124px。
-     * 配合 cellW/cellH（见 FloorMapToolbar.tsx）按 0.5 倍渲染，preview-cell（最大 92px）
-     * + 标准 padding（12 8）正好落在 124px 内，兼顾画布展示空间与图元预览可视性。
-     */
-    width: 124px;
+    width: 248px;
     flex-shrink: 0;
     display: flex;
     flex-direction: column;
     background: #fff;
     border-right: 1px solid #e8e8e8;
     z-index: 10;
-    /** 收起态：只保留一条边和外突的切换按钮 */
-    transition: width 0.2s ease;
-    /**
-     * 注意：根元素必须保持 overflow: visible —— 否则下方 collapse-handle
-     * 用 right: -22px 外突的按钮会被裁掉。横向裁剪转移到 &-inner 内层做。
-     */
-
-    &.pisell-floor-map-layout-toolbar-sidebar--collapsed {
-      width: 0;
-      border-right: none;
-      /**
-       * 不再给 body/footer 设 display: none —— 让它们维持固定宽度参与动画的横向裁剪，
-       * 否则收起态切换会先 hide 后再瞬间 show，反而更容易暴露挤压的瞬间。
-       */
-    }
-  }
-
-  /**
-   * 内层容器：宽度跟随 sidebar 100% 伸缩，但用 overflow: hidden + 子元素固定宽度
-   * 把中间帧的水平挤压裁掉。这样 0→124px 展开过程中，body/footer 始终按 124px
-   * 排版，只是从右侧逐步揭开，避免文案被压成竖排。
-   */
-  &-inner {
-    flex: 1;
-    min-height: 0;
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-  }
-
-  /**
-   * 收起 / 展开按钮：左缘与侧栏**右缘对齐**（`left: 100%`），整体仍在侧栏外，不与图元预览重叠；
-   * 旧写法 `right: -22px` + `width: 28` 会让按钮左缘落在侧栏内约 6px 压到卡片。
-   * 收起态下容器宽度为 0，100% 仍锚在右缘，按钮仍能完整露出（z-index 高于地图区遮罩）。
-   */
-  &-collapse-handle {
-    position: absolute;
-    top: 50%;
-    left: 100%;
-    right: auto;
-    transform: translateY(-50%);
-    width: 28px;
-    height: 72px;
-    padding: 0;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    background: #fff;
-    color: #595959;
-    border: 1px solid #e8e8e8;
-    border-left: none;
-    border-radius: 0 12px 12px 0;
-    box-shadow: 2px 0 8px rgba(0, 0, 0, 0.08);
-    cursor: pointer;
-    z-index: 11;
-    transition: color 0.15s, background 0.15s, border-color 0.15s,
-      box-shadow 0.15s;
-
-    &:hover {
-      color: var(--fmap-primary, #1677ff);
-      background: color-mix(in srgb, var(--fmap-primary, #1677ff) 8%, #fff);
-      border-color: var(--fmap-primary, #1677ff);
-      box-shadow: 2px 0 12px rgba(22, 119, 255, 0.16);
-    }
-
-    &:focus-visible {
-      outline: 2px solid var(--fmap-primary, #1677ff);
-      outline-offset: 2px;
-    }
-
-    .anticon {
-      font-size: 16px;
-      line-height: 1;
-    }
   }
 
   &-body {
     flex: 1;
     min-height: 0;
     overflow-y: auto;
-    /** 124px 抽屉下，左右各留 8px 给 preview-card 的标准 padding 兜住 92px cell */
-    padding: 12px 8px;
-    /**
-     * 写死 124px 防止展开动画过程中跟随父容器 0→124px 同步缩放，避免文案被挤成竖排。
-     * 父容器 overflow: hidden 会裁掉超出的部分，视觉上就是抽屉从右侧划出。
-     */
-    width: 124px;
-    box-sizing: border-box;
-    flex-shrink: 0;
+    padding: 12px 10px;
   }
 
   &-section {
@@ -152,8 +64,7 @@
   &-preview-card {
     display: block;
     width: 100%;
-    /** 标准 padding 适配 124px 抽屉 + 92px cell 的尺寸预算 */
-    padding: 8px;
+    padding: 6px;
     text-align: center;
     background: #fafafa;
     border: 1px solid #e8e8e8;
@@ -275,15 +186,11 @@
 
   &-footer {
     flex-shrink: 0;
-    /** 与 body 同步水平 padding，124px 抽屉下按钮宽度足够呈现 */
-    padding: 12px 8px;
+    padding: 12px 10px;
     border-top: 1px solid #f0f0f0;
     display: flex;
     flex-direction: column;
     gap: 8px;
-    /** 同 body：固定 124px 防止展开动画期间被父容器宽度挤压换行 */
-    width: 124px;
-    box-sizing: border-box;
   }
 
   &-dirty-hint {

package/lib/components/pisellFloorMapLayout/components/ItemLayer.js

@@ -13,8 +13,6 @@ require("./ItemLayer.less");
 const PREFIX = "pisell-floor-map-layout";
 /** 图元内可滚动区标记（如预约房间卡 body / multi-list），与 private-materials 约定一致 */
 const ROOM_SCROLL_SURFACE_SELECTOR = "[data-pisell-floor-room-scroll-surface]";
-/** 与 EditableItemLayer `SELECTED_ITEM_STACK_Z` 一致：阅读态选中时抬升，避免邻桌图形盖住描边 */
-const READ_MODE_SELECTED_STACK_Z = 1e6;
 function getItemKey(item, index, rowKey) {
 	var _rowKey;
 	if (!rowKey) return item.id;
@@ -34,7 +32,7 @@ function getShapeStyle(shape = "rect") {
 	}
 }
 function ItemLayer(props) {
-	const { items, renderItem, viewportScale, rowKey, cellSize, itemUnit = "cell", itemGap = 0, contentWidth, contentHeight, contentOffsetX = 0, contentOffsetY = 0, enableHover = true, itemHoverOutline = true, onItemClick, onItemHover, onItemLeave, getMergedItemWrapperStyle, onInteractionChange, readModeSelectedItemId, className } = props;
+	const { items, renderItem, rowKey, cellSize, itemUnit = "cell", itemGap = 0, contentWidth, contentHeight, contentOffsetX = 0, contentOffsetY = 0, enableHover = true, itemHoverOutline = true, onItemClick, onItemHover, onItemLeave, getMergedItemWrapperStyle, onInteractionChange, className } = props;
 	/** 触控/指针在房间卡滚动区内按下时禁用画布 pan，松手恢复 */
 	const notifyRoomScrollSurfaceActive = (0, react.useCallback)(() => {
 		if (!onInteractionChange) return;
@@ -53,21 +51,9 @@ function ItemLayer(props) {
 			passive: true
 		});
 	}, [onInteractionChange]);
-	/**
-	* 只对触屏指针拦截画布 pan：触屏在卡内纵向滑动时会和画布 pan 抢事件，
-	* 这里把 `isInteractingWithElement` 拉起来让 TransformWrapper 关掉 panning，
-	* 让原生 scroll 接管列表。
-	*
-	* 鼠标 / 触控笔（pen）不走这条路径——桌面端鼠标要可以从任意图元上按下并直接拖动画布，
-	* 否则用户会发现「只有空白处才能拖动画布」（react-zoom-pan-pinch 的鼠标 pan 走的是
-	* window 的 mousedown 监听，但 panning.disabled=true 一样会让它直接拒绝启动）。
-	*
-	* 触屏 e.button 默认为 0，不再前置 `e.button !== 0` 早返；鼠标右键此时已被 pointerType 过滤掉。
-	*/
 	const handleItemPointerDownCapture = (0, react.useCallback)((e) => {
 		var _el$closest;
-		if (!onInteractionChange) return;
-		if (e.pointerType !== "touch") return;
+		if (!onInteractionChange || e.button !== 0) return;
 		const el = e.target;
 		if (!(el === null || el === void 0 || (_el$closest = el.closest) === null || _el$closest === void 0 ? void 0 : _el$closest.call(el, ROOM_SCROLL_SURFACE_SELECTOR))) return;
 		notifyRoomScrollSurfaceActive();
@@ -87,13 +73,11 @@ function ItemLayer(props) {
 	const itemNodes = (0, react.useMemo)(() => {
 		const isPixel = itemUnit === "pixel";
 		const g = itemGap;
-		const sorted = [...items].sort((a, b) => {
+		return [...items].sort((a, b) => {
 			var _a$zIndex, _b$zIndex;
 			return ((_a$zIndex = a.zIndex) !== null && _a$zIndex !== void 0 ? _a$zIndex : 0) - ((_b$zIndex = b.zIndex) !== null && _b$zIndex !== void 0 ? _b$zIndex : 0);
-		});
-		const renderOpts = viewportScale != null && Number.isFinite(viewportScale) && viewportScale > 0 ? { viewportScale } : void 0;
-		return sorted.map((item, index) => {
-			var _item$zIndex, _item$zIndex2;
+		}).map((item, index) => {
+			var _item$zIndex;
 			let left;
 			let top;
 			let width;
@@ -115,13 +99,11 @@ function ItemLayer(props) {
 			}
 			const key = getItemKey(item, index, rowKey);
 			const shapeStyle = getShapeStyle(item.shape);
-			const selectedRead = readModeSelectedItemId != null && String(readModeSelectedItemId).trim() !== "" && key === String(readModeSelectedItemId);
 			return /* @__PURE__ */ react.default.createElement("div", {
 				key,
 				className: (0, classnames.default)(`${PREFIX}-item`, {
 					[`${PREFIX}-item-hoverable`]: enableHover,
-					[`${PREFIX}-item-hover-outline`]: enableHover && itemHoverOutline,
-					[`${PREFIX}-item-read-selected`]: selectedRead
+					[`${PREFIX}-item-hover-outline`]: enableHover && itemHoverOutline
 				}),
 				style: require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({
 					position: "absolute",
@@ -130,19 +112,18 @@ function ItemLayer(props) {
 					width,
 					height,
 					boxSizing: "border-box",
-					zIndex: selectedRead ? READ_MODE_SELECTED_STACK_Z + ((_item$zIndex = item.zIndex) !== null && _item$zIndex !== void 0 ? _item$zIndex : 0) : (_item$zIndex2 = item.zIndex) !== null && _item$zIndex2 !== void 0 ? _item$zIndex2 : 0
+					zIndex: (_item$zIndex = item.zIndex) !== null && _item$zIndex !== void 0 ? _item$zIndex : 0
 				}, shapeStyle), getMergedItemWrapperStyle === null || getMergedItemWrapperStyle === void 0 ? void 0 : getMergedItemWrapperStyle(item, index)),
 				onClick: (e) => onItemClick === null || onItemClick === void 0 ? void 0 : onItemClick(item, index, e),
 				onMouseEnter: (e) => onItemHover === null || onItemHover === void 0 ? void 0 : onItemHover(item, index, e),
 				onMouseLeave: (e) => onItemLeave === null || onItemLeave === void 0 ? void 0 : onItemLeave(item, index, e),
 				onPointerDownCapture: handleItemPointerDownCapture,
 				onTouchStartCapture: handleItemTouchStartCapture
-			}, renderItem(item, index, renderOpts));
+			}, renderItem(item, index));
 		});
 	}, [
 		items,
 		renderItem,
-		viewportScale,
 		rowKey,
 		cellSize,
 		itemUnit,
@@ -154,8 +135,7 @@ function ItemLayer(props) {
 		onItemLeave,
 		getMergedItemWrapperStyle,
 		handleItemPointerDownCapture,
-		handleItemTouchStartCapture,
-		readModeSelectedItemId
+		handleItemTouchStartCapture
 	]);
 	return /* @__PURE__ */ react.default.createElement("div", {
 		className: (0, classnames.default)(`${PREFIX}-item-layer`, className),

package/lib/components/pisellFloorMapLayout/components/ItemLayer.less

@@ -13,27 +13,10 @@
 
   /** hover 描边与编辑态选中一致（见 EditableItemLayer：`pisell-floor-map-layout-editable-item-selected`） */
 
-  // &-hoverable&-hover-outline:hover {
-  //   outline: 3px solid var(--fmap-primary, #1677ff);
-  //   outline-offset: 0;
-  //   box-shadow: 0 0 0 1px rgba(22, 119, 255, 0.25);
-  //   z-index: 1;
-  // }
-
-  /** 阅读态：详情弹层等打开时由业务传入 `readModeSelectedItemId`，与编辑态选中描边一致 */
-  &-read-selected {
+  &-hoverable&-hover-outline:hover {
     outline: 3px solid var(--fmap-primary, #1677ff);
     outline-offset: 0;
     box-shadow: 0 0 0 1px rgba(22, 119, 255, 0.25);
+    z-index: 1;
   }
 }
-
-/**
- * 房台小卡（tooltip-time）需要允许 tooltip 浮层越出格子边界。
- * 仅在 item 内包含该类卡片时放开 overflow，避免影响其它图元定位/裁剪。
- */
-.pisell-floor-map-layout-item:has(.pisell-res-floor-room-card[data-tooltip-time='on']),
-.pisell-floor-map-layout-item:has(.pisell-res-floor-room-card[data-reserved-halo='on']) {
-  overflow: visible;
-  z-index: 1;
-}