@tmagic/editor 1.8.0-manmanyu.8 → 1.8.0

package/dist/es/utils/history.js

@@ -33,7 +33,7 @@ var detectStackOpType = (oldVal, newVal) => {
 *
 * - `add`：oldValue = null；`remove`：newValue = null；`update`：两者都有，可带 changeRecords 做局部更新。
 * - 内容会做 cloneDeep 防止后续被外部引用篡改；opType 依据 old/new 是否为 null 推断。
-* - 仅负责构造 step 并返回，入栈与事件 emit 由各公共方法（pushCodeBlock / pushDataSource）自行处理。
+* - 仅负责构造 step 并返回，入栈与事件 emit 由统一的 history.push(stepType, step, id) 处理。
 * - 不直接驱动业务 service，调用方负责实际写回。
 */
 var createStackStep = (id, payload) => {
@@ -42,9 +42,14 @@ var createStackStep = (id, payload) => {
 	const newSchema = payload.newValue ? cloneDeep(payload.newValue) : null;
 	const changeRecords = payload.changeRecords?.length ? cloneDeep(payload.changeRecords) : void 0;
 	const opType = detectStackOpType(payload.oldValue, payload.newValue);
+	const schema = payload.newValue ?? payload.oldValue;
+	const name = payload.name ?? schema?.name ?? schema?.title ?? "";
 	return {
 		uuid: guid(),
-		id,
+		data: {
+			name,
+			id
+		},
 		opType,
 		diff: [{
 			...newSchema !== null ? { newSchema } : {},
@@ -53,7 +58,10 @@ var createStackStep = (id, payload) => {
 		}],
 		historyDescription: payload.historyDescription,
 		source: payload.source,
-		timestamp: Date.now()
+		operator: payload.operator,
+		rootStep: payload.rootStep,
+		timestamp: Date.now(),
+		extra: payload.extra
 	};
 };
 var markStackSaved = (undoRedo) => {
@@ -66,46 +74,22 @@ var markStackSaved = (undoRedo) => {
 	});
 };
 /**
-* 把单个「按 id 分栈」的历史栈（代码块 / 数据源）拆成若干 group：
-* 每条操作记录独立成组，不做相邻 update 合并（与页面历史的合并策略不同）。
+* 把单个历史栈（页面 / 代码块 / 数据源 / 扩展类型）的步骤列表按"目标"做相邻合并：
+* - 单实体的 'update' 按 targetId 与相邻同 targetId 的 update 合并到一个 group，组内可展开查看每步；
+* - 'add' / 'remove' 始终独立成组（语义上是结构变更，不应被收纳进单实体修改组）；
+* - 多实体 'update'（如页面批量改属性）也独立成组（无明确单一目标，避免误合并）。
 *
-* 代码块与数据源除 `kind` 外结构完全一致，统一由本方法处理；`kind` 决定返回的具体分组类型。
+* 各类型行为完全一致，仅 `kind` 与 step 快照类型不同，统一由本方法处理。
 */
-var mergeStackSteps = (kind, id, list, cursor) => {
-	const currentIndex = cursor - 1;
-	return list.map((step, index) => {
-		const applied = index < cursor;
-		const isCurrent = index === currentIndex;
-		return {
-			kind,
-			id,
-			opType: step.opType,
-			steps: [{
-				step,
-				index,
-				applied,
-				isCurrent
-			}],
-			applied,
-			isCurrent
-		};
-	});
-};
-/**
-* 把页面栈拆成若干 group：
-* - 单节点的 'update' 按 targetId 与相邻同 targetId 的 update 合并到一个 group；
-* - 'add' / 'remove' 始终独立成组（语义上是结构变更，不应被收纳进单节点修改组）；
-* - 多节点 'update'（如批量改属性）也独立成组（无明确单一目标，避免误合并）。
-*/
-var mergePageSteps = (pageId, list, cursor) => {
+var mergeSteps = (kind, id, list, cursor) => {
 	const groups = [];
 	let current = null;
 	const currentIndex = cursor - 1;
 	list.forEach((step, index) => {
 		const applied = index < cursor;
 		const isCurrent = index === currentIndex;
-		const targetId = detectPageTargetId(step);
-		const targetName = detectPageTargetName(step);
+		const targetId = detectTargetId(step);
+		const targetName = detectTargetName(step);
 		const entry = {
 			step,
 			index,
@@ -120,8 +104,8 @@ var mergePageSteps = (pageId, list, cursor) => {
 			if (targetName) current.targetName = targetName;
 		} else {
 			current = {
-				kind: "page",
-				pageId,
+				kind,
+				id,
 				opType: step.opType,
 				targetId: mergeable ? targetId : void 0,
 				targetName,
@@ -135,18 +119,21 @@ var mergePageSteps = (pageId, list, cursor) => {
 	return groups;
 };
 /**
-* 解析 StepValue 中的"目标节点 id"用于合并：
-* - 单节点 update：取唯一一项 updatedItems 的节点 id；
-* - 其它情形（多节点 update / add / remove）：返回 undefined，表示不参与合并。
+* 解析 step 中的"目标 id"用于合并：
+* - 单实体 update：取唯一一项 diff 的快照 id；快照无 id 时（如 CodeBlockContent）回退到 `step.data.id`
+*   （即资源 id），使代码块 / 数据源同样能按资源合并相邻 update；
+* - 其它情形（多实体 update / add / remove）：返回 undefined，表示不参与合并。
 */
-var detectPageTargetId = (step) => {
+var detectTargetId = (step) => {
 	if (step.opType !== "update") return void 0;
 	const items = step.diff;
 	if (items?.length !== 1) return void 0;
-	return items[0].newSchema?.id ?? items[0].oldSchema?.id;
+	const newSchema = items[0].newSchema;
+	const oldSchema = items[0].oldSchema;
+	return newSchema?.id ?? oldSchema?.id ?? step.data?.id;
 };
-/** 解析 StepValue 中的目标节点可读名（用于 UI 展示）。 */
-var detectPageTargetName = (step) => {
+/** 解析 step 中的目标可读名（用于 UI 展示）。 */
+var detectTargetName = (step) => {
 	const items = step.diff;
 	if (step.opType === "update") {
 		if (items?.length === 1) {
@@ -220,8 +207,9 @@ var getOrCreateStack = (stacks, id) => {
 	return stacks[id];
 };
 /**
-* 撤销下限：当页面栈 index 0 是 `opType: 'initial'` 的基线 step 时为 1（基线不可被撤销），否则为 0。
-* 用于把 cursor 钉在基线之上，保证 undo / canUndo / goto 都不会越过初始基线。
+* 撤销下限：当栈 index 0 是 `opType: 'initial'` 的基线 step 时为 1（基线不可被撤销），否则为 0。
+* 适用于所有历史类型（page / codeBlock / dataSource / 扩展），把 cursor 钉在基线之上，
+* 保证 undo / canUndo / goto 都不会越过初始基线。
 */
 var undoFloor = (undoRedo) => {
 	return undoRedo.getElementList()[0]?.opType === "initial" ? 1 : 0;
@@ -229,4 +217,4 @@ var undoFloor = (undoRedo) => {
 /** 将单次 push 产生的 history uuid（或 null）转为 *AndGetHistoryId 返回用的 uuid 列表。 */
 var getLastPushedHistoryIds = (historyId) => historyId ? [historyId] : [];
 //#endregion
-export { createStackStep, describeRevertStep, deserializeStacks, detectPageTargetId, detectPageTargetName, detectStackOpType, getLastPushedHistoryIds, getOrCreateStack, markStackSaved, mergePageSteps, mergeStackSteps, serializeStacks, undoFloor };
+export { createStackStep, describeRevertStep, deserializeStacks, detectStackOpType, detectTargetId, detectTargetName, getLastPushedHistoryIds, getOrCreateStack, markStackSaved, mergeSteps, serializeStacks, undoFloor };

package/dist/es/utils/monaco-editor.js

@@ -1,12 +1,28 @@
 //#region packages/editor/src/utils/monaco-editor.ts
 var cached;
-var monaco_editor_default = () => {
-	if (!cached) cached = Promise.all([import("emmet-monaco-es"), import("monaco-editor")]).then(([emmet, monaco]) => {
-		const { emmetHTML, emmetCSS } = emmet;
-		emmetHTML(monaco);
-		emmetCSS(monaco, ["css", "scss"]);
-		return monaco;
+var isMonacoCanceledError = (reason) => {
+	if (!reason) return false;
+	if (reason instanceof Error) return reason.name === "Canceled" || reason.message === "Canceled";
+	return reason === "Canceled";
+};
+var canceledRejectionHandlerInstalled = false;
+var installCanceledRejectionHandler = () => {
+	if (canceledRejectionHandlerInstalled || typeof globalThis.addEventListener !== "function") return;
+	canceledRejectionHandlerInstalled = true;
+	globalThis.addEventListener("unhandledrejection", (event) => {
+		if (isMonacoCanceledError(event.reason)) event.preventDefault();
 	});
+};
+var monaco_editor_default = () => {
+	if (!cached) {
+		installCanceledRejectionHandler();
+		cached = Promise.all([import("emmet-monaco-es"), import("monaco-editor")]).then(([emmet, monaco]) => {
+			const { emmetHTML, emmetCSS } = emmet;
+			emmetHTML(monaco);
+			emmetCSS(monaco, ["css", "scss"]);
+			return monaco;
+		});
+	}
 	return cached;
 };
 //#endregion

package/dist/es/utils/operator.js

@@ -1,7 +1,7 @@
 import props_default from "../services/props.js";
 import { generatePageNameByApp, getInitPositionStyle } from "./editor.js";
 import editor_default from "../services/editor.js";
-import { calcValueByFontsize, getElById, isPage, isPageFragment } from "@tmagic/utils";
+import { calcValueByFontsize, getElById, isPage, isPageOrFragment } from "@tmagic/utils";
 import { NodeType } from "@tmagic/core";
 import { toRaw } from "vue";
 import { isEmpty } from "lodash-es";
@@ -33,7 +33,7 @@ var beforePaste = (position, config, doc) => {
 			};
 		}
 		const root = editor_default.get("root");
-		if ((isPage(pasteConfig) || isPageFragment(pasteConfig)) && root) pasteConfig.name = generatePageNameByApp(root, isPage(pasteConfig) ? NodeType.PAGE : NodeType.PAGE_FRAGMENT);
+		if (isPageOrFragment(pasteConfig) && root) pasteConfig.name = generatePageNameByApp(root, isPage(pasteConfig) ? NodeType.PAGE : NodeType.PAGE_FRAGMENT);
 		return pasteConfig;
 	});
 };

package/dist/es/utils/props.js

@@ -1,5 +1,5 @@
 import { tMagicMessage } from "@tmagic/design";
-import { NODE_CONDS_KEY, NODE_CONDS_RESULT_KEY, NODE_DISABLE_CODE_BLOCK_KEY, NODE_DISABLE_DATA_SOURCE_KEY } from "@tmagic/core";
+import { HookType, NODE_CONDS_KEY, NODE_CONDS_RESULT_KEY, NODE_DISABLE_CODE_BLOCK_KEY, NODE_DISABLE_DATA_SOURCE_KEY } from "@tmagic/core";
 //#region packages/editor/src/utils/props.ts
 var arrayOptions = [{
 	text: "包含",
@@ -41,10 +41,28 @@ var numberOptions = [
 		value: "not_between"
 	}
 ];
+var booleanOptions = [{
+	text: "是",
+	value: "is"
+}, {
+	text: "不是",
+	value: "not"
+}];
+/** 按字段类型返回条件运算符选项（UI 与 typeMatch 校验共用） */
+var getCondOpOptionsByFieldType = (type) => {
+	if (type === "array") return arrayOptions;
+	if (type === "boolean" || type === "null") return booleanOptions;
+	if (type === "number") return [...eqOptions, ...numberOptions];
+	if (type === "string") return [...arrayOptions, ...eqOptions];
+	return [
+		...arrayOptions,
+		...eqOptions,
+		...numberOptions
+	];
+};
 var styleTabConfig = {
 	title: "样式",
-	lazy: true,
-	display: ({ services }) => !(services.uiService.get("showStylePanel") ?? true),
+	display: ({ services }) => !(services?.uiService?.get("showStylePanel") ?? true),
 	items: [{
 		name: "style",
 		labelWidth: "100px",
@@ -108,145 +126,73 @@ var styleTabConfig = {
 };
 var eventTabConfig = {
 	title: "事件",
-	lazy: true,
 	items: [{
 		name: "events",
 		src: "component",
 		labelWidth: "100px",
-		type: "event-select"
+		type: "event-select",
+		defaultValue: [],
+		rules: [{ typeMatch: true }]
 	}]
 };
-var getReportTypeConfig = ({ reportType }) => {
-	return {
-		name: reportType,
-		style: {
-			backgroundColor: "#fff",
-			borderRadius: "4px",
-			padding: "16px",
-			marginBottom: "10px"
-		},
-		items: [
-			{
-				text: {
-					click: "点击",
-					expose: "曝光"
-				}[reportType],
-				static: true,
-				labelPosition: "left",
-				labelWidth: "200px",
-				className: "m-fields-title-container"
-			},
-			{
-				name: "f_module",
-				type: "data-source-field-select",
-				fieldConfig: { type: "text" },
-				checkStrictly: false,
-				dataSourceFieldType: ["string"],
-				disabled: (_vm, { formValue }) => !formValue?.report?.custom,
-				text: "f_module",
-				labelPosition: "left"
-			},
-			{
-				name: "f_resource",
-				type: "data-source-field-select",
-				fieldConfig: { type: "text" },
-				checkStrictly: false,
-				dataSourceFieldType: ["string"],
-				disabled: (_vm, { formValue }) => !formValue?.report?.custom,
-				text: "f_resource",
-				labelPosition: "left"
-			},
-			{
-				name: "f_type",
-				type: "data-source-field-select",
-				fieldConfig: { type: "text" },
-				checkStrictly: false,
-				dataSourceFieldType: ["string", "number"],
-				disabled: (_vm, { formValue }) => !formValue?.report?.custom,
-				text: "f_type",
-				labelPosition: "left"
-			}
-		]
-	};
-};
 var advancedTabConfig = {
 	title: "高级",
-	lazy: true,
 	items: [
-		{
-			type: "link",
-			displayText: "点击查看配置指南",
-			href: "https://iwiki.woa.com/pages/viewpage.action?pageId=827749220",
-			css: "color: #F56C6C;font-weight: bold"
-		},
 		{
 			name: NODE_DISABLE_CODE_BLOCK_KEY,
 			text: "禁用代码块",
 			type: "switch",
-			labelPosition: "left",
 			defaultValue: false,
-			extra: "开启后，配置的代码块将不会被执行",
-			style: { padding: "0 22px" }
+			extra: "开启后，配置的代码块将不会被执行"
 		},
 		{
 			name: NODE_DISABLE_DATA_SOURCE_KEY,
 			text: "禁用数据源",
 			type: "switch",
-			labelPosition: "left",
 			defaultValue: false,
-			extra: "开启后，组件内配置的数据源相关配置将不会被编译，显隐条件将失效",
-			style: { padding: "0 22px" }
+			extra: "开启后，组件内配置的数据源相关配置将不会被编译，显隐条件将失效"
 		},
 		{
 			name: "created",
 			text: "Created",
-			flat: true,
 			labelPosition: "top",
 			type: "code-select",
 			titleExtra: "组件初始化时执行",
-			style: { padding: "0 22px" }
+			rules: [{
+				typeMatch: true,
+				trigger: "change"
+			}, { validator: ({ value, callback }) => {
+				if (value && value.hookType !== HookType.CODE) return callback("hookType 必须是 code");
+				callback();
+			} }]
 		},
 		{
 			name: "mounted",
 			text: "Mounted",
 			labelPosition: "top",
-			flat: true,
 			type: "code-select",
 			titleExtra: "组件挂载到dom时执行",
-			style: { padding: "0 22px" }
+			rules: [{
+				typeMatch: true,
+				trigger: "change"
+			}, { validator: ({ value, callback }) => {
+				if (value && value.hookType !== HookType.CODE) return callback("hookType 必须是 code");
+				callback();
+			} }]
 		},
 		{
 			name: "display",
 			text: "Display",
-			flat: true,
 			titleExtra: "控制组件是否渲染，关系的代码块返回值为false时不渲染",
 			labelPosition: "top",
 			type: "code-select",
-			style: { padding: "0 22px" }
-		},
-		{
-			type: "fieldset",
-			legend: "上报",
-			labelWidth: "80px",
-			name: "report",
-			className: "no-border-fieldset",
-			style: { paddingTop: "10px" },
-			items: [
-				{
-					type: "row",
-					items: [{
-						type: "switch",
-						name: "custom",
-						labelPosition: "left",
-						defaultValue: false,
-						labelWidth: "120px",
-						text: "开启自定义",
-						extra: "开启自定义后可以手动修改上报内容，关闭后会自动生成上报内容"
-					}]
-				},
-				getReportTypeConfig({ reportType: "click" }),
-				getReportTypeConfig({ reportType: "expose" })
-			]
+			rules: [{
+				typeMatch: true,
+				trigger: "change"
+			}, { validator: ({ value, callback }) => {
+				if (value && value.hookType !== HookType.CODE) return callback("hookType 必须是 code");
+				callback();
+			} }]
 		}
 	]
 };
@@ -277,10 +223,8 @@ var displayTabConfig = {
 			type: "display-conds",
 			name: NODE_CONDS_KEY,
 			titlePrefix: "条件组",
-			flat: true,
-			fixed: "right",
-			operateColWidth: 112,
-			defaultValue: []
+			defaultValue: [],
+			rules: [{ typeMatch: true }]
 		}
 	]
 };
@@ -339,4 +283,4 @@ var fillConfig = (config = [], { labelWidth = "80px", disabledDataSource = false
 	return [tabConfig];
 };
 //#endregion
-export { advancedTabConfig, arrayOptions, displayTabConfig, eqOptions, eventTabConfig, fillConfig, numberOptions, styleTabConfig };
+export { advancedTabConfig, arrayOptions, booleanOptions, displayTabConfig, eqOptions, eventTabConfig, fillConfig, getCondOpOptionsByFieldType, numberOptions, styleTabConfig };