@tmagic/editor 1.8.0-manmanyu.8 → 1.8.0

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

@@ -1,14 +1,17 @@
+import { useEditorFormContext } from "../../hooks/use-form-context.js";
 import { useServices } from "../../hooks/use-services.js";
 import { useEditorContentHeight } from "../../hooks/use-editor-content-height.js";
 import Icon_default from "../../components/Icon.js";
 import CodeEditor_default from "../CodeEditor.js";
-import { MForm } from "@tmagic/form";
-import { TMagicButton, TMagicScrollbar } from "@tmagic/design";
-import { computed, createBlock, createCommentVNode, createElementBlock, createVNode, defineComponent, getCurrentInstance, inject, normalizeClass, onMounted, onUnmounted, openBlock, ref, renderSlot, unref, useTemplateRef, watchEffect, withCtx } from "vue";
+import { ENABLE_PROPS_FORM_VALIDATE } from "../../editorProps.js";
+import { MForm, validateForm } from "@tmagic/form";
+import { TMagicButton, TMagicScrollbar, tMagicMessage } from "@tmagic/design";
+import { filterXSS } from "@tmagic/utils";
+import { computed, createBlock, createCommentVNode, createElementBlock, createVNode, defineComponent, getCurrentInstance, inject, normalizeClass, onMounted, onUnmounted, openBlock, ref, renderSlot, unref, useTemplateRef, withCtx } from "vue";
 import { Document } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/props-panel/FormPanel.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "m-editor-props-form-panel" };
-var FormPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var FormPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorFormPanel",
 	__name: "FormPanel",
 	props: {
@@ -17,8 +20,7 @@ var FormPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 		disabledShowSrc: { type: Boolean },
 		labelWidth: {},
 		codeValueKey: {},
-		labelPosition: {},
-		extendState: { type: Function }
+		labelPosition: {}
 	},
 	emits: [
 		"submit",
@@ -30,20 +32,15 @@ var FormPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 	setup(__props, { expose: __expose, emit: __emit }) {
 		const props = __props;
 		const emit = __emit;
+		const enablePropsFormValidate = inject(ENABLE_PROPS_FORM_VALIDATE, false);
 		const services = useServices();
-		const { editorService, uiService } = services;
+		const { uiService } = services;
 		const codeOptions = inject("codeOptions", {});
 		const showSrc = ref(false);
 		const propsPanelSize = computed(() => uiService.get("propsPanelSize") || "small");
 		const { height: editorContentHeight } = useEditorContentHeight();
-		const stage = computed(() => editorService.get("stage"));
+		const formContext = useEditorFormContext(() => services);
 		const configFormRef = useTemplateRef("configForm");
-		watchEffect(() => {
-			if (configFormRef.value) {
-				configFormRef.value.formState.stage = stage.value;
-				configFormRef.value.formState.services = services;
-			}
-		});
 		const internalInstance = getCurrentInstance();
 		onMounted(() => {
 			emit("mounted", internalInstance?.proxy);
@@ -53,16 +50,47 @@ var FormPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 		});
 		const submit = async (v, eventData) => {
 			try {
-				emit("submit", await configFormRef.value?.submitForm(), eventData);
+				const values = await configFormRef.value?.submitForm();
+				emit("submit", values, eventData);
 			} catch (e) {
-				emit("submit-error", e);
+				if (enablePropsFormValidate) emit("submit", v, eventData, e);
+				else emit("submit-error", e);
 			}
 		};
 		const errorHandler = (e) => {
 			emit("form-error", e);
 		};
-		const saveCode = (values) => {
-			emit("submit", props.codeValueKey ? { [props.codeValueKey]: values } : values);
+		/**
+		* 将校验错误文案安全地转为用于弹窗展示的 HTML。
+		*
+		* 文案形如 `字段 -> 主文案\n\n建议`，多条以结构性 `<br>` 拼接。为在保留换行排版的同时
+		* 避免 `${value}`/字段名中可能夹带的 HTML 造成 XSS：先按结构性 `<br>` 拆分，对每段做 HTML
+		* 转义后再把段内换行 `\n` 替换为 `<br>`，最后用 `<br>` 拼回。
+		*/
+		const formatValidateErrorHtml = (error) => error.split(/<br\s*\/?>/i).map((segment) => filterXSS(segment).replaceAll("\n", "<br>")).join("<br>");
+		const saveCode = async (values) => {
+			const newValues = props.codeValueKey ? { [props.codeValueKey]: values } : values;
+			if (!enablePropsFormValidate) {
+				emit("submit", newValues);
+				return;
+			}
+			try {
+				const error = await validateForm({
+					config: props.config,
+					typeMatchValid: true,
+					initValues: newValues,
+					context: formContext.value
+				});
+				if (error) tMagicMessage({
+					type: "error",
+					message: formatValidateErrorHtml(error),
+					dangerouslyUseHTMLString: true
+				});
+				emit("submit", newValues, void 0, error ? new Error(error) : void 0);
+			} catch (e) {
+				console.error("validateForm error", e);
+				emit("submit", newValues, void 0, e instanceof Error ? e : new Error(String(e)));
+			}
 		};
 		__expose({
 			configForm: configFormRef,
@@ -81,7 +109,9 @@ var FormPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 						size: propsPanelSize.value,
 						"init-values": __props.values,
 						config: __props.config,
-						"extend-state": __props.extendState,
+						"type-match-valid": true,
+						context: unref(formContext),
+						"validate-on-init": true,
 						onChange: submit,
 						onError: errorHandler
 					}, null, 8, [
@@ -92,7 +122,7 @@ var FormPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 						"size",
 						"init-values",
 						"config",
-						"extend-state"
+						"context"
 					])]),
 					_: 1
 				}),

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

@@ -4,11 +4,12 @@ import { PROPS_PANEL_WIDTH_STORAGE_KEY } from "../../utils/const.js";
 import { useServices } from "../../hooks/use-services.js";
 import Resizer_default from "../../components/Resizer.js";
 import Icon_default from "../../components/Icon.js";
+import { ENABLE_PROPS_FORM_VALIDATE } from "../../editorProps.js";
 import FormPanel_default from "./FormPanel.js";
 import { useStylePanel } from "./use-style-panel.js";
 import { TMagicButton } from "@tmagic/design";
 import { setValueByKeyPath } from "@tmagic/utils";
-import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, normalizeClass, onBeforeUnmount, onMounted, openBlock, ref, renderSlot, unref, useTemplateRef, vShow, watch, watchEffect, withCtx, withDirectives } from "vue";
+import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, inject, normalizeClass, onBeforeUnmount, onMounted, openBlock, ref, renderSlot, unref, useTemplateRef, vShow, watch, watchEffect, withCtx, withDirectives } from "vue";
 import { Close, Sugar } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/props-panel/PropsPanel.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = {
@@ -16,13 +17,10 @@ var _hoisted_1 = {
 	class: "m-editor-props-panel"
 };
 var _hoisted_2 = { class: "m-editor-props-style-panel-title" };
-var PropsPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var PropsPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorPropsPanel",
 	__name: "PropsPanel",
-	props: {
-		disabledShowSrc: { type: Boolean },
-		extendState: { type: Function }
-	},
+	props: { disabledShowSrc: { type: Boolean } },
 	emits: [
 		"submit-error",
 		"form-error",
@@ -32,6 +30,7 @@ var PropsPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 	setup(__props, { expose: __expose, emit: __emit }) {
 		const emit = __emit;
 		const { editorService, uiService, propsService, storageService } = useServices();
+		const enablePropsFormValidate = inject(ENABLE_PROPS_FORM_VALIDATE, false);
 		const values = ref({});
 		const curFormConfig = ref([]);
 		const node = computed(() => editorService.get("node"));
@@ -40,39 +39,65 @@ var PropsPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 			tabPosition: "right",
 			items: styleTabConfig.items
 		}];
+		let initSeq = 0;
+		let mounted = true;
 		const init = async () => {
+			initSeq += 1;
+			const seq = initSeq;
 			if (!node.value) {
+				if (seq !== initSeq || !mounted) return;
 				curFormConfig.value = [];
 				return;
 			}
 			const type = node.value.type || (node.value.items ? "container" : "text");
-			curFormConfig.value = await propsService.getPropsConfig(type, { node: node.value });
+			const config = await propsService.getPropsConfig(type, { node: node.value });
+			if (seq !== initSeq || !mounted) return;
+			if (!node.value) return;
+			curFormConfig.value = config;
 			values.value = node.value;
 		};
 		watchEffect(init);
 		propsService.on("props-configs-change", init);
 		onBeforeUnmount(() => {
+			mounted = false;
 			propsService.off("props-configs-change", init);
 		});
-		const submit = async (v, eventData) => {
+		const submit = async (v, eventData, error, source = "props") => {
 			try {
 				if (!v.id) v.id = values.value.id;
-				const newValue = {
-					...v,
-					style: {}
-				};
-				if (v.style) {
-					Object.entries(v.style).forEach(([key, value]) => {
-						if (value !== "" && newValue.style) newValue.style[key] = value;
-					});
-					eventData?.changeRecords?.forEach((record) => {
-						if (record.propPath?.startsWith("style") && record.value === "") setValueByKeyPath(record.propPath, record.value, newValue);
-					});
-				}
 				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 {
+					newValue = {
+						...v,
+						style: {}
+					};
+					if (v.style) {
+						Object.entries(v.style).forEach(([key, value]) => {
+							if (value !== "" && newValue.style) newValue.style[key] = value;
+						});
+						eventData?.changeRecords?.forEach((record) => {
+							if (record.propPath?.startsWith("style") && record.value === "") setValueByKeyPath(record.propPath, record.value, newValue);
+						});
+					}
+				}
 				editorService.update(newValue, {
 					changeRecords: eventData?.changeRecords,
-					historySource
+					historySource,
+					replace,
+					...enablePropsFormValidate && error ? { invalidInfo: {
+						id: newValue.id,
+						source,
+						error: error?.message
+					} } : {}
 				});
 			} catch (e) {
 				emit("submit-error", e);
@@ -122,8 +147,7 @@ var PropsPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 					config: curFormConfig.value,
 					values: values.value,
 					disabledShowSrc: __props.disabledShowSrc,
-					extendState: __props.extendState,
-					onSubmit: submit,
+					onSubmit: _cache[0] || (_cache[0] = (v, eventData, error) => submit(v, eventData, error, "props")),
 					onSubmitError: errorHandler,
 					onFormError: errorHandler,
 					onMounted: mountedHandler,
@@ -132,8 +156,7 @@ var PropsPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 					"class",
 					"config",
 					"values",
-					"disabledShowSrc",
-					"extendState"
+					"disabledShowSrc"
 				]),
 				unref(showStylePanel) ? (openBlock(), createBlock(Resizer_default, {
 					key: 0,
@@ -147,30 +170,25 @@ var PropsPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 					config: styleFormConfig,
 					values: values.value,
 					disabledShowSrc: __props.disabledShowSrc,
-					extendState: __props.extendState,
-					onSubmit: submit,
+					onSubmit: _cache[2] || (_cache[2] = (v, eventData, error) => submit(v, eventData, error, "style")),
 					onSubmitError: errorHandler,
 					onFormError: errorHandler
 				}, {
-					"props-form-panel-header": withCtx(() => [createElementVNode("div", _hoisted_2, [_cache[2] || (_cache[2] = createElementVNode("span", null, "样式", -1)), createElementVNode("div", null, [createVNode(unref(TMagicButton), {
+					"props-form-panel-header": withCtx(() => [createElementVNode("div", _hoisted_2, [_cache[4] || (_cache[4] = createElementVNode("span", null, "样式", -1)), createElementVNode("div", null, [createVNode(unref(TMagicButton), {
 						link: "",
 						size: "small",
-						onClick: _cache[0] || (_cache[0] = ($event) => unref(toggleStylePanel)(false))
+						onClick: _cache[1] || (_cache[1] = ($event) => unref(toggleStylePanel)(false))
 					}, {
 						default: withCtx(() => [createVNode(Icon_default, { icon: unref(Close) }, null, 8, ["icon"])]),
 						_: 1
 					})])])]),
 					_: 1
-				}, 8, [
-					"values",
-					"disabledShowSrc",
-					"extendState"
-				])) : createCommentVNode("v-if", true),
+				}, 8, ["values", "disabledShowSrc"])) : createCommentVNode("v-if", true),
 				unref(showStylePanelToggleButton) && !unref(showStylePanel) ? (openBlock(), createBlock(unref(TMagicButton), {
 					key: 2,
 					class: "m-editor-props-panel-style-icon",
 					circle: "",
-					onClick: _cache[1] || (_cache[1] = ($event) => unref(toggleStylePanel)(true))
+					onClick: _cache[3] || (_cache[3] = ($event) => unref(toggleStylePanel)(true))
 				}, {
 					default: withCtx(() => [createVNode(Icon_default, { icon: unref(Sugar) }, null, 8, ["icon"])]),
 					_: 1

package/dist/es/layouts/props-panel/use-style-panel.js

@@ -23,8 +23,9 @@ var useStylePanel = ({ uiService, storageService }, propsPanelWidth) => {
 			columnWidth.center += propsPanelWidth.value;
 		}
 		if (columnWidth.center < 0) {
-			columnWidth.right = columnWidth.right + columnWidth.center - 400;
-			columnWidth.center = 400;
+			const minCenterColumnWidth = uiService.get("minCenterColumnWidth");
+			columnWidth.right = columnWidth.right + columnWidth.center - minCenterColumnWidth;
+			columnWidth.center = minCenterColumnWidth;
 			propsPanelWidth.value = columnWidth.right / 2;
 		}
 		storageService.setItem(RIGHT_COLUMN_WIDTH_STORAGE_KEY, columnWidth.right, { protocol: Protocol.NUMBER });

package/dist/es/layouts/sidebar/ComponentListPanel.vue_vue_type_script_setup_true_lang.js

@@ -10,7 +10,7 @@ import { Grid } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/sidebar/ComponentListPanel.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = ["onClick", "onDragstart"];
 var _hoisted_2 = ["title"];
-var ComponentListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var ComponentListPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorComponentListPanel",
 	__name: "ComponentListPanel",
 	setup(__props) {
@@ -23,7 +23,7 @@ var ComponentListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE_
 		const stage = computed(() => editorService.get("stage"));
 		const list = computed(() => componentListService.getList().map((group) => ({
 			...group,
-			items: group.items.filter((item) => item.text.includes(searchText.value))
+			items: group.items.filter((item) => `${item.text || ""}${item.desc || ""}${item.type}`.toLocaleLowerCase().includes(searchText.value.toLocaleLowerCase()))
 		})));
 		const collapseValue = ref();
 		watch(list, () => {
@@ -70,7 +70,7 @@ var ComponentListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE_
 				return;
 			}
 			if (timeout || !stage.value) return;
-			timeout = stage.value.delayedMarkContainer(e);
+			timeout = stage.value.delayedMarkContainer(e, [], true);
 		};
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(TMagicScrollbar), null, {

package/dist/es/layouts/sidebar/Sidebar.vue_vue_type_script_setup_true_lang.js

@@ -9,7 +9,7 @@ import DataSourceListPanel_default from "./data-source/DataSourceListPanel.js";
 import LayerPanel_default from "./layer/LayerPanel.js";
 import ComponentListPanel_default from "./ComponentListPanel.js";
 import { Fragment, Teleport, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createVNode, defineComponent, mergeProps, nextTick, normalizeClass, normalizeStyle, openBlock, ref, renderList, renderSlot, resolveDynamicComponent, toDisplayString, toHandlers, unref, vShow, watch, withCtx, withDirectives, withModifiers } from "vue";
-import { Close, Coin, EditPen, Goods, List } from "@element-plus/icons-vue";
+import { Box, Close, Coin, EditPen, Finished } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/sidebar/Sidebar.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = {
 	key: 0,
@@ -30,7 +30,7 @@ var _hoisted_5 = {
 	class: "m-editor-sidebar-tips"
 };
 var _hoisted_6 = { class: "m-editor-slide-list-box" };
-var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Sidebar_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorSidebar",
 	__name: "Sidebar",
 	props: {
@@ -61,6 +61,7 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 		const taskLength = computed(() => depService.get("taskLength"));
 		const tipsBarVisible = ref(true);
 		const columnLeftWidth = computed(() => uiService.get("columnWidth")[ColumnLayout.LEFT]);
+		const frameworkWidth = computed(() => uiService.get("frameworkRect")?.width || 0);
 		const { height: editorContentHeight } = useEditorContentHeight();
 		const columnLeftHeight = ref(0);
 		const unWatchEditorContentHeight = watch(editorContentHeight, (height) => {
@@ -81,7 +82,7 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 				[SideItemKey.COMPONENT_LIST]: {
 					$key: SideItemKey.COMPONENT_LIST,
 					type: "component",
-					icon: Goods,
+					icon: Box,
 					text: "组件",
 					component: ComponentListPanel_default,
 					slots: {}
@@ -89,7 +90,7 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 				layer: {
 					$key: SideItemKey.LAYER,
 					type: "component",
-					icon: List,
+					icon: Finished,
 					text: "已选组件",
 					props: {
 						layerContentMenu: props.layerContentMenu,
@@ -144,7 +145,8 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 		watch(() => props.data.status, (status) => {
 			activeTabName.value = status || "0";
 		});
-		const { dragstartHandler, dragendHandler, floatBoxStates, showingBoxKeys } = useFloatBox(computed(() => sideBarItems.value.map((sideBarItem) => sideBarItem.$key)));
+		const slideKeys = computed(() => sideBarItems.value.map((sideBarItem) => sideBarItem.$key));
+		const { dragstartHandler, dragendHandler, floatBoxStates, showingBoxKeys } = useFloatBox(slideKeys);
 		watch(() => showingBoxKeys.value.length, () => {
 			if (!showingBoxKeys.value.some((key) => activeTabName.value === sideBarItems.value.find((v) => v.$key === key)?.text) && activeTabName.value) return;
 			const nextSlideBarItem = sideBarItems.value.find((sideBarItem) => !showingBoxKeys.value.includes(sideBarItem.$key));
@@ -189,23 +191,17 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 					}, config.props || {}, toHandlers(config?.listeners || {})), createSlots({ _: 2 }, [
 						config.$key === "component-list" || config.slots?.componentList ? {
 							name: "component-list",
-							fn: withCtx(({ componentGroupList }) => [config.$key === "component-list" ? renderSlot(_ctx.$slots, "component-list", {
-								key: 0,
-								componentGroupList
-							}) : config.slots?.componentList ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.componentList), { key: 1 })) : createCommentVNode("v-if", true)]),
+							fn: withCtx(({ componentGroupList }) => [config.$key === "component-list" ? renderSlot(_ctx.$slots, "component-list", { componentGroupList }, void 0, void 0, 0) : config.slots?.componentList ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.componentList), { key: 1 })) : createCommentVNode("v-if", true)]),
 							key: "0"
 						} : void 0,
 						config.$key === "component-list" || config.slots?.componentListPanelHeader ? {
 							name: "component-list-panel-header",
-							fn: withCtx(() => [config.$key === "component-list" ? renderSlot(_ctx.$slots, "component-list-panel-header", { key: 0 }) : config.slots?.componentListPanelHeader ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.componentListPanelHeader), { key: 1 })) : createCommentVNode("v-if", true)]),
+							fn: withCtx(() => [config.$key === "component-list" ? renderSlot(_ctx.$slots, "component-list-panel-header", {}, void 0, void 0, 0) : config.slots?.componentListPanelHeader ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.componentListPanelHeader), { key: 1 })) : createCommentVNode("v-if", true)]),
 							key: "1"
 						} : void 0,
 						config.$key === "component-list" || config.slots?.componentListItem ? {
 							name: "component-list-item",
-							fn: withCtx(({ component }) => [config.$key === "component-list" ? renderSlot(_ctx.$slots, "component-list-item", {
-								key: 0,
-								component
-							}) : config.slots?.componentListItem ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.componentListItem), {
+							fn: withCtx(({ component }) => [config.$key === "component-list" ? renderSlot(_ctx.$slots, "component-list-item", { component }, void 0, void 0, 0) : config.slots?.componentListItem ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.componentListItem), {
 								key: 1,
 								component
 							}, null, 8, ["component"])) : createCommentVNode("v-if", true)]),
@@ -213,34 +209,30 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 						} : void 0,
 						config.$key === "layer" || config.slots?.layerPanelHeader ? {
 							name: "layer-panel-header",
-							fn: withCtx(() => [config.$key === "layer" ? renderSlot(_ctx.$slots, "layer-panel-header", { key: 0 }) : config.slots?.layerPanelHeader ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.layerPanelHeader), { key: 1 })) : createCommentVNode("v-if", true)]),
+							fn: withCtx(() => [config.$key === "layer" ? renderSlot(_ctx.$slots, "layer-panel-header", {}, void 0, void 0, 0) : config.slots?.layerPanelHeader ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.layerPanelHeader), { key: 1 })) : createCommentVNode("v-if", true)]),
 							key: "3"
 						} : void 0,
 						config.$key === "code-block" || config.slots?.codeBlockPanelHeader ? {
 							name: "code-block-panel-header",
-							fn: withCtx(() => [config.$key === "code-block" ? renderSlot(_ctx.$slots, "code-block-panel-header", { key: 0 }) : config.slots?.codeBlockPanelHeader ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.codeBlockPanelHeader), { key: 1 })) : createCommentVNode("v-if", true)]),
+							fn: withCtx(() => [config.$key === "code-block" ? renderSlot(_ctx.$slots, "code-block-panel-header", {}, void 0, void 0, 0) : config.slots?.codeBlockPanelHeader ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.codeBlockPanelHeader), { key: 1 })) : createCommentVNode("v-if", true)]),
 							key: "4"
 						} : void 0,
 						config.$key === "code-block" || config.slots?.codeBlockPanelTool ? {
 							name: "code-block-panel-tool",
 							fn: withCtx(({ id, data }) => [config.$key === "code-block" ? renderSlot(_ctx.$slots, "code-block-panel-tool", {
-								key: 0,
 								id,
 								data
-							}) : config.slots?.codeBlockPanelTool ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.codeBlockPanelTool), { key: 1 })) : createCommentVNode("v-if", true)]),
+							}, void 0, void 0, 0) : config.slots?.codeBlockPanelTool ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.codeBlockPanelTool), { key: 1 })) : createCommentVNode("v-if", true)]),
 							key: "5"
 						} : void 0,
 						config.$key === "code-block" || config.slots?.codeBlockPanelSearch ? {
 							name: "code-block-panel-search",
-							fn: withCtx(() => [config.$key === "code-block" ? renderSlot(_ctx.$slots, "code-block-panel-search", { key: 0 }) : config.slots?.codeBlockPanelSearch ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.codeBlockPanelSearch), { key: 1 })) : createCommentVNode("v-if", true)]),
+							fn: withCtx(() => [config.$key === "code-block" ? renderSlot(_ctx.$slots, "code-block-panel-search", {}, void 0, void 0, 0) : config.slots?.codeBlockPanelSearch ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.codeBlockPanelSearch), { key: 1 })) : createCommentVNode("v-if", true)]),
 							key: "6"
 						} : void 0,
 						config.$key === "layer" || config.slots?.layerNodeContent ? {
 							name: "layer-node-content",
-							fn: withCtx(({ data: nodeData }) => [config.$key === "layer" ? renderSlot(_ctx.$slots, "layer-node-content", {
-								key: 0,
-								data: nodeData
-							}) : config.slots?.layerNodeContent ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.layerNodeContent), {
+							fn: withCtx(({ data: nodeData }) => [config.$key === "layer" ? renderSlot(_ctx.$slots, "layer-node-content", { data: nodeData }, void 0, void 0, 0) : config.slots?.layerNodeContent ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.layerNodeContent), {
 								key: 1,
 								data: nodeData
 							}, null, 8, ["data"])) : createCommentVNode("v-if", true)]),
@@ -248,10 +240,7 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 						} : void 0,
 						config.$key === "layer" || config.slots?.layerNodeLabel ? {
 							name: "layer-node-label",
-							fn: withCtx(({ data: nodeData }) => [config.$key === "layer" ? renderSlot(_ctx.$slots, "layer-node-label", {
-								key: 0,
-								data: nodeData
-							}) : config.slots?.layerNodeLabel ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.layerNodeTool), {
+							fn: withCtx(({ data: nodeData }) => [config.$key === "layer" ? renderSlot(_ctx.$slots, "layer-node-label", { data: nodeData }, void 0, void 0, 0) : config.slots?.layerNodeLabel ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.layerNodeTool), {
 								key: 1,
 								data: nodeData
 							}, null, 8, ["data"])) : createCommentVNode("v-if", true)]),
@@ -259,10 +248,7 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 						} : void 0,
 						config.$key === "layer" || config.slots?.layerNodeTool ? {
 							name: "layer-node-tool",
-							fn: withCtx(({ data: nodeData }) => [config.$key === "layer" ? renderSlot(_ctx.$slots, "layer-node-tool", {
-								key: 0,
-								data: nodeData
-							}) : config.slots?.layerNodeTool ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.layerNodeTool), {
+							fn: withCtx(({ data: nodeData }) => [config.$key === "layer" ? renderSlot(_ctx.$slots, "layer-node-tool", { data: nodeData }, void 0, void 0, 0) : config.slots?.layerNodeTool ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.layerNodeTool), {
 								key: 1,
 								data: nodeData
 							}, null, 8, ["data"])) : createCommentVNode("v-if", true)]),
@@ -270,15 +256,12 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 						} : void 0,
 						config.$key === "data-source" || config.slots?.dataSourcePanelTool ? {
 							name: "data-source-panel-tool",
-							fn: withCtx(({ data }) => [config.$key === "data-source" ? renderSlot(_ctx.$slots, "data-source-panel-tool", {
-								key: 0,
-								data
-							}) : config.slots?.DataSourcePanelTool ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.DataSourcePanelTool), { key: 1 })) : createCommentVNode("v-if", true)]),
+							fn: withCtx(({ data }) => [config.$key === "data-source" ? renderSlot(_ctx.$slots, "data-source-panel-tool", { data }, void 0, void 0, 0) : config.slots?.DataSourcePanelTool ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.DataSourcePanelTool), { key: 1 })) : createCommentVNode("v-if", true)]),
 							key: "10"
 						} : void 0,
 						config.$key === "data-source" || config.slots?.dataSourcePanelSearch ? {
 							name: "data-source-panel-search",
-							fn: withCtx(() => [config.$key === "data-source" ? renderSlot(_ctx.$slots, "data-source-panel-search", { key: 0 }) : config.slots?.dataSourcePanelSearch ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.dataSourcePanelSearch), { key: 1 })) : createCommentVNode("v-if", true)]),
+							fn: withCtx(() => [config.$key === "data-source" ? renderSlot(_ctx.$slots, "data-source-panel-search", {}, void 0, void 0, 0) : config.slots?.dataSourcePanelSearch ? (openBlock(), createBlock(resolveDynamicComponent(config.slots.dataSourcePanelSearch), { key: 1 })) : createCommentVNode("v-if", true)]),
 							key: "11"
 						} : void 0
 					]), 1040)) : createCommentVNode("v-if", true)], 2)), [[vShow, [
@@ -301,6 +284,7 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 					"onUpdate:height": _cache[2] || (_cache[2] = ($event) => columnLeftHeight.value = $event),
 					width: columnLeftWidth.value,
 					title: config.text,
+					"framework-width": frameworkWidth.value,
 					position: {
 						left: unref(floatBoxStates)[config.$key].left,
 						top: unref(floatBoxStates)[config.$key].top
@@ -317,6 +301,7 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 					"height",
 					"width",
 					"title",
+					"framework-width",
 					"position"
 				])) : createCommentVNode("v-if", true)], 64);
 			}), 256))]))], 64);

package/dist/es/layouts/sidebar/code-block/CodeBlockList.vue_vue_type_script_setup_true_lang.js

@@ -9,7 +9,7 @@ import { DepTargetType } from "@tmagic/core";
 import { computed, createBlock, createCommentVNode, createElementVNode, createVNode, defineComponent, normalizeClass, openBlock, renderSlot, toDisplayString, unref, withCtx, withModifiers } from "vue";
 import { Close, Edit, View } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue?vue&type=script&setup=true&lang.ts
-var CodeBlockList_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var CodeBlockList_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorCodeBlockList",
 	__name: "CodeBlockList",
 	props: {

package/dist/es/layouts/sidebar/code-block/CodeBlockListPanel.vue_vue_type_script_setup_true_lang.js

@@ -9,7 +9,7 @@ import { TMagicButton, TMagicScrollbar } from "@tmagic/design";
 import { Fragment, Teleport, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, inject, openBlock, renderSlot, unref, useTemplateRef, watch, withCtx } from "vue";
 //#region packages/editor/src/layouts/sidebar/code-block/CodeBlockListPanel.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "search-wrapper" };
-var CodeBlockListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var CodeBlockListPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorCodeBlockListPanel",
 	__name: "CodeBlockListPanel",
 	props: {
@@ -20,7 +20,7 @@ var CodeBlockListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE_
 	},
 	setup(__props) {
 		const props = __props;
-		const eventBus = inject("eventBus");
+		const eventBus = inject("eventBus", null);
 		const { codeBlockService } = useServices();
 		const editable = computed(() => codeBlockService.getEditStatus());
 		const { codeId, codeBlockEditor, codeConfig, editCode, deleteCode, createCodeBlock, submitCodeBlockHandler } = useCodeBlockEdit(codeBlockService);
@@ -37,10 +37,10 @@ var CodeBlockListPanel_vue_vue_type_script_setup_true_lang_default = /* @__PURE_
 		const editDialogCloseHandler = () => {
 			if (codeBlockListRef.value) for (const [, status] of codeBlockListRef.value.nodeStatusMap.entries()) status.selected = false;
 		};
-		const { nodeContentMenuHandler, menuData: contentMenuData, contentMenuHideHandler } = useContentMenu((id) => {
+		const { nodeContentMenuHandler, menuData: contentMenuData, contentMenuHideHandler, getTarget } = useContentMenu((id) => {
 			codeBlockListRef.value?.deleteCode(id, { historySource: "tree-contextmenu" });
 		});
-		const menuData = computed(() => props.customContentMenu(contentMenuData, "code-block"));
+		const menuData = computed(() => props.customContentMenu(contentMenuData, "code-block", getTarget));
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock(Fragment, null, [
 				createVNode(unref(TMagicScrollbar), { class: "m-editor-code-block-list m-editor-layer-panel" }, {

package/dist/es/layouts/sidebar/code-block/useContentMenu.js

@@ -3,9 +3,17 @@ import { cloneDeep } from "lodash-es";
 import { CopyDocument, Delete, Edit } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/sidebar/code-block/useContentMenu.ts
 var useContentMenu = (deleteCode) => {
-	const eventBus = inject("eventBus");
+	const eventBus = inject("eventBus", null);
 	const menuRef = useTemplateRef("menu");
 	let selectId = "";
+	let selectData = null;
+	const getTarget = () => {
+		if (!selectId) return null;
+		return {
+			id: selectId,
+			data: selectData ?? void 0
+		};
+	};
 	const menuData = [
 		{
 			type: "button",
@@ -43,17 +51,24 @@ var useContentMenu = (deleteCode) => {
 		event.preventDefault();
 		if (data.type === "code") {
 			menuRef.value?.show(event);
-			if (data.id) selectId = `${data.id}`;
-			else selectId = "";
+			if (data.id) {
+				selectId = `${data.id}`;
+				selectData = data;
+			} else {
+				selectId = "";
+				selectData = null;
+			}
 		}
 	};
 	const contentMenuHideHandler = () => {
 		selectId = "";
+		selectData = null;
 	};
 	return {
 		menuData,
 		nodeContentMenuHandler,
-		contentMenuHideHandler
+		contentMenuHideHandler,
+		getTarget
 	};
 };
 //#endregion

package/dist/es/layouts/sidebar/data-source/DataSourceAddButton.vue_vue_type_script_setup_true_lang.js

@@ -2,7 +2,7 @@ import ToolButton_default from "../../../components/ToolButton.js";
 import { TMagicButton, TMagicPopover } from "@tmagic/design";
 import { Fragment, createBlock, createElementBlock, createTextVNode, createVNode, defineComponent, guardReactiveProps, normalizeProps, openBlock, renderList, toDisplayString, unref, withCtx } from "vue";
 //#region packages/editor/src/layouts/sidebar/data-source/DataSourceAddButton.vue?vue&type=script&setup=true&lang.ts
-var DataSourceAddButton_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var DataSourceAddButton_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorDataSourceAddButton",
 	__name: "DataSourceAddButton",
 	props: {