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

package/dist/es/style.css

@@ -126,7 +126,10 @@
 .m-form-container.has-tip .tmagic-design-form-item {
   flex: 1;
 }
-.m-form-container .tmagic-design-form-item.show-diff {
+.m-form-container .tmagic-design-form-item.show-after-diff {
+  background: rgb(225, 243, 216);
+}
+.m-form-container .tmagic-design-form-item.show-before-diff {
   background: #f7dadd;
 }
 
@@ -578,6 +581,381 @@ fieldset.m-fieldset .m-form-tip {
   background-color: transparent;
 }
 
+.m-editor-history-list-popover {
+  padding: 0 !important;
+}
+.m-editor-history-list-popover .m-editor-history-list {
+  position: relative;
+  padding: 4px 8px 8px;
+}
+.m-editor-history-list-popover .m-editor-history-list-close {
+  position: absolute;
+  top: 4px;
+  right: 4px;
+  z-index: 1;
+  display: flex;
+  align-items: center;
+  height: 40px;
+  margin: 0;
+  color: #909399;
+}
+.m-editor-history-list-popover .m-editor-history-list-close:hover {
+  color: #409eff;
+}
+.m-editor-history-list-popover .m-editor-history-list-tabs .el-tabs__header,
+.m-editor-history-list-popover .m-editor-history-list-tabs .t-tabs__header {
+  margin-bottom: 4px;
+}
+.m-editor-history-list-popover .m-editor-history-list-empty {
+  padding: 24px 0;
+  text-align: center;
+  color: #909399;
+  font-size: 12px;
+}
+.m-editor-history-list-popover .m-editor-history-list-ul {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+.m-editor-history-list-popover .m-editor-history-list-item {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 6px 8px;
+  border-radius: 4px;
+  font-size: 12px;
+  line-height: 1.4;
+  color: #303133;
+  cursor: default;
+}
+.m-editor-history-list-popover .m-editor-history-list-item:not(.m-editor-history-list-group.is-merged):hover {
+  background-color: rgba(0, 0, 0, 0.04);
+}
+.m-editor-history-list-popover .m-editor-history-list-item.is-undone {
+  color: #c0c4cc;
+}
+.m-editor-history-list-popover .m-editor-history-list-item.is-undone .m-editor-history-list-item-op {
+  opacity: 0.5;
+}
+.m-editor-history-list-popover .m-editor-history-list-item.is-current:not(.m-editor-history-list-group.is-merged) {
+  background-color: rgba(64, 158, 255, 0.1);
+  box-shadow: inset 2px 0 0 #409eff;
+}
+.m-editor-history-list-popover .m-editor-history-list-item.is-current:not(.m-editor-history-list-group.is-merged):hover {
+  background-color: rgba(64, 158, 255, 0.16);
+}
+.m-editor-history-list-popover .m-editor-history-list-item.is-current:not(.m-editor-history-list-group.is-merged) .m-editor-history-list-item-desc {
+  font-weight: 600;
+  color: #409eff;
+}
+.m-editor-history-list-popover .m-editor-history-list-group {
+  flex-direction: column;
+  align-items: stretch;
+  gap: 0;
+}
+.m-editor-history-list-popover .m-editor-history-list-group .m-editor-history-list-group-head {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  cursor: default;
+}
+.m-editor-history-list-popover .m-editor-history-list-group .m-editor-history-list-group-head.is-clickable {
+  cursor: pointer;
+}
+.m-editor-history-list-popover .m-editor-history-list-group .m-editor-history-list-group-toggle {
+  flex: 0 0 auto;
+  width: 16px;
+  text-align: center;
+  color: #909399;
+  font-size: 12px;
+  user-select: none;
+  transition: transform 0.15s ease;
+  pointer-events: none;
+}
+.m-editor-history-list-popover .m-editor-history-list-group .m-editor-history-list-group-toggle.is-expanded {
+  transform: rotate(180deg);
+}
+.m-editor-history-list-popover .m-editor-history-list-group.is-merged {
+  margin: 4px 0;
+  padding: 4px 8px 6px;
+  background-color: rgba(47, 84, 235, 0.06);
+  border: 1px solid rgba(47, 84, 235, 0.18);
+  border-left: 3px solid #2f54eb;
+  border-radius: 4px;
+}
+.m-editor-history-list-popover .m-editor-history-list-group.is-merged:hover {
+  background-color: rgba(47, 84, 235, 0.1);
+}
+.m-editor-history-list-popover .m-editor-history-list-group.is-merged .m-editor-history-list-group-head {
+  font-weight: 600;
+  color: #1d39c4;
+}
+.m-editor-history-list-popover .m-editor-history-list-group.is-merged.is-undone {
+  background-color: rgba(192, 196, 204, 0.08);
+  border-color: rgba(192, 196, 204, 0.4);
+  border-left-color: #c0c4cc;
+}
+.m-editor-history-list-popover .m-editor-history-list-group.is-merged.is-undone .m-editor-history-list-group-head {
+  color: #c0c4cc;
+}
+.m-editor-history-list-popover .m-editor-history-list-group.is-merged.is-current {
+  background-color: rgba(64, 158, 255, 0.08);
+  border-color: rgba(64, 158, 255, 0.3);
+  border-left-color: #409eff;
+  box-shadow: none;
+}
+.m-editor-history-list-popover .m-editor-history-list-group.is-merged.is-current .m-editor-history-list-group-head {
+  color: #409eff;
+}
+.m-editor-history-list-popover .m-editor-history-list-substeps {
+  margin: 6px 0 0 6px;
+  padding: 0;
+  list-style: none;
+  border-left: 1px dashed rgba(47, 84, 235, 0.45);
+}
+.m-editor-history-list-popover .m-editor-history-list-substeps li {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 3px 8px;
+  font-size: 11px;
+  color: #606266;
+  cursor: default;
+  border-radius: 3px;
+}
+.m-editor-history-list-popover .m-editor-history-list-substeps li.is-clickable {
+  cursor: pointer;
+}
+.m-editor-history-list-popover .m-editor-history-list-substeps li.is-clickable:hover {
+  background-color: rgba(47, 84, 235, 0.1);
+}
+.m-editor-history-list-popover .m-editor-history-list-substeps li.is-undone {
+  color: #c0c4cc;
+}
+.m-editor-history-list-popover .m-editor-history-list-substeps li.is-current {
+  color: #409eff;
+  font-weight: 600;
+  background-color: rgba(64, 158, 255, 0.08);
+  border-radius: 3px;
+}
+.m-editor-history-list-popover .m-editor-history-list-item-current {
+  flex: 0 0 auto;
+  padding: 0 6px;
+  border-radius: 2px;
+  font-size: 10px;
+  line-height: 16px;
+  color: #fff;
+  background-color: #409eff;
+  font-weight: 500;
+}
+.m-editor-history-list-popover .m-editor-history-list-item-index {
+  flex: 0 0 auto;
+  color: #909399;
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+  font-size: 11px;
+  font-weight: 400;
+  white-space: nowrap;
+}
+.m-editor-history-list-popover .m-editor-history-list-item-time {
+  flex: 0 0 auto;
+  color: #a8abb2;
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+  font-size: 11px;
+  font-weight: 400;
+  white-space: nowrap;
+}
+.m-editor-history-list-popover .m-editor-history-list-item-op {
+  flex: 0 0 auto;
+  padding: 0 6px;
+  border-radius: 2px;
+  font-size: 11px;
+  line-height: 18px;
+  color: #fff;
+  background-color: #909399;
+}
+.m-editor-history-list-popover .m-editor-history-list-item-op.op-add {
+  background-color: #67c23a;
+}
+.m-editor-history-list-popover .m-editor-history-list-item-op.op-remove {
+  background-color: #f56c6c;
+}
+.m-editor-history-list-popover .m-editor-history-list-item-op.op-update {
+  background-color: #e6a23c;
+}
+.m-editor-history-list-popover .m-editor-history-list-item-op.op-initial {
+  background-color: #909399;
+}
+.m-editor-history-list-popover .m-editor-history-list-initial {
+  cursor: default;
+  color: #606266;
+  border-top: 1px dashed #dcdfe6;
+  margin-top: 4px;
+  padding-top: 8px;
+}
+.m-editor-history-list-popover .m-editor-history-list-initial.is-clickable {
+  cursor: pointer;
+}
+.m-editor-history-list-popover .m-editor-history-list-initial .m-editor-history-list-item-desc {
+  font-style: italic;
+}
+.m-editor-history-list-popover .m-editor-history-list-item-desc {
+  flex: 1 1 auto;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.m-editor-history-list-popover .m-editor-history-list-item-merge {
+  flex: 0 0 auto;
+  padding: 0 8px;
+  border-radius: 8px;
+  font-size: 10px;
+  line-height: 16px;
+  color: #fff;
+  background-color: #2f54eb;
+  font-weight: 500;
+  letter-spacing: 0.2px;
+}
+.m-editor-history-list-popover .m-editor-history-list-item-diff {
+  flex: 0 0 auto;
+  padding: 0 6px;
+  border-radius: 2px;
+  font-size: 10px;
+  line-height: 16px;
+  color: #409eff;
+  background-color: rgba(64, 158, 255, 0.1);
+  cursor: pointer;
+  user-select: none;
+}
+.m-editor-history-list-popover .m-editor-history-list-item-diff:hover {
+  background-color: rgba(64, 158, 255, 0.2);
+}
+.m-editor-history-list-popover .m-editor-history-list-item-goto {
+  flex: 0 0 auto;
+  padding: 0 6px;
+  border-radius: 2px;
+  font-size: 10px;
+  line-height: 16px;
+  color: #606266;
+  background-color: rgba(96, 98, 102, 0.1);
+  cursor: pointer;
+  user-select: none;
+}
+.m-editor-history-list-popover .m-editor-history-list-item-goto:hover {
+  background-color: rgba(96, 98, 102, 0.18);
+}
+.m-editor-history-list-popover .m-editor-history-list-item-revert {
+  flex: 0 0 auto;
+  padding: 0 6px;
+  border-radius: 2px;
+  font-size: 10px;
+  line-height: 16px;
+  color: #f56c6c;
+  background-color: rgba(245, 108, 108, 0.12);
+  cursor: pointer;
+  user-select: none;
+}
+.m-editor-history-list-popover .m-editor-history-list-item-revert:hover {
+  background-color: rgba(245, 108, 108, 0.25);
+}
+.m-editor-history-list-popover .m-editor-history-list-substep-desc {
+  flex: 1 1 auto;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.m-editor-history-list-popover .m-editor-history-list-bucket {
+  margin-bottom: 8px;
+}
+.m-editor-history-list-popover .m-editor-history-list-bucket:last-child {
+  margin-bottom: 0;
+}
+.m-editor-history-list-popover .m-editor-history-list-bucket-title {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  padding: 4px 8px;
+  font-size: 12px;
+  font-weight: 500;
+  color: #606266;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+}
+.m-editor-history-list-popover .m-editor-history-list-bucket-title code {
+  flex: 1 1 auto;
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+  font-size: 11px;
+  color: #409eff;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.m-editor-history-list-popover .m-editor-history-list-bucket-count {
+  flex: 0 0 auto;
+  color: #909399;
+  font-weight: 400;
+  font-size: 11px;
+}
+
+.m-editor-history-diff-dialog .m-editor-history-diff-dialog-body {
+  display: flex;
+  flex-direction: column;
+}
+.m-editor-history-diff-dialog .m-editor-history-diff-dialog-notice {
+  margin-bottom: 8px;
+  padding: 8px 12px;
+  background-color: #fdf6ec;
+  border: 1px solid #faecd8;
+  border-radius: 4px;
+  color: #e6a23c;
+  font-size: 13px;
+  line-height: 1.5;
+}
+.m-editor-history-diff-dialog .m-editor-history-diff-dialog-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 8px;
+  padding: 8px 12px;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  gap: 12px;
+}
+.m-editor-history-diff-dialog .m-editor-history-diff-dialog-controls {
+  display: flex;
+  align-items: center;
+  flex: 0 0 auto;
+  gap: 8px;
+}
+.m-editor-history-diff-dialog .m-editor-history-diff-dialog-view,
+.m-editor-history-diff-dialog .m-editor-history-diff-dialog-mode {
+  flex: 0 0 auto;
+}
+.m-editor-history-diff-dialog .m-editor-history-diff-dialog-target {
+  flex: 1 1 auto;
+  font-size: 13px;
+  font-weight: 500;
+  color: #303133;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.m-editor-history-diff-dialog .m-editor-history-diff-dialog-legend {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  margin-bottom: 12px;
+  padding: 0 4px;
+}
+.m-editor-history-diff-dialog .m-editor-history-diff-dialog-arrow {
+  color: #909399;
+  font-size: 12px;
+}
+.m-editor-history-diff-dialog .m-editor-history-diff-dialog-tip {
+  margin-left: 8px;
+  color: #e6a23c;
+  font-size: 12px;
+}
+
 .m-editor {
   display: flex;
   flex-direction: column;

package/dist/es/utils/code-block.js

@@ -0,0 +1,122 @@
+import { getEditorConfig } from "./config.js";
+import { defineFormConfig, defineFormItem } from "@tmagic/form";
+import { tMagicMessage } from "@tmagic/design";
+//#region packages/editor/src/utils/code-block.ts
+/** 默认的"参数类型"列配置：数字 / 字符串 / 组件 三选一。 */
+var 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"
+			}
+		]
+	}]
+});
+/**
+* 生成代码块表单配置。返回的是普通对象数组，可直接传给 `<MForm :config>`；
+* 如需响应式的 props 变化（如切换 dataSourceType），调用方在 `computed` 中再次调用本函数即可。
+*/
+var getCodeBlockFormConfig = (options = {}) => {
+	const { paramColConfig, isDataSource, dataSourceType, codeOptions = {}, editable = true } = options;
+	return defineFormConfig([
+		{
+			text: "名称",
+			name: "name",
+			...editable ? { rules: [{
+				required: true,
+				message: "请输入名称",
+				trigger: "blur"
+			}] } : {}
+		},
+		{
+			text: "描述",
+			name: "desc"
+		},
+		{
+			text: "执行时机",
+			name: "timing",
+			type: "select",
+			options: () => {
+				const list = [{
+					text: "初始化前",
+					value: "beforeInit"
+				}, {
+					text: "初始化后",
+					value: "afterInit"
+				}];
+				if (dataSourceType?.() !== "base") {
+					list.push({
+						text: "请求前",
+						value: "beforeRequest"
+					});
+					list.push({
+						text: "请求后",
+						value: "afterRequest"
+					});
+				}
+				return list;
+			},
+			display: () => Boolean(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"
+				},
+				paramColConfig || defaultParamColConfig()
+			]
+		},
+		{
+			name: "content",
+			type: "vs-code",
+			options: codeOptions,
+			autosize: {
+				minRows: 10,
+				maxRows: 30
+			},
+			...editable ? { onChange: (_formState, code) => {
+				try {
+					getEditorConfig("parseDSL")(code);
+					return code;
+				} catch (error) {
+					tMagicMessage.error(error.message);
+					throw error;
+				}
+			} } : {}
+		}
+	]);
+};
+//#endregion
+export { getCodeBlockFormConfig };

package/dist/es/utils/content-menu.js

@@ -1,6 +1,6 @@
 import { COPY_STORAGE_KEY } from "./editor.js";
 import { calcValueByFontsize, isPage, isPageFragment } from "@tmagic/utils";
-import { NodeType } from "@tmagic/core";
+import { NodeType, cloneDeep } from "@tmagic/core";
 import { computed, markRaw } from "vue";
 import { CopyDocument, Delete, DocumentCopy } from "@element-plus/icons-vue";
 //#region packages/editor/src/utils/content-menu.ts
@@ -47,12 +47,11 @@ var usePasteMenu = (menu) => ({
 		} else editorService.paste();
 	}
 });
-var moveTo = (id, { editorService }) => {
+var moveTo = async (id, { editorService }) => {
 	const nodes = editorService.get("nodes") || [];
 	const parent = editorService.getNodeById(id);
-	if (!parent) return;
-	editorService.add(nodes, parent);
-	editorService.remove(nodes);
+	if (!parent || nodes.length === 0) return;
+	await editorService.moveToContainer(cloneDeep(nodes), parent.id, { doNotSwitchPage: true });
 };
 var useMoveToMenu = ({ editorService }) => {
 	return {

package/dist/es/utils/dep/worker.js

@@ -1,5 +1,5 @@
 //#region packages/editor/src/utils/dep/worker.ts?worker&inline
-var jsContent = "(function() {\n	//#region packages/schema/src/index.ts\n	const NODE_CONDS_KEY = \"displayConds\";\n	const NODE_DISABLE_DATA_SOURCE_KEY = \"_tmagic_node_disabled_data_source\";\n	const NODE_DISABLE_CODE_BLOCK_KEY = \"_tmagic_node_disabled_code_block\";\n	let HookType = /* @__PURE__ */ function(HookType) {\n		/** 代码块钩子标识 */\n		HookType[\"CODE\"] = \"code\";\n		return HookType;\n	}({});\n	//#endregion\n	//#region packages/utils/src/const.ts\n	const DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX = \"ds-field::\";\n	//#endregion\n	//#region packages/utils/src/index.ts\n	const isObject = (obj) => Object.prototype.toString.call(obj) === \"[object Object]\";\n	const getKeysArray = (keys) => `${keys}`.replace(/\\[(\\d+)\\]/g, \".$1\").split(\".\");\n	const dataSourceTemplateRegExp = /\\$\\{([\\s\\S]+?)\\}/g;\n	//#endregion\n	//#region packages/dep/src/types.ts\n	/** 依赖收集的目标类型 */\n	let DepTargetType = /* @__PURE__ */ function(DepTargetType) {\n		DepTargetType[\"DEFAULT\"] = \"default\";\n		/** 代码块 */\n		DepTargetType[\"CODE_BLOCK\"] = \"code-block\";\n		/** 数据源 */\n		DepTargetType[\"DATA_SOURCE\"] = \"data-source\";\n		/** 数据源方法 */\n		DepTargetType[\"DATA_SOURCE_METHOD\"] = \"data-source-method\";\n		/** 数据源条件 */\n		DepTargetType[\"DATA_SOURCE_COND\"] = \"data-source-cond\";\n		return DepTargetType;\n	}({});\n	//#endregion\n	//#region packages/dep/src/Target.ts\n	/**\n	* 需要收集依赖的目标\n	* 例如：一个代码块可以为一个目标\n	*/\n	var Target = class {\n		/**\n		* 如何识别目标\n		*/\n		isTarget;\n		/**\n		* 目标id，不可重复\n		* 例如目标是代码块，则为代码块id\n		*/\n		id;\n		/**\n		* 目标名称，用于显示在依赖列表中\n		*/\n		name;\n		/**\n		* 不同的目标可以进行分类，例如代码块，数据源可以为两个不同的type\n		*/\n		type = DepTargetType.DEFAULT;\n		/**\n		* 依赖详情\n		* 实例：{ 'node_id': { name: 'node_name', keys: [ created, mounted ] } }\n		*/\n		deps = {};\n		/**\n		* 是否默认收集，默认为true，当值为false时需要传入type参数给collect方法才会被收集\n		*/\n		isCollectByDefault;\n		constructor(options) {\n			this.isTarget = options.isTarget;\n			this.id = options.id;\n			this.name = options.name;\n			this.isCollectByDefault = options.isCollectByDefault ?? true;\n			if (options.type) this.type = options.type;\n			if (options.initialDeps) this.deps = options.initialDeps;\n		}\n		/**\n		* 更新依赖\n		* @param option 节点配置\n		* @param key 哪个key配置了这个目标的id\n		*/\n		updateDep({ id, name, key, data }) {\n			const dep = this.deps[id] || {\n				name,\n				keys: []\n			};\n			dep.name = name;\n			dep.data = data;\n			this.deps[id] = dep;\n			if (!dep.keys.includes(key)) dep.keys.push(key);\n		}\n		/**\n		* 删除依赖\n		* @param node 哪个节点的依赖需要移除，如果为空，则移除所有依赖\n		* @param key 节点下哪个key需要移除，如果为空，则移除改节点下的所有依赖key\n		* @returns void\n		*/\n		removeDep(id, key) {\n			if (typeof id === \"undefined\") {\n				Object.keys(this.deps).forEach((depKey) => {\n					delete this.deps[depKey];\n				});\n				return;\n			}\n			const dep = this.deps[id];\n			if (!dep) return;\n			if (key) {\n				const index = dep.keys.indexOf(key);\n				dep.keys.splice(index, 1);\n				if (dep.keys.length === 0) delete this.deps[id];\n			} else delete this.deps[id];\n		}\n		/**\n		* 判断指定节点下的指定key是否存在在依赖列表中\n		* @param node 哪个节点\n		* @param key 哪个key\n		* @returns boolean\n		*/\n		hasDep(id, key) {\n			return this.deps[id]?.keys.includes(key) ?? false;\n		}\n		destroy() {\n			this.deps = {};\n		}\n	};\n	//#endregion\n	//#region packages/dep/src/utils.ts\n	const INTEGER_REGEXP = /^\\d+$/;\n	const createCodeBlockTarget = (id, codeBlock, initialDeps = {}) => new Target({\n		type: DepTargetType.CODE_BLOCK,\n		id,\n		initialDeps,\n		name: codeBlock.name,\n		isTarget: (_key, value) => {\n			if (id === value) return true;\n			if (value?.hookType === HookType.CODE && Array.isArray(value.hookData)) return value.hookData.some((item) => item.codeId === id);\n			return false;\n		}\n	});\n	/**\n	* ['array'] ['array', '0'] ['array', '0', 'a'] 这种返回false\n	* ['array', 'a'] 这种返回true\n	* @param keys\n	* @param fields\n	* @returns boolean\n	*/\n	const isIncludeArrayField = (keys, fields) => {\n		let f = fields;\n		return keys.some((key, index) => {\n			const field = f.find(({ name }) => name === key);\n			f = field?.fields || [];\n			return field?.type === \"array\" && index < keys.length - 1 && !INTEGER_REGEXP.test(keys[index + 1]);\n		});\n	};\n	/**\n	* 判断模板(value)是不是使用数据源Id(dsId)，如：`xxx${dsId.field}xxx${dsId.field}`\n	* @param value any\n	* @param dsId string | number\n	* @param hasArray boolean true: 一定要包含有需要迭代的模板; false: 一定要包含普通模板;\n	* @returns boolean\n	*/\n	const isDataSourceTemplate = (value, ds, hasArray = false) => {\n		const templates = value.match(dataSourceTemplateRegExp) || [];\n		if (templates.length <= 0) return false;\n		for (const tpl of templates) {\n			const keys = getKeysArray(tpl.substring(2, tpl.length - 1));\n			const dsId = keys.shift();\n			if (!dsId || dsId !== ds.id) continue;\n			if (hasArray === isIncludeArrayField(keys, ds.fields)) return true;\n		}\n		return false;\n	};\n	/**\n	* 指定数据源的字符串模板,如：{ isBindDataSourceField: true, dataSourceId: 'id', template: `xxx${field}xxx`}\n	* @param value any\n	* @param dsId string | number\n	* @returns boolean\n	*/\n	const isSpecificDataSourceTemplate = (value, dsId) => value?.isBindDataSourceField && value.dataSourceId && value.dataSourceId === dsId && typeof value.template === \"string\";\n	/**\n	* 关联数据源字段，格式为 [前缀+数据源ID, 字段名]\n	* 使用data-source-field-select value: 'value' 可以配置出来\n	* @param value any[]\n	* @param id string | number\n	* @returns boolean\n	*/\n	const isUseDataSourceField = (value, id) => {\n		if (!Array.isArray(value) || typeof value[0] !== \"string\") return false;\n		const [prefixId] = value;\n		const prefixIndex = prefixId.indexOf(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX);\n		if (prefixIndex === -1) return false;\n		return prefixId.substring(prefixIndex + DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX.length) === id;\n	};\n	const isDataSourceTarget = (ds, key, value, hasArray = false) => {\n		if (!value) return false;\n		const valueType = typeof value;\n		if (valueType !== \"string\" && valueType !== \"object\") return false;\n		if (`${key}`.startsWith(\"displayConds\")) return false;\n		if (valueType === \"string\") return isDataSourceTemplate(value, ds, hasArray);\n		if (isObject(value) && value.isBindDataSource && value.dataSourceId === ds.id) return true;\n		if (isSpecificDataSourceTemplate(value, ds.id)) return true;\n		if (isUseDataSourceField(value, ds.id)) {\n			const [, ...keys] = value;\n			const includeArray = isIncludeArrayField(keys, ds.fields);\n			return hasArray ? includeArray : !includeArray;\n		}\n		return false;\n	};\n	const isDataSourceCondTarget = (ds, key, value, hasArray = false) => {\n		if (!Array.isArray(value) || !ds) return false;\n		const [dsId, ...keys] = value;\n		if (dsId !== ds.id || !`${key}`.startsWith(\"displayConds\")) return false;\n		if (ds.fields?.some((field) => field.name === keys[0])) {\n			const includeArray = isIncludeArrayField(keys, ds.fields);\n			return hasArray ? includeArray : !includeArray;\n		}\n		return false;\n	};\n	const createDataSourceTarget = (ds, initialDeps = {}) => new Target({\n		type: DepTargetType.DATA_SOURCE,\n		id: ds.id,\n		initialDeps,\n		isTarget: (key, value) => isDataSourceTarget(ds, key, value)\n	});\n	const createDataSourceCondTarget = (ds, initialDeps = {}) => new Target({\n		type: DepTargetType.DATA_SOURCE_COND,\n		id: ds.id,\n		initialDeps,\n		isTarget: (key, value) => isDataSourceCondTarget(ds, key, value)\n	});\n	const createDataSourceMethodTarget = (ds, initialDeps = {}) => new Target({\n		type: DepTargetType.DATA_SOURCE_METHOD,\n		id: ds.id,\n		initialDeps,\n		isTarget: (_key, value) => {\n			if (!Array.isArray(value)) return false;\n			const [dsId, methodName] = value;\n			if (!methodName || dsId !== ds.id) return false;\n			if (ds.methods?.some((method) => method.name === methodName)) return true;\n			if (ds.fields?.some((field) => field.name === methodName)) return false;\n			return true;\n		}\n	});\n	const traverseTarget = (targetsList, cb, type) => {\n		if (type) {\n			const targets = targetsList[type];\n			if (targets) for (const target of Object.values(targets)) cb(target);\n			return;\n		}\n		for (const targets of Object.values(targetsList)) for (const target of Object.values(targets)) cb(target);\n	};\n	//#endregion\n	//#region packages/dep/src/Watcher.ts\n	const DATA_SOURCE_TARGET_TYPES = new Set([\n		DepTargetType.DATA_SOURCE,\n		DepTargetType.DATA_SOURCE_COND,\n		DepTargetType.DATA_SOURCE_METHOD\n	]);\n	var Watcher = class {\n		targetsList = {};\n		childrenProp = \"items\";\n		idProp = \"id\";\n		nameProp = \"name\";\n		constructor(options) {\n			if (options?.initialTargets) this.targetsList = options.initialTargets;\n			if (options?.childrenProp) this.childrenProp = options.childrenProp;\n		}\n		getTargetsList() {\n			return this.targetsList;\n		}\n		/**\n		* 获取指定类型中的所有target\n		* @param type 分类\n		* @returns Target[]\n		*/\n		getTargets(type = DepTargetType.DEFAULT) {\n			return this.targetsList[type] || {};\n		}\n		/**\n		* 添加新的目标\n		* @param target Target\n		*/\n		addTarget(target) {\n			const targets = this.getTargets(target.type) || {};\n			this.targetsList[target.type] = targets;\n			targets[target.id] = target;\n		}\n		/**\n		* 获取指定id的target\n		* @param id target id\n		* @returns Target\n		*/\n		getTarget(id, type = DepTargetType.DEFAULT) {\n			return this.getTargets(type)[id];\n		}\n		/**\n		* 判断是否存在指定id的target\n		* @param id target id\n		* @returns boolean\n		*/\n		hasTarget(id, type = DepTargetType.DEFAULT) {\n			return Boolean(this.getTarget(id, type));\n		}\n		/**\n		* 判断是否存在指定类型的target\n		* @param type target type\n		* @returns boolean\n		*/\n		hasSpecifiedTypeTarget(type = DepTargetType.DEFAULT) {\n			return Object.keys(this.getTargets(type)).length > 0;\n		}\n		/**\n		* 删除指定id的target\n		* @param id target id\n		*/\n		removeTarget(id, type = DepTargetType.DEFAULT) {\n			const targets = this.getTargets(type);\n			if (targets[id]) {\n				targets[id].destroy();\n				delete targets[id];\n			}\n		}\n		/**\n		* 删除指定分类的所有target\n		* @param type 分类\n		* @returns void\n		*/\n		removeTargets(type = DepTargetType.DEFAULT) {\n			const targets = this.targetsList[type];\n			if (!targets) return;\n			for (const target of Object.values(targets)) target.destroy();\n			delete this.targetsList[type];\n		}\n		/**\n		* 删除所有target\n		*/\n		clearTargets() {\n			for (const key of Object.keys(this.targetsList)) delete this.targetsList[key];\n		}\n		/**\n		* 收集依赖\n		* @param nodes 需要收集的节点\n		* @param deep 是否需要收集子节点\n		* @param type 强制收集指定类型的依赖\n		*/\n		collect(nodes, depExtendedData = {}, deep = false, type) {\n			this.collectByCallback(nodes, type, ({ node, target }) => {\n				this.removeTargetDep(target, node);\n				this.collectItem(node, target, depExtendedData, deep);\n			});\n		}\n		collectByCallback(nodes, type, cb) {\n			traverseTarget(this.targetsList, (target) => {\n				if (!type && !target.isCollectByDefault) return;\n				for (const node of nodes) cb({\n					node,\n					target\n				});\n			}, type);\n		}\n		/**\n		* 清除所有目标的依赖\n		* @param nodes 需要清除依赖的节点\n		*/\n		clear(nodes, type) {\n			let { targetsList } = this;\n			if (type) targetsList = { [type]: this.getTargets(type) };\n			const clearedItemsNodeIds = /* @__PURE__ */ new Set();\n			traverseTarget(targetsList, (target) => {\n				if (nodes) for (const node of nodes) {\n					target.removeDep(node[this.idProp]);\n					if (Array.isArray(node[this.childrenProp]) && node[this.childrenProp].length && !clearedItemsNodeIds.has(node[this.idProp])) {\n						clearedItemsNodeIds.add(node[this.idProp]);\n						this.clear(node[this.childrenProp]);\n					}\n				}\n				else target.removeDep();\n			});\n		}\n		/**\n		* 清除指定类型的依赖\n		* @param type 类型\n		* @param nodes 需要清除依赖的节点\n		*/\n		clearByType(type, nodes) {\n			this.clear(nodes, type);\n		}\n		collectItem(node, target, depExtendedData = {}, deep = false) {\n			if (node[\"_tmagic_node_disabled_data_source\"] && DATA_SOURCE_TARGET_TYPES.has(target.type)) return;\n			if (node[\"_tmagic_node_disabled_code_block\"] && target.type === DepTargetType.CODE_BLOCK) return;\n			const collectTarget = (config, prop = \"\") => {\n				const doCollect = (key, value) => {\n					const keyIsItems = key === this.childrenProp;\n					const fullKey = prop ? `${prop}.${key}` : key;\n					if (target.isTarget(fullKey, value)) target.updateDep({\n						id: node[this.idProp],\n						name: `${node[this.nameProp] || node[this.idProp]}`,\n						data: depExtendedData,\n						key: fullKey\n					});\n					else if (!keyIsItems && Array.isArray(value)) for (let i = 0, l = value.length; i < l; i++) {\n						const item = value[i];\n						if (isObject(item)) collectTarget(item, `${fullKey}[${i}]`);\n					}\n					else if (isObject(value)) collectTarget(value, fullKey);\n					if (keyIsItems && deep && Array.isArray(value)) for (const child of value) this.collectItem(child, target, depExtendedData, deep);\n				};\n				for (const [key, value] of Object.entries(config)) {\n					if (typeof value === \"undefined\" || value === \"\") continue;\n					doCollect(key, value);\n				}\n			};\n			collectTarget(node);\n		}\n		removeTargetDep(target, node, key) {\n			target.removeDep(node[this.idProp], key);\n			if (typeof key === \"undefined\" && Array.isArray(node[this.childrenProp]) && node[this.childrenProp].length) for (const item of node[this.childrenProp]) this.removeTargetDep(target, item, key);\n		}\n	};\n	//#endregion\n	//#region packages/editor/src/utils/logger.ts\n	const error = (...args) => {\n		if (process.env.NODE_ENV === \"development\") console.error(\"magic editor: \", ...args);\n	};\n	//#endregion\n	//#region packages/editor/src/utils/dep/worker.ts\n	onmessage = (e) => {\n		const watcher = new Watcher({ initialTargets: {} });\n		const { dsl } = e.data;\n		try {\n			const mApp = eval(`(${dsl})`);\n			if (!mApp) postMessage({});\n			watcher.clearTargets();\n			if (mApp.codeBlocks) for (const [id, code] of Object.entries(mApp.codeBlocks)) watcher.addTarget(createCodeBlockTarget(id, code));\n			if (mApp.dataSources) for (const ds of mApp.dataSources) {\n				watcher.addTarget(createDataSourceTarget(ds, {}));\n				watcher.addTarget(createDataSourceMethodTarget(ds, {}));\n				watcher.addTarget(createDataSourceCondTarget(ds, {}));\n			}\n			watcher.collectByCallback(mApp.items, void 0, ({ node, target }) => {\n				watcher.collectItem(node, target, { pageId: node.id }, true);\n			});\n			const data = {\n				[DepTargetType.DATA_SOURCE]: {},\n				[DepTargetType.DATA_SOURCE_METHOD]: {},\n				[DepTargetType.DATA_SOURCE_COND]: {},\n				[DepTargetType.CODE_BLOCK]: {}\n			};\n			traverseTarget(watcher.getTargetsList(), (target) => {\n				data[target.type][target.id] = target.deps;\n			});\n			postMessage(data);\n		} catch (e) {\n			error(e);\n			postMessage({});\n		}\n	};\n	//#endregion\n})();\n";
+var jsContent = "(function() {\n	//#region packages/schema/src/index.ts\n	const NODE_CONDS_KEY = \"displayConds\";\n	const NODE_DISABLE_DATA_SOURCE_KEY = \"_tmagic_node_disabled_data_source\";\n	const NODE_DISABLE_CODE_BLOCK_KEY = \"_tmagic_node_disabled_code_block\";\n	let HookType = /* @__PURE__ */ function(HookType) {\n		/** 代码块钩子标识 */\n		HookType[\"CODE\"] = \"code\";\n		return HookType;\n	}({});\n	//#endregion\n	//#region packages/utils/src/const.ts\n	const DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX = \"ds-field::\";\n	//#endregion\n	//#region packages/utils/src/index.ts\n	const isObject = (obj) => Object.prototype.toString.call(obj) === \"[object Object]\";\n	const getKeysArray = (keys) => `${keys}`.replace(/\\[(\\d+)\\]/g, \".$1\").split(\".\");\n	const dataSourceTemplateRegExp = /\\$\\{([\\s\\S]+?)\\}/g;\n	//#endregion\n	//#region packages/dep/src/types.ts\n	/** 依赖收集的目标类型 */\n	let DepTargetType = /* @__PURE__ */ function(DepTargetType) {\n		DepTargetType[\"DEFAULT\"] = \"default\";\n		/** 代码块 */\n		DepTargetType[\"CODE_BLOCK\"] = \"code-block\";\n		/** 数据源 */\n		DepTargetType[\"DATA_SOURCE\"] = \"data-source\";\n		/** 数据源方法 */\n		DepTargetType[\"DATA_SOURCE_METHOD\"] = \"data-source-method\";\n		/** 数据源条件 */\n		DepTargetType[\"DATA_SOURCE_COND\"] = \"data-source-cond\";\n		return DepTargetType;\n	}({});\n	//#endregion\n	//#region packages/dep/src/Target.ts\n	/**\n	* 需要收集依赖的目标\n	* 例如：一个代码块可以为一个目标\n	*/\n	var Target = class {\n		/**\n		* 如何识别目标\n		*/\n		isTarget;\n		/**\n		* 目标id，不可重复\n		* 例如目标是代码块，则为代码块id\n		*/\n		id;\n		/**\n		* 目标名称，用于显示在依赖列表中\n		*/\n		name;\n		/**\n		* 不同的目标可以进行分类，例如代码块，数据源可以为两个不同的type\n		*/\n		type = DepTargetType.DEFAULT;\n		/**\n		* 依赖详情\n		* 实例：{ 'node_id': { name: 'node_name', keys: [ created, mounted ] } }\n		*/\n		deps = {};\n		/**\n		* 是否默认收集，默认为true，当值为false时需要传入type参数给collect方法才会被收集\n		*/\n		isCollectByDefault;\n		constructor(options) {\n			this.isTarget = options.isTarget;\n			this.id = options.id;\n			this.name = options.name;\n			this.isCollectByDefault = options.isCollectByDefault ?? true;\n			if (options.type) this.type = options.type;\n			if (options.initialDeps) this.deps = options.initialDeps;\n		}\n		/**\n		* 更新依赖\n		* @param option 节点配置\n		* @param key 哪个key配置了这个目标的id\n		*/\n		updateDep({ id, name, key, data }) {\n			const dep = this.deps[id] || {\n				name,\n				keys: []\n			};\n			dep.name = name;\n			dep.data = data;\n			this.deps[id] = dep;\n			if (!dep.keys.includes(key)) dep.keys.push(key);\n		}\n		/**\n		* 删除依赖\n		* @param node 哪个节点的依赖需要移除，如果为空，则移除所有依赖\n		* @param key 节点下哪个key需要移除，如果为空，则移除改节点下的所有依赖key\n		* @returns void\n		*/\n		removeDep(id, key) {\n			if (typeof id === \"undefined\") {\n				Object.keys(this.deps).forEach((depKey) => {\n					delete this.deps[depKey];\n				});\n				return;\n			}\n			const dep = this.deps[id];\n			if (!dep) return;\n			if (key) {\n				const index = dep.keys.indexOf(key);\n				dep.keys.splice(index, 1);\n				if (dep.keys.length === 0) delete this.deps[id];\n			} else delete this.deps[id];\n		}\n		/**\n		* 判断指定节点下的指定key是否存在在依赖列表中\n		* @param node 哪个节点\n		* @param key 哪个key\n		* @returns boolean\n		*/\n		hasDep(id, key) {\n			return this.deps[id]?.keys.includes(key) ?? false;\n		}\n		destroy() {\n			this.deps = {};\n		}\n	};\n	//#endregion\n	//#region packages/dep/src/utils.ts\n	const INTEGER_REGEXP = /^\\d+$/;\n	const createCodeBlockTarget = (id, codeBlock, initialDeps = {}) => new Target({\n		type: DepTargetType.CODE_BLOCK,\n		id,\n		initialDeps,\n		name: codeBlock.name,\n		isTarget: (_key, value) => {\n			if (id === value) return true;\n			if (value?.hookType === HookType.CODE && Array.isArray(value.hookData)) return value.hookData.some((item) => item.codeId === id);\n			return false;\n		}\n	});\n	/**\n	* ['array'] ['array', '0'] ['array', '0', 'a'] 这种返回false\n	* ['array', 'a'] 这种返回true\n	* @param keys\n	* @param fields\n	* @returns boolean\n	*/\n	const isIncludeArrayField = (keys, fields) => {\n		let f = fields;\n		return keys.some((key, index) => {\n			const field = f.find(({ name }) => name === key);\n			f = field?.fields || [];\n			return field?.type === \"array\" && index < keys.length - 1 && !INTEGER_REGEXP.test(keys[index + 1]);\n		});\n	};\n	/**\n	* 判断模板(value)是不是使用数据源Id(dsId)，如：`xxx${dsId.field}xxx${dsId.field}`\n	* @param value any\n	* @param dsId string | number\n	* @param hasArray boolean true: 一定要包含有需要迭代的模板; false: 一定要包含普通模板;\n	* @returns boolean\n	*/\n	const isDataSourceTemplate = (value, ds, hasArray = false) => {\n		const templates = value.match(dataSourceTemplateRegExp) || [];\n		if (templates.length <= 0) return false;\n		for (const tpl of templates) {\n			const keys = getKeysArray(tpl.substring(2, tpl.length - 1));\n			const dsId = keys.shift();\n			if (!dsId || dsId !== ds.id) continue;\n			if (hasArray === isIncludeArrayField(keys, ds.fields)) return true;\n		}\n		return false;\n	};\n	/**\n	* 指定数据源的字符串模板,如：{ isBindDataSourceField: true, dataSourceId: 'id', template: `xxx${field}xxx`}\n	* @param value any\n	* @param dsId string | number\n	* @returns boolean\n	*/\n	const isSpecificDataSourceTemplate = (value, dsId) => value?.isBindDataSourceField && value.dataSourceId && value.dataSourceId === dsId && typeof value.template === \"string\";\n	/**\n	* 关联数据源字段，格式为 [前缀+数据源ID, 字段名]\n	* 使用data-source-field-select value: 'value' 可以配置出来\n	* @param value any[]\n	* @param id string | number\n	* @returns boolean\n	*/\n	const isUseDataSourceField = (value, id) => {\n		if (!Array.isArray(value) || typeof value[0] !== \"string\") return false;\n		const [prefixId] = value;\n		const prefixIndex = prefixId.indexOf(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX);\n		if (prefixIndex === -1) return false;\n		return prefixId.substring(prefixIndex + DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX.length) === id;\n	};\n	const isDataSourceTarget = (ds, key, value, hasArray = false) => {\n		if (!value) return false;\n		const valueType = typeof value;\n		if (valueType !== \"string\" && valueType !== \"object\") return false;\n		if (`${key}`.startsWith(\"displayConds\")) return false;\n		if (valueType === \"string\") return isDataSourceTemplate(value, ds, hasArray);\n		if (isObject(value) && value.isBindDataSource && value.dataSourceId === ds.id) return true;\n		if (isSpecificDataSourceTemplate(value, ds.id)) return true;\n		if (isUseDataSourceField(value, ds.id)) {\n			const [, ...keys] = value;\n			const includeArray = isIncludeArrayField(keys, ds.fields);\n			return hasArray ? includeArray : !includeArray;\n		}\n		return false;\n	};\n	const isDataSourceCondTarget = (ds, key, value, hasArray = false) => {\n		if (!Array.isArray(value) || !ds) return false;\n		const [dsId, ...keys] = value;\n		if (dsId !== ds.id || !`${key}`.startsWith(\"displayConds\")) return false;\n		if (ds.fields?.some((field) => field.name === keys[0])) {\n			const includeArray = isIncludeArrayField(keys, ds.fields);\n			return hasArray ? includeArray : !includeArray;\n		}\n		return false;\n	};\n	const createDataSourceTarget = (ds, initialDeps = {}) => new Target({\n		type: DepTargetType.DATA_SOURCE,\n		id: ds.id,\n		initialDeps,\n		isTarget: (key, value) => isDataSourceTarget(ds, key, value)\n	});\n	const createDataSourceCondTarget = (ds, initialDeps = {}) => new Target({\n		type: DepTargetType.DATA_SOURCE_COND,\n		id: ds.id,\n		initialDeps,\n		isTarget: (key, value) => isDataSourceCondTarget(ds, key, value)\n	});\n	const createDataSourceMethodTarget = (ds, initialDeps = {}) => new Target({\n		type: DepTargetType.DATA_SOURCE_METHOD,\n		id: ds.id,\n		initialDeps,\n		isTarget: (_key, value) => {\n			if (!Array.isArray(value)) return false;\n			const [dsId, methodName] = value;\n			if (!methodName || dsId !== ds.id) return false;\n			if (ds.methods?.some((method) => method.name === methodName)) return true;\n			if (ds.fields?.some((field) => field.name === methodName)) return false;\n			return true;\n		}\n	});\n	const traverseTarget = (targetsList, cb, type) => {\n		if (type) {\n			const targets = targetsList[type];\n			if (targets) for (const target of Object.values(targets)) cb(target);\n			return;\n		}\n		for (const targets of Object.values(targetsList)) for (const target of Object.values(targets)) cb(target);\n	};\n	//#endregion\n	//#region packages/dep/src/Watcher.ts\n	const DATA_SOURCE_TARGET_TYPES = new Set([\n		DepTargetType.DATA_SOURCE,\n		DepTargetType.DATA_SOURCE_COND,\n		DepTargetType.DATA_SOURCE_METHOD\n	]);\n	var Watcher = class {\n		targetsList = {};\n		childrenProp = \"items\";\n		idProp = \"id\";\n		nameProp = \"name\";\n		constructor(options) {\n			if (options?.initialTargets) this.targetsList = options.initialTargets;\n			if (options?.childrenProp) this.childrenProp = options.childrenProp;\n		}\n		getTargetsList() {\n			return this.targetsList;\n		}\n		/**\n		* 获取指定类型中的所有target\n		* @param type 分类\n		* @returns Target[]\n		*/\n		getTargets(type = DepTargetType.DEFAULT) {\n			return this.targetsList[type] || {};\n		}\n		/**\n		* 添加新的目标\n		* @param target Target\n		*/\n		addTarget(target) {\n			const targets = this.getTargets(target.type) || {};\n			this.targetsList[target.type] = targets;\n			targets[target.id] = target;\n		}\n		/**\n		* 获取指定id的target\n		* @param id target id\n		* @returns Target\n		*/\n		getTarget(id, type = DepTargetType.DEFAULT) {\n			return this.getTargets(type)[id];\n		}\n		/**\n		* 判断是否存在指定id的target\n		* @param id target id\n		* @returns boolean\n		*/\n		hasTarget(id, type = DepTargetType.DEFAULT) {\n			return Boolean(this.getTarget(id, type));\n		}\n		/**\n		* 判断是否存在指定类型的target\n		* @param type target type\n		* @returns boolean\n		*/\n		hasSpecifiedTypeTarget(type = DepTargetType.DEFAULT) {\n			return Object.keys(this.getTargets(type)).length > 0;\n		}\n		/**\n		* 删除指定id的target\n		* @param id target id\n		*/\n		removeTarget(id, type = DepTargetType.DEFAULT) {\n			const targets = this.getTargets(type);\n			if (targets[id]) {\n				targets[id].destroy();\n				delete targets[id];\n			}\n		}\n		/**\n		* 删除指定分类的所有target\n		* @param type 分类\n		* @returns void\n		*/\n		removeTargets(type = DepTargetType.DEFAULT) {\n			const targets = this.targetsList[type];\n			if (!targets) return;\n			for (const target of Object.values(targets)) target.destroy();\n			delete this.targetsList[type];\n		}\n		/**\n		* 删除所有target\n		*/\n		clearTargets() {\n			for (const key of Object.keys(this.targetsList)) delete this.targetsList[key];\n		}\n		/**\n		* 收集依赖\n		* @param nodes 需要收集的节点\n		* @param deep 是否需要收集子节点\n		* @param type 强制收集指定类型的依赖\n		*/\n		collect(nodes, depExtendedData = {}, deep = false, type) {\n			const targets = this.getCollectableTargets(type);\n			if (!targets.length) return;\n			for (const node of nodes) {\n				this.removeTargetsDep(targets, node);\n				this.collectItems(node, targets, depExtendedData, deep);\n			}\n		}\n		/**\n		* 获取本次需要参与收集的 target（过滤规则与 collectByCallback 一致）\n		*\n		* 注：供 editor 的 dep service / worker 跨包批量收集时复用，因此为 public。\n		* @param type 强制收集指定类型的依赖\n		*/\n		getCollectableTargets(type) {\n			const targets = [];\n			traverseTarget(this.targetsList, (target) => {\n				if (!type && !target.isCollectByDefault) return;\n				targets.push(target);\n			}, type);\n			return targets;\n		}\n		collectByCallback(nodes, type, cb) {\n			traverseTarget(this.targetsList, (target) => {\n				if (!type && !target.isCollectByDefault) return;\n				for (const node of nodes) cb({\n					node,\n					target\n				});\n			}, type);\n		}\n		/**\n		* 清除所有目标的依赖\n		* @param nodes 需要清除依赖的节点\n		*/\n		clear(nodes, type) {\n			let { targetsList } = this;\n			if (type) targetsList = { [type]: this.getTargets(type) };\n			const clearedItemsNodeIds = /* @__PURE__ */ new Set();\n			traverseTarget(targetsList, (target) => {\n				if (nodes) for (const node of nodes) {\n					target.removeDep(node[this.idProp]);\n					if (Array.isArray(node[this.childrenProp]) && node[this.childrenProp].length && !clearedItemsNodeIds.has(node[this.idProp])) {\n						clearedItemsNodeIds.add(node[this.idProp]);\n						this.clear(node[this.childrenProp]);\n					}\n				}\n				else target.removeDep();\n			});\n		}\n		/**\n		* 清除指定类型的依赖\n		* @param type 类型\n		* @param nodes 需要清除依赖的节点\n		*/\n		clearByType(type, nodes) {\n			this.clear(nodes, type);\n		}\n		/**\n		* 收集单个 target 的依赖，等价于 collectItems(node, [target], ...)\n		*/\n		collectItem(node, target, depExtendedData = {}, deep = false) {\n			this.collectItems(node, [target], depExtendedData, deep);\n		}\n		removeTargetDep(target, node, key) {\n			target.removeDep(node[this.idProp], key);\n			if (typeof key === \"undefined\" && Array.isArray(node[this.childrenProp]) && node[this.childrenProp].length) for (const item of node[this.childrenProp]) this.removeTargetDep(target, item, key);\n		}\n		/**\n		* 与 removeTargetDep 等价，但一次子树递归同时处理多个 target，\n		* 把删除阶段的结构遍历从 ×targets 降到 ×1。\n		*\n		* 注：供 editor 的 dep service 跨包批量删除时复用，因此为 public。\n		*/\n		removeTargetsDep(targets, node, key) {\n			const id = node[this.idProp];\n			for (const target of targets) target.removeDep(id, key);\n			if (typeof key === \"undefined\" && Array.isArray(node[this.childrenProp]) && node[this.childrenProp].length) for (const item of node[this.childrenProp]) this.removeTargetsDep(targets, item, key);\n		}\n		/**\n		* 与 collectItem 等价，但一次遍历同时处理多个 target（不含删除阶段）。\n		*\n		* 关键优化：原实现对每个 target 都完整遍历一遍节点树（O(targets × 树规模)），大页面 + 大量数据源时，\n		* 结构遍历（Object.entries / 递归 / fullKey 字符串拼接）会被重复 targets 次。这里改为「整棵树只遍历一次，\n		* 在每个属性上检查所有 target」，把结构遍历开销从 ×targets 降到 ×1，isTarget 调用次数不变，收集结果完全一致。\n		*\n		* 注：供 editor 的 dep service / worker 跨包批量收集时复用，因此为 public。\n		*/\n		collectItems(node, targets, depExtendedData = {}, deep = false) {\n			const activeTargets = this.filterTargetsByNode(node, targets);\n			if (!activeTargets.length) return;\n			this.collectTargetForTargets(node, node, \"\", activeTargets, depExtendedData, deep);\n		}\n		filterTargetsByNode(node, targets) {\n			const disableDataSource = Boolean(node[NODE_DISABLE_DATA_SOURCE_KEY]);\n			const disableCodeBlock = Boolean(node[NODE_DISABLE_CODE_BLOCK_KEY]);\n			if (!disableDataSource && !disableCodeBlock) return targets;\n			return targets.filter((target) => {\n				if (disableDataSource && DATA_SOURCE_TARGET_TYPES.has(target.type)) return false;\n				if (disableCodeBlock && target.type === DepTargetType.CODE_BLOCK) return false;\n				return true;\n			});\n		}\n		collectTargetForTargets(node, config, prop, targets, depExtendedData, deep) {\n			const id = node[this.idProp];\n			const name = `${node[this.nameProp] || node[this.idProp]}`;\n			for (const [key, value] of Object.entries(config)) {\n				if (typeof value === \"undefined\" || value === \"\") continue;\n				const keyIsItems = key === this.childrenProp;\n				const fullKey = prop ? `${prop}.${key}` : key;\n				let notMatched = null;\n				for (let i = 0, l = targets.length; i < l; i++) {\n					const target = targets[i];\n					if (target.isTarget(fullKey, value, config)) target.updateDep({\n						id,\n						name,\n						data: depExtendedData,\n						key: fullKey\n					});\n					else (notMatched || (notMatched = [])).push(target);\n				}\n				if (notMatched) {\n					if (!keyIsItems && Array.isArray(value)) for (let i = 0, l = value.length; i < l; i++) {\n						const item = value[i];\n						if (isObject(item)) this.collectTargetForTargets(node, item, `${fullKey}[${i}]`, notMatched, depExtendedData, deep);\n					}\n					else if (isObject(value)) this.collectTargetForTargets(node, value, fullKey, notMatched, depExtendedData, deep);\n				}\n				if (keyIsItems && deep && Array.isArray(value)) for (const child of value) this.collectItems(child, targets, depExtendedData, deep);\n			}\n		}\n	};\n	//#endregion\n	//#region packages/editor/src/utils/logger.ts\n	const error = (...args) => {\n		if (process.env.NODE_ENV === \"development\") console.error(\"magic editor: \", ...args);\n	};\n	//#endregion\n	//#region packages/editor/src/utils/dep/worker.ts\n	onmessage = (e) => {\n		const watcher = new Watcher({ initialTargets: {} });\n		const { dsl } = e.data;\n		try {\n			const mApp = eval(`(${dsl})`);\n			if (!mApp) postMessage({});\n			watcher.clearTargets();\n			if (mApp.codeBlocks) for (const [id, code] of Object.entries(mApp.codeBlocks)) watcher.addTarget(createCodeBlockTarget(id, code));\n			if (mApp.dataSources) for (const ds of mApp.dataSources) {\n				watcher.addTarget(createDataSourceTarget(ds, {}));\n				watcher.addTarget(createDataSourceMethodTarget(ds, {}));\n				watcher.addTarget(createDataSourceCondTarget(ds, {}));\n			}\n			const targets = watcher.getCollectableTargets();\n			for (const page of mApp.items) watcher.collectItems(page, targets, { pageId: page.id }, true);\n			const data = {\n				[DepTargetType.DATA_SOURCE]: {},\n				[DepTargetType.DATA_SOURCE_METHOD]: {},\n				[DepTargetType.DATA_SOURCE_COND]: {},\n				[DepTargetType.CODE_BLOCK]: {}\n			};\n			traverseTarget(watcher.getTargetsList(), (target) => {\n				data[target.type][target.id] = target.deps;\n			});\n			postMessage(data);\n		} catch (e) {\n			error(e);\n			postMessage({});\n		}\n	};\n	//#endregion\n})();\n";
 var blob = typeof self !== "undefined" && self.Blob && new Blob(["(self.URL || self.webkitURL).revokeObjectURL(self.location.href);", jsContent], { type: "text/javascript;charset=utf-8" });
 function WorkerWrapper(options) {
 	let objURL;

package/dist/es/utils/editor.js

@@ -2,7 +2,7 @@ import { LayerOffset, Layout } from "../type.js";
 import { isFixed } from "@tmagic/stage";
 import { calcValueByFontsize, getElById, getNodePath, isNumber, isPage, isPageFragment, isPop, isValueIncludeDataSource } from "@tmagic/utils";
 import { NODE_CONDS_KEY, Target, Watcher } from "@tmagic/core";
-import { cloneDeep, get, isObject } from "lodash-es";
+import { cloneDeep as cloneDeep$1, get, isObject } from "lodash-es";
 import serialize from "serialize-javascript";
 import { detailedDiff } from "deep-object-diff";
 //#region packages/editor/src/utils/editor.ts
@@ -287,7 +287,7 @@ var resolveSelectedNode = (config, getNodeInfoFn, rootId) => {
 * @returns 处理后的节点配置（深拷贝）
 */
 var toggleFixedPosition = async (dist, src, root, getLayoutFn) => {
-	const newConfig = cloneDeep(dist);
+	const newConfig = cloneDeep$1(dist);
 	if (!isPop(src) && newConfig.style?.position) {
 		if (isFixed(newConfig.style) && !isFixed(src.style || {})) newConfig.style = change2Fixed(newConfig, root);
 		else if (!isFixed(newConfig.style) && isFixed(src.style || {})) newConfig.style = await Fixed2Other(newConfig, root, getLayoutFn);

package/dist/es/utils/undo-redo.js

@@ -41,6 +41,26 @@ var UndoRedo = class {
 		if (this.listCursor < 1) return null;
 		return cloneDeep(this.elementList[this.listCursor - 1]);
 	}
+	/**
+	* 返回栈内全部元素的浅克隆数组（按时间顺序，索引 0 为最早一步）。
+	* 仅用于历史面板等只读展示场景，不应直接修改返回值。
+	*/
+	getElementList() {
+		return this.elementList.slice();
+	}
+	/**
+	* 当前游标位置：表示已应用的步骤数量。
+	* - cursor === 0 表示全部已撤销
+	* - cursor === length 表示已重做到末尾
+	* 历史面板用于区分"已应用 / 已撤销"两段。
+	*/
+	getCursor() {
+		return this.listCursor;
+	}
+	/** 栈内总步数。 */
+	getLength() {
+		return this.elementList.length;
+	}
 };
 //#endregion
 export { UndoRedo };