@tmagic/editor 1.8.0-manmanyu.8 → 1.8.0-manmanyu.9

package/dist/es/components/CompareForm.vue_vue_type_script_setup_true_lang.js

@@ -103,7 +103,10 @@ var CompareForm_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ de
 				case "node":
 					if (!props.type) return [];
 					return removeStyleDisplayConfig(await propsService.getPropsConfig(props.type, { node: props.value }));
-				case "data-source": return dataSourceService.getFormConfig(props.type || "base");
+				case "data-source": return dataSourceService.getFormConfig(props.type || "base").map((item) => "type" in item && item.type === "tab" ? {
+					...item,
+					active: "fields"
+				} : item);
 				case "code-block": return getCodeBlockFormConfig({
 					paramColConfig: codeBlockService.getParamsColConfig(),
 					isDataSource: () => Boolean(props.dataSourceType),

package/dist/es/index.js

@@ -4,7 +4,7 @@ import { advancedTabConfig, arrayOptions, displayTabConfig, eqOptions, eventTabC
 import props_default from "./services/props.js";
 import { getEditorConfig, setEditorConfig } from "./utils/config.js";
 import { UndoRedo } from "./utils/undo-redo.js";
-import { createStackStep, describeRevertStep, deserializeStacks, detectPageTargetId, detectPageTargetName, detectStackOpType, getLastPushedHistoryIds, getOrCreateStack, markStackSaved, mergePageSteps, mergeStackSteps, serializeStacks, undoFloor } from "./utils/history.js";
+import { createStackStep, describeRevertStep, deserializeStacks, detectStackOpType, detectTargetId, detectTargetName, getLastPushedHistoryIds, getOrCreateStack, markStackSaved, mergeSteps, serializeStacks, undoFloor } from "./utils/history.js";
 import { idbDelete, idbGet, idbSet, isIndexedDBSupported, openIndexedDB } from "./utils/indexed-db.js";
 import history_default from "./services/history.js";
 import storage_default from "./services/storage.js";
@@ -85,4 +85,4 @@ export * from "@tmagic/table";
 export * from "@tmagic/stage";
 export * from "@tmagic/design";
 export * from "@tmagic/utils";
-export { CODE_DRAFT_STORAGE_KEY, COPY_CODE_STORAGE_KEY, COPY_DS_STORAGE_KEY, COPY_STORAGE_KEY, CodeBlockEditor_default as CodeBlockEditor, CodeBlockList_default as CodeBlockList, CodeBlockListPanel_default as CodeBlockListPanel, CodeDeleteErrorType, CodeSelect_default as CodeSelect, CodeSelectCol_default as CodeSelectCol, ColumnLayout, CompareForm_default as CompareForm, ComponentListPanel_default as ComponentListPanel, CondOpSelect_default as CondOpSelect, ContentMenu_default as ContentMenu, DEFAULT_LEFT_COLUMN_WIDTH, DEFAULT_RIGHT_COLUMN_WIDTH, DataSourceAddButton_default as DataSourceAddButton, DataSourceConfigPanel_default as DataSourceConfigPanel, Index_default as DataSourceFieldSelect, DataSourceFields_default as DataSourceFields, DataSourceInput_default as DataSourceInput, DataSourceMethodSelect_default as DataSourceMethodSelect, DataSourceMethods_default as DataSourceMethods, DataSourceMocks_default as DataSourceMocks, DataSourceSelect_default as DataSourceSelect, DepTargetType, DisplayConds_default as DisplayConds, DragType, EventSelect_default as EventSelect, Fixed2Other, FloatingBox_default as FloatingBox, H_GUIDE_LINE_STORAGE_KEY, HistoryDiffDialog_default as HistoryDiffDialog, Bucket_default as HistoryListBucket, BucketTab_default as HistoryListBucketTab, Icon_default as Icon, IdleTask, KeyBindingCommand, KeyValue_default as KeyValue, Keys, LEFT_COLUMN_WIDTH_STORAGE_KEY, LayerOffset, LayerPanel_default as LayerPanel, Layout, SplitView_default as LayoutContainer, MIN_CENTER_COLUMN_WIDTH, MIN_LEFT_COLUMN_WIDTH, MIN_RIGHT_COLUMN_WIDTH, PROPS_PANEL_WIDTH_STORAGE_KEY, PageFragmentSelect_default as PageFragmentSelect, FormPanel_default as PropsFormPanel, PropsPanel_default as PropsPanel, RIGHT_COLUMN_WIDTH_STORAGE_KEY, Resizer_default as Resizer, ScrollViewer, SideItemKey, SplitView_default as SplitView, StageCore, Index_default$1 as StyleSetter, CodeEditor_default as TMagicCodeEditor, Editor_default as TMagicEditor, ToolButton_default as ToolButton, Tree_default as Tree, TreeNode_default as TreeNode, UI_SELECT_MODE_EVENT_NAME, UndoRedo, V_GUIDE_LINE_STORAGE_KEY, advancedTabConfig, arrayOptions, beforePaste, buildChangeRecords, calcAlignCenterStyle, calcLayerTargetIndex, calcMoveStyle, canUsePluginMethods, change2Fixed, classifyDragSources, codeBlock_default as codeBlockService, collectRelatedNodes, confirmHistoryAction, createStackStep, dataSource_default as dataSourceService, debug, plugin_default as default, defaultIsExpandable, dep_default as depService, describeRevertStep, describeStepForRevert, deserializeStacks, designPlugin, detectPageTargetId, detectPageTargetName, detectStackOpType, displayTabConfig, editorNodeMergeCustomizer, editor_default as editorService, eqOptions, error, eventTabConfig, events_default as eventsService, fillConfig, fixNodeLeft, fixNodePosition, formPlugin, generatePageName, generatePageNameByApp, getAddParent, getCascaderOptionsFromFields, getCodeBlockFormConfig, getDefaultConfig, getDisplayField, getEditorConfig, getFieldType, getFormConfig, getFormValue, getGuideLineFromCache, getInitPositionStyle, getLastPushedHistoryIds, getNodeIndex, getOrCreateStack, getPageFragmentList, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, history_default as historyService, idbDelete, idbGet, idbSet, info, isIncludeDataSource, isIndexedDBSupported, monaco_editor_default as loadMonaco, log, markStackSaved, mergePageSteps, mergeStackSteps, moveItemsInContainer, numberOptions, openIndexedDB, props_default as propsService, resolveSelectedNode, serializeConfig, serializeStacks, setChildrenLayout, setEditorConfig, setLayout, stageOverlay_default as stageOverlayService, storage_default as storageService, styleTabConfig, tablePlugin, toggleFixedPosition, ui_default as uiService, undoFloor, updateStatus, useCodeBlockEdit, useEditorContentHeight, useFilter, useFloatBox, useGetSo, useHistoryRevert, useNextFloatBoxPosition, useNodeStatus, useServices, useStage, useWindowRect, warn };
+export { CODE_DRAFT_STORAGE_KEY, COPY_CODE_STORAGE_KEY, COPY_DS_STORAGE_KEY, COPY_STORAGE_KEY, CodeBlockEditor_default as CodeBlockEditor, CodeBlockList_default as CodeBlockList, CodeBlockListPanel_default as CodeBlockListPanel, CodeDeleteErrorType, CodeSelect_default as CodeSelect, CodeSelectCol_default as CodeSelectCol, ColumnLayout, CompareForm_default as CompareForm, ComponentListPanel_default as ComponentListPanel, CondOpSelect_default as CondOpSelect, ContentMenu_default as ContentMenu, DEFAULT_LEFT_COLUMN_WIDTH, DEFAULT_RIGHT_COLUMN_WIDTH, DataSourceAddButton_default as DataSourceAddButton, DataSourceConfigPanel_default as DataSourceConfigPanel, Index_default as DataSourceFieldSelect, DataSourceFields_default as DataSourceFields, DataSourceInput_default as DataSourceInput, DataSourceMethodSelect_default as DataSourceMethodSelect, DataSourceMethods_default as DataSourceMethods, DataSourceMocks_default as DataSourceMocks, DataSourceSelect_default as DataSourceSelect, DepTargetType, DisplayConds_default as DisplayConds, DragType, EventSelect_default as EventSelect, Fixed2Other, FloatingBox_default as FloatingBox, H_GUIDE_LINE_STORAGE_KEY, HistoryDiffDialog_default as HistoryDiffDialog, Bucket_default as HistoryListBucket, BucketTab_default as HistoryListBucketTab, Icon_default as Icon, IdleTask, KeyBindingCommand, KeyValue_default as KeyValue, Keys, LEFT_COLUMN_WIDTH_STORAGE_KEY, LayerOffset, LayerPanel_default as LayerPanel, Layout, SplitView_default as LayoutContainer, MIN_CENTER_COLUMN_WIDTH, MIN_LEFT_COLUMN_WIDTH, MIN_RIGHT_COLUMN_WIDTH, PROPS_PANEL_WIDTH_STORAGE_KEY, PageFragmentSelect_default as PageFragmentSelect, FormPanel_default as PropsFormPanel, PropsPanel_default as PropsPanel, RIGHT_COLUMN_WIDTH_STORAGE_KEY, Resizer_default as Resizer, ScrollViewer, SideItemKey, SplitView_default as SplitView, StageCore, Index_default$1 as StyleSetter, CodeEditor_default as TMagicCodeEditor, Editor_default as TMagicEditor, ToolButton_default as ToolButton, Tree_default as Tree, TreeNode_default as TreeNode, UI_SELECT_MODE_EVENT_NAME, UndoRedo, V_GUIDE_LINE_STORAGE_KEY, advancedTabConfig, arrayOptions, beforePaste, buildChangeRecords, calcAlignCenterStyle, calcLayerTargetIndex, calcMoveStyle, canUsePluginMethods, change2Fixed, classifyDragSources, codeBlock_default as codeBlockService, collectRelatedNodes, confirmHistoryAction, createStackStep, dataSource_default as dataSourceService, debug, plugin_default as default, defaultIsExpandable, dep_default as depService, describeRevertStep, describeStepForRevert, deserializeStacks, designPlugin, detectStackOpType, detectTargetId, detectTargetName, displayTabConfig, editorNodeMergeCustomizer, editor_default as editorService, eqOptions, error, eventTabConfig, events_default as eventsService, fillConfig, fixNodeLeft, fixNodePosition, formPlugin, generatePageName, generatePageNameByApp, getAddParent, getCascaderOptionsFromFields, getCodeBlockFormConfig, getDefaultConfig, getDisplayField, getEditorConfig, getFieldType, getFormConfig, getFormValue, getGuideLineFromCache, getInitPositionStyle, getLastPushedHistoryIds, getNodeIndex, getOrCreateStack, getPageFragmentList, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, history_default as historyService, idbDelete, idbGet, idbSet, info, isIncludeDataSource, isIndexedDBSupported, monaco_editor_default as loadMonaco, log, markStackSaved, mergeSteps, moveItemsInContainer, numberOptions, openIndexedDB, props_default as propsService, resolveSelectedNode, serializeConfig, serializeStacks, setChildrenLayout, setEditorConfig, setLayout, stageOverlay_default as stageOverlayService, storage_default as storageService, styleTabConfig, tablePlugin, toggleFixedPosition, ui_default as uiService, undoFloor, updateStatus, useCodeBlockEdit, useEditorContentHeight, useFilter, useFloatBox, useGetSo, useHistoryRevert, useNextFloatBoxPosition, useNodeStatus, useServices, useStage, useWindowRect, warn };

package/dist/es/layouts/NavMenu.vue_vue_type_script_setup_true_lang.js

@@ -55,7 +55,7 @@ var NavMenu_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 						className: "undo",
 						icon: markRaw(Back),
 						tooltip: `后退(${ctrl}+z)`,
-						disabled: () => !historyService.state.canUndo,
+						disabled: () => !historyService.canUndo("page", editorService.get("page")?.id),
 						handler: () => editorService.undo()
 					});
 					break;
@@ -65,7 +65,7 @@ var NavMenu_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 						className: "redo",
 						icon: markRaw(Right),
 						tooltip: `前进(${ctrl}+Shift+z)`,
-						disabled: () => !historyService.state.canRedo,
+						disabled: () => !historyService.canRedo("page", editorService.get("page")?.id),
 						handler: () => editorService.redo()
 					});
 					break;

