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

package/dist/es/fields/CodeSelectCol.vue_vue_type_script_setup_true_lang.js

@@ -47,7 +47,8 @@ var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 		*/
 		const isCompareMode = computed(() => Boolean(props.isCompare && props.lastValues));
 		const notEditable = computed(() => filterFunction(mForm, props.config.notEditable, props));
-		const hasCodeBlockSidePanel = computed(() => (uiService.get("sideBarItems") || []).find((item) => item.$key === SideItemKey.CODE_BLOCK));
+		const codeBlockSidePanel = computed(() => (uiService.get("sideBarItems") || []).find((item) => item.$key === SideItemKey.CODE_BLOCK));
+		const hasCodeBlockSidePanel = computed(() => codeBlockSidePanel.value);
 		/**
 		* 根据代码块id获取代码块参数配置
 		* @param codeId 代码块ID
@@ -102,6 +103,8 @@ var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 			emit("change", props.model[props.name], eventData);
 		};
 		const editCode = (id) => {
+			const sideBarItem = codeBlockSidePanel.value;
+			if (sideBarItem) uiService.set("sideBarActiveTabName", sideBarItem.text || sideBarItem.$key || SideItemKey.CODE_BLOCK);
 			eventBus?.emit("edit-code", id);
 		};
 		return (_ctx, _cache) => {

package/dist/es/fields/DataSourceFieldSelect/FieldSelect.vue_vue_type_script_setup_true_lang.js

@@ -89,9 +89,15 @@ var FieldSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ de
 			modelValue.value = v;
 			emit("change", v);
 		};
-		const hasDataSourceSidePanel = computed(() => uiService.get("sideBarItems").find((item) => item.$key === SideItemKey.DATA_SOURCE));
+		const dataSourceSidePanel = computed(() => uiService.get("sideBarItems").find((item) => item.$key === SideItemKey.DATA_SOURCE));
+		const hasDataSourceSidePanel = computed(() => dataSourceSidePanel.value);
 		const editHandler = (id) => {
-			eventBus?.emit("edit-data-source", removeDataSourceFieldPrefix(id));
+			const sideBarItem = dataSourceSidePanel.value;
+			if (sideBarItem) uiService.set("sideBarActiveTabName", sideBarItem.text || sideBarItem.$key || SideItemKey.DATA_SOURCE);
+			const dataSourceId = removeDataSourceFieldPrefix(id);
+			const fieldPath = selectFieldsId.value;
+			if (fieldPath.length) eventBus?.emit("edit-data-source-field", dataSourceId, [...fieldPath]);
+			else eventBus?.emit("edit-data-source", dataSourceId);
 		};
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", _hoisted_1, [__props.dataSourceId ? (openBlock(), createBlock(unref(TMagicCascader), {

package/dist/es/fields/DataSourceFields.vue_vue_type_script_setup_true_lang.js

@@ -7,7 +7,7 @@ import { MFormBox } from "@tmagic/form";
 import { MagicTable } from "@tmagic/table";
 import { TMagicButton, tMagicMessage, tMagicMessageBox } from "@tmagic/design";
 import { getDefaultValueFromFields } from "@tmagic/utils";
-import { computed, createCommentVNode, createElementBlock, createTextVNode, createVNode, defineComponent, inject, isRef, mergeModels, openBlock, ref, unref, useModel, withCtx } from "vue";
+import { computed, createCommentVNode, createElementBlock, createTextVNode, createVNode, defineComponent, inject, isRef, mergeModels, onMounted, openBlock, provide, ref, unref, useModel, withCtx } from "vue";
 //#region packages/editor/src/fields/DataSourceFields.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "m-editor-data-source-fields" };
 var _hoisted_2 = {
@@ -66,6 +66,15 @@ var DataSourceFields_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 			calcBoxPosition();
 			addDialogVisible.value = true;
 		};
+		const editField = (row, index) => {
+			fieldValues.value = {
+				...row,
+				index
+			};
+			fieldTitle.value = `编辑${row.title}`;
+			calcBoxPosition();
+			addDialogVisible.value = true;
+		};
 		const fieldChange = ({ index, ...value }, data) => {
 			addDialogVisible.value = false;
 			if (index > -1) emit("change", value, {
@@ -117,13 +126,7 @@ var DataSourceFields_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 				actions: [{
 					text: "编辑",
 					handler: (row, index) => {
-						fieldValues.value = {
-							...row,
-							index
-						};
-						fieldTitle.value = `编辑${row.title}`;
-						calcBoxPosition();
-						addDialogVisible.value = true;
+						editField(row, index);
 					}
 				}, {
 					text: "删除",
@@ -310,6 +313,20 @@ var DataSourceFields_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		const addFromJsonDialogVisible = useModel(__props, "visible1");
 		const { height: editorHeight } = useEditorContentHeight();
 		const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(uiService, inject("parentFloating", ref(null)));
+		/**
+		* 由 DataSourceConfigPanel 注入：打开数据源详情后需要直接打开的字段路径（字段名数组）。
+		* 当前层消费 path[0]，并把剩余路径下发给嵌套字段，实现逐层打开。
+		*/
+		const editingFieldPath = inject("editingDataSourceFieldPath", computed(() => []));
+		provide("editingDataSourceFieldPath", computed(() => editingFieldPath.value.slice(1)));
+		onMounted(() => {
+			const path = editingFieldPath.value;
+			if (!path.length) return;
+			const fields = props.model[props.name] || [];
+			const index = fields.findIndex((field) => field.name === path[0]);
+			if (index === -1) return;
+			editField(fields[index], index);
+		});
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", _hoisted_1, [
 				createVNode(unref(MagicTable), {

package/dist/es/fields/DataSourceMethodSelect.vue_vue_type_script_setup_true_name_true_lang.js

@@ -36,7 +36,7 @@ var DataSourceMethodSelect_vue_vue_type_script_setup_true_name_true_lang_default
 		const eventBus = inject("eventBus");
 		const emit = __emit;
 		const props = __props;
-		const hasDataSourceSidePanel = computed(() => (uiService.get("sideBarItems") || []).find((item) => item.$key === SideItemKey.DATA_SOURCE));
+		const dataSourceSidePanel = computed(() => (uiService.get("sideBarItems") || []).find((item) => item.$key === SideItemKey.DATA_SOURCE));
 		const notEditable = computed(() => filterFunction(mForm, props.config.notEditable, props));
 		/** 对比模式下隐藏查看/编辑操作按钮，仅保留只读展示。 */
 		const isCompare = computed(() => Boolean(mForm?.isCompare));
@@ -124,9 +124,11 @@ var DataSourceMethodSelect_vue_vue_type_script_setup_true_name_true_lang_default
 			emit("change", props.model[props.name], eventData);
 		};
 		const editCodeHandler = () => {
-			const [id] = props.model[props.name];
+			const [id, methodName] = props.model[props.name];
 			if (!dataSourceService.getDataSourceById(id)) return;
-			eventBus?.emit("edit-data-source", id);
+			const sideBarItem = dataSourceSidePanel.value;
+			if (sideBarItem) uiService.set("sideBarActiveTabName", sideBarItem.text || sideBarItem.$key || SideItemKey.DATA_SOURCE);
+			eventBus?.emit("edit-data-source-method", id, methodName);
 		};
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", _hoisted_1, [createElementVNode("div", _hoisted_2, [createVNode(unref(MCascader), {
@@ -145,7 +147,7 @@ var DataSourceMethodSelect_vue_vue_type_script_setup_true_name_true_lang_default
 				"size",
 				"disabled",
 				"prop"
-			]), __props.model[__props.name] && isCustomMethod.value && hasDataSourceSidePanel.value && !isCompare.value ? (openBlock(), createBlock(unref(TMagicTooltip), {
+			]), __props.model[__props.name] && isCustomMethod.value && dataSourceSidePanel.value && !isCompare.value ? (openBlock(), createBlock(unref(TMagicTooltip), {
 				key: 0,
 				content: notEditable.value ? "查看" : "编辑"
 			}, {

package/dist/es/fields/DataSourceMethods.vue_vue_type_script_setup_true_lang.js

@@ -1,7 +1,7 @@
 import CodeBlockEditor_default from "../components/CodeBlockEditor.js";
 import { MagicTable } from "@tmagic/table";
 import { TMagicButton, tMagicMessageBox } from "@tmagic/design";
-import { computed, createBlock, createCommentVNode, createElementBlock, createTextVNode, createVNode, defineComponent, inject, nextTick, openBlock, ref, unref, useTemplateRef, withCtx } from "vue";
+import { computed, createBlock, createCommentVNode, createElementBlock, createTextVNode, createVNode, defineComponent, inject, nextTick, onMounted, openBlock, ref, unref, useTemplateRef, withCtx } from "vue";
 import { cloneDeep } from "lodash-es";
 //#region packages/editor/src/fields/DataSourceMethods.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "m-editor-data-source-methods" };
@@ -37,6 +37,19 @@ var DataSourceMethods_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		const codeConfig = ref();
 		const codeBlockEditorRef = useTemplateRef("codeBlockEditor");
 		let editIndex = -1;
+		const editMethod = (method, index) => {
+			let codeContent = "({ params, dataSource, app }) => {\n  // place your code here\n}";
+			if (method.content) if (typeof method.content !== "string") codeContent = method.content.toString();
+			else codeContent = method.content;
+			codeConfig.value = {
+				...cloneDeep(method),
+				content: codeContent
+			};
+			editIndex = index;
+			nextTick(() => {
+				codeBlockEditorRef.value?.show();
+			});
+		};
 		const methodColumns = [
 			{
 				label: "名称",
@@ -61,17 +74,7 @@ var DataSourceMethods_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 				actions: [{
 					text: "编辑",
 					handler: (method, index) => {
-						let codeContent = "({ params, dataSource, app }) => {\n  // place your code here\n}";
-						if (method.content) if (typeof method.content !== "string") codeContent = method.content.toString();
-						else codeContent = method.content;
-						codeConfig.value = {
-							...cloneDeep(method),
-							content: codeContent
-						};
-						editIndex = index;
-						nextTick(() => {
-							codeBlockEditorRef.value?.show();
-						});
+						editMethod(method, index);
 					}
 				}, {
 					text: "删除",
@@ -119,6 +122,16 @@ var DataSourceMethods_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 			codeConfig.value = void 0;
 			codeBlockEditorRef.value?.hide();
 		};
+		/** 由 DataSourceConfigPanel 注入：打开数据源详情后需要直接打开的方法名 */
+		const editingMethodName = inject("editingDataSourceMethodName", computed(() => ""));
+		onMounted(() => {
+			const methodName = editingMethodName.value;
+			if (!methodName) return;
+			const methods = props.model[props.name] || [];
+			const index = methods.findIndex((method) => method.name === methodName);
+			if (index === -1) return;
+			editMethod(methods[index], index);
+		});
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", _hoisted_1, [
 				createVNode(unref(MagicTable), {

package/dist/es/fields/StyleSetter/components/Border.vue_vue_type_script_setup_true_lang.js

@@ -54,6 +54,13 @@ var Border_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineC
 		] }));
 		const selectDirection = (d) => direction.value = d || "";
 		const emit = __emit;
+		const props = __props;
+		const hasValue = (value) => value !== void 0 && value !== null && value !== "";
+		const isConfigured = (d) => [
+			"Width",
+			"Color",
+			"Style"
+		].some((key) => hasValue(props.model?.[`border${d}${key}`]));
 		const change = (value, eventData) => {
 			eventData.changeRecords?.forEach((record) => {
 				emit("change", record.value, { modifyKey: record.propPath });
@@ -63,25 +70,40 @@ var Border_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineC
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", _hoisted_1, [createElementVNode("div", _hoisted_2, [
 				createElementVNode("div", _hoisted_3, [createElementVNode("div", {
-					class: normalizeClass(["border-icon border-icon-top", { active: direction.value === "Top" }]),
+					class: normalizeClass(["border-icon border-icon-top", {
+						active: direction.value === "Top",
+						configured: isConfigured("Top")
+					}]),
 					onClick: _cache[0] || (_cache[0] = ($event) => selectDirection("Top"))
 				}, null, 2)]),
 				createElementVNode("div", _hoisted_4, [
 					createElementVNode("div", {
-						class: normalizeClass(["border-icon border-icon-left", { active: direction.value === "Left" }]),
+						class: normalizeClass(["border-icon border-icon-left", {
+							active: direction.value === "Left",
+							configured: isConfigured("Left")
+						}]),
 						onClick: _cache[1] || (_cache[1] = ($event) => selectDirection("Left"))
 					}, null, 2),
 					createElementVNode("div", {
-						class: normalizeClass(["border-icon", { active: direction.value === "" }]),
+						class: normalizeClass(["border-icon", {
+							active: direction.value === "",
+							configured: isConfigured("")
+						}]),
 						onClick: _cache[2] || (_cache[2] = ($event) => selectDirection())
 					}, null, 2),
 					createElementVNode("div", {
-						class: normalizeClass(["border-icon border-icon-right", { active: direction.value === "Right" }]),
+						class: normalizeClass(["border-icon border-icon-right", {
+							active: direction.value === "Right",
+							configured: isConfigured("Right")
+						}]),
 						onClick: _cache[3] || (_cache[3] = ($event) => selectDirection("Right"))
 					}, null, 2)
 				]),
 				createElementVNode("div", _hoisted_5, [createElementVNode("div", {
-					class: normalizeClass(["border-icon border-icon-bottom", { active: direction.value === "Bottom" }]),
+					class: normalizeClass(["border-icon border-icon-bottom", {
+						active: direction.value === "Bottom",
+						configured: isConfigured("Bottom")
+					}]),
 					onClick: _cache[4] || (_cache[4] = ($event) => selectDirection("Bottom"))
 				}, null, 2)])
 			]), createElementVNode("div", _hoisted_6, [createVNode(unref(MContainer), {

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, getOrCreateStack, markStackSaved, mergePageSteps, mergeStackSteps, serializeStacks, undoFloor } from "./utils/history.js";
+import { createStackStep, describeRevertStep, deserializeStacks, detectPageTargetId, detectPageTargetName, detectStackOpType, getLastPushedHistoryIds, getOrCreateStack, markStackSaved, mergePageSteps, mergeStackSteps, 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";
@@ -83,4 +83,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, 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, 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, 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, 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, useNextFloatBoxPosition, useNodeStatus, useServices, useStage, useWindowRect, warn };

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

@@ -1,6 +1,6 @@
 import { useServices } from "../../hooks/use-services.js";
 import Icon_default from "../../components/Icon.js";
-import { describeCodeBlockGroup, describeCodeBlockStep, describeDataSourceGroup, describeDataSourceStep, isCodeBlockStepRevertable, isDataSourceStepRevertable, useHistoryList } from "./composables.js";
+import { describeStep, isSingleDiffStepRevertable, useHistoryList } from "./composables.js";
 import BucketTab_default from "./BucketTab.js";
 import HistoryDiffDialog_default from "./HistoryDiffDialog.js";
 import PageTab_default from "./PageTab.js";
@@ -22,8 +22,8 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		/**
 		* 历史记录面板：在顶部 NavMenu 上点击图标打开 popover，分三个 tab：
 		* - 页面：当前活动页面的历史栈，连续修改同一节点的多步会被合并成一组
-		* - 数据源：以 dataSource.id 分组，每组内部相邻的连续 update 自动合并
-		* - 代码块：同上，按 codeBlock.id 分组并合并相邻 update
+		* - 数据源：以 dataSource.id 分桶，每条操作记录独立展示
+		* - 代码块：同上，按 codeBlock.id 分桶，每条操作记录独立展示
 		*
 		* 数据通过 historyService 暴露的聚合 API 读取，UI 仅用于只读展示，
 		* 同时支持点击任意一条记录跳转至该状态：
@@ -78,10 +78,8 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		* 基于 historyService 的 reactive state 派生，活动页切换或标记写入后自动刷新。
 		*/
 		const pageMarker = computed(() => historyService.getPageMarker());
-		/** 数据源 step 仅 update（前后 schema 都存在）时可查看差异。 */
-		const isDataSourceStepDiffable = (step) => Boolean(step.diff?.[0]?.oldSchema && step.diff?.[0]?.newSchema);
 		/** 代码块 step 仅 update（前后 content 都存在）时可查看差异。 */
-		const isCodeBlockStepDiffable = (step) => Boolean(step.diff?.[0]?.oldSchema && step.diff?.[0]?.newSchema);
+		const isStepDiffable = (step) => Boolean(step.diff?.[0]?.oldSchema && step.diff?.[0]?.newSchema);
 		/**
 		* 数据源 / 代码块两类 bucket 历史的整体渲染配置：把 title / prefix 与各自的描述、
 		* 可差异、可回滚判定收敛为单一对象整体注入 BucketTab，组件内部按需读取。
@@ -89,18 +87,16 @@ var HistoryListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		const dataSourceConfig = {
 			title: "数据源",
 			prefix: "ds",
-			describeGroup: describeDataSourceGroup,
-			describeStep: describeDataSourceStep,
-			isStepDiffable: isDataSourceStepDiffable,
-			isStepRevertable: isDataSourceStepRevertable
+			describeStep: (step) => describeStep(step, (schema) => schema?.title, "数据源"),
+			isStepDiffable,
+			isStepRevertable: isSingleDiffStepRevertable
 		};
 		const codeBlockConfig = {
 			title: "代码块",
 			prefix: "cb",
-			describeGroup: describeCodeBlockGroup,
-			describeStep: describeCodeBlockStep,
-			isStepDiffable: isCodeBlockStepDiffable,
-			isStepRevertable: isCodeBlockStepRevertable
+			describeStep: (step) => describeStep(step, (content) => content?.name, "代码块"),
+			isStepDiffable,
+			isStepRevertable: isSingleDiffStepRevertable
 		};
 		/** 把"目标 step 索引"翻译成"目标 cursor"（已应用步骤数量）。 */
 		const indexToCursor = (index) => index + 1;

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

@@ -5,9 +5,14 @@ var _hoisted_1 = ["title"];
 var _hoisted_2 = { class: "m-editor-history-list-item-desc" };
 var _hoisted_3 = {
 	key: 0,
+	class: "m-editor-history-list-item-saved",
+	title: "该记录为最近一次保存的状态"
+};
+var _hoisted_4 = {
+	key: 1,
 	class: "m-editor-history-list-item-actions"
 };
-var _hoisted_4 = ["title"];
+var _hoisted_5 = ["title"];
 var InitialRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
 	name: "MEditorHistoryListInitialRow",
 	__name: "InitialRow",
@@ -32,6 +37,8 @@ var InitialRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		*/
 		const props = __props;
 		const desc = computed(() => props.marker?.historyDescription || "未修改的初始状态");
+		/** 基线（初始状态）是否为最近一次保存点：仅页面栈的 `initial` 基线 step 会被 markSaved 标记。 */
+		const saved = computed(() => Boolean(props.marker?.saved));
 		const time = computed(() => formatHistoryTime(props.marker?.timestamp));
 		const timeTitle = computed(() => formatHistoryFullTime(props.marker?.timestamp));
 		const rowTitle = computed(() => {
@@ -57,16 +64,17 @@ var InitialRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 				}, "#0", -1)),
 				_cache[1] || (_cache[1] = createElementVNode("span", { class: "m-editor-history-list-item-op op-initial" }, "初始", -1)),
 				createElementVNode("span", _hoisted_2, toDisplayString(desc.value), 1),
-				__props.gotoEnabled && !__props.isCurrent ? (openBlock(), createElementBlock("span", _hoisted_3, [createElementVNode("span", {
+				saved.value ? (openBlock(), createElementBlock("span", _hoisted_3, "已保存")) : createCommentVNode("v-if", true),
+				__props.gotoEnabled && !__props.isCurrent ? (openBlock(), createElementBlock("span", _hoisted_4, [createElementVNode("span", {
 					class: "m-editor-history-list-item-goto",
 					title: "回到该记录",
 					onClick: withModifiers(onClick, ["stop"])
 				}, "回到")])) : createCommentVNode("v-if", true),
 				time.value ? (openBlock(), createElementBlock("span", {
-					key: 1,
+					key: 2,
 					class: "m-editor-history-list-item-time",
 					title: timeTitle.value
-				}, toDisplayString(time.value), 9, _hoisted_4)) : createCommentVNode("v-if", true)
+				}, toDisplayString(time.value), 9, _hoisted_5)) : createCommentVNode("v-if", true)
 			], 10, _hoisted_1);
 		};
 	}

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

@@ -109,12 +109,13 @@ var groupSource = (group) => group.steps[group.steps.length - 1]?.step.source;
 var toRowGroup = (group, key, descriptor) => {
 	const { describeGroup, describeStep, isStepDiffable, isStepRevertable } = descriptor;
 	const timestamp = groupTimestamp(group);
+	const lastStep = group.steps[group.steps.length - 1]?.step;
 	return {
 		key,
 		applied: group.applied,
 		isCurrent: Boolean(group.isCurrent),
 		opType: group.opType,
-		desc: describeGroup(group),
+		desc: describeGroup ? describeGroup(group) : describeStep(lastStep),
 		source: groupSource(group),
 		time: formatHistoryTime(timestamp),
 		timeTitle: formatHistoryFullTime(timestamp),
@@ -147,28 +148,36 @@ var labelWithId = (label, id) => {
 var pickLastDescription = (descs) => {
 	for (let i = descs.length - 1; i >= 0; i--) if (descs[i]) return descs[i];
 };
-var describePageStep = (step) => {
+/**
+* 页面 / 数据源 / 代码块三类历史共用的单步描述核心。
+* 各类型只在「取展示名」与「实体单位名」上有差异，通过参数注入，文案模板完全一致：
+* - 新增 / 删除：单实体展示「label」，多实体（仅页面可能出现）退化为「N 个X」；
+* - 修改：展示「label · propPath」，无 diff 时兜底「X」，多实体退化为「N 个X」。
+* 操作类型（新增 / 删除 / 修改）已由列表行的 op 徽标单独展示，故描述文案不再重复动词。
+* 展示 id 统一取 schema.id；调用方显式传入的 historyDescription 永远优先。
+*/
+var describeStep = (step, getLabel, unit) => {
 	if (step.historyDescription) return step.historyDescription;
-	const { opType } = step;
 	const items = step.diff ?? [];
-	if (opType === "add") {
-		const count = items.length;
+	const label = (schema) => labelWithId(getLabel(schema), schema?.id);
+	if (step.opType === "add") {
 		const node = items[0]?.newSchema;
-		return `新增 ${count} 个节点${count === 1 && node ? `（${labelWithId(nameOf(node), node.id)}）` : ""}`;
+		return items.length === 1 && node ? label(node) : `${items.length} 个${unit}`;
 	}
-	if (opType === "remove") {
-		const count = items.length;
+	if (step.opType === "remove") {
 		const node = items[0]?.oldSchema;
-		return `删除 ${count} 个节点${count === 1 && node ? `（${labelWithId(nameOf(node), node.id)}）` : ""}`;
+		return items.length === 1 && node ? label(node) : `${items.length} 个${unit}`;
 	}
-	if (!items.length) return "修改节点";
+	if (!items.length) return unit;
 	if (items.length === 1) {
-		const { newSchema, changeRecords } = items[0];
-		const propPath = changeRecords?.[0]?.propPath;
-		return `修改 ${labelWithId(nameOf(newSchema), newSchema?.id)}${propPath ? ` · ${propPath}` : ""}`;
+		const { newSchema, oldSchema, changeRecords } = items[0];
+		const propPath = changeRecords?.map((changeRecord) => changeRecord.propPath).join(",");
+		const target = label(newSchema ?? oldSchema);
+		return propPath ? `${target} · ${propPath}` : target;
 	}
-	return `修改 ${items.length} 个节点`;
+	return `${items.length} 个${unit}`;
 };
+var describePageStep = (step) => describeStep(step, (node) => nameOf(node), "节点");
 /**
 * 合并组的展示文案：
 * - 若组内任一步显式提供了 historyDescription：取最后一条非空 historyDescription（最近一次的描述更准确）；
@@ -179,55 +188,7 @@ var describePageGroup = (group) => {
 	const lastDesc = pickLastDescription(group.steps.map((s) => s.step.historyDescription));
 	if (lastDesc) return lastDesc;
 	if (group.steps.length === 1) return describePageStep(group.steps[0].step);
-	const paths = /* @__PURE__ */ new Set();
-	group.steps.forEach((s) => {
-		s.step.diff?.[0]?.changeRecords?.forEach((r) => r.propPath && paths.add(r.propPath));
-	});
-	const pathList = Array.from(paths).slice(0, 3).join(", ");
-	const target = labelWithId(group.targetName ?? (group.targetId !== void 0 ? `${group.targetId}` : "节点"), group.targetId);
-	return pathList ? `修改 ${target} · ${pathList}${paths.size > 3 ? "…" : ""}` : `修改 ${target}`;
-};
-var describeDataSourceStep = (step) => {
-	if (step.historyDescription) return step.historyDescription;
-	const { oldSchema, newSchema, changeRecords } = step.diff?.[0] ?? {};
-	if (!oldSchema && newSchema) return `创建 ${labelWithId(newSchema.title, newSchema.id ?? step.id)}`;
-	if (!newSchema && oldSchema) return `删除 ${labelWithId(oldSchema.title, oldSchema.id ?? step.id)}`;
-	const propPath = changeRecords?.[0]?.propPath;
-	const title = labelWithId(newSchema?.title || oldSchema?.title, step.id);
-	return propPath ? `修改 ${title} · ${propPath}` : `修改 ${title}`;
-};
-var describeDataSourceGroup = (group) => {
-	const lastDesc = pickLastDescription(group.steps.map((s) => s.step.historyDescription));
-	if (lastDesc) return lastDesc;
-	if (group.steps.length === 1) return describeDataSourceStep(group.steps[0].step);
-	const paths = /* @__PURE__ */ new Set();
-	group.steps.forEach((s) => {
-		s.step.diff?.[0]?.changeRecords?.forEach((r) => r.propPath && paths.add(r.propPath));
-	});
-	const pathList = Array.from(paths).slice(0, 3).join(", ");
-	const target = labelWithId(group.steps[group.steps.length - 1].step.diff?.[0]?.newSchema?.title || group.steps[0].step.diff?.[0]?.oldSchema?.title, group.id);
-	return pathList ? `修改 ${target} · ${pathList}${paths.size > 3 ? "…" : ""}` : `修改 ${target}`;
-};
-var describeCodeBlockStep = (step) => {
-	if (step.historyDescription) return step.historyDescription;
-	const { oldSchema: oldContent, newSchema: newContent, changeRecords } = step.diff?.[0] ?? {};
-	if (!oldContent && newContent) return `创建 ${labelWithId(newContent.name, newContent.id ?? step.id)}`;
-	if (!newContent && oldContent) return `删除 ${labelWithId(oldContent.name, oldContent.id ?? step.id)}`;
-	const propPath = changeRecords?.[0]?.propPath;
-	const title = labelWithId(newContent?.name || oldContent?.name, step.id);
-	return propPath ? `修改 ${title} · ${propPath}` : `修改 ${title}`;
-};
-var describeCodeBlockGroup = (group) => {
-	const lastDesc = pickLastDescription(group.steps.map((s) => s.step.historyDescription));
-	if (lastDesc) return lastDesc;
-	if (group.steps.length === 1) return describeCodeBlockStep(group.steps[0].step);
-	const paths = /* @__PURE__ */ new Set();
-	group.steps.forEach((s) => {
-		s.step.diff?.[0]?.changeRecords?.forEach((r) => r.propPath && paths.add(r.propPath));
-	});
-	const pathList = Array.from(paths).slice(0, 3).join(", ");
-	const target = labelWithId(group.steps[group.steps.length - 1].step.diff?.[0]?.newSchema?.name || group.steps[0].step.diff?.[0]?.oldSchema?.name, group.id);
-	return pathList ? `修改 ${target} · ${pathList}${paths.size > 3 ? "…" : ""}` : `修改 ${target}`;
+	return labelWithId(group.targetName ?? (group.targetId !== void 0 ? `${group.targetId}` : "节点"), group.targetId);
 };
 /**
 * 页面 step 是否支持「回滚」（类 git revert）：
@@ -242,24 +203,14 @@ var isPageStepRevertable = (step) => {
 	return items.every((item) => Boolean(item.changeRecords?.length));
 };
 /**
-* 数据源 step 是否支持「回滚」：
-* - 新增（无 oldSchema）/ 删除（无 newSchema）：不依赖 changeRecords，始终可回滚；
-* - 更新（前后 schema 都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
-*/
-var isDataSourceStepRevertable = (step) => {
-	const item = step.diff?.[0];
-	if (!item?.oldSchema || !item?.newSchema) return true;
-	return Boolean(item.changeRecords?.length);
-};
-/**
-* 代码块 step 是否支持「回滚」：
+* 单 diff 项历史（数据源 / 代码块）是否支持「回滚」：
 * - 新增（无 oldSchema）/ 删除（无 newSchema）：不依赖 changeRecords，始终可回滚；
-* - 更新（前后 content 都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
+* - 更新（前后内容都存在）：必须有 changeRecords 才支持局部反向 patch，否则不支持回滚。
 */
-var isCodeBlockStepRevertable = (step) => {
+var isSingleDiffStepRevertable = (step) => {
 	const item = step.diff?.[0];
 	if (!item?.oldSchema || !item?.newSchema) return true;
 	return Boolean(item.changeRecords?.length);
 };
 //#endregion
-export { describeCodeBlockGroup, describeCodeBlockStep, describeDataSourceGroup, describeDataSourceStep, describePageGroup, describePageStep, formatHistoryFullTime, formatHistoryTime, isCodeBlockStepRevertable, isDataSourceStepRevertable, isHistoryGroupExpanded, isPageStepRevertable, opLabel, sourceLabel, toRowGroup, useHistoryList };
+export { describePageGroup, describePageStep, describeStep, formatHistoryFullTime, formatHistoryTime, isHistoryGroupExpanded, isPageStepRevertable, isSingleDiffStepRevertable, opLabel, sourceLabel, toRowGroup, useHistoryList };

package/dist/es/layouts/sidebar/Sidebar.vue_vue_type_script_setup_true_lang.js

@@ -87,7 +87,7 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 					slots: {}
 				},
 				layer: {
-					$key: "layer",
+					$key: SideItemKey.LAYER,
 					type: "component",
 					icon: List,
 					text: "已选组件",
@@ -105,7 +105,7 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 					slots: {}
 				},
 				[SideItemKey.CODE_BLOCK]: {
-					$key: "code-block",
+					$key: SideItemKey.CODE_BLOCK,
 					type: "component",
 					icon: EditPen,
 					text: "代码编辑",

package/dist/es/layouts/sidebar/data-source/DataSourceConfigPanel.vue_vue_type_script_setup_true_lang.js

@@ -4,7 +4,7 @@ import { useNextFloatBoxPosition } from "../../../hooks/use-next-float-box-posit
 import FloatingBox_default from "../../../components/FloatingBox.js";
 import { MFormBox } from "@tmagic/form";
 import { tMagicMessage } from "@tmagic/design";
-import { createBlock, createVNode, defineComponent, inject, isRef, mergeModels, nextTick, openBlock, ref, unref, useModel, watch, watchEffect, withCtx } from "vue";
+import { computed, createBlock, createVNode, defineComponent, inject, isRef, mergeModels, nextTick, openBlock, provide, ref, unref, useModel, watch, watchEffect, withCtx } from "vue";
 //#region packages/editor/src/layouts/sidebar/data-source/DataSourceConfigPanel.vue?vue&type=script&setup=true&lang.ts
 var DataSourceConfigPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
 	name: "MEditorDataSourceConfigPanel",
@@ -12,7 +12,9 @@ var DataSourceConfigPanel_vue_vue_type_script_setup_true_lang_default = /* @__PU
 	props: /* @__PURE__ */ mergeModels({
 		title: {},
 		values: {},
-		disabled: { type: Boolean }
+		disabled: { type: Boolean },
+		editMethodName: {},
+		editFieldPath: {}
 	}, {
 		"visible": {
 			type: Boolean,
@@ -37,9 +39,20 @@ var DataSourceConfigPanel_vue_vue_type_script_setup_true_lang_default = /* @__PU
 		const dataSourceConfig = ref([]);
 		const { height: editorHeight } = useEditorContentHeight();
 		const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(uiService, inject("parentFloating", ref(null)));
+		/** 供「方法定义」tab 内的字段消费，用于打开数据源详情后自动打开指定方法 */
+		provide("editingDataSourceMethodName", computed(() => props.editMethodName));
+		/** 供「数据定义」tab 内的字段消费，用于打开数据源详情后自动打开指定字段 */
+		provide("editingDataSourceFieldPath", computed(() => props.editFieldPath || []));
 		watchEffect(() => {
 			initValues.value = props.values;
-			dataSourceConfig.value = dataSourceService.getFormConfig(initValues.value.type);
+			const config = dataSourceService.getFormConfig(initValues.value.type);
+			let activeTab = "fields";
+			if (props.editMethodName) activeTab = "methods";
+			else if (props.editFieldPath?.length) activeTab = "fields";
+			dataSourceConfig.value = config.map((item) => item.type === "tab" ? {
+				...item,
+				active: activeTab
+			} : item);
 		});
 		const submitHandler = (values, data) => {
 			emit("submit", values, data);