@tmagic/editor 1.8.0-beta.1 → 1.8.0-beta.2

package/dist/es/Editor.vue_vue_type_script_setup_true_lang.js

@@ -29,6 +29,7 @@ var Editor_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineC
 		componentGroupList: {},
 		datasourceList: {},
 		sidebar: {},
+		hideSidebar: { type: Boolean },
 		menu: {},
 		layerContentMenu: {},
 		stageContentMenu: {},
@@ -124,6 +125,12 @@ var Editor_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineC
 		provide("services", services);
 		provide("codeOptions", props.codeOptions);
 		provide("stageOptions", stageOptions);
+		/**
+		* 把顶层 `extendFormState` 提供给非 PropsPanel 链路上的组件使用（例如历史差异对话框 HistoryDiffDialog
+		* 内部的 CompareForm）。这样所有依赖业务上下文的表单 filterFunction 都能拿到一致的扩展状态，
+		* 与 PropsPanel 通过 `:extend-state` 显式传入的方式保持等价。
+		*/
+		provide("extendFormState", props.extendFormState);
 		provide("eventBus", new EventEmitter());
 		const propsPanelMountedHandler = (e) => {
 			emit("props-panel-mounted", e);
@@ -145,7 +152,8 @@ var Editor_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineC
 			return openBlock(), createBlock(Framework_default, {
 				"disabled-page-fragment": __props.disabledPageFragment,
 				"page-bar-sort-options": __props.pageBarSortOptions,
-				"page-filter-function": __props.pageFilterFunction
+				"page-filter-function": __props.pageFilterFunction,
+				"hide-sidebar": __props.hideSidebar
 			}, {
 				header: withCtx(() => [renderSlot(_ctx.$slots, "header")]),
 				nav: withCtx(() => [renderSlot(_ctx.$slots, "nav", { editorService: unref(editor_default) }, () => [createVNode(NavMenu_default, { data: __props.menu }, null, 8, ["data"])])]),
@@ -225,7 +233,8 @@ var Editor_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineC
 			}, 8, [
 				"disabled-page-fragment",
 				"page-bar-sort-options",
-				"page-filter-function"
+				"page-filter-function",
+				"hide-sidebar"
 			]);
 		};
 	}

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

@@ -3,9 +3,10 @@ import { useServices } from "../hooks/use-services.js";
 import { useWindowRect } from "../hooks/use-window-rect.js";
 import { useEditorContentHeight } from "../hooks/use-editor-content-height.js";
 import { useNextFloatBoxPosition } from "../hooks/use-next-float-box-position.js";
+import { getCodeBlockFormConfig } from "../utils/code-block.js";
 import CodeEditor_default from "../layouts/CodeEditor.js";
 import FloatingBox_default from "./FloatingBox.js";
-import { MFormBox, defineFormConfig, defineFormItem } from "@tmagic/form";
+import { MFormBox } from "@tmagic/form";
 import { TMagicButton, TMagicDialog, TMagicTag, tMagicMessage, tMagicMessageBox } from "@tmagic/design";
 import { Fragment, Teleport, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, inject, isRef, mergeModels, nextTick, openBlock, ref, unref, useModel, useTemplateRef, watch, withCtx } from "vue";
 //#region packages/editor/src/components/CodeBlockEditor.vue?vue&type=script&setup=true&lang.ts
@@ -53,114 +54,21 @@ var CodeBlockEditor_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 			formBox.value.form.values.content = magicVsEditorRef.value.getEditorValue();
 			difVisible.value = false;
 		};
-		const defaultParamColConfig = defineFormItem({
-			type: "row",
-			label: "参数类型",
-			items: [{
-				text: "参数类型",
-				labelWidth: "70px",
-				type: "select",
-				name: "type",
-				options: [
-					{
-						text: "数字",
-						label: "数字",
-						value: "number"
-					},
-					{
-						text: "字符串",
-						label: "字符串",
-						value: "text"
-					},
-					{
-						text: "组件",
-						label: "组件",
-						value: "ui-select"
-					}
-				]
-			}]
-		});
-		const functionConfig = computed(() => defineFormConfig([
-			{
-				text: "名称",
-				name: "name",
-				rules: [{
-					required: true,
-					message: "请输入名称",
-					trigger: "blur"
-				}]
-			},
-			{
-				text: "描述",
-				name: "desc"
-			},
-			{
-				text: "执行时机",
-				name: "timing",
-				type: "select",
-				options: () => {
-					const options = [{
-						text: "初始化前",
-						value: "beforeInit"
-					}, {
-						text: "初始化后",
-						value: "afterInit"
-					}];
-					if (props.dataSourceType !== "base") {
-						options.push({
-							text: "请求前",
-							value: "beforeRequest"
-						});
-						options.push({
-							text: "请求后",
-							value: "afterRequest"
-						});
-					}
-					return options;
-				},
-				display: () => props.isDataSource
-			},
-			{
-				type: "table",
-				border: true,
-				text: "参数",
-				enableFullscreen: false,
-				enableToggleMode: false,
-				name: "params",
-				dropSort: false,
-				items: [
-					{
-						type: "text",
-						label: "参数名",
-						name: "name"
-					},
-					{
-						type: "text",
-						label: "描述",
-						name: "extra"
-					},
-					codeBlockService.getParamsColConfig() || defaultParamColConfig
-				]
-			},
-			{
-				name: "content",
-				type: "vs-code",
-				options: inject("codeOptions", {}),
-				autosize: {
-					minRows: 10,
-					maxRows: 30
-				},
-				onChange: (_formState, code) => {
-					try {
-						getEditorConfig("parseDSL")(code);
-						return code;
-					} catch (error) {
-						tMagicMessage.error(error.message);
-						throw error;
-					}
-				}
-			}
-		]));
+		const codeOptions = inject("codeOptions", {});
+		/**
+		* 代码块编辑表单配置。统一委托到 utils/code-block 的 `getCodeBlockFormConfig`，
+		* 与 CompareForm 等其它使用方共享同一份 schema，避免双份维护。
+		*
+		* 这里以 computed 包裹是为了让 `props.isDataSource` / `props.dataSourceType` 变化时
+		* "执行时机"字段的可见性与可选项实时刷新。
+		*/
+		const functionConfig = computed(() => getCodeBlockFormConfig({
+			paramColConfig: codeBlockService.getParamsColConfig(),
+			isDataSource: () => Boolean(props.isDataSource),
+			dataSourceType: () => props.dataSourceType,
+			codeOptions,
+			editable: true
+		}));
 		const parseContent = (content) => {
 			if (typeof content === "string") return getEditorConfig("parseDSL")(content);
 			return content;
@@ -304,7 +212,7 @@ var CodeBlockEditor_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ *
 					})])]),
 					default: withCtx(() => [createElementVNode("div", _hoisted_1, [createElementVNode("div", _hoisted_2, [createVNode(unref(TMagicTag), {
 						size: "small",
-						type: "info"
+						type: "danger"
 					}, {
 						default: withCtx(() => [..._cache[7] || (_cache[7] = [createTextVNode("修改前", -1)])]),
 						_: 1

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

@@ -7,6 +7,8 @@ var CodeParams_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 	__name: "CodeParams",
 	props: {
 		model: {},
+		lastValues: {},
+		isCompare: { type: Boolean },
 		size: {},
 		disabled: { type: Boolean },
 		name: {},
@@ -56,6 +58,8 @@ var CodeParams_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 				ref: "form",
 				config: codeParamsConfig.value,
 				"init-values": __props.model,
+				"last-values": __props.lastValues,
+				"is-compare": __props.isCompare,
 				disabled: __props.disabled,
 				size: __props.size,
 				"watch-props": false,
@@ -63,6 +67,8 @@ var CodeParams_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 			}, null, 8, [
 				"config",
 				"init-values",
+				"last-values",
+				"is-compare",
 				"disabled",
 				"size"
 			]);

package/dist/es/components/CompareForm.js

@@ -0,0 +1,5 @@
+import CompareForm_vue_vue_type_script_setup_true_lang_default from "./CompareForm.vue_vue_type_script_setup_true_lang.js";
+//#region packages/editor/src/components/CompareForm.vue
+var CompareForm_default = CompareForm_vue_vue_type_script_setup_true_lang_default;
+//#endregion
+export { CompareForm_default as default };

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

@@ -0,0 +1,167 @@
+import { useServices } from "../hooks/use-services.js";
+import { getCodeBlockFormConfig } from "../utils/code-block.js";
+import { MForm } from "@tmagic/form";
+import { HookType } from "@tmagic/core";
+import { computed, createBlock, createCommentVNode, createElementBlock, defineComponent, inject, normalizeStyle, openBlock, ref, unref, useTemplateRef, watch, watchEffect } from "vue";
+import { isEqual } from "lodash-es";
+//#region packages/editor/src/components/CompareForm.vue?vue&type=script&setup=true&lang.ts
+var CompareForm_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+	name: "MEditorCompareForm",
+	__name: "CompareForm",
+	props: {
+		value: {},
+		lastValue: {},
+		type: {},
+		category: { default: "node" },
+		dataSourceType: {},
+		labelWidth: { default: "120px" },
+		height: {},
+		extendState: {}
+	},
+	setup(__props, { expose: __expose }) {
+		/**
+		* 对比类型：
+		* - node: 节点组件，按 `type` 从 propsService 获取属性表单配置
+		* - data-source: 数据源，按 `type`(base/http/...) 从 dataSourceService 获取数据源表单配置
+		* - code-block: 数据源代码块，使用内置的代码块表单配置
+		*/
+		const props = __props;
+		const { propsService, dataSourceService, codeBlockService, editorService } = useServices();
+		const services = useServices();
+		const config = ref([]);
+		/** vs-code 编辑器的 monaco 配置项，沿用 Editor 顶层 provide('codeOptions', ...) 的注入。 */
+		const codeOptions = inject("codeOptions", {});
+		/** 将代码块的 content 字段统一成字符串，便于在表单/对比中展示 */
+		const normalizeCodeBlockValue = (v) => {
+			if (!v) return {};
+			const next = { ...v };
+			if (next.content && typeof next.content !== "string") try {
+				next.content = next.content.toString();
+			} catch {
+				next.content = "";
+			}
+			return next;
+		};
+		const currentValues = computed(() => {
+			if (props.category === "code-block") return normalizeCodeBlockValue(props.value);
+			return props.value || {};
+		});
+		const lastValuesProcessed = computed(() => {
+			if (props.category === "code-block") return normalizeCodeBlockValue(props.lastValue);
+			return props.lastValue || {};
+		});
+		/**
+		* 外层包裹层的样式：当传入 `height` 时启用固定高度 + 内部滚动，
+		* 这样滚动条会出现在 CompareForm 内部，避免父容器（如 Dialog）自身也产生滚动。
+		*/
+		const wrapperStyle = computed(() => {
+			if (!props.height) return void 0;
+			return {
+				height: props.height,
+				overflow: "auto"
+			};
+		});
+		/**
+		* `code-select` 字段在历史数据中存在两种"语义为空"的形态：
+		* - 字符串 `''`（旧数据 / 用户从未配置过钩子）；
+		* - `{ hookType: HookType.CODE, hookData: [] }`（CodeSelect.vue 在挂载时
+		*   写入的默认结构，参见 packages/editor/src/fields/CodeSelect.vue 中
+		*   `props.model[props.name] = { hookType: HookType.CODE, hookData: [] }`）。
+		*
+		* 直接 `isEqual` 会把两者判为不等，从而在历史对比里对每个未配置过钩子的组件
+		* 都展示一份"差异"，体验很糟糕。这里把它们视为相等，跳过对比。
+		*
+		* 其它类型字段沿用 MForm/Container 的默认 `!isEqual` 判断逻辑。
+		*/
+		const isEmptyCodeSelectValue = (v) => {
+			if (v === "" || v === void 0 || v === null) return true;
+			if (Array.isArray(v) && v.length === 0) return true;
+			return typeof v === "object" && v.hookType === HookType.CODE && Array.isArray(v.hookData) && v.hookData.length === 0;
+		};
+		const showDiff = ({ curValue, lastValue, config }) => {
+			if (config?.type === "code-select") {
+				if (isEmptyCodeSelectValue(curValue) && isEmptyCodeSelectValue(lastValue)) return false;
+			}
+			return !isEqual(curValue, lastValue);
+		};
+		const loadConfig = async () => {
+			switch (props.category) {
+				case "node":
+					if (!props.type) {
+						config.value = [];
+						return;
+					}
+					config.value = await propsService.getPropsConfig(props.type);
+					break;
+				case "data-source":
+					config.value = dataSourceService.getFormConfig(props.type || "base");
+					break;
+				case "code-block":
+					config.value = getCodeBlockFormConfig({
+						paramColConfig: codeBlockService.getParamsColConfig(),
+						isDataSource: () => Boolean(props.dataSourceType),
+						dataSourceType: () => props.dataSourceType,
+						codeOptions,
+						editable: false
+					});
+					break;
+				default: config.value = [];
+			}
+		};
+		watch([
+			() => props.category,
+			() => props.type,
+			() => props.dataSourceType
+		], () => {
+			loadConfig();
+		}, { immediate: true });
+		const formRef = useTemplateRef("form");
+		/**
+		* 把 services / stage 注入 MForm 的 formState，避免 propsService 注入的表单配置中
+		* 形如 `display: ({ services }) => services.uiService.get(...)` 的 filterFunction
+		* 在执行时拿不到 `formState.services` 而报错。
+		*
+		* 与 props-panel/FormPanel.vue 中的注入方式保持一致：
+		* - services：整个 useServices() 返回的服务集合；
+		* - stage：当前 editorService.get('stage') 的最新值。
+		*/
+		const stage = computed(() => editorService.get("stage"));
+		watchEffect(() => {
+			if (formRef.value) {
+				formRef.value.formState.stage = stage.value;
+				formRef.value.formState.services = services;
+			}
+		});
+		__expose({
+			form: formRef,
+			config,
+			reload: loadConfig
+		});
+		return (_ctx, _cache) => {
+			return openBlock(), createElementBlock("div", {
+				class: "m-editor-compare-form-wrapper",
+				style: normalizeStyle(wrapperStyle.value)
+			}, [config.value.length ? (openBlock(), createBlock(unref(MForm), {
+				key: 0,
+				ref: "form",
+				class: "m-editor-compare-form",
+				config: config.value,
+				"init-values": currentValues.value,
+				"last-values": lastValuesProcessed.value,
+				"is-compare": true,
+				disabled: true,
+				"label-width": __props.labelWidth,
+				"extend-state": __props.extendState,
+				"show-diff": showDiff
+			}, null, 8, [
+				"config",
+				"init-values",
+				"last-values",
+				"label-width",
+				"extend-state"
+			])) : createCommentVNode("v-if", true)], 4);
+		};
+	}
+});
+//#endregion
+export { CompareForm_vue_vue_type_script_setup_true_lang_default as default };

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

@@ -1,5 +1,5 @@
 import CodeEditor_default from "../layouts/CodeEditor.js";
-import { createBlock, defineComponent, openBlock } from "vue";
+import { computed, createBlock, defineComponent, openBlock } from "vue";
 //#region packages/editor/src/fields/Code.vue?vue&type=script&setup=true&lang.ts
 var Code_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
 	name: "MFieldsVsCode",
@@ -22,17 +22,31 @@ var Code_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {
 		const emit = __emit;
+		const props = __props;
+		/**
+		* 对比模式判定：
+		*
+		* - 当 `isCompare === true` 时，由父级 `MFormContainer` 统一渲染一次本字段（不再渲染前后两份独立组件），
+		*   并把 `model`（当前值）与 `lastValues`（历史值）一并传入；
+		* - 此时本字段切换到 monaco 自带的 diff 编辑器（左侧旧、右侧新），相比"两个独立 monaco 实例"更直观，
+		*   也避免了同一表单内重复实例化重型编辑器带来的开销。
+		*
+		* 仅当存在历史值（lastValues）且开启了对比模式时启用 diff，避免在 lastValues 缺失时退化为空对比。
+		*/
+		const diffMode = computed(() => Boolean(props.isCompare && props.lastValues));
 		const save = (v) => {
 			emit("change", v);
 		};
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(CodeEditor_default, {
 				height: __props.config.height,
-				"init-values": __props.model[__props.name],
+				type: diffMode.value ? "diff" : void 0,
+				"init-values": diffMode.value ? (__props.lastValues || {})[__props.name] : __props.model[__props.name],
+				"modified-values": diffMode.value ? __props.model[__props.name] : void 0,
 				language: __props.config.language,
 				options: {
 					...__props.config.options,
-					readOnly: __props.disabled
+					readOnly: diffMode.value ? true : __props.disabled
 				},
 				autosize: __props.config.autosize,
 				parse: __props.config.parse,
@@ -40,7 +54,9 @@ var Code_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 				onSave: save
 			}, null, 8, [
 				"height",
+				"type",
 				"init-values",
+				"modified-values",
 				"language",
 				"options",
 				"autosize",

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

@@ -25,6 +25,20 @@ var CodeSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		const emit = __emit;
 		const { dataSourceService, codeBlockService } = useServices();
 		const props = __props;
+		/**
+		* 对比模式判定：
+		*
+		* code-select 仅是对内部「钩子列表」group-list 的包裹，本身不渲染叶子字段。父级 `MFormContainer`
+		* 已将其归入「自接管对比字段」（见 Container.vue 的 `SELF_DIFF_FIELD_TYPES`），即对比时只渲染一次
+		* 本组件，并把当前值 `model` 与历史值 `lastValues` 一并传入，由本组件把 `is-compare`/`lastValues`
+		* 透传给内部 MContainer，再由 group-list / code-select-col 等子级逐项展示前后差异。
+		*
+		* 注意：`model` 传入的是 `model[name]`（钩子值本身），因此 `lastValues` 也必须同层取 `lastValues[name]`，
+		* 否则前后值的嵌套层级不一致会导致对比错位。
+		*
+		* 仅当存在历史值时才启用对比，避免 lastValues 缺失时退化为「全部新增」的空对比。
+		*/
+		const isCompareMode = computed(() => Boolean(props.isCompare && props.lastValues));
 		const codeConfig = computed(() => ({
 			type: "group-list",
 			name: "hookData",
@@ -96,7 +110,8 @@ var CodeSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 					size: __props.size,
 					prop: __props.prop,
 					disabled: __props.disabled,
-					lastValues: __props.lastValues,
+					"is-compare": isCompareMode.value,
+					"last-values": __props.lastValues?.[__props.name],
 					model: __props.model[__props.name],
 					onChange: changeHandler
 				}, null, 8, [
@@ -104,7 +119,8 @@ var CodeSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 					"size",
 					"prop",
 					"disabled",
-					"lastValues",
+					"is-compare",
+					"last-values",
 					"model"
 				])]),
 				_: 1

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

@@ -2,7 +2,7 @@ import { SideItemKey } from "../type.js";
 import { useServices } from "../hooks/use-services.js";
 import Icon_default from "../components/Icon.js";
 import CodeParams_default from "../components/CodeParams.js";
-import { MSelect, createValues, filterFunction } from "@tmagic/form";
+import { MContainer, MSelect, createValues, filterFunction } from "@tmagic/form";
 import { TMagicButton } from "@tmagic/design";
 import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, inject, openBlock, ref, unref, watch, withCtx } from "vue";
 import { isEmpty, map } from "lodash-es";
@@ -35,6 +35,17 @@ var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 		const eventBus = inject("eventBus");
 		const emit = __emit;
 		const props = __props;
+		/**
+		* 对比模式判定：
+		*
+		* code-select-col 由「代码块下拉框 + 参数子表单」组成，属于复合字段。父级 `MFormContainer` 已将其
+		* 归入「自接管对比字段」（见 Container.vue 的 `SELF_DIFF_FIELD_TYPES`），即对比时只渲染一次本组件，
+		* 并把当前值 `model` 与历史值 `lastValues` 一并传入，由本组件把 `is-compare`/`lastValues` 透传给
+		* 内部的下拉框（MFormContainer）与参数表单（CodeParams），逐项展示前后差异。
+		*
+		* 仅当存在历史值时才启用对比，避免 lastValues 缺失时退化为「全部新增」的空对比。
+		*/
+		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));
 		/**
@@ -97,7 +108,23 @@ var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 			return openBlock(), createElementBlock("div", _hoisted_1, [
 				createElementVNode("div", _hoisted_2, [
 					createCommentVNode(" 代码块下拉框 "),
-					createVNode(unref(MSelect), {
+					createCommentVNode(" 对比模式下交由 MFormContainer 展示下拉框的前后差异（codeId 变化时高亮新旧代码块名），\n           普通模式仍直接渲染 MSelect 以保留选择 / 写值逻辑 "),
+					isCompareMode.value ? (openBlock(), createBlock(unref(MContainer), {
+						key: 0,
+						class: "select",
+						config: selectConfig,
+						model: __props.model,
+						"last-values": __props.lastValues,
+						"is-compare": true,
+						size: __props.size,
+						prop: __props.prop
+					}, null, 8, [
+						"model",
+						"last-values",
+						"size",
+						"prop"
+					])) : (openBlock(), createBlock(unref(MSelect), {
+						key: 1,
 						class: "select",
 						config: selectConfig,
 						name: __props.name,
@@ -110,10 +137,10 @@ var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 						"model",
 						"size",
 						"prop"
-					]),
-					createCommentVNode(" 查看/编辑按钮 "),
-					__props.model[__props.name] && hasCodeBlockSidePanel.value ? (openBlock(), createBlock(unref(TMagicButton), {
-						key: 0,
+					])),
+					createCommentVNode(" 查看/编辑按钮：对比模式为只读，不展示 "),
+					!isCompareMode.value && __props.model[__props.name] && hasCodeBlockSidePanel.value ? (openBlock(), createBlock(unref(TMagicButton), {
+						key: 2,
 						class: "m-fields-select-action-button",
 						size: __props.size,
 						onClick: _cache[0] || (_cache[0] = ($event) => editCode(__props.model[__props.name]))
@@ -127,12 +154,16 @@ var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 					name: "params",
 					key: __props.model[__props.name],
 					model: __props.model,
+					"last-values": __props.lastValues,
+					"is-compare": isCompareMode.value,
 					size: __props.size,
 					disabled: __props.disabled,
 					"params-config": paramsConfig.value,
 					onChange: onParamsChangeHandler
 				}, null, 8, [
 					"model",
+					"last-values",
+					"is-compare",
 					"size",
 					"disabled",
 					"params-config"

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

@@ -39,6 +39,8 @@ var FieldSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ de
 		});
 		const valueIsKey = computed(() => props.value === "key");
 		const notEditable = computed(() => filterFunction(mForm, props.notEditable, props));
+		/** 对比模式下隐藏查看/编辑操作按钮，仅保留只读展示。 */
+		const isCompare = computed(() => Boolean(mForm?.isCompare));
 		const dataSourcesOptions = computed(() => dataSources.value.map((ds) => ({
 			text: ds.title || ds.id,
 			value: valueIsKey.value ? ds.id : `${DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX}${ds.id}`
@@ -166,7 +168,7 @@ var FieldSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ de
 				"size",
 				"options",
 				"props"
-			])), selectDataSourceId.value && hasDataSourceSidePanel.value ? (openBlock(), createBlock(unref(TMagicTooltip), {
+			])), selectDataSourceId.value && hasDataSourceSidePanel.value && !isCompare.value ? (openBlock(), createBlock(unref(TMagicTooltip), {
 				key: 3,
 				content: notEditable.value ? "查看" : "编辑"
 			}, {

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

@@ -140,7 +140,7 @@ var Index_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 				"init-values",
 				"values",
 				"prop"
-			])), __props.config.fieldConfig && !disabledDataSource.value ? (openBlock(), createBlock(unref(TMagicTooltip), {
+			])), __props.config.fieldConfig && !disabledDataSource.value && !unref(mForm)?.isCompare ? (openBlock(), createBlock(unref(TMagicTooltip), {
 				key: 2,
 				disabled: showDataSourceFieldSelect.value,
 				content: "选择数据源"
@@ -148,7 +148,7 @@ var Index_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 				default: withCtx(() => [createVNode(unref(TMagicButton), {
 					type: showDataSourceFieldSelect.value ? "primary" : "default",
 					size: __props.size,
-					disabled: __props.disabled || unref(mForm)?.isCompare,
+					disabled: __props.disabled,
 					onClick: onToggleDataSourceFieldSelectHandler
 				}, {
 					default: withCtx(() => [createVNode(Icon_default, { icon: unref(Coin) }, null, 8, ["icon"])]),

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

@@ -7,10 +7,13 @@ import { MFormBox } from "@tmagic/form";
 import { MagicTable } from "@tmagic/table";
 import { TMagicButton, tMagicMessage, tMagicMessageBox } from "@tmagic/design";
 import { getDefaultValueFromFields } from "@tmagic/utils";
-import { createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, inject, isRef, mergeModels, openBlock, ref, unref, useModel, withCtx } from "vue";
+import { computed, createCommentVNode, createElementBlock, createTextVNode, createVNode, defineComponent, inject, isRef, mergeModels, openBlock, 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 = { class: "m-editor-data-source-fields-footer" };
+var _hoisted_2 = {
+	key: 0,
+	class: "m-editor-data-source-fields-footer"
+};
 var DataSourceFields_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
 	name: "MFieldsDataSourceFields",
 	__name: "DataSourceFields",
@@ -51,6 +54,9 @@ var DataSourceFields_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 		const props = __props;
 		const emit = __emit;
 		const { uiService } = useServices();
+		const mForm = inject("mForm");
+		/** 对比模式下隐藏新增/编辑/删除等操作按钮，仅保留只读展示。 */
+		const isCompare = computed(() => Boolean(mForm?.isCompare));
 		const fieldValues = ref({});
 		const fieldTitle = ref("");
 		const width = useModel(__props, "width");
@@ -130,6 +136,8 @@ var DataSourceFields_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 				}]
 			}
 		];
+		/** 对比模式下移除「操作」列（编辑/删除按钮），仅保留只读列。 */
+		const displayColumns = computed(() => isCompare.value ? fieldColumns.filter((col) => !col.actions) : fieldColumns);
 		const dataSourceFieldsConfig = [
 			{
 				name: "index",
@@ -306,10 +314,10 @@ var DataSourceFields_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 			return openBlock(), createElementBlock("div", _hoisted_1, [
 				createVNode(unref(MagicTable), {
 					data: __props.model[__props.name],
-					columns: fieldColumns,
+					columns: displayColumns.value,
 					border: true
-				}, null, 8, ["data"]),
-				createElementVNode("div", _hoisted_2, [createVNode(unref(TMagicButton), {
+				}, null, 8, ["data", "columns"]),
+				!isCompare.value ? (openBlock(), createElementBlock("div", _hoisted_2, [createVNode(unref(TMagicButton), {
 					size: "small",
 					disabled: __props.disabled,
 					plain: "",
@@ -326,7 +334,7 @@ var DataSourceFields_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 				}, {
 					default: withCtx(() => [..._cache[9] || (_cache[9] = [createTextVNode("添加", -1)])]),
 					_: 1
-				}, 8, ["disabled"])]),
+				}, 8, ["disabled"])])) : createCommentVNode("v-if", true),
 				createVNode(FloatingBox_default, {
 					visible: addDialogVisible.value,
 					"onUpdate:visible": _cache[2] || (_cache[2] = ($event) => addDialogVisible.value = $event),