package/dist/es/layouts/history-list/HistoryListPanel.vue_vue_type_script_setup_true_lang.js

@@ -73,27 +73,35 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		* 当前活动页的「加载/初始」标记记录（设置 root 时生成），透传给 PageTab 的底部初始行展示。
 		* 基于 historyService 的 reactive state 派生，活动页切换或标记写入后自动刷新。
 		*/
-		const pageMarker = computed(() => historyService.getPageMarker());
+		const pageMarker = computed(() => historyService.getMarker("page", editorService.get("page")?.id));
+		/**
+		* 各历史类型的展示名称（页面 / 数据源 / 代码块），由 historyService.state.stepNames 配置，
+		* 业务方可通过 historyService.setStepName / registerStepType 覆盖。基于 reactive state 派生，配置变更后自动刷新。
+		*/
+		const pageName = computed(() => historyService.getStepName("page"));
+		const dataSourceName = computed(() => historyService.getStepName("dataSource"));
+		const codeBlockName = computed(() => historyService.getStepName("codeBlock"));
 		/** 代码块 step 仅 update（前后 content 都存在）时可查看差异。 */
 		const isStepDiffable = (step) => Boolean(step.diff?.[0]?.oldSchema && step.diff?.[0]?.newSchema);
 		/**
 		* 数据源 / 代码块两类 bucket 历史的整体渲染配置：把 title / prefix 与各自的描述、
 		* 可差异、可回滚判定收敛为单一对象整体注入 BucketTab，组件内部按需读取。
+		* title / 描述回退名取自可配置的展示名称，故用 computed 使其随 stepNames 变更刷新。
 		*/
