@tmagic/editor 1.8.0-beta.12 → 1.8.0-beta.14

package/dist/es/fields/StyleSetter/pro/Layout.vue_vue_type_script_setup_true_lang.js

@@ -1,4 +1,9 @@
 import Box_default from "../components/Box.js";
+import Center_default from "../icons/align-items/Center.js";
+import FlexEnd_default from "../icons/align-items/FlexEnd.js";
+import FlexStart_default from "../icons/align-items/FlexStart.js";
+import SpaceAround_default from "../icons/align-items/SpaceAround.js";
+import SpaceBetween_default from "../icons/align-items/SpaceBetween.js";
 import Block_default from "../icons/display/Block.js";
 import Flex_default from "../icons/display/Flex.js";
 import Inline_default from "../icons/display/Inline.js";
@@ -8,12 +13,13 @@ import Column_default from "../icons/flex-direction/Column.js";
 import ColumnReverse_default from "../icons/flex-direction/ColumnReverse.js";
 import Row_default from "../icons/flex-direction/Row.js";
 import RowReverse_default from "../icons/flex-direction/RowReverse.js";
-import Center_default from "../icons/justify-content/Center.js";
-import FlexEnd_default from "../icons/justify-content/FlexEnd.js";
-import FlexStart_default from "../icons/justify-content/FlexStart.js";
-import SpaceAround_default from "../icons/justify-content/SpaceAround.js";
-import SpaceBetween_default from "../icons/justify-content/SpaceBetween.js";
+import Center_default$1 from "../icons/justify-content/Center.js";
+import FlexEnd_default$1 from "../icons/justify-content/FlexEnd.js";
+import FlexStart_default$1 from "../icons/justify-content/FlexStart.js";
+import SpaceAround_default$1 from "../icons/justify-content/SpaceAround.js";
+import SpaceBetween_default$1 from "../icons/justify-content/SpaceBetween.js";
 import { MContainer, defineFormConfig } from "@tmagic/form";
+import { useTheme } from "@tmagic/design";
 import { Fragment, createBlock, createElementBlock, createVNode, defineComponent, markRaw, openBlock, renderList, unref, vShow, withDirectives } from "vue";
 //#region packages/editor/src/fields/StyleSetter/pro/Layout.vue?vue&type=script&setup=true&lang.ts
 var Layout_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
@@ -24,18 +30,22 @@ var Layout_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 		isCompare: { type: Boolean },
 		disabled: { type: Boolean },
 		size: {},
+		theme: {},
 		prop: {}
 	},
 	emits: ["change", "addDiffCount"],
 	setup(__props, { emit: __emit }) {
+		const props = __props;
 		const emit = __emit;
+		const displayTheme = useTheme(props);
 		const formConfig = defineFormConfig([
 			{
 				name: "display",
 				text: "模式",
 				type: "radioGroup",
 				childType: "button",
-				labelWidth: "68px",
+				labelWidth: "90px",
+				iconSize: "24px",
 				options: [
 					{
 						value: "inline",
@@ -69,7 +79,8 @@ var Layout_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 				text: "主轴方向",
 				type: "radioGroup",
 				childType: "button",
-				labelWidth: "68px",
+				labelWidth: "90px",
+				iconSize: "24px",
 				options: [
 					{
 						value: "row",
@@ -99,31 +110,32 @@ var Layout_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 				text: "主轴对齐",
 				type: "radioGroup",
 				childType: "button",
-				labelWidth: "68px",
+				labelWidth: "90px",
+				iconSize: "24px",
 				options: [
 					{
 						value: "flex-start",
-						icon: markRaw(FlexStart_default),
+						icon: markRaw(FlexStart_default$1),
 						tooltip: "左对齐 flex-start"
 					},
 					{
 						value: "flex-end",
-						icon: markRaw(FlexEnd_default),
+						icon: markRaw(FlexEnd_default$1),
 						tooltip: "右对齐 flex-end"
 					},
 					{
 						value: "center",
-						icon: markRaw(Center_default),
+						icon: markRaw(Center_default$1),
 						tooltip: "居中 center"
 					},
 					{
 						value: "space-between",
-						icon: markRaw(SpaceBetween_default),
+						icon: markRaw(SpaceBetween_default$1),
 						tooltip: "两端对齐 space-between"
 					},
 					{
 						value: "space-around",
-						icon: markRaw(SpaceAround_default),
+						icon: markRaw(SpaceAround_default$1),
 						tooltip: "横向平分 space-around"
 					}
 				],
@@ -134,7 +146,8 @@ var Layout_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 				text: "辅轴对齐",
 				type: "radioGroup",
 				childType: "button",
-				labelWidth: "68px",
+				labelWidth: "90px",
+				iconSize: "24px",
 				options: [
 					{
 						value: "flex-start",
@@ -168,8 +181,9 @@ var Layout_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 				name: "flexWrap",
 				text: "换行",
 				type: "radioGroup",
-				childType: "button",
-				labelWidth: "68px",
+				childType: displayTheme.value !== "magic-admin" ? "button" : "default",
+				labelWidth: "90px",
+				iconSize: "24px",
 				options: [
 					{
 						value: "nowrap",
@@ -193,14 +207,18 @@ var Layout_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 				type: "row",
 				items: [{
 					name: "width",
-					text: "宽度",
-					labelWidth: "68px",
+					text: "宽度（px）",
+					labelWidth: "90px",
 					type: "data-source-field-select",
 					fieldConfig: { type: "text" }
-				}, {
+				}]
+			},
+			{
+				type: "row",
+				items: [{
 					name: "height",
-					text: "高度",
-					labelWidth: "68px",
+					text: "高度（px）",
+					labelWidth: "90px",
 					type: "data-source-field-select",
 					fieldConfig: { type: "text" }
 				}]
@@ -211,7 +229,7 @@ var Layout_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 					type: "data-source-field-select",
 					text: "overflow",
 					name: "overflow",
-					labelWidth: "68px",
+					labelWidth: "90px",
 					checkStrictly: false,
 					dataSourceFieldType: ["string"],
 					fieldConfig: {
@@ -249,11 +267,15 @@ var Layout_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCom
 							}
 						]
 					}
-				}, {
+				}]
+			},
+			{
+				type: "row",
+				items: [{
 					type: "data-source-field-select",
-					text: "透明度",
+					text: "透明度（%）",
 					name: "opacity",
-					labelWidth: "68px",
+					labelWidth: "90px",
 					dataSourceFieldType: ["string", "number"],
 					fieldConfig: { type: "text" }
 				}]

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

@@ -24,7 +24,10 @@ var UISelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineC
 		disabled: { type: Boolean },
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {

package/dist/es/hooks/use-compare-form.js

@@ -0,0 +1,119 @@
+import { getCodeBlockFormConfig } from "../utils/code-block.js";
+import { removeStyleDisplayConfig } from "../utils/props.js";
+import { computed, inject, provide, ref, useTemplateRef, watch, watchEffect } from "vue";
+//#region packages/editor/src/hooks/use-compare-form.ts
+/**
+* CompareForm / ViewForm 共用逻辑：
+* - 按 `category`(node / data-source / code-block) 加载 FormConfig（支持自定义 `loadConfig`）；
+* - 代码块 `content` 归一化为字符串；
+* - 外层容器固定高度 + 内部滚动的 `wrapperStyle`；
+* - 将 services / stage 注入 MForm.formState，保证 filterFunction 上下文一致。
+*
+* 两个组件的差异仅在于是否做新旧值对比，这部分逻辑保留在各自组件中。
+*/
+var useCompareForm = (props) => {
+	provide("services", props.services);
+	const config = ref([]);
+	/** vs-code 编辑器的 monaco 配置项，沿用 Editor 顶层 provide('codeOptions', ...) 的注入。 */
+	const codeOptions = inject("codeOptions", {});
+	/** 将代码块的 content 字段统一成字符串，便于在表单 / 对比中展示 */
+	const normalizeCodeBlockValue = (v) => {
+		if (!v) return {};
+		const next = { ...v };
+		if (next.content && typeof next.content !== "string") try {
+			next.content = next.content.toString();
+		} catch {
+			next.content = "";
+		}
+		return next;
+	};
+	const currentValues = computed(() => {
+		if (props.category === "code-block") return normalizeCodeBlockValue(props.value);
+		return props.value || {};
+	});
+	/**
+	* 外层包裹层的样式：当传入 `height` 时启用固定高度 + 内部滚动，
+	* 这样滚动条会出现在组件内部，避免父容器（如 Dialog）自身也产生滚动。
+	*/
+	const wrapperStyle = computed(() => {
+		if (!props.height) return void 0;
+		return {
+			height: props.height,
+			overflow: "auto"
+		};
+	});
+	const mergedExtendState = (state) => {
+		return (props.extendState ?? ((s) => s))(props.baseFormState || state);
+	};
+	/**
+	* 内置的默认 FormConfig 加载逻辑：按 `category` 从对应 service / 工具取配置。
+	* 作为 ctx.defaultLoadConfig 透传给自定义 `loadConfig`，方便复用与二次加工。
+	*/
+	const defaultLoadConfig = async () => {
+		if (!props.services) return [];
+		switch (props.category) {
+			case "node":
+				if (!props.type) return [];
+				return removeStyleDisplayConfig(await props.services.propsService.getPropsConfig(props.type, { node: props.value }));
+			case "data-source": return props.services.dataSourceService.getFormConfig(props.type || "base").map((item) => "type" in item && item.type === "tab" ? {
+				...item,
+				active: "fields"
+			} : item);
+			case "code-block": return getCodeBlockFormConfig({
+				paramColConfig: props.services.codeBlockService.getParamsColConfig(),
+				isDataSource: () => Boolean(props.dataSourceType),
+				dataSourceType: () => props.dataSourceType,
+				codeOptions,
+				editable: false
+			});
+			default: return [];
+		}
+	};
+	const loadConfig = async () => {
+		if (props.loadConfig) {
+			config.value = await props.loadConfig({
+				category: props.category,
+				type: props.type,
+				dataSourceType: props.dataSourceType,
+				defaultLoadConfig
+			});
+			return;
+		}
+		config.value = await defaultLoadConfig();
+	};
+	watch([
+		() => props.category,
+		() => props.type,
+		() => props.dataSourceType,
+		() => props.loadConfig
+	], () => {
+		loadConfig();
+	}, { immediate: true });
+	const formRef = useTemplateRef("form");
+	/**
+	* 把 services / stage 注入 MForm 的 formState，避免 propsService 注入的表单配置中
+	* 形如 `display: ({ services }) => services.uiService.get(...)` 的 filterFunction
+	* 在执行时拿不到 `formState.services` 而报错。
+	*
+	* 与 props-panel/FormPanel.vue 中的注入方式保持一致：
+	* - services：整个 useServices() 返回的服务集合；
+	* - stage：当前 editorService.get('stage') 的最新值。
+	*/
+	watchEffect(() => {
+		if (formRef.value && props.services) {
+			formRef.value.formState.stage = props.services.editorService.get("stage");
+			formRef.value.formState.services = props.services;
+		}
+	});
+	return {
+		config,
+		currentValues,
+		wrapperStyle,
+		mergedExtendState,
+		loadConfig,
+		formRef,
+		normalizeCodeBlockValue
+	};
+};
+//#endregion
+export { useCompareForm };

package/dist/es/icons/DatasourceIcon.js

@@ -0,0 +1,17 @@
+import _plugin_vue_export_helper_default from "../_virtual/_plugin-vue_export-helper.js";
+import { createElementBlock, createElementVNode, openBlock } from "vue";
+//#region packages/editor/src/icons/DatasourceIcon.vue
+var _sfc_main = {};
+var _hoisted_1 = {
+	xmlns: "http://www.w3.org/2000/svg",
+	width: "16",
+	height: "16",
+	viewBox: "0 0 16 16",
+	fill: "currentColor"
+};
+function _sfc_render(_ctx, _cache) {
+	return openBlock(), createElementBlock("svg", _hoisted_1, [..._cache[0] || (_cache[0] = [createElementVNode("path", { d: "M6.25 9.723C4.392 9.6095 2.804 9.137 1.875 8.4775V9.7495C1.875 10.6165 3.7665 11.3365 6.25 11.4745V12.348C4.392 12.2345 2.804 11.763 1.875 11.102V12.3745H1V4.0625C1 2.371 3.742 1 7.125 1C10.507 1 13.249 2.371 13.249 4.0625V6.8255H12.374V5.6405C11.3025 6.5295 9.352 7.1245 7.1245 7.1245C4.897 7.1245 2.947 6.5295 1.8745 5.6405V7.1245C1.8745 7.9915 3.7665 8.712 6.2495 8.85L6.25 9.723ZM7.125 14.999C3.742 14.999 1 13.8245 1 12.3745H1.875C1.875 13.3415 4.225 14.124 7.125 14.124V14.999ZM7.125 6.2495C10.024 6.2495 12.3745 5.2695 12.3745 4.0625C12.3745 2.855 10.0245 1.875 7.1245 1.875C4.225 1.875 1.8745 2.855 1.8745 4.0625C1.8745 5.2695 4.2255 6.2495 7.125 6.2495ZM14.7385 11.9895L14.1295 11.6345C14.1635 11.4485 14.1855 11.2585 14.1855 11.062C14.1843 10.8697 14.1655 10.6779 14.1295 10.489L14.7385 10.134C14.988 9.987 15.073 9.667 14.929 9.416L14.409 8.507C14.3752 8.44726 14.3299 8.39483 14.2757 8.35275C14.2215 8.31066 14.1595 8.27977 14.0933 8.26186C14.027 8.24395 13.9579 8.23938 13.8898 8.24842C13.8218 8.25745 13.7563 8.27992 13.697 8.3145L13.081 8.6735C12.7931 8.42269 12.4616 8.22694 12.103 8.096V7.6495C12.103 7.36 11.8705 7.1245 11.5825 7.1245H10.5415C10.4728 7.12476 10.4049 7.13855 10.3415 7.16507C10.2782 7.1916 10.2206 7.23034 10.1723 7.2791C10.1239 7.32785 10.0856 7.38565 10.0595 7.4492C10.0335 7.51276 10.0202 7.58082 10.0205 7.6495V8.096C9.66186 8.22694 9.33035 8.42269 9.0425 8.6735L8.4265 8.3145C8.36725 8.27999 8.30174 8.2576 8.23377 8.2486C8.1658 8.23961 8.09672 8.24419 8.03053 8.2621C7.96435 8.28001 7.90238 8.31088 7.84821 8.35292C7.79405 8.39495 7.74877 8.44733 7.715 8.507L7.195 9.417C7.12576 9.53751 7.10688 9.68047 7.14246 9.81482C7.17804 9.94917 7.2652 10.0641 7.385 10.1345L7.9945 10.489C7.9585 10.6775 7.9395 10.8695 7.9385 11.062C7.9385 11.2585 7.96 11.4485 7.9945 11.635L7.3855 11.99C7.1355 12.1365 7.0505 12.4565 7.1945 12.7075L7.715 13.6165C7.74877 13.6762 7.79405 13.7285 7.84821 13.7706C7.90238 13.8126 7.96435 13.8435 8.03053 13.8614C8.09672 13.8793 8.1658 13.8839 8.23377 13.8749C8.30174 13.8659 8.36725 13.8435 8.4265 13.809L9.0425 13.4505C9.33023 13.7015 9.66178 13.8972 10.0205 14.028V14.474C10.0205 14.764 10.2535 14.999 10.5415 14.999H11.5825C11.7211 14.9983 11.8538 14.9427 11.9514 14.8442C12.049 14.7458 12.1035 14.6126 12.103 14.474V14.028C12.4616 13.8971 12.7931 13.7013 13.081 13.4505L13.697 13.809C13.7563 13.8434 13.8218 13.8657 13.8897 13.8746C13.9577 13.8835 14.0267 13.8789 14.0929 13.861C14.159 13.8431 14.221 13.8123 14.2751 13.7703C14.3293 13.7283 14.3746 13.6761 14.4085 13.6165L14.929 12.7065C14.998 12.586 15.0168 12.4431 14.9811 12.3089C14.9454 12.1746 14.8583 12.0599 14.7385 11.9895ZM14.092 12.5065L13.852 12.915C13.8193 12.9693 13.7667 13.0086 13.7054 13.0246C13.6441 13.0406 13.579 13.0319 13.524 13.0005L12.8575 12.623C12.5109 13.0069 12.0497 13.2688 11.5425 13.37V13.889C11.5425 14.0185 11.4345 14.124 11.3015 14.124H10.822C10.7907 14.1243 10.7597 14.1184 10.7308 14.1067C10.7018 14.0949 10.6754 14.0776 10.6531 14.0557C10.6308 14.0338 10.6131 14.0077 10.6009 13.9789C10.5887 13.9502 10.5823 13.9193 10.582 13.888V13.37C10.0746 13.2689 9.61328 13.007 9.2665 12.623L8.6 13C8.54495 13.0316 8.47971 13.0403 8.4183 13.0243C8.35688 13.0083 8.30418 12.9689 8.2715 12.9145L8.0315 12.506C8.01582 12.4792 8.00564 12.4496 8.00158 12.4189C7.99752 12.3881 7.99965 12.3569 8.00785 12.327C8.01605 12.297 8.03016 12.2691 8.04933 12.2447C8.0685 12.2203 8.09236 12.2 8.1195 12.185L8.789 11.805C8.70604 11.5658 8.66313 11.3146 8.662 11.0615C8.662 10.8005 8.709 10.552 8.7895 10.3175L8.1195 9.9375C8.09247 9.92244 8.06872 9.90213 8.04964 9.87777C8.03056 9.85341 8.01654 9.82549 8.00839 9.79564C8.00024 9.76579 7.99813 9.73461 8.00218 9.70394C8.00624 9.67326 8.01637 9.64371 8.032 9.617L8.272 9.208C8.30467 9.15373 8.35729 9.1144 8.41858 9.09843C8.47988 9.08245 8.54499 9.09109 8.6 9.1225L9.2665 9.5005C9.61315 9.11663 10.0743 8.85468 10.5815 8.7535V8.235C10.5815 8.105 10.689 8 10.822 8H11.302C11.4345 8 11.542 8.105 11.542 8.236V8.754C12.0492 8.85518 12.5104 9.11713 12.857 9.501L13.524 9.123C13.579 9.09159 13.6441 9.08295 13.7054 9.09893C13.7667 9.1149 13.8193 9.15423 13.852 9.2085L14.092 9.6175C14.1077 9.64423 14.1179 9.67383 14.122 9.70455C14.1261 9.73528 14.124 9.76652 14.1159 9.79643C14.1077 9.82634 14.0937 9.85431 14.0745 9.87871C14.0554 9.90311 14.0316 9.92344 14.0045 9.9385L13.335 10.3185C13.4135 10.5525 13.462 10.801 13.462 11.062C13.462 11.3225 13.4145 11.571 13.335 11.8055L14.0045 12.1855C14.0316 12.2006 14.0554 12.2209 14.0745 12.2453C14.0937 12.2697 14.1077 12.2977 14.1159 12.3276C14.124 12.3575 14.1261 12.3887 14.122 12.4194C14.1179 12.4502 14.1077 12.4798 14.092 12.5065ZM11.062 9.7495C10.7139 9.7495 10.3801 9.88778 10.1339 10.1339C9.88778 10.3801 9.7495 10.7139 9.7495 11.062C9.7495 11.4101 9.88778 11.7439 10.1339 11.9901C10.3801 12.2362 10.7139 12.3745 11.062 12.3745C11.4101 12.3745 11.7439 12.2362 11.9901 11.9901C12.2362 11.7439 12.3745 11.4101 12.3745 11.062C12.3745 10.7139 12.2362 10.3801 11.9901 10.1339C11.7439 9.88778 11.4101 9.7495 11.062 9.7495ZM11.062 11.4995C10.946 11.4995 10.8347 11.4534 10.7526 11.3714C10.6706 11.2893 10.6245 11.178 10.6245 11.062C10.6245 10.946 10.6706 10.8347 10.7526 10.7526C10.8347 10.6706 10.946 10.6245 11.062 10.6245C11.178 10.6245 11.2893 10.6706 11.3714 10.7526C11.4534 10.8347 11.4995 10.946 11.4995 11.062C11.4995 11.178 11.4534 11.2893 11.3714 11.3714C11.2893 11.4534 11.178 11.4995 11.062 11.4995Z" }, null, -1)])]);
+}
+var DatasourceIcon_default = /*#__PURE__*/ _plugin_vue_export_helper_default(_sfc_main, [["render", _sfc_render]]);
+//#endregion
+export { DatasourceIcon_default as default };

package/dist/es/index.js

@@ -1,8 +1,10 @@
 import { CODE_DRAFT_STORAGE_KEY, CodeDeleteErrorType, ColumnLayout, DragType, KeyBindingCommand, Keys, LayerOffset, Layout, SideItemKey, canUsePluginMethods } from "./type.js";
 import { useCodeBlockEdit } from "./hooks/use-code-block-edit.js";
-import { advancedTabConfig, arrayOptions, booleanOptions, displayTabConfig, eqOptions, eventTabConfig, fillConfig, getCondOpOptionsByFieldType, numberOptions, styleTabConfig, validatePropsForm } from "./utils/props.js";
+import { getEditorConfig, isGlobalFlat, setEditorConfig } from "./utils/config.js";
+import { getCodeBlockFormConfig } from "./utils/code-block.js";
+import { advancedTabConfig, arrayOptions, booleanOptions, displayTabConfig, eqOptions, eventTabConfig, fillConfig, getCondOpOptionsByFieldType, numberOptions, removeStyleDisplayConfig, styleTabConfig, validatePropsForm } from "./utils/props.js";
+import { useCompareForm } from "./hooks/use-compare-form.js";
 import props_default from "./services/props.js";
-import { getEditorConfig, setEditorConfig } from "./utils/config.js";
 import { UndoRedo } from "./utils/undo-redo.js";
 import { createStackStep, describeRevertStep, deserializeStacks, detectStackOpType, detectTargetId, detectTargetName, getLastPushedHistoryIds, getOrCreateStack, markStackSaved, mergeSteps, serializeStacks, undoFloor } from "./utils/history.js";
 import { idbDelete, idbGet, idbSet, isIndexedDBSupported, openIndexedDB } from "./utils/indexed-db.js";
@@ -23,7 +25,6 @@ import { useFilter } from "./hooks/use-filter.js";
 import { useGetSo } from "./hooks/use-getso.js";
 import { useNextFloatBoxPosition } from "./hooks/use-next-float-box-position.js";
 import { useNodeStatus } from "./hooks/use-node-status.js";
-import { getCodeBlockFormConfig } from "./utils/code-block.js";
 import { debug, error, info, log, warn } from "./utils/logger.js";
 import { getCascaderOptionsFromFields, getDisplayField, getFieldType, getFormConfig, getFormValue, resolveFieldByPath } from "./utils/data-source/index.js";
 import { IdleTask } from "./utils/dep/idle-task.js";
@@ -74,6 +75,7 @@ import Index_default from "./fields/DataSourceFieldSelect/Index.js";
 import EventSelect_default from "./fields/EventSelect.js";
 import KeyValue_default from "./fields/KeyValue.js";
 import CompareForm_default from "./components/CompareForm.js";
+import ViewForm_default from "./components/ViewForm.js";
 import HistoryDiffDialog_default from "./layouts/history-list/HistoryDiffDialog.js";
 import PageFragmentSelect_default from "./fields/PageFragmentSelect.js";
 import DisplayConds_default from "./fields/DisplayConds.js";
@@ -90,4 +92,4 @@ export * from "@tmagic/table";
 export * from "@tmagic/stage";
 export * from "@tmagic/design";
 export * from "@tmagic/utils";
-export { ALL_COND_OPS, CODE_DRAFT_STORAGE_KEY, COPY_CODE_STORAGE_KEY, COPY_DS_STORAGE_KEY, COPY_STORAGE_KEY, CodeBlockEditor_default as CodeBlockEditor, CodeBlockList_default as CodeBlockList, CodeBlockListPanel_default as CodeBlockListPanel, CodeDeleteErrorType, CodeSelect_default as CodeSelect, CodeSelectCol_default as CodeSelectCol, ColumnLayout, CompareForm_default as CompareForm, ComponentListPanel_default as ComponentListPanel, CondOpSelect_default as CondOpSelect, ContentMenu_default as ContentMenu, DEFAULT_LEFT_COLUMN_WIDTH, DEFAULT_RIGHT_COLUMN_WIDTH, DataSourceAddButton_default as DataSourceAddButton, DataSourceConfigPanel_default as DataSourceConfigPanel, Index_default as DataSourceFieldSelect, DataSourceFields_default as DataSourceFields, DataSourceInput_default as DataSourceInput, DataSourceMethodSelect_default as DataSourceMethodSelect, DataSourceMethods_default as DataSourceMethods, DataSourceMocks_default as DataSourceMocks, DataSourceSelect_default as DataSourceSelect, DepTargetType, DisplayConds_default as DisplayConds, DragType, EVENT_NAME_VALUE_SEPARATOR, EventSelect_default as EventSelect, Fixed2Other, FloatingBox_default as FloatingBox, H_GUIDE_LINE_STORAGE_KEY, HistoryDiffDialog_default as HistoryDiffDialog, Bucket_default as HistoryListBucket, BucketTab_default as HistoryListBucketTab, Icon_default as Icon, IdleTask, KeyBindingCommand, KeyValue_default as KeyValue, Keys, LEFT_COLUMN_WIDTH_STORAGE_KEY, LayerNodeContent_default as LayerNodeContent, LayerOffset, LayerPanel_default as LayerPanel, Layout, SplitView_default as LayoutContainer, MIN_CENTER_COLUMN_WIDTH, MIN_LEFT_COLUMN_WIDTH, MIN_RIGHT_COLUMN_WIDTH, PROPS_PANEL_WIDTH_STORAGE_KEY, PageFragmentSelect_default as PageFragmentSelect, FormPanel_default as PropsFormPanel, PropsPanel_default as PropsPanel, RIGHT_COLUMN_WIDTH_STORAGE_KEY, Resizer_default as Resizer, ScrollViewer, SideItemKey, SplitView_default as SplitView, StageCore, Index_default$1 as StyleSetter, CodeEditor_default as TMagicCodeEditor, Editor_default as TMagicEditor, ToolButton_default as ToolButton, Tree_default as Tree, TreeNode_default as TreeNode, UI_SELECT_MODE_EVENT_NAME, UndoRedo, V_GUIDE_LINE_STORAGE_KEY, advancedTabConfig, arrayOptions, beforePaste, booleanOptions, buildChangeRecords, calcAlignCenterStyle, calcLayerTargetIndex, calcMoveStyle, canUsePluginMethods, change2Fixed, classifyDragSources, codeBlock_default as codeBlockService, collectEventNameOptionValues, collectRelatedNodes, componentList_default as componentListService, confirmHistoryAction, createStackStep, dataSource_default as dataSourceService, debug, plugin_default as default, defaultIsExpandable, dep_default as depService, describeRevertStep, describeStepForRevert, deserializeStacks, designPlugin, detectStackOpType, detectTargetId, detectTargetName, displayTabConfig, editorNodeMergeCustomizer, editor_default as editorService, editorTypeMatchRules, eqOptions, error, eventTabConfig, events_default as eventsService, fillConfig, fixNodeLeft, fixNodePosition, formPlugin, generatePageName, generatePageNameByApp, getAddParent, getCascaderOptionsFromFields, getCodeBlockFormConfig, getCompActionAllowedValues, getCompActionOptions, getCondOpOptionsByFieldType, getDefaultConfig, getDisplayField, getEditorConfig, getEventNameAllowedValues, getEventNameOptions, getFieldType, getFormConfig, getFormValue, getGuideLineFromCache, getInitPositionStyle, getLastPushedHistoryIds, getNodeIndex, getOrCreateStack, getPageFragmentList, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, history_default as historyService, idbDelete, idbGet, idbSet, info, isEventNameCheckStrictly, isIncludeDataSource, isIndexedDBSupported, keybinding_default as keybindingService, monaco_editor_default as loadMonaco, log, markStackSaved, mergeSteps, moveItemsInContainer, normalizeCompActionValue, numberOptions, openIndexedDB, props_default as propsService, resolveFieldByPath, resolveSelectedNode, serializeConfig, serializeStacks, setChildrenLayout, setEditorConfig, setLayout, stageOverlay_default as stageOverlayService, storage_default as storageService, styleTabConfig, tablePlugin, toggleFixedPosition, ui_default as uiService, undoFloor, updateStatus, useCodeBlockEdit, useEditorContentHeight, useFilter, useFloatBox, useGetSo, useHistoryRevert, useNextFloatBoxPosition, useNodeStatus, useServices, useStage, useWindowRect, validatePropsForm, warn };
+export { ALL_COND_OPS, CODE_DRAFT_STORAGE_KEY, COPY_CODE_STORAGE_KEY, COPY_DS_STORAGE_KEY, COPY_STORAGE_KEY, CodeBlockEditor_default as CodeBlockEditor, CodeBlockList_default as CodeBlockList, CodeBlockListPanel_default as CodeBlockListPanel, CodeDeleteErrorType, CodeSelect_default as CodeSelect, CodeSelectCol_default as CodeSelectCol, ColumnLayout, CompareForm_default as CompareForm, ComponentListPanel_default as ComponentListPanel, CondOpSelect_default as CondOpSelect, ContentMenu_default as ContentMenu, DEFAULT_LEFT_COLUMN_WIDTH, DEFAULT_RIGHT_COLUMN_WIDTH, DataSourceAddButton_default as DataSourceAddButton, DataSourceConfigPanel_default as DataSourceConfigPanel, Index_default as DataSourceFieldSelect, DataSourceFields_default as DataSourceFields, DataSourceInput_default as DataSourceInput, DataSourceMethodSelect_default as DataSourceMethodSelect, DataSourceMethods_default as DataSourceMethods, DataSourceMocks_default as DataSourceMocks, DataSourceSelect_default as DataSourceSelect, DepTargetType, DisplayConds_default as DisplayConds, DragType, EVENT_NAME_VALUE_SEPARATOR, EventSelect_default as EventSelect, Fixed2Other, FloatingBox_default as FloatingBox, H_GUIDE_LINE_STORAGE_KEY, HistoryDiffDialog_default as HistoryDiffDialog, Bucket_default as HistoryListBucket, BucketTab_default as HistoryListBucketTab, Icon_default as Icon, IdleTask, KeyBindingCommand, KeyValue_default as KeyValue, Keys, LEFT_COLUMN_WIDTH_STORAGE_KEY, LayerNodeContent_default as LayerNodeContent, LayerOffset, LayerPanel_default as LayerPanel, Layout, SplitView_default as LayoutContainer, MIN_CENTER_COLUMN_WIDTH, MIN_LEFT_COLUMN_WIDTH, MIN_RIGHT_COLUMN_WIDTH, PROPS_PANEL_WIDTH_STORAGE_KEY, PageFragmentSelect_default as PageFragmentSelect, FormPanel_default as PropsFormPanel, PropsPanel_default as PropsPanel, RIGHT_COLUMN_WIDTH_STORAGE_KEY, Resizer_default as Resizer, ScrollViewer, SideItemKey, SplitView_default as SplitView, StageCore, Index_default$1 as StyleSetter, CodeEditor_default as TMagicCodeEditor, Editor_default as TMagicEditor, ToolButton_default as ToolButton, Tree_default as Tree, TreeNode_default as TreeNode, UI_SELECT_MODE_EVENT_NAME, UndoRedo, V_GUIDE_LINE_STORAGE_KEY, ViewForm_default as ViewForm, advancedTabConfig, arrayOptions, beforePaste, booleanOptions, buildChangeRecords, calcAlignCenterStyle, calcLayerTargetIndex, calcMoveStyle, canUsePluginMethods, change2Fixed, classifyDragSources, codeBlock_default as codeBlockService, collectEventNameOptionValues, collectRelatedNodes, componentList_default as componentListService, confirmHistoryAction, createStackStep, dataSource_default as dataSourceService, debug, plugin_default as default, defaultIsExpandable, dep_default as depService, describeRevertStep, describeStepForRevert, deserializeStacks, designPlugin, detectStackOpType, detectTargetId, detectTargetName, displayTabConfig, editorNodeMergeCustomizer, editor_default as editorService, editorTypeMatchRules, eqOptions, error, eventTabConfig, events_default as eventsService, fillConfig, fixNodeLeft, fixNodePosition, formPlugin, generatePageName, generatePageNameByApp, getAddParent, getCascaderOptionsFromFields, getCodeBlockFormConfig, getCompActionAllowedValues, getCompActionOptions, getCondOpOptionsByFieldType, getDefaultConfig, getDisplayField, getEditorConfig, getEventNameAllowedValues, getEventNameOptions, getFieldType, getFormConfig, getFormValue, getGuideLineFromCache, getInitPositionStyle, getLastPushedHistoryIds, getNodeIndex, getOrCreateStack, getPageFragmentList, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, history_default as historyService, idbDelete, idbGet, idbSet, info, isEventNameCheckStrictly, isGlobalFlat, isIncludeDataSource, isIndexedDBSupported, keybinding_default as keybindingService, monaco_editor_default as loadMonaco, log, markStackSaved, mergeSteps, moveItemsInContainer, normalizeCompActionValue, numberOptions, openIndexedDB, props_default as propsService, removeStyleDisplayConfig, resolveFieldByPath, resolveSelectedNode, serializeConfig, serializeStacks, setChildrenLayout, setEditorConfig, setLayout, stageOverlay_default as stageOverlayService, storage_default as storageService, styleTabConfig, tablePlugin, toggleFixedPosition, ui_default as uiService, undoFloor, updateStatus, useCodeBlockEdit, useCompareForm, useEditorContentHeight, useFilter, useFloatBox, useGetSo, useHistoryRevert, useNextFloatBoxPosition, useNodeStatus, useServices, useStage, useWindowRect, validatePropsForm, warn };

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

@@ -6,13 +6,8 @@ import SplitView_default from "../components/SplitView.js";
 import PageBar_default from "./page-bar/PageBar.js";
 import AddPageBox_default from "./AddPageBox.js";
 import CodeEditor_default from "./CodeEditor.js";
-import { computed, createCommentVNode, createElementBlock, createSlots, createVNode, defineComponent, inject, onBeforeUnmount, onMounted, openBlock, renderSlot, unref, useTemplateRef, vShow, watch, withCtx, withDirectives } from "vue";
+import { computed, createCommentVNode, createElementBlock, createSlots, createVNode, defineComponent, inject, normalizeClass, onBeforeUnmount, onMounted, openBlock, renderSlot, unref, useTemplateRef, vShow, watch, withCtx, withDirectives } from "vue";
 //#region packages/editor/src/layouts/Framework.vue?vue&type=script&setup=true&lang.ts
-var _hoisted_1 = {
-	class: "m-editor",
-	ref: "content",
-	style: { "min-width": "900px" }
-};
 var Framework_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorFramework",
 	__name: "Framework",
@@ -20,7 +15,8 @@ var Framework_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 		disabledPageFragment: { type: Boolean },
 		pageBarSortOptions: {},
 		pageFilterFunction: { type: Function },
-		hideSidebar: { type: Boolean }
+		hideSidebar: { type: Boolean },
+		theme: {}
 	},
 	setup(__props) {
 		const props = __props;
@@ -42,7 +38,7 @@ var Framework_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 		watch(() => uiService.get("hideSlideBar"), (hideSlideBar) => {
 			uiService.set("columnWidth", {
 				...columnWidth.value,
-				left: hideSlideBar ? 0 : storageService.getItem("$MagicEditorLeftColumnWidthData", { protocol: Protocol.NUMBER }) || 310
+				left: hideSlideBar ? 0 : storageService.getItem("$MagicEditorLeftColumnWidthData", { protocol: Protocol.NUMBER }) || 345
 			});
 		});
 		const columnWidthChange = (columnW) => {
@@ -75,7 +71,15 @@ var Framework_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 			}
 		};
 		return (_ctx, _cache) => {
-			return openBlock(), createElementBlock("div", _hoisted_1, [
+			return openBlock(), createElementBlock("div", {
+				ref: "content",
+				class: normalizeClass([
+					"m-editor",
+					__props.theme ? `m-editor--${__props.theme}` : "",
+					__props.theme ? `m-theme--${__props.theme}` : ""
+				]),
+				style: { "min-width": "900px" }
+			}, [
 				renderSlot(_ctx.$slots, "header"),
 				renderSlot(_ctx.$slots, "nav"),
 				renderSlot(_ctx.$slots, "content-before"),
@@ -134,7 +138,7 @@ var Framework_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ define
 				]), [[vShow, !showSrc.value]]),
 				renderSlot(_ctx.$slots, "content-after"),
 				renderSlot(_ctx.$slots, "footer")
-			], 512);
+			], 2);
 		};
 	}
 });

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

@@ -42,18 +42,27 @@ var PropsPanel_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defin
 			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, error, source = "props") => {

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,
@@ -82,7 +82,7 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCo
 				[SideItemKey.COMPONENT_LIST]: {
 					$key: SideItemKey.COMPONENT_LIST,
 					type: "component",
-					icon: Goods,
+					icon: Box,
 					text: "组件",
 					component: ComponentListPanel_default,
 					slots: {}
@@ -90,7 +90,7 @@ var Sidebar_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCo
 				layer: {
 					$key: SideItemKey.LAYER,
 					type: "component",
-					icon: List,
+					icon: Finished,
 					text: "已选组件",
 					props: {
 						layerContentMenu: props.layerContentMenu,

package/dist/es/plugin.js

@@ -28,7 +28,8 @@ import designPlugin from "@tmagic/design";
 var defaultInstallOpt = {
 	parseDSL: (dsl) => eval(dsl),
 	customCreateMonacoEditor: (monaco, codeEditorEl, options) => monaco.editor.create(codeEditorEl, options),
-	customCreateMonacoDiffEditor: (monaco, codeEditorEl, options) => monaco.editor.createDiffEditor(codeEditorEl, options)
+	customCreateMonacoDiffEditor: (monaco, codeEditorEl, options) => monaco.editor.createDiffEditor(codeEditorEl, options),
+	flat: false
 };
 var plugin_default = { install: (app, opt) => {
 	const option = Object.assign(defaultInstallOpt, opt || {});

package/dist/es/services/codeBlock.js

@@ -1,6 +1,6 @@
 import { CODE_DRAFT_STORAGE_KEY } from "../type.js";
-import BaseService from "./BaseService.js";
 import { getEditorConfig } from "../utils/config.js";
+import BaseService from "./BaseService.js";
 import { createStackStep, describeRevertStep, getLastPushedHistoryIds } from "../utils/history.js";
 import history_default from "./history.js";
 import storage_default, { Protocol } from "./storage.js";