@tmagic/editor 1.8.0-beta.28 → 1.8.0-beta.29

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

@@ -48,9 +48,10 @@ var ScrollBar_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 			return props.scrollSize * ratio;
 		};
 		const scrollBy = (delta) => {
-			if (delta < 0) if (props.pos <= 0) emit("scroll", 0);
-			else emit("scroll", -Math.min(-delta, props.pos));
-			else {
+			if (delta < 0) {
+				if (props.pos <= 0) emit("scroll", 0);
+				else emit("scroll", -Math.min(-delta, props.pos));
+			} else {
 				const leftPos = props.size - (thumbSize.value + thumbPos.value);
 				if (leftPos <= 0) emit("scroll", 0);
 				else emit("scroll", Math.min(delta, leftPos));

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

@@ -20,7 +20,7 @@ var FieldSelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 		notEditable: { type: [Boolean, Function] },
 		dataSourceId: {}
 	}, {
-		"modelValue": { default: [] },
+		"modelValue": { default: () => [] },
 		"modelModifiers": {}
 	}),
 	emits: /*@__PURE__*/ mergeModels(["change"], ["update:modelValue"]),

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

@@ -42,8 +42,10 @@ var DataSourceMethods_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*
 		let editIndex = -1;
 		const editMethod = (method, index) => {
 			let codeContent = "({ params, dataSource, app }) => {\n  // place your code here\n}";
-			if (method.content) if (typeof method.content !== "string") codeContent = method.content.toString();
-			else codeContent = method.content;
+			if (method.content) {
+				if (typeof method.content !== "string") codeContent = method.content.toString();
+				else codeContent = method.content;
+			}
 			codeConfig.value = {
 				...cloneDeep(method),
 				content: codeContent

package/dist/es/hooks/use-code-block-edit.js

@@ -23,8 +23,10 @@ var useCodeBlockEdit = (codeBlockService) => {
 			return;
 		}
 		let codeContent = "";
-		if (codeBlock.content) if (typeof codeBlock.content !== "string") codeContent = codeBlock.content.toString();
-		else codeContent = codeBlock.content;
+		if (codeBlock.content) {
+			if (typeof codeBlock.content !== "string") codeContent = codeBlock.content.toString();
+			else codeContent = codeBlock.content;
+		}
 		codeConfig.value = {
 			...cloneDeep(codeBlock),
 			content: codeContent

package/dist/es/layouts/CodeEditor.vue_vue_type_script_setup_true_lang.js

@@ -93,9 +93,10 @@ var CodeEditor_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 		};
 		const toString = (v, language) => {
 			let value;
-			if (typeof v !== "string") if (language === "json") value = JSON.stringify(v, null, 2);
-			else value = serializeConfig(v);
-			else value = v;
+			if (typeof v !== "string") {
+				if (language === "json") value = JSON.stringify(v, null, 2);
+				else value = serializeConfig(v);
+			} else value = v;
 			if (language === "javascript" && value.startsWith("{") && value.endsWith("}")) value = `(${value})`;
 			return value;
 		};

package/dist/es/layouts/props-panel/PropsPanel.vue_vue_type_script_setup_true_lang.js

@@ -68,13 +68,14 @@ var PropsPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 				const historySource = eventData ? "props" : "code";
 				const replace = historySource === "code";
 				let newValue;
-				if (replace) if (source === "style") newValue = {
-					...values.value,
-					id: v.id || values.value.id,
-					style: { ...v.style || {} }
-				};
-				else newValue = { ...v };
-				else {
+				if (replace) {
+					if (source === "style") newValue = {
+						...values.value,
+						id: v.id || values.value.id,
+						style: { ...v.style || {} }
+					};
+					else newValue = { ...v };
+				} else {
 					newValue = {
 						...v,
 						style: {}

package/dist/es/layouts/sidebar/layer/use-drag.js

@@ -109,16 +109,17 @@ var useDrag = ({ editorService }, options = {}) => {
 			let targetParent = targetInfo.parent;
 			if (!targetParent || !targetNode) return;
 			let targetIndex = -1;
-			if (Array.isArray(targetNode.items) && dragState.dropType === "inner") if (dragState.redirectedTargetId !== void 0) {
-				const redirectedNode = editorService.getNodeInfo(dragState.redirectedTargetId, false).node;
-				if (!redirectedNode || !Array.isArray(redirectedNode.items)) return;
-				targetParent = redirectedNode;
-				targetIndex = redirectedNode.items.length;
-			} else {
-				targetIndex = targetNode.items.length;
-				targetParent = targetNode;
-			}
-			else targetIndex = getNodeIndex(dragState.dragOverNodeId, targetParent);
+			if (Array.isArray(targetNode.items) && dragState.dropType === "inner") {
+				if (dragState.redirectedTargetId !== void 0) {
+					const redirectedNode = editorService.getNodeInfo(dragState.redirectedTargetId, false).node;
+					if (!redirectedNode || !Array.isArray(redirectedNode.items)) return;
+					targetParent = redirectedNode;
+					targetIndex = redirectedNode.items.length;
+				} else {
+					targetIndex = targetNode.items.length;
+					targetParent = targetNode;
+				}
+			} else targetIndex = getNodeIndex(dragState.dragOverNodeId, targetParent);
 			if (dragState.dropType === "after") targetIndex += 1;
 			const selectedNodes = editorService.get("nodes");
 			if (selectedNodes.find((n) => `${n.id}` === `${node.id}`)) editorService.dragTo(selectedNodes, targetParent, targetIndex);

package/dist/es/layouts/workspace/viewer/Stage.vue_vue_type_script_setup_true_lang.js

@@ -151,11 +151,44 @@ var Stage_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComp
 				height: contentRect.height
 			});
 		});
+		const parseDSL = getEditorConfig("parseDSL");
+		/**
+		* 本次拖拽是否由编辑器文档内部发起
+		*
+		* drop 的 text/json 里可能带函数（组件配置的事件、钩子等），还原只能交给 parseDSL，
+		* 而 parseDSL 的默认实现是 eval；HTML 拖放又允许其他源的页面在 DataTransfer 中投递
+		* 自定义 MIME 数据，跨源页面只要诱导用户拖拽一次，就能让 eval 执行任意脚本。
+		*
+		* 跨源页面既不会在本文档触发 dragstart，也无法往本文档创建的 DataTransfer 中写数据，
+		* 因此只有起源于本文档的拖拽才交给 parseDSL 还原。
+		* 同源拖拽源写入的 text/json 由业务保证可信。
+		*/
+		let isInternalDrag = false;
+		let internalDragSession = 0;
+		let clearInternalDragTimer;
+		const documentDragStartHandler = () => {
+			internalDragSession += 1;
+			isInternalDrag = true;
+			if (clearInternalDragTimer !== void 0) {
+				globalThis.clearTimeout(clearInternalDragTimer);
+				clearInternalDragTimer = void 0;
+			}
+		};
+		const documentDragEndHandler = () => {
+			const session = internalDragSession;
+			if (clearInternalDragTimer !== void 0) globalThis.clearTimeout(clearInternalDragTimer);
+			clearInternalDragTimer = globalThis.setTimeout(() => {
+				clearInternalDragTimer = void 0;
+				if (session === internalDragSession) isInternalDrag = false;
+			}, 0);
+		};
 		onMounted(() => {
 			if (stageWrapRef.value?.container) {
 				resizeObserver.observe(stageWrapRef.value.container);
 				keybindingService.registerEl(KeyBindingContainerKey.STAGE, stageWrapRef.value.container);
 			}
+			globalThis.document.addEventListener("dragstart", documentDragStartHandler, true);
+			globalThis.document.addEventListener("dragend", documentDragEndHandler, true);
 		});
 		onBeforeUnmount(() => {
 			stage?.destroy();
@@ -163,8 +196,13 @@ var Stage_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComp
 			resizeObserver.disconnect();
 			editorService.set("stage", null);
 			keybindingService.unregisterEl("stage");
+			if (clearInternalDragTimer !== void 0) {
+				globalThis.clearTimeout(clearInternalDragTimer);
+				clearInternalDragTimer = void 0;
+			}
+			globalThis.document.removeEventListener("dragstart", documentDragStartHandler, true);
+			globalThis.document.removeEventListener("dragend", documentDragEndHandler, true);
 		});
-		const parseDSL = getEditorConfig("parseDSL");
 		const contextmenuHandler = (e) => {
 			e.preventDefault();
 			menuRef.value?.show(e);
@@ -175,11 +213,19 @@ var Stage_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComp
 			e.dataTransfer.dropEffect = "move";
 		};
 		const dropHandler = async (e) => {
+			const allowed = isInternalDrag;
+			isInternalDrag = false;
 			if (!e.dataTransfer) return;
 			const data = e.dataTransfer.getData("text/json");
-			if (!data) return;
-			const config = parseDSL(`(${data})`);
-			if (!config || config.dragType !== DragType.COMPONENT_LIST) return;
+			if (!data || !allowed) return;
+			let config;
+			try {
+				config = parseDSL(`(${data})`);
+			} catch {
+				return;
+			}
+			if (!config || config.dragType !== DragType.COMPONENT_LIST || !config.data) return;
+			const dragData = config.data;
 			e.preventDefault();
 			const doc = stage?.renderer?.contentWindow?.document;
 			const parentEl = doc?.querySelector(`.${props.stageOptions?.containerHighlightClassName}`);
@@ -201,7 +247,7 @@ var Stage_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComp
 				const layout = await editorService.getLayout(parent);
 				const containerRect = stageContainerEl.value.getBoundingClientRect();
 				const { scrollTop, scrollLeft } = stage.mask;
-				const { style = {} } = config.data;
+				const { style = {} } = dragData;
 				let top = 0;
 				let left = 0;
 				let position = "relative";
@@ -219,14 +265,14 @@ var Stage_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComp
 						top = top - parentTop * zoom.value;
 					}
 				}
-				config.data.style = {
+				dragData.style = {
 					...style,
 					position,
 					top: calcValueByFontsize(doc, top / zoom.value),
 					left: calcValueByFontsize(doc, left / zoom.value)
 				};
-				config.data.inputEvent = e;
-				editorService.add(config.data, parent, { historySource: "component-panel" });
+				dragData.inputEvent = e;
+				editorService.add(dragData, parent, { historySource: "component-panel" });
 			}
 		};
 		return (_ctx, _cache) => {

package/dist/es/services/editor.js

@@ -455,13 +455,15 @@ var Editor = class extends BaseService {
 		}
 		await Promise.all(nodes.map((node) => this.doRemove(node, options)));
 		this.removeInvalidNodesBySubtree(nodes);
-		if (removedItems.length > 0 && pageForOp) if (!doNotPushHistory) this.pushOpHistory("remove", {
-			diff: removedItems,
-			pageData: pageForOp,
-			historyDescription,
-			source: historySource
-		});
-		else this.selectionBeforeOp = null;
+		if (removedItems.length > 0 && pageForOp) {
+			if (!doNotPushHistory) this.pushOpHistory("remove", {
+				diff: removedItems,
+				pageData: pageForOp,
+				historyDescription,
+				source: historySource
+			});
+			else this.selectionBeforeOp = null;
+		}
 		this.emit("remove", nodes);
 		this.emit("change", {
 			type: "remove",
@@ -541,22 +543,24 @@ var Editor = class extends BaseService {
 		}));
 		this.applyInvalidInfo(config, invalidInfo);
 		if (updateData[0].oldNode?.type !== NodeType.ROOT) {
-			if (this.get("nodes").length) if (!doNotPushHistory) {
-				const pageForOp = this.getNodeInfo(nodes[0].id, false).page;
-				this.pushOpHistory("update", {
-					diff: buildUpdateDiff(updateData.map((d) => ({
-						oldNode: cloneDeep$1(d.oldNode),
-						newNode: cloneDeep$1(d.newNode),
-						changeRecords: d.changeRecords?.length ? cloneDeep$1(d.changeRecords) : void 0
-					}))),
-					pageData: {
-						name: pageForOp?.name || "",
-						id: pageForOp.id
-					},
-					historyDescription,
-					source: historySource
-				});
-			} else this.selectionBeforeOp = null;
+			if (this.get("nodes").length) {
+				if (!doNotPushHistory) {
+					const pageForOp = this.getNodeInfo(nodes[0].id, false).page;
+					this.pushOpHistory("update", {
+						diff: buildUpdateDiff(updateData.map((d) => ({
+							oldNode: cloneDeep$1(d.oldNode),
+							newNode: cloneDeep$1(d.newNode),
+							changeRecords: d.changeRecords?.length ? cloneDeep$1(d.changeRecords) : void 0
+						}))),
+						pageData: {
+							name: pageForOp?.name || "",
+							id: pageForOp.id
+						},
+						historyDescription,
+						source: historySource
+					});
+				} else this.selectionBeforeOp = null;
+			}
 		}
 		this.emit("update", updateData);
 		this.emit("change", {
@@ -684,8 +688,10 @@ var Editor = class extends BaseService {
 			historyDescription,
 			historySource
 		});
-		if (!doNotSelect) if (newNodes.length > 1) await stage?.multiSelect(newNodes.map((node) => node.id));
-		else await stage?.select(newNodes[0].id);
+		if (!doNotSelect) {
+			if (newNodes.length > 1) await stage?.multiSelect(newNodes.map((node) => node.id));
+			else await stage?.select(newNodes[0].id);
+		}
 		return newNode;
 	}
 	/**

package/dist/es/style.css

@@ -1395,7 +1395,7 @@ fieldset.m-fieldset .m-form-tip {
   left: 40px;
   width: calc(100% - 40px);
   text-align: center;
-  background-color: rgba(252.5, 245.7, 235.5, 0.9);
+  background-color: rgba(99.0196078431%, 96.3529411765%, 92.3529411765%, 0.9);
   color: #e6a23c;
   padding: 5px 0;
   font-size: 12px;

package/dist/es/utils/editor.js

@@ -83,8 +83,10 @@ var removeConflictPosition = (style, primary, secondary) => {
 	const secondaryInvalid = isInvalid(secondaryValue);
 	if (primaryInvalid && !secondaryInvalid) delete style[primary];
 	else if (secondaryInvalid && !primaryInvalid) delete style[secondary];
-	else if (primaryInvalid && secondaryInvalid) if (secondaryValue === 0 && primaryValue !== 0) delete style[primary];
-	else delete style[secondary];
+	else if (primaryInvalid && secondaryInvalid) {
+		if (secondaryValue === 0 && primaryValue !== 0) delete style[primary];
+		else delete style[secondary];
+	}
 };
 var getInitPositionStyle = (style = {}, layout) => {
 	if (layout === Layout.ABSOLUTE) {

package/dist/style.css

@@ -1395,7 +1395,7 @@ fieldset.m-fieldset .m-form-tip {
   left: 40px;
   width: calc(100% - 40px);
   text-align: center;
-  background-color: rgba(252.5, 245.7, 235.5, 0.9);
+  background-color: rgba(99.0196078431%, 96.3529411765%, 92.3529411765%, 0.9);
   color: #e6a23c;
   padding: 5px 0;
   font-size: 12px;

package/dist/themes/magic-admin.css

@@ -1481,7 +1481,7 @@ fieldset.m-fieldset .m-form-tip {
   left: 40px;
   width: calc(100% - 40px);
   text-align: center;
-  background-color: rgba(252.5, 245.7, 235.5, 0.9);
+  background-color: rgba(99.0196078431%, 96.3529411765%, 92.3529411765%, 0.9);
   color: #e6a23c;
   padding: 5px 0;
   font-size: 12px;

package/dist/tmagic-editor-headless.umd.cjs

@@ -79,8 +79,10 @@
 			var unmasked = true;
 		} catch (e) {}
 		var result = nativeObjectToString$1.call(value);
-		if (unmasked) if (isOwn) value[symToStringTag$1] = tag;
-		else delete value[symToStringTag$1];
+		if (unmasked) {
+			if (isOwn) value[symToStringTag$1] = tag;
+			else delete value[symToStringTag$1];
+		}
 		return result;
 	}
 	//#endregion
@@ -217,7 +219,7 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_baseToString.js
 	/** Used as references for various `Number` constants. */
-	var INFINITY$1 = Infinity;
+	var INFINITY$1 = 1 / 0;
 	/** Used to convert symbols to primitives and strings. */
 	var symbolProto$2 = Symbol$1 ? Symbol$1.prototype : void 0;
 	var symbolToString = symbolProto$2 ? symbolProto$2.toString : void 0;
@@ -1815,7 +1817,7 @@
 	//#endregion
 	//#region node_modules/.pnpm/lodash-es@4.18.1/node_modules/lodash-es/_toKey.js
 	/** Used as references for various `Number` constants. */
-	var INFINITY = Infinity;
+	var INFINITY = 1 / 0;
 	/**
 	* Converts `value` to a string key if it's not a string or symbol.
 	*
@@ -1923,9 +1925,10 @@
 		result || (result = []);
 		while (++index < length) {
 			var value = array[index];
-			if (depth > 0 && predicate(value)) if (depth > 1) baseFlatten(value, depth - 1, predicate, isStrict, result);
-			else arrayPush(result, value);
-			else if (!isStrict) result[result.length] = value;
+			if (depth > 0 && predicate(value)) {
+				if (depth > 1) baseFlatten(value, depth - 1, predicate, isStrict, result);
+				else arrayPush(result, value);
+			} else if (!isStrict) result[result.length] = value;
 		}
 		return result;
 	}
@@ -3281,16 +3284,17 @@
 		if (isCommon) {
 			var isArr = isArray(srcValue), isBuff = !isArr && isBuffer(srcValue), isTyped = !isArr && !isBuff && isTypedArray(srcValue);
 			newValue = srcValue;
-			if (isArr || isBuff || isTyped) if (isArray(objValue)) newValue = objValue;
-			else if (isArrayLikeObject(objValue)) newValue = copyArray(objValue);
-			else if (isBuff) {
-				isCommon = false;
-				newValue = cloneBuffer(srcValue, true);
-			} else if (isTyped) {
-				isCommon = false;
-				newValue = cloneTypedArray(srcValue, true);
-			} else newValue = [];
-			else if (isPlainObject$1(srcValue) || isArguments(srcValue)) {
+			if (isArr || isBuff || isTyped) {
+				if (isArray(objValue)) newValue = objValue;
+				else if (isArrayLikeObject(objValue)) newValue = copyArray(objValue);
+				else if (isBuff) {
+					isCommon = false;
+					newValue = cloneBuffer(srcValue, true);
+				} else if (isTyped) {
+					isCommon = false;
+					newValue = cloneTypedArray(srcValue, true);
+				} else newValue = [];
+			} else if (isPlainObject$1(srcValue) || isArguments(srcValue)) {
 				newValue = objValue;
 				if (isArguments(objValue)) newValue = toPlainObject(objValue);
 				else if (!isObject(objValue) || isFunction(objValue)) newValue = initCloneObject(srcValue);
@@ -3604,7 +3608,7 @@
 	* @param {Array} values The values to add to the set.
 	* @returns {Object} Returns the new set.
 	*/
-	var createSet = !(Set$1 && 1 / setToArray(new Set$1([, -0]))[1] == Infinity) ? noop : function(values) {
+	var createSet = !(Set$1 && 1 / setToArray(new Set$1([, -0]))[1] == 1 / 0) ? noop : function(values) {
 		return new Set$1(values);
 	};
 	//#endregion
@@ -5369,8 +5373,10 @@
 		const secondaryInvalid = isInvalid(secondaryValue);
 		if (primaryInvalid && !secondaryInvalid) delete style[primary];
 		else if (secondaryInvalid && !primaryInvalid) delete style[secondary];
-		else if (primaryInvalid && secondaryInvalid) if (secondaryValue === 0 && primaryValue !== 0) delete style[primary];
-		else delete style[secondary];
+		else if (primaryInvalid && secondaryInvalid) {
+			if (secondaryValue === 0 && primaryValue !== 0) delete style[primary];
+			else delete style[secondary];
+		}
 	};
 	var getInitPositionStyle = (style = {}, layout) => {
 		if (layout === Layout.ABSOLUTE) {
@@ -6209,13 +6215,15 @@
 			}
 			await Promise.all(nodes.map((node) => this.doRemove(node, options)));
 			this.removeInvalidNodesBySubtree(nodes);
-			if (removedItems.length > 0 && pageForOp) if (!doNotPushHistory) this.pushOpHistory("remove", {
-				diff: removedItems,
-				pageData: pageForOp,
-				historyDescription,
-				source: historySource
-			});
-			else this.selectionBeforeOp = null;
+			if (removedItems.length > 0 && pageForOp) {
+				if (!doNotPushHistory) this.pushOpHistory("remove", {
+					diff: removedItems,
+					pageData: pageForOp,
+					historyDescription,
+					source: historySource
+				});
+				else this.selectionBeforeOp = null;
+			}
 			this.emit("remove", nodes);
 			this.emit("change", {
 				type: "remove",
@@ -6295,22 +6303,24 @@
 			}));
 			this.applyInvalidInfo(config, invalidInfo);
 			if (updateData[0].oldNode?.type !== _tmagic_core.NodeType.ROOT) {
-				if (this.get("nodes").length) if (!doNotPushHistory) {
-					const pageForOp = this.getNodeInfo(nodes[0].id, false).page;
-					this.pushOpHistory("update", {
-						diff: buildUpdateDiff(updateData.map((d) => ({
-							oldNode: cloneDeep(d.oldNode),
-							newNode: cloneDeep(d.newNode),
-							changeRecords: d.changeRecords?.length ? cloneDeep(d.changeRecords) : void 0
-						}))),
-						pageData: {
-							name: pageForOp?.name || "",
-							id: pageForOp.id
-						},
-						historyDescription,
-						source: historySource
-					});
-				} else this.selectionBeforeOp = null;
+				if (this.get("nodes").length) {
+					if (!doNotPushHistory) {
+						const pageForOp = this.getNodeInfo(nodes[0].id, false).page;
+						this.pushOpHistory("update", {
+							diff: buildUpdateDiff(updateData.map((d) => ({
+								oldNode: cloneDeep(d.oldNode),
+								newNode: cloneDeep(d.newNode),
+								changeRecords: d.changeRecords?.length ? cloneDeep(d.changeRecords) : void 0
+							}))),
+							pageData: {
+								name: pageForOp?.name || "",
+								id: pageForOp.id
+							},
+							historyDescription,
+							source: historySource
+						});
+					} else this.selectionBeforeOp = null;
+				}
 			}
 			this.emit("update", updateData);
 			this.emit("change", {
@@ -6438,8 +6448,10 @@
 				historyDescription,
 				historySource
 			});
-			if (!doNotSelect) if (newNodes.length > 1) await stage?.multiSelect(newNodes.map((node) => node.id));
-			else await stage?.select(newNodes[0].id);
+			if (!doNotSelect) {
+				if (newNodes.length > 1) await stage?.multiSelect(newNodes.map((node) => node.id));
+				else await stage?.select(newNodes[0].id);
+			}
 			return newNode;
 		}
 		/**