-		const dataSourceConfig = {
-			title: "数据源",
+		const dataSourceConfig = computed(() => ({
+			title: dataSourceName.value,
 			prefix: "ds",
-			describeStep: (step) => describeStep(step, (schema) => schema?.title, "数据源"),
+			describeStep: (step) => describeStep(step, (schema) => schema?.title, dataSourceName.value),
 			isStepDiffable,
 			isStepRevertable: isSingleDiffStepRevertable
-		};
-		const codeBlockConfig = {
-			title: "代码块",
+		}));
+		const codeBlockConfig = computed(() => ({
+			title: codeBlockName.value,
 			prefix: "cb",
-			describeStep: (step) => describeStep(step, (content) => content?.name, "代码块"),
+			describeStep: (step) => describeStep(step, (content) => content?.name, codeBlockName.value),
 			isStepDiffable,
 			isStepRevertable: isSingleDiffStepRevertable
-		};
+		}));
 		/** 把"目标 step 索引"翻译成"目标 cursor"（已应用步骤数量）。 */
 		const indexToCursor = (index) => index + 1;
 		const onPageGoto = (index) => {
@@ -106,7 +114,7 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		* - 该 step 涉及的节点都已不存在（如删除记录、被撤销的新增）时给出提示，不做选中。
 		*/
 		const onPageSelect = async (index) => {
-			const step = historyService.getPageStepList()[index]?.step;
+			const step = historyService.getStepList("page", editorService.get("page")?.id)[index]?.step;
 			if (!step) return;
 			const targetId = (step.diff ?? []).map((item) => item.newSchema?.id ?? item.oldSchema?.id).find((id) => id !== void 0 && id !== null && editorService.getNodeById(id, false));
 			if (targetId === void 0 || targetId === null) {
@@ -156,19 +164,19 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		};
 		const onPageClear = async () => {
 			if (await confirmHistoryAction("确定清空当前页面的历史记录吗？清空后将无法撤销/重做之前的操作，本地保存的记录也会一并删除。")) {
-				historyService.clearPage();
+				historyService.clear("page", editorService.get("page")?.id);
 				await syncIndexedDB();
 			}
 		};
 		const onDataSourceClear = async () => {
 			if (await confirmHistoryAction("确定清空数据源的历史记录吗？清空后将无法撤销/重做之前的操作，本地保存的记录也会一并删除。")) {
-				historyService.clearDataSource();
+				historyService.clear("dataSource");
 				await syncIndexedDB();
 			}
 		};
 		const onCodeBlockClear = async () => {
 			if (await confirmHistoryAction("确定清空代码块的历史记录吗？清空后将无法撤销/重做之前的操作，本地保存的记录也会一并删除。")) {
-				historyService.clearCodeBlock();
+				historyService.clear("codeBlock");
 				await syncIndexedDB();
 			}
 		};
@@ -219,7 +227,7 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 					default: withCtx(() => [
 						(openBlock(), createBlock(resolveDynamicComponent(unref(tabPaneComponent)?.component || "el-tab-pane"), normalizeProps(guardReactiveProps(unref(tabPaneComponent)?.props({
 							name: "page",
-							label: `页面 (${unref(pageGroups).length})`
+							label: `${pageName.value} (${unref(pageGroups).length})`
 						}) || {})), {
 							default: withCtx(() => [createVNode(PageTab_default, {
 								list: unref(pageGroupsDisplay),
@@ -244,10 +252,10 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 						}, 16)),
 						!disabledDataSource.value ? (openBlock(), createBlock(resolveDynamicComponent(unref(tabPaneComponent)?.component || "el-tab-pane"), normalizeProps(mergeProps({ key: 0 }, unref(tabPaneComponent)?.props({
 							name: "data-source",
-							label: `数据源 (${unref(dataSourceGroups).length})`
+							label: `${dataSourceName.value} (${unref(dataSourceGroups).length})`
 						}) || {})), {
 							default: withCtx(() => [createVNode(BucketTab_default, {
-								config: dataSourceConfig,
+								config: dataSourceConfig.value,
 								buckets: unref(dataSourceGroupsByTarget),
 								expanded: unref(expanded),
 								onToggle: unref(toggleGroup),
@@ -257,6 +265,7 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 								onRevertStep: unref(onDataSourceRevert),
 								onClear: onDataSourceClear
 							}, null, 8, [
+								"config",
 								"buckets",
 								"expanded",
 								"onToggle",
@@ -267,10 +276,10 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 						}, 16)) : createCommentVNode("v-if", true),
 						!disabledCodeBlock.value ? (openBlock(), createBlock(resolveDynamicComponent(unref(tabPaneComponent)?.component || "el-tab-pane"), normalizeProps(mergeProps({ key: 1 }, unref(tabPaneComponent)?.props({
 							name: "code-block",
-							label: `代码块 (${unref(codeBlockGroups).length})`
+							label: `${codeBlockName.value} (${unref(codeBlockGroups).length})`
 						}) || {})), {
 							default: withCtx(() => [createVNode(BucketTab_default, {
-								config: codeBlockConfig,
+								config: codeBlockConfig.value,
 								buckets: unref(codeBlockGroupsByTarget),
 								expanded: unref(expanded),
 								onToggle: unref(toggleGroup),
@@ -280,6 +289,7 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 								onRevertStep: unref(onCodeBlockRevert),
 								onClear: onCodeBlockClear
 							}, null, 8, [
+								"config",
 								"buckets",
 								"expanded",
 								"onToggle",

package/dist/es/layouts/history-list/useHistoryList.js

@@ -10,7 +10,7 @@ import { computed, reactive } from "vue";
 * 所有数据基于 historyService 的 reactive state 派生，自动跟随历史变化刷新。
 */
 var useHistoryList = () => {
-	const { historyService } = useServices();
+	const { editorService, historyService } = useServices();
 	/**
 	* 折叠状态：key 形如 `pg-${组内首步 index}` / `ds-${id}-${组内首步 index}` / `cb-${id}-${组内首步 index}`。
 	* 用组内首步的稳定 index（而非展示位置）作为 key，确保历史数据更新后已展开的分组状态保持不变。
@@ -20,9 +20,9 @@ var useHistoryList = () => {
 	const toggleGroup = (key) => {
 		expanded[key] = expanded[key] === false;
 	};
-	const pageGroups = computed(() => historyService.getPageHistoryGroups());
-	const dataSourceGroups = computed(() => historyService.getDataSourceHistoryGroups());
-	const codeBlockGroups = computed(() => historyService.getCodeBlockHistoryGroups());
+	const pageGroups = computed(() => historyService.getHistoryGroups("page", editorService.get("page")?.id));
+	const dataSourceGroups = computed(() => historyService.getHistoryGroups("dataSource"));
+	const codeBlockGroups = computed(() => historyService.getHistoryGroups("codeBlock"));
 	/** 页面 tab 倒序展示（最新一组在最上面）。 */
 	const pageGroupsDisplay = computed(() => pageGroups.value.slice().reverse());
 	/**

package/dist/es/layouts/history-list/useHistoryRevert.js

@@ -151,21 +151,21 @@ var useHistoryRevert = (services, options = {}) => {
 	};
 	const buildPageDiffPayload = (index) => buildDiffPayload({
 		category: "node",
-		groups: () => historyService.getPageHistoryGroups(),
+		groups: () => historyService.getHistoryGroups("page", editorService.get("page")?.id),
 		getCurrent: (id) => editorService.getNodeById(id),
 		resolveType: (n, o) => n.type || o.type || "",
 		resolveLabel: (n, o) => n.name || o.name || n.type || o.type || ""
 	}, index);
 	const buildDataSourceDiffPayload = (id, index) => buildDiffPayload({
 		category: "data-source",
-		groups: () => historyService.getDataSourceHistoryGroups(),
+		groups: () => historyService.getHistoryGroups("dataSource"),
 		getCurrent: (id) => dataSourceService.getDataSourceById(`${id}`),
 		resolveType: (n, o) => n.type || o.type || "base",
 		resolveLabel: (n, o, id) => n.title || o.title || `${id}`
 	}, index, id);
 	const buildCodeBlockDiffPayload = (id, index) => buildDiffPayload({
 		category: "code-block",
-		groups: () => historyService.getCodeBlockHistoryGroups(),
+		groups: () => historyService.getHistoryGroups("codeBlock"),
 		getCurrent: (id) => codeBlockService.getCodeContentById(id),
 		resolveLabel: (n, o, id) => n.name || o.name || `${id}`
 	}, index, id);
@@ -176,7 +176,7 @@ var useHistoryRevert = (services, options = {}) => {
 	* add（回滚即删除）即使目标已不在，也已达成「删除」目的，不视为失败。
 	*/
 	const isPageRevertTargetMissing = (index) => {
-		const step = historyService.getPageStepList()[index]?.step;
+		const step = historyService.getStepList("page", editorService.get("page")?.id)[index]?.step;
 		if (!step) return false;
 		if (step.opType === "update") return (step.diff ?? []).some((item) => {
 			const id = item.newSchema?.id ?? item.oldSchema?.id;
@@ -187,12 +187,12 @@ var useHistoryRevert = (services, options = {}) => {
 	};
 	/** 数据源 update 步骤回滚时，对应数据源必须仍存在（已删除则无处写回旧值）。 */
 	const isDataSourceRevertTargetMissing = (id, index) => {
-		const step = historyService.getDataSourceStepList(id)[index]?.step;
+		const step = historyService.getStepList("dataSource", id)[index]?.step;
 		return Boolean(step?.opType === "update" && !dataSourceService.getDataSourceById(`${id}`));
 	};
 	/** 代码块 update 步骤回滚时，对应代码块必须仍存在（已删除则无处写回旧值）。 */
 	const isCodeBlockRevertTargetMissing = (id, index) => {
-		const step = historyService.getCodeBlockStepList(id)[index]?.step;
+		const step = historyService.getStepList("codeBlock", id)[index]?.step;
 		return Boolean(step?.opType === "update" && !codeBlockService.getCodeContentById(id));
 	};
 	const onPageRevert = (index) => {

package/dist/es/services/codeBlock.js

@@ -1,7 +1,7 @@
 import { CODE_DRAFT_STORAGE_KEY } from "../type.js";
 import BaseService from "./BaseService.js";
 import { getEditorConfig } from "../utils/config.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_CODE_STORAGE_KEY } from "../utils/editor.js";
@@ -121,13 +121,16 @@ var CodeBlock = class extends BaseService {
 			...codeConfigProcessed
 		};
 		const newContent = cloneDeep$1(codeDsl[id]);
-		if (!doNotPushHistory) this.lastPushedHistoryId = history_default.pushCodeBlock(id, {
-			oldContent,
-			newContent,
-			changeRecords,
-			historyDescription,
-			source: historySource
-		})?.uuid ?? null;
+		if (!doNotPushHistory) {
+			const step = createStackStep(id, {
+				oldValue: oldContent,
+				newValue: newContent,
+				changeRecords,
+				historyDescription,
+				source: historySource
+			});
+			this.lastPushedHistoryId = (step ? history_default.push("codeBlock", step, id) : null)?.uuid ?? null;
+		}
 		this.emit("addOrUpdate", id, codeDsl[id]);
 	}
 	/**
@@ -212,15 +215,16 @@ var CodeBlock = class extends BaseService {
 		if (!currentDsl) return;
 		this.lastDeletedHistoryIds = [];
 		codeIds.forEach((id) => {
-			const oldContent = currentDsl[id] ? cloneDeep$1(currentDsl[id]) : null;
+			const oldValue = currentDsl[id] ? cloneDeep$1(currentDsl[id]) : null;
 			delete currentDsl[id];
-			if (oldContent && !doNotPushHistory) {
-				const uuid = history_default.pushCodeBlock(id, {
-					oldContent,
-					newContent: null,
+			if (oldValue && !doNotPushHistory) {
+				const step = createStackStep(id, {
+					oldValue,
+					newValue: null,
 					historyDescription,
 					source: historySource
-				})?.uuid;
+				});
+				const uuid = step ? history_default.push("codeBlock", step, id)?.uuid : void 0;
 				if (uuid) this.lastDeletedHistoryIds.push(uuid);
 			}
 			this.emit("remove", id);
@@ -281,7 +285,7 @@ var CodeBlock = class extends BaseService {
 	* @returns 撤销的 step；栈不存在或已无可撤销时返回 null
 	*/
 	async undo(id) {
-		const step = history_default.undoCodeBlock(id);
+		const step = history_default.undo("codeBlock", id);
 		if (!step) return null;
 		await this.applyHistoryStep(step, true);
 		return step;
@@ -292,18 +296,18 @@ var CodeBlock = class extends BaseService {
 	* @returns 重做的 step；栈不存在或已无可重做时返回 null
 	*/
 	async redo(id) {
-		const step = history_default.redoCodeBlock(id);
+		const step = history_default.redo("codeBlock", id);
 		if (!step) return null;
 		await this.applyHistoryStep(step, false);
 		return step;
 	}
 	/** 是否可对指定代码块撤销。 */
 	canUndo(id) {
-		return history_default.canUndoCodeBlock(id);
+		return history_default.canUndo("codeBlock", id);
 	}
 	/** 是否可对指定代码块重做。 */
 	canRedo(id) {
-		return history_default.canRedoCodeBlock(id);
+		return history_default.canRedo("codeBlock", id);
 	}
 	/**
 	* 跳转指定代码块的历史栈到目标游标。语义同 editor.gotoPageStep。
@@ -313,7 +317,7 @@ var CodeBlock = class extends BaseService {
 	* @returns 实际移动到的最终游标位置
 	*/
 	async goto(id, targetCursor) {
-		let cursor = history_default.getCodeBlockCursor(id);
+		let cursor = history_default.getCursor("codeBlock", id);
 		const target = Math.max(0, targetCursor);
 		while (cursor > target) {
 			if (!await this.undo(id)) break;
@@ -336,11 +340,11 @@ var CodeBlock = class extends BaseService {
 	* @returns 反向后产生的新 step；目标不存在 / 未应用时返回 null
 	*/
 	async revert(id, index) {
-		const entry = history_default.getCodeBlockStepList(id)[index];
+		const entry = history_default.getStepList("codeBlock", 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.name)}`;
+		const description = `回滚 #${index + 1}: ${describeRevertStep(entry.step.data.id, entry.step.diff?.[0], (s) => s.name)}`;
 		return await this.applyRevertStep(entry.step, description);
 	}
 	/**
@@ -353,7 +357,7 @@ var CodeBlock = class extends BaseService {
 	async revertById(uuids) {
 		const results = [];
 		for (const uuid of uuids) {
-			const location = history_default.findCodeBlockStepLocationByUuid(uuid);
+			const location = history_default.findStepLocationByUuid("codeBlock", uuid);
 			results.push(location ? await this.revert(location.id, location.index) : null);
 		}
 		return results;
@@ -423,21 +427,21 @@ var CodeBlock = class extends BaseService {
 	* 差异仅在于通过公开的 setCodeDslByIdSync / deleteCodeDslByIds 触发 push。
 	*/
 	async applyRevertStep(step, historyDescription) {
-		const { id } = step;
+		const { id } = step.data;
 		const { oldSchema, newSchema, changeRecords } = step.diff?.[0] ?? {};
 		if (!oldSchema && newSchema) {
 			await this.deleteCodeDslByIds([id], {
 				historyDescription,
 				historySource: "rollback"
 			});
-			return history_default.getCodeBlockStepList(id).slice(-1)[0]?.step ?? null;
+			return history_default.getStepList("codeBlock", id).slice(-1)[0]?.step ?? null;
 		}
 		if (oldSchema && !newSchema) {
 			this.setCodeDslByIdSync(id, cloneDeep$1(oldSchema), true, {
 				historyDescription,
 				historySource: "rollback"
 			});
-			return history_default.getCodeBlockStepList(id).slice(-1)[0]?.step ?? null;
+			return history_default.getStepList("codeBlock", id).slice(-1)[0]?.step ?? null;
 		}
 		if (!oldSchema || !newSchema) return null;
 		if (changeRecords?.length) {
@@ -458,13 +462,13 @@ var CodeBlock = class extends BaseService {
 				historyDescription,
 				historySource: "rollback"
 			});
-			return history_default.getCodeBlockStepList(id).slice(-1)[0]?.step ?? null;
+			return history_default.getStepList("codeBlock", id).slice(-1)[0]?.step ?? null;
 		}
 		this.setCodeDslByIdSync(id, cloneDeep$1(oldSchema), true, {
 			historyDescription,
 			historySource: "rollback"
 		});
-		return history_default.getCodeBlockStepList(id).slice(-1)[0]?.step ?? null;
+		return history_default.getStepList("codeBlock", id).slice(-1)[0]?.step ?? null;
 	}
 	/**
 	* 把一条历史 step 应用到当前代码块服务上。
@@ -481,7 +485,7 @@ var CodeBlock = class extends BaseService {
 	* @param reverse true=撤销，false=重做
 	*/
 	async applyHistoryStep(step, reverse) {
-		const { id } = step;
+		const { id } = step.data;
 		const { oldSchema, newSchema, changeRecords } = step.diff?.[0] ?? {};
 		if (!oldSchema && newSchema) {
 			if (reverse) await this.deleteCodeDslByIds([id], { doNotPushHistory: true });

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 });