@tmagic/editor 1.8.0-manmanyu.8 → 1.8.0

package/dist/es/plugin.js

@@ -16,46 +16,58 @@ import PageFragmentSelect_default from "./fields/PageFragmentSelect.js";
 import DisplayConds_default from "./fields/DisplayConds.js";
 import CondOpSelect_default from "./fields/CondOpSelect.js";
 import Index_default$1 from "./fields/StyleSetter/Index.js";
+import { editorFields } from "./fields/headless-validation.js";
 import Code_default from "./fields/Code.js";
 import CodeLink_default from "./fields/CodeLink.js";
 import UISelect_default from "./fields/UISelect.js";
 /* empty css            */
-import formPlugin from "@tmagic/form";
+import formPlugin, { mergeFieldOptions } from "@tmagic/form";
 import tablePlugin from "@tmagic/table";
 import designPlugin from "@tmagic/design";
 //#region packages/editor/src/plugin.ts
 var defaultInstallOpt = {
 	parseDSL: (dsl) => eval(dsl),
 	customCreateMonacoEditor: (monaco, codeEditorEl, options) => monaco.editor.create(codeEditorEl, options),
-	customCreateMonacoDiffEditor: (monaco, codeEditorEl, options) => monaco.editor.createDiffEditor(codeEditorEl, options)
+	customCreateMonacoDiffEditor: (monaco, codeEditorEl, options) => monaco.editor.createDiffEditor(codeEditorEl, options),
+	flat: false
+};
+var editorFieldVue = {
+	"vs-code": { component: Code_default },
+	"ui-select": { component: UISelect_default },
+	"cond-op-select": { component: CondOpSelect_default },
+	"page-fragment-select": { component: PageFragmentSelect_default },
+	"data-source-select": { component: DataSourceSelect_default },
+	"data-source-input": { component: DataSourceInput_default },
+	"code-link": { component: CodeLink_default },
+	"key-value": { component: KeyValue_default },
+	"code-select-col": { component: CodeSelectCol_default },
+	"data-source-fields": { component: DataSourceFields_default },
+	"data-source-mocks": { component: DataSourceMocks_default },
+	"data-source-methods": { component: DataSourceMethods_default },
+	"data-source-method-select": { component: DataSourceMethodSelect_default },
+	"data-source-field-select": { component: Index_default },
+	"code-select": { component: CodeSelect_default },
+	"display-conds": { component: DisplayConds_default },
+	"event-select": { component: EventSelect_default },
+	"style-setter": { container: Index_default$1 }
 };
 var plugin_default = { install: (app, opt) => {
-	const option = Object.assign(defaultInstallOpt, opt || {});
-	app.use(designPlugin, opt || {});
-	app.use(formPlugin, opt || {});
+	const incoming = opt || {};
+	const option = {
+		...defaultInstallOpt,
+		...incoming
+	};
+	const formOpt = incoming;
+	app.use(designPlugin, incoming);
+	app.use(formPlugin, {
+		...formOpt,
+		fields: mergeFieldOptions(editorFields, editorFieldVue, formOpt.fields)
+	});
 	app.use(tablePlugin);
 	app.config.globalProperties.$TMAGIC_EDITOR = option;
 	setEditorConfig(option);
 	app.component(`${Editor_default.name || "MEditor"}`, Editor_default);
 	app.component("magic-code-editor", CodeEditor_default);
-	app.component("m-fields-ui-select", UISelect_default);
-	app.component("m-fields-code-link", CodeLink_default);
-	app.component("m-fields-vs-code", Code_default);
-	app.component("m-fields-code-select", CodeSelect_default);
-	app.component("m-fields-code-select-col", CodeSelectCol_default);
-	app.component("m-fields-event-select", EventSelect_default);
-	app.component("m-fields-data-source-fields", DataSourceFields_default);
-	app.component("m-fields-data-source-mocks", DataSourceMocks_default);
-	app.component("m-fields-key-value", KeyValue_default);
-	app.component("m-fields-data-source-input", DataSourceInput_default);
-	app.component("m-fields-data-source-select", DataSourceSelect_default);
-	app.component("m-fields-data-source-methods", DataSourceMethods_default);
-	app.component("m-fields-data-source-method-select", DataSourceMethodSelect_default);
-	app.component("m-fields-data-source-field-select", Index_default);
-	app.component("m-fields-page-fragment-select", PageFragmentSelect_default);
-	app.component("m-fields-display-conds", DisplayConds_default);
-	app.component("m-fields-cond-op-select", CondOpSelect_default);
-	app.component("m-form-style-setter", Index_default$1);
 } };
 //#endregion
 export { plugin_default as default };

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 BaseService from "./BaseService.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";
@@ -56,6 +56,7 @@ var CodeBlock = class extends BaseService {
 	async setCodeDsl(codeDsl) {
 		this.state.codeDsl = codeDsl;
 		this.emit("code-dsl-change", this.state.codeDsl);
+		this.emit("change", this.state.codeDsl);
 	}
 	/**
 	* 获取活动的代码块dsl数据源（默认从dsl中的codeBlocks字段读取）
@@ -121,14 +122,18 @@ 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]);
+		this.emit("change", this.getCodeDsl());
 	}
 	/**
 	* 根据代码块id数组获取代码dsl
@@ -136,7 +141,8 @@ var CodeBlock = class extends BaseService {
 	* @returns {CodeBlockDSL}
 	*/
 	getCodeDslByIds(ids) {
-		return pick(this.getCodeDsl(), ids);
+		const codeDsl = this.getCodeDsl();
+		return pick(codeDsl, ids);
 	}
 	/**
 	* 获取编辑状态
@@ -212,19 +218,21 @@ 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);
 		});
+		this.emit("change", this.getCodeDsl());
 	}
 	/**
 	* 下列 *AndGetHistoryId 方法与对应的写入方法行为完全一致，
@@ -281,7 +289,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 +300,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 +321,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 +344,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 +361,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;
@@ -364,7 +372,8 @@ var CodeBlock = class extends BaseService {
 	*/
 	async getUniqueId() {
 		const newId = `code_${Math.random().toString(10).substring(2).substring(0, 4)}`;
-		if (!keys(await this.getCodeDsl()).includes(newId)) return newId;
+		const dsl = await this.getCodeDsl();
+		if (!keys(dsl).includes(newId)) return newId;
 		return await this.getUniqueId();
 	}
 	/**
@@ -423,21 +432,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 +467,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 +490,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,13 +92,17 @@ 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);
+		this.emit("change", this.get("dataSources"));
 		return newConfig;
 	}
 	/**
@@ -115,17 +119,21 @@ 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
 		});
+		this.emit("change", this.get("dataSources"));
 		return newConfig;
 	}
 	/**
@@ -140,13 +148,17 @@ 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);
+		this.emit("change", this.get("dataSources"));
 	}
 	/**
 	* 下列 *AndGetHistoryId 方法与对应的 add / update / remove 行为完全一致，
@@ -191,7 +203,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 +214,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 +235,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 +258,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 +274,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 +337,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 +372,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 +395,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 });