@tmagic/editor 1.8.0-beta.7 → 1.8.0-beta.8

package/dist/es/services/dataSource.js

@@ -1,5 +1,5 @@
 import BaseService from "./BaseService.js";
-import { describeRevertStep, getLastPushedHistoryIds } from "../utils/history.js";
+import { createStackStep, describeRevertStep, getLastPushedHistoryIds } from "../utils/history.js";
 import history_default from "./history.js";
 import storage_default, { Protocol } from "./storage.js";
 import { COPY_DS_STORAGE_KEY } from "../utils/editor.js";
@@ -92,12 +92,15 @@ var DataSource = class extends BaseService {
 			id: config.id && !this.getDataSourceById(config.id) ? config.id : this.createId()
 		};
 		this.get("dataSources").push(newConfig);
-		if (!doNotPushHistory) this.lastPushedHistoryId = history_default.pushDataSource(newConfig.id, {
-			oldSchema: null,
-			newSchema: newConfig,
-			historyDescription,
-			source: historySource
-		})?.uuid ?? null;
+		if (!doNotPushHistory) {
+			const step = createStackStep(newConfig.id, {
+				oldValue: null,
+				newValue: newConfig,
+				historyDescription,
+				source: historySource
+			});
+			this.lastPushedHistoryId = (step ? history_default.push("dataSource", step, newConfig.id) : null)?.uuid ?? null;
+		}
 		this.emit("add", newConfig);
 		return newConfig;
 	}
@@ -115,13 +118,16 @@ var DataSource = class extends BaseService {
 		const oldConfig = dataSources[index];
 		const newConfig = cloneDeep$1(config);
 		dataSources[index] = newConfig;
-		if (!doNotPushHistory) this.lastPushedHistoryId = history_default.pushDataSource(newConfig.id, {
-			oldSchema: oldConfig ? cloneDeep$1(oldConfig) : null,
-			newSchema: newConfig,
-			changeRecords,
-			historyDescription,
-			source: historySource
-		})?.uuid ?? null;
+		if (!doNotPushHistory) {
+			const step = createStackStep(newConfig.id, {
+				oldValue: oldConfig ? cloneDeep$1(oldConfig) : null,
+				newValue: newConfig,
+				changeRecords,
+				historyDescription,
+				source: historySource
+			});
+			this.lastPushedHistoryId = (step ? history_default.push("dataSource", step, newConfig.id) : null)?.uuid ?? null;
+		}
 		this.emit("update", newConfig, {
 			oldConfig,
 			changeRecords
@@ -140,12 +146,15 @@ var DataSource = class extends BaseService {
 		const index = dataSources.findIndex((ds) => ds.id === id);
 		const oldConfig = index !== -1 ? dataSources[index] : null;
 		dataSources.splice(index, 1);
-		if (oldConfig && !doNotPushHistory) this.lastPushedHistoryId = history_default.pushDataSource(id, {
-			oldSchema: cloneDeep$1(oldConfig),
-			newSchema: null,
-			historyDescription,
-			source: historySource
-		})?.uuid ?? null;
+		if (oldConfig && !doNotPushHistory) {
+			const step = createStackStep(id, {
+				oldValue: cloneDeep$1(oldConfig),
+				newValue: null,
+				historyDescription,
+				source: historySource
+			});
+			this.lastPushedHistoryId = (step ? history_default.push("dataSource", step, id) : null)?.uuid ?? null;
+		}
 		this.emit("remove", id);
 	}
 	/**
@@ -191,7 +200,7 @@ var DataSource = class extends BaseService {
 	* @returns 撤销的 step；栈不存在或已无可撤销时返回 null
 	*/
 	undo(id) {
-		const step = history_default.undoDataSource(id);
+		const step = history_default.undo("dataSource", id);
 		if (!step) return null;
 		this.applyHistoryStep(step, true);
 		return step;
@@ -202,18 +211,18 @@ var DataSource = class extends BaseService {
 	* @returns 重做的 step；栈不存在或已无可重做时返回 null
 	*/
 	redo(id) {
-		const step = history_default.redoDataSource(id);
+		const step = history_default.redo("dataSource", id);
 		if (!step) return null;
 		this.applyHistoryStep(step, false);
 		return step;
 	}
 	/** 是否可对指定数据源撤销。 */
 	canUndo(id) {
-		return history_default.canUndoDataSource(id);
+		return history_default.canUndo("dataSource", id);
 	}
 	/** 是否可对指定数据源重做。 */
 	canRedo(id) {
-		return history_default.canRedoDataSource(id);
+		return history_default.canRedo("dataSource", id);
 	}
 	/**
 	* 跳转指定数据源的历史栈到目标游标。语义同 editor.gotoPageStep。
@@ -223,7 +232,7 @@ var DataSource = class extends BaseService {
 	* @returns 实际移动到的最终游标位置
 	*/
 	goto(id, targetCursor) {
-		let cursor = history_default.getDataSourceCursor(id);
+		let cursor = history_default.getCursor("dataSource", id);
 		const target = Math.max(0, targetCursor);
 		while (cursor > target) {
 			if (!this.undo(id)) break;
@@ -246,11 +255,11 @@ var DataSource = class extends BaseService {
 	* @returns 反向后产生的新 step；目标不存在 / 未应用时返回 null
 	*/
 	revert(id, index) {
-		const entry = history_default.getDataSourceStepList(id)[index];
+		const entry = history_default.getStepList("dataSource", id)[index];
 		if (!entry?.applied) return null;
 		const { oldSchema, newSchema, changeRecords } = entry.step.diff?.[0] ?? {};
 		if (oldSchema && newSchema && !changeRecords?.length) return null;
-		const description = `回滚 #${index + 1}: ${describeRevertStep(entry.step.id, entry.step.diff?.[0], (s) => s.title)}`;
+		const description = `回滚 #${index + 1}: ${describeRevertStep(entry.step.data.id, entry.step.diff?.[0], (s) => s.title)}`;
 		return this.applyRevertStep(entry.step, description);
 	}
 	/**
@@ -262,7 +271,7 @@ var DataSource = class extends BaseService {
 	*/
 	revertById(uuids) {
 		return uuids.map((uuid) => {
-			const location = history_default.findDataSourceStepLocationByUuid(uuid);
+			const location = history_default.findStepLocationByUuid("dataSource", uuid);
 			if (!location) return null;
 			return this.revert(location.id, location.index);
 		});
@@ -325,21 +334,21 @@ var DataSource = class extends BaseService {
 	* 同构，差异仅在于走对应的公共 add / update / remove 而不是带 doNotPushHistory 的版本。
 	*/
 	applyRevertStep(step, historyDescription) {
-		const { id } = step;
+		const { id } = step.data;
 		const { oldSchema, newSchema, changeRecords } = step.diff?.[0] ?? {};
 		if (!oldSchema && newSchema) {
 			this.remove(`${id}`, {
 				historyDescription,
 				historySource: "rollback"
 			});
-			return history_default.getDataSourceStepList(id).slice(-1)[0]?.step ?? null;
+			return history_default.getStepList("dataSource", id).slice(-1)[0]?.step ?? null;
 		}
 		if (oldSchema && !newSchema) {
 			this.add(cloneDeep$1(oldSchema), {
 				historyDescription,
 				historySource: "rollback"
 			});
-			return history_default.getDataSourceStepList(id).slice(-1)[0]?.step ?? null;
+			return history_default.getStepList("dataSource", id).slice(-1)[0]?.step ?? null;
 		}
 		if (!oldSchema || !newSchema) return null;
 		if (changeRecords?.length) {
@@ -360,13 +369,13 @@ var DataSource = class extends BaseService {
 				historyDescription,
 				historySource: "rollback"
 			});
-			return history_default.getDataSourceStepList(id).slice(-1)[0]?.step ?? null;
+			return history_default.getStepList("dataSource", id).slice(-1)[0]?.step ?? null;
 		}
 		this.update(cloneDeep$1(oldSchema), {
 			historyDescription,
 			historySource: "rollback"
 		});
-		return history_default.getDataSourceStepList(id).slice(-1)[0]?.step ?? null;
+		return history_default.getStepList("dataSource", id).slice(-1)[0]?.step ?? null;
 	}
 	/**
 	* 把一条历史 step 应用到当前数据源服务上。
@@ -383,7 +392,7 @@ var DataSource = class extends BaseService {
 	* @param reverse true=撤销，false=重做
 	*/
 	applyHistoryStep(step, reverse) {
-		const { id } = step;
+		const { id } = step.data;
 		const { oldSchema, newSchema, changeRecords } = step.diff?.[0] ?? {};
 		if (!oldSchema && newSchema) {
 			if (reverse) this.remove(`${id}`, { doNotPushHistory: true });

package/dist/es/services/editor.js

@@ -74,7 +74,7 @@ var Editor = class extends BaseService {
 				this.state.stageLoading = this.state.pageLength !== 0;
 				if (preValue && !isEmpty(preValue)) this.pushRootDiffHistory(preValue, app, options.historySource);
 				else app.items?.forEach((pageNode) => {
-					if (pageNode?.id !== void 0 && !history_default.getPageMarker(pageNode.id)) history_default.setPageMarker(pageNode.id, {
+					if (pageNode?.id !== void 0 && !history_default.getMarker("page", pageNode.id)) history_default.setMarker("page", pageNode.id, {
 						name: pageNode.name,
 						source: options.historySource
 					});
@@ -176,8 +176,6 @@ var Editor = class extends BaseService {
 		this.set("nodes", node ? [node] : []);
 		this.set("page", page);
 		this.set("parent", parent);
-		if (page) history_default.changePage(toRaw(page));
-		else history_default.resetState();
 		if (node?.id) this.get("stage")?.renderer?.runtime?.getApp?.()?.page?.emit("editor:select", {
 			node,
 			page,
@@ -368,10 +366,7 @@ var Editor = class extends BaseService {
 			if (pages[0]) {
 				await this.select(pages[0]);
 				stage?.select(pages[0].id);
-			} else {
-				this.selectRoot();
-				history_default.resetPage();
-			}
+			} else this.selectRoot();
 		};
 		const rootItems = root.items || [];
 		if (isPage(node)) {
@@ -875,7 +870,9 @@ var Editor = class extends BaseService {
 	* @returns 被撤销的操作
 	*/
 	async undo() {
-		const value = history_default.undo();
+		const pageId = this.get("page")?.id;
+		if (pageId === void 0) return null;
+		const value = history_default.undo("page", pageId);
 		if (value) await this.applyHistoryOp(value, true);
 		return value;
 	}
@@ -884,7 +881,9 @@ var Editor = class extends BaseService {
 	* @returns 被恢复的操作
 	*/
 	async redo() {
-		const value = history_default.redo();
+		const pageId = this.get("page")?.id;
+		if (pageId === void 0) return null;
+		const value = history_default.redo("page", pageId);
 		if (value) await this.applyHistoryOp(value, false);
 		return value;
 	}
@@ -905,7 +904,7 @@ var Editor = class extends BaseService {
 	* @returns 反向后产生的新 step；目标不存在 / 未应用 / 反向失败时返回 null
 	*/
 	async revertPageStep(index) {
-		const entry = history_default.getPageStepList()[index];
+		const entry = history_default.getStepList("page", this.get("page")?.id)[index];
 		if (!entry?.applied) return null;
 		const { step } = entry;
 		if (step.opType === "initial") return null;
@@ -915,7 +914,7 @@ var Editor = class extends BaseService {
 			if (!items.length || !items.every((item) => item.changeRecords?.length)) return null;
 		}
 		let revertedStep = null;
-		const captureRevert = (s) => {
+		const captureRevert = (_pageId, s) => {
 			revertedStep = s;
 		};
 		history_default.once("change", captureRevert);
@@ -985,9 +984,10 @@ var Editor = class extends BaseService {
 	*/
 	async revertPageStepById(uuids) {
 		const results = [];
+		const pageId = this.get("page")?.id;
 		for (const uuid of uuids) {
-			const index = history_default.getPageStepIndexByUuid(uuid);
-			results.push(index < 0 ? null : await this.revertPageStep(index));
+			const location = history_default.findStepLocationByUuid("page", uuid, pageId);
+			results.push(!location ? null : await this.revertPageStep(location.index));
 		}
 		return results;
 	}
@@ -1001,8 +1001,9 @@ var Editor = class extends BaseService {
 	* @returns 实际移动到的最终游标位置
 	*/
 	async gotoPageStep(targetCursor) {
-		let cursor = history_default.getPageCursor();
-		const { length } = history_default.getPageStepList();
+		const pageId = this.get("page")?.id;
+		let cursor = history_default.getCursor("page", pageId);
+		const { length } = history_default.getStepList("page", pageId);
 		const target = Math.max(0, Math.min(targetCursor, length));
 		while (cursor > target) {
 			if (!await this.undo()) break;
@@ -1117,30 +1118,34 @@ var Editor = class extends BaseService {
 				id: page.id
 			},
 			opType,
-			selectedBefore: [],
-			selectedAfter: [],
-			modifiedNodeIds: /* @__PURE__ */ new Map(),
+			extra: {
+				selectedBefore: [],
+				selectedAfter: [],
+				modifiedNodeIds: /* @__PURE__ */ new Map()
+			},
 			diff: [diffItem],
 			rootStep: true
 		};
 		if (source) step.source = source;
 		const top = history_default.getCurrentPageStep(page.id);
-		if (top?.rootStep && top.source === source) history_default.replaceCurrentPageStep(step, page.id);
-		else history_default.push(step, page.id);
+		if (top?.rootStep && top.source === source) history_default.replaceCurrentStep("page", step, page.id);
+		else history_default.push("page", step, page.id);
 	}
 	pushOpHistory(opType, { diff, pageData, historyDescription, source }) {
 		const step = {
 			uuid: guid(),
 			data: pageData,
 			opType,
-			selectedBefore: this.selectionBeforeOp ?? [],
-			selectedAfter: this.get("nodes").map((n) => n.id),
-			modifiedNodeIds: new Map(this.get("modifiedNodeIds")),
+			extra: {
+				selectedBefore: this.selectionBeforeOp ?? [],
+				selectedAfter: this.get("nodes").map((n) => n.id),
+				modifiedNodeIds: new Map(this.get("modifiedNodeIds"))
+			},
 			diff
 		};
 		if (historyDescription) step.historyDescription = historyDescription;
 		if (source) step.source = source;
-		const historyId = history_default.push(step, pageData.id) ? step.uuid : null;
+		const historyId = history_default.push("page", step, pageData.id) ? step.uuid : null;
 		this.lastPushedHistoryId = historyId;
 		this.selectionBeforeOp = null;
 		return historyId;
@@ -1241,10 +1246,10 @@ var Editor = class extends BaseService {
 				break;
 			}
 		}
-		this.set("modifiedNodeIds", step.modifiedNodeIds);
+		this.set("modifiedNodeIds", step.extra?.modifiedNodeIds ?? /* @__PURE__ */ new Map());
 		const page = toRaw(this.get("page"));
 		if (page) {
-			const selectIds = reverse ? step.selectedBefore : step.selectedAfter;
+			const selectIds = (reverse ? step.extra?.selectedBefore : step.extra?.selectedAfter) ?? [];
 			setTimeout(() => {
 				if (!selectIds.length) return;
 				if (selectIds.length > 1) {