@pisell/materials 1.8.38 → 1.8.41

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

@@ -7,7 +7,6 @@ import useEngineContext from "../../../hooks/useEngineContext.js";
 import { createTranslationText } from "../../translation/utils.js";
 import { initFloorMapLayoutLocales } from "../utils/floorMapCanvasDisplay.js";
 import { mergeCanvasItems } from "../utils/floorMapConfigMerge.js";
-import { useDraftConfigHistory } from "./useDraftConfigHistory.js";
 import { floorMapViewConfigsEqual, normalizeFloorMapViewConfigFromProp } from "../utils/floorMapViewConfigDiff.js";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { locales } from "@pisell/utils";
@@ -64,18 +63,7 @@ function useFloorMapEditState(params) {
 	const { floorMapConfigProp, isFloorMapView, itemsProp, cellSizeProp, dataSources, onSave, onDataSourceRecordSave, dataSourceFormColumns, dataSourceRecordForm, dataSourceLabels, layoutPrefix, contentOffsetRef, showDataSourceRecordFormBlock } = params;
 	const engineCtx = useEngineContext();
 	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";
-	/**
-	* 草稿历史栈：所有可撤销的编辑操作都通过 `commitDraft` 写入；
-	* 上游 props 同步走 `replaceDraft`（不入栈、清空历史）。
-	*/
-	const draftHistory = 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 [draftConfig, setDraftConfig] = useState(null);
 	const [currentCanvasId, setCurrentCanvasId] = useState(null);
 	const [selectedId, setSelectedId] = useState(null);
 	const [placeMode, setPlaceMode] = useState(null);
@@ -99,11 +87,8 @@ function useFloorMapEditState(params) {
 			if (stored == null) return canvas;
 			return _objectSpread2(_objectSpread2({}, canvas), {}, { mapLayer: _objectSpread2(_objectSpread2({}, (_canvas$mapLayer = canvas.mapLayer) !== null && _canvas$mapLayer !== void 0 ? _canvas$mapLayer : {}), {}, { showGrid: stored }) });
 		}) });
-		/**
-		* 上游配置变更：直接 replace（不进入历史栈），并清空 undo/redo；
-		* 同时清空本地临时保存基线，让 dirty/未保存提示与上游对齐。
-		*/
-		replaceDraft(nextConfig);
+		setDraftConfig(nextConfig);
+		/** 上游配置已刷新，以服务端/父级为准，清空本地临时保存基线 */
 		setSavedBaselineConfig(null);
 		const enabled = nextConfig.canvases.filter((c) => c.enabled).sort((a, b) => a.order - b.order);
 		setCurrentCanvasId((prev) => {
@@ -121,25 +106,6 @@ function useFloorMapEditState(params) {
 		floorMapConfigProp,
 		savedBaselineConfig
 	]);
-	/**
-	* 撤销/重做后：若选中的图元已不存在于新草稿（如撤回了刚复制/新建的元素），
-	* 自动清理 selectedId，避免侧栏/快捷栏停留在「悬空选中」状态。
-	*/
-	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]);
-	/**
-	* 撤销/重做后：若当前画布在新草稿中已被删除或禁用，回退到第一张启用画布。
-	*/
-	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 = useCallback(() => {
 		initFloorMapLayoutLocales(engineLocale);
 		const defaultName = createTranslationText(locales.getText("pisell-floor-map-layout.canvas-tabs.default-new-canvas-name"), true);
@@ -150,7 +116,7 @@ function useFloorMapEditState(params) {
 			order: 0,
 			enabled: true
 		};
-		commitDraft((prev) => {
+		setDraftConfig((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;
@@ -159,7 +125,7 @@ function useFloorMapEditState(params) {
 		setCurrentCanvasId(newId);
 	}, [engineLocale]);
 	const handleRemoveCanvas = useCallback((canvasId) => {
-		commitDraft((prev) => {
+		setDraftConfig((prev) => {
 			var _prev$sceneElements;
 			if (!prev) return prev;
 			const nextCanvases = prev.canvases.filter((c) => c.id !== canvasId);
@@ -170,18 +136,18 @@ function useFloorMapEditState(params) {
 			});
 		});
 		setCurrentCanvasId((prev) => {
-			var _enabled$0$id3, _enabled$3;
+			var _enabled$0$id2, _enabled$2;
 			if (prev !== canvasId) return prev;
 			const cfg = configRef.current;
 			if (!cfg) return prev;
-			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;
+			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;
 		});
 	}, []);
 	const handleRenameCanvas = useCallback((canvasId, name) => {
 		if (typeof name === "string") {
 			const trimmed = name.trim();
 			if (!trimmed) return;
-			commitDraft((prev) => {
+			setDraftConfig((prev) => {
 				if (!prev) return prev;
 				return _objectSpread2(_objectSpread2({}, prev), {}, { canvases: prev.canvases.map((c) => c.id === canvasId ? _objectSpread2(_objectSpread2({}, c), {}, {
 					name: trimmed,
@@ -191,7 +157,7 @@ function useFloorMapEditState(params) {
 			return;
 		}
 		if (!Object.values(name).some((s) => typeof s === "string" && s.trim())) return;
-		commitDraft((prev) => {
+		setDraftConfig((prev) => {
 			if (!prev) return prev;
 			return _objectSpread2(_objectSpread2({}, prev), {}, { canvases: prev.canvases.map((c) => c.id === canvasId ? _objectSpread2(_objectSpread2({}, c), {}, {
 				name,
@@ -210,7 +176,7 @@ function useFloorMapEditState(params) {
 	]);
 	const items = isFloorMapView ? mergedItems : itemsProp;
 	const updateDraftSceneElement = useCallback((instanceId, patch) => {
-		commitDraft((prev) => {
+		setDraftConfig((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);
@@ -327,7 +293,7 @@ function useFloorMapEditState(params) {
 					message.warning("没有可落位的记录");
 					return false;
 				}
-				commitDraft((prev) => {
+				setDraftConfig((prev) => {
 					var _prev$sceneElements4;
 					return prev ? _objectSpread2(_objectSpread2({}, prev), {}, { sceneElements: [...(_prev$sceneElements4 = prev.sceneElements) !== null && _prev$sceneElements4 !== void 0 ? _prev$sceneElements4 : [], ...newEls] }) : prev;
 				});
@@ -348,7 +314,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);
-		commitDraft((prev) => {
+		setDraftConfig((prev) => {
 			var _prev$sceneElements5;
 			return prev ? _objectSpread2(_objectSpread2({}, prev), {}, { sceneElements: [...(_prev$sceneElements5 = prev.sceneElements) !== null && _prev$sceneElements5 !== void 0 ? _prev$sceneElements5 : [], newEl] }) : prev;
 		});
@@ -385,36 +351,9 @@ 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 = useCallback(() => {
-		if (!floorMapConfigProp) {
-			replaceDraft(null);
-			setSavedBaselineConfig(null);
-			return;
-		}
-		const baseConfig = normalizeFloorMapViewConfigFromProp(floorMapConfigProp);
-		replaceDraft(_objectSpread2(_objectSpread2({}, baseConfig), {}, { canvases: baseConfig.canvases.map((canvas) => {
-			var _canvas$mapLayer2;
-			const stored = readStoredGridVisible(canvas.id);
-			if (stored == null) return canvas;
-			return _objectSpread2(_objectSpread2({}, canvas), {}, { mapLayer: _objectSpread2(_objectSpread2({}, (_canvas$mapLayer2 = canvas.mapLayer) !== null && _canvas$mapLayer2 !== void 0 ? _canvas$mapLayer2 : {}), {}, { showGrid: stored }) });
-		}) }));
-		setSavedBaselineConfig(null);
-	}, [floorMapConfigProp, replaceDraft]);
 	/** 切换当前画布草稿中的 mapLayer.showGrid（随布局保存持久化） */
 	const toggleDraftCanvasShowGrid = useCallback(() => {
-		commitDraft((prev) => {
+		setDraftConfig((prev) => {
 			if (!prev || !currentCanvasId) return prev;
 			return _objectSpread2(_objectSpread2({}, prev), {}, { canvases: prev.canvases.map((c) => {
 				var _c$mapLayer;
@@ -445,7 +384,7 @@ function useFloorMapEditState(params) {
 	}, [onDataSourceRecordSave]);
 	const handleEditPanelDelete = useCallback(() => {
 		if (!selectedId) return;
-		commitDraft((prev) => {
+		setDraftConfig((prev) => {
 			var _prev$sceneElements6;
 			if (!prev) return prev;
 			return _objectSpread2(_objectSpread2({}, prev), {}, { sceneElements: ((_prev$sceneElements6 = prev.sceneElements) !== null && _prev$sceneElements6 !== void 0 ? _prev$sceneElements6 : []).filter((e) => e.instanceId !== selectedId) });
@@ -477,7 +416,7 @@ function useFloorMapEditState(params) {
 			dataBinding: void 0,
 			layoutTransformLocked: false
 		});
-		commitDraft(_objectSpread2(_objectSpread2({}, prev), {}, { sceneElements: [...(_prev$sceneElements8 = prev.sceneElements) !== null && _prev$sceneElements8 !== void 0 ? _prev$sceneElements8 : [], copy] }));
+		setDraftConfig(_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;
@@ -499,7 +438,6 @@ 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,
@@ -519,11 +457,7 @@ function useFloorMapEditState(params) {
 		toggleDraftCanvasShowGrid,
 		toggleSelectedLayoutLock,
 		duplicateSelectedElement,
-		deleteSelectedElement: handleEditPanelDelete,
-		undoDraft,
-		redoDraft,
-		canUndo,
-		canRedo
+		deleteSelectedElement: handleEditPanelDelete
 	};
 }
 //#endregion