@tmagic/editor 1.8.0-beta.2 → 1.8.0-beta.21

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

@@ -1,7 +1,7 @@
 import { computed, createElementBlock, createElementVNode, defineComponent, normalizeClass, normalizeStyle, onBeforeUnmount, onMounted, openBlock, useTemplateRef } from "vue";
 import Gesto from "gesto";
 //#region packages/editor/src/components/ScrollBar.vue?vue&type=script&setup=true&lang.ts
-var ScrollBar_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var ScrollBar_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorScrollBar",
 	__name: "ScrollBar",
 	props: {

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

@@ -7,7 +7,7 @@ var _hoisted_1 = {
 	class: "m-editor-scroll-viewer-container",
 	ref: "container"
 };
-var ScrollViewer_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var ScrollViewer_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorScrollViewer",
 	__name: "ScrollViewer",
 	props: {

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

@@ -2,7 +2,7 @@ import { TMagicIcon, TMagicInput } from "@tmagic/design";
 import { createBlock, createVNode, defineComponent, openBlock, ref, unref, withCtx } from "vue";
 import { Search } from "@element-plus/icons-vue";
 //#region packages/editor/src/components/SearchInput.vue?vue&type=script&setup=true&lang.ts
-var SearchInput_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var SearchInput_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorSearchInput",
 	__name: "SearchInput",
 	emits: ["search"],

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

@@ -1,7 +1,7 @@
 import Resizer_default from "./Resizer.js";
 import { Fragment, computed, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, normalizeClass, normalizeStyle, onBeforeUnmount, onMounted, openBlock, ref, renderSlot, useTemplateRef, watchEffect } from "vue";
 //#region packages/editor/src/components/SplitView.vue?vue&type=script&setup=true&lang.ts
-var SplitView_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var SplitView_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorSplitView",
 	__name: "SplitView",
 	props: {

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

@@ -9,7 +9,7 @@ var _hoisted_1 = {
 	class: "menu-item-text"
 };
 var _hoisted_2 = { class: "el-dropdown-link menubar-menu-button" };
-var ToolButton_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var ToolButton_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorToolButton",
 	__name: "ToolButton",
 	props: {
@@ -73,11 +73,11 @@ var ToolButton_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 				placement: "bottom-start",
 				content: __props.data.tooltip
 			}, {
-				default: withCtx(() => [createVNode(unref(TMagicButton), {
+				default: withCtx(() => [createVNode(unref(TMagicButton), mergeProps({
 					size: "small",
 					link: "",
 					disabled: disabled.value
-				}, createSlots({ _: 2 }, [__props.data.icon ? {
+				}, __props.data.buttonProps || {}), createSlots({ _: 2 }, [__props.data.icon ? {
 					name: "icon",
 					fn: withCtx(() => [createVNode(Icon_default, { icon: __props.data.icon }, null, 8, ["icon"])]),
 					key: "0"
@@ -85,15 +85,15 @@ var ToolButton_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 					name: "default",
 					fn: withCtx(() => [createTextVNode(toDisplayString(__props.data.text), 1)]),
 					key: "1"
-				} : void 0]), 1032, ["disabled"])]),
+				} : void 0]), 1040, ["disabled"])]),
 				_: 1
-			}, 8, ["content"])) : (openBlock(), createBlock(unref(TMagicButton), {
+			}, 8, ["content"])) : (openBlock(), createBlock(unref(TMagicButton), mergeProps({
 				key: 1,
 				size: "small",
 				link: "",
 				disabled: disabled.value,
 				title: __props.data.text
-			}, createSlots({ _: 2 }, [__props.data.icon ? {
+			}, __props.data.buttonProps || {}), createSlots({ _: 2 }, [__props.data.icon ? {
 				name: "icon",
 				fn: withCtx(() => [createVNode(Icon_default, { icon: __props.data.icon }, null, 8, ["icon"])]),
 				key: "0"
@@ -101,7 +101,7 @@ var ToolButton_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 				name: "default",
 				fn: withCtx(() => [createTextVNode(toDisplayString(__props.data.text), 1)]),
 				key: "1"
-			} : void 0]), 1032, ["disabled", "title"]))], 64)) : __props.data.type === "dropdown" ? (openBlock(), createBlock(unref(TMagicDropdown), {
+			} : void 0]), 1040, ["disabled", "title"]))], 64)) : __props.data.type === "dropdown" ? (openBlock(), createBlock(unref(TMagicDropdown), {
 				key: 3,
 				trigger: "click",
 				disabled: disabled.value,

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

@@ -5,7 +5,7 @@ var _hoisted_1 = {
 	key: 1,
 	class: "m-editor-tree-empty"
 };
-var Tree_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Tree_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorTree",
 	__name: "Tree",
 	props: {

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

@@ -16,7 +16,7 @@ var _hoisted_4 = {
 	key: 0,
 	class: "m-editor-tree-node-children"
 };
-var TreeNode_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var TreeNode_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorTreeNode",
 	__name: "TreeNode",
 	props: {

package/dist/es/components/ViewForm.js

@@ -0,0 +1,5 @@
+import ViewForm_vue_vue_type_script_setup_true_lang_default from "./ViewForm.vue_vue_type_script_setup_true_lang.js";
+//#region packages/editor/src/components/ViewForm.vue
+var ViewForm_default = ViewForm_vue_vue_type_script_setup_true_lang_default;
+//#endregion
+export { ViewForm_default as default };

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

@@ -0,0 +1,58 @@
+import { useCompareForm } from "../hooks/use-compare-form.js";
+import { MForm } from "@tmagic/form";
+import { createBlock, createCommentVNode, createElementBlock, defineComponent, normalizeStyle, openBlock, unref } from "vue";
+//#region packages/editor/src/components/ViewForm.vue?vue&type=script&setup=true&lang.ts
+var ViewForm_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
+	name: "MEditorViewForm",
+	__name: "ViewForm",
+	props: {
+		value: {},
+		type: {},
+		category: { default: "node" },
+		dataSourceType: {},
+		labelWidth: { default: "120px" },
+		height: {},
+		extendState: {},
+		baseFormState: {},
+		size: {},
+		loadConfig: {},
+		services: {},
+		disabled: {
+			type: Boolean,
+			default: true
+		}
+	},
+	setup(__props, { expose: __expose }) {
+		const { config, currentValues, wrapperStyle, mergedExtendState, loadConfig, formRef } = useCompareForm(__props);
+		__expose({
+			form: formRef,
+			config,
+			reload: loadConfig
+		});
+		return (_ctx, _cache) => {
+			return openBlock(), createElementBlock("div", {
+				class: "m-editor-view-form-wrapper",
+				style: normalizeStyle(unref(wrapperStyle))
+			}, [unref(config).length ? (openBlock(), createBlock(unref(MForm), {
+				key: 0,
+				ref: "form",
+				class: "m-editor-view-form",
+				config: unref(config),
+				"init-values": unref(currentValues),
+				disabled: __props.disabled,
+				"label-width": __props.labelWidth,
+				"extend-state": unref(mergedExtendState),
+				size: __props.size
+			}, null, 8, [
+				"config",
+				"init-values",
+				"disabled",
+				"label-width",
+				"extend-state",
+				"size"
+			])) : createCommentVNode("v-if", true)], 4);
+		};
+	}
+});
+//#endregion
+export { ViewForm_vue_vue_type_script_setup_true_lang_default as default };

package/dist/es/editorProps.js

@@ -1,20 +1,28 @@
 import { CONTAINER_HIGHLIGHT_CLASS_NAME, ContainerHighlightType, RenderType } from "@tmagic/stage";
 import { getIdFromEl } from "@tmagic/utils";
 //#region packages/editor/src/editorProps.ts
+/**
+* 「属性配置表单校验」联动能力的 provide/inject 注入键。
+* 使用 Symbol 避免与其它字符串键冲突，供 PropsPanel / FormPanel 注入判断校验失败时是否仍更新节点并记录错误。
+*/
+var ENABLE_PROPS_FORM_VALIDATE = Symbol("enablePropsFormValidate");
 var defaultEditorProps = {
 	renderType: RenderType.IFRAME,
 	disabledMultiSelect: false,
 	alwaysMultiSelect: false,
 	disabledPageFragment: false,
+	disabledFlashTip: false,
 	disabledStageOverlay: false,
 	containerHighlightClassName: CONTAINER_HIGHLIGHT_CLASS_NAME,
 	containerHighlightDuration: 800,
 	containerHighlightType: ContainerHighlightType.DEFAULT,
+	containerHighlightAddOnly: false,
 	disabledShowSrc: false,
 	disabledDataSource: false,
 	disabledCodeBlock: false,
 	componentGroupList: () => [],
 	datasourceList: () => [],
+	historyListExtraTabs: () => [],
 	menu: () => ({
 		left: [],
 		right: []
@@ -32,4 +40,4 @@ var defaultEditorProps = {
 	customContentMenu: (menus) => menus
 };
 //#endregion
-export { defaultEditorProps };
+export { ENABLE_PROPS_FORM_VALIDATE, defaultEditorProps };

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

@@ -1,7 +1,8 @@
 import CodeEditor_default from "../layouts/CodeEditor.js";
-import { computed, createBlock, defineComponent, openBlock } from "vue";
+import { FORM_SILENT_MODE_KEY } from "@tmagic/form";
+import { computed, createBlock, createCommentVNode, defineComponent, inject, openBlock, unref } from "vue";
 //#region packages/editor/src/fields/Code.vue?vue&type=script&setup=true&lang.ts
-var Code_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Code_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFieldsVsCode",
 	__name: "Code",
 	props: {
@@ -17,10 +18,19 @@ var Code_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 		},
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {
+		/**
+		* 静默模式（submitForm/validateForm 隐藏挂载）下跳过 monaco 渲染：
+		* 校验由 FormItem 针对 model 中的值完成，与编辑器实例无关；本组件挂载无值副作用
+		* （save 仅由用户操作/编辑器内容变更触发），跳过可省去 monaco worker/model 的无谓实例化。
+		*/
+		const silentMode = inject(FORM_SILENT_MODE_KEY, false);
 		const emit = __emit;
 		const props = __props;
 		/**
@@ -38,7 +48,8 @@ var Code_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 			emit("change", v);
 		};
 		return (_ctx, _cache) => {
-			return openBlock(), createBlock(CodeEditor_default, {
+			return !unref(silentMode) ? (openBlock(), createBlock(CodeEditor_default, {
+				key: 0,
 				height: __props.config.height,
 				type: diffMode.value ? "diff" : void 0,
 				"init-values": diffMode.value ? (__props.lastValues || {})[__props.name] : __props.model[__props.name],
@@ -62,7 +73,7 @@ var Code_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCom
 				"autosize",
 				"parse",
 				"editor-custom-type"
-			]);
+			])) : createCommentVNode("v-if", true);
 		};
 	}
 });

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

@@ -1,8 +1,8 @@
 import { getEditorConfig } from "../utils/config.js";
+import { serializeConfig } from "../utils/editor.js";
 import { computed, createBlock, defineComponent, openBlock, reactive, resolveComponent, watch } from "vue";
-import serialize from "serialize-javascript";
 //#region packages/editor/src/fields/CodeLink.vue?vue&type=script&setup=true&lang.ts
-var CodeLink_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var CodeLink_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFieldsCodeLink",
 	__name: "CodeLink",
 	props: {
@@ -15,7 +15,10 @@ var CodeLink_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defin
 		disabled: { type: Boolean },
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {
@@ -39,10 +42,7 @@ var CodeLink_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defin
 		});
 		const modelValue = reactive({ form: { [props.name]: "" } });
 		watch(() => props.model[props.name], (value) => {
-			modelValue.form = { [props.name]: serialize(value, {
-				space: 2,
-				unsafe: true
-			}).replace(/"(\w+)":\s/g, "$1: ") };
+			modelValue.form = { [props.name]: serializeConfig(value) };
 		}, { immediate: true });
 		const changeHandler = (v) => {
 			if (!props.name || !props.model) return;

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

@@ -1,11 +1,12 @@
 import { useServices } from "../hooks/use-services.js";
 import { MContainer } from "@tmagic/form";
-import { TMagicCard } from "@tmagic/design";
+import { TMagicButton, TMagicCard } from "@tmagic/design";
 import { HookCodeType, HookType } from "@tmagic/core";
-import { computed, createElementBlock, createVNode, defineComponent, normalizeClass, openBlock, unref, watch, withCtx } from "vue";
+import { computed, createElementBlock, createTextVNode, createVNode, defineComponent, normalizeClass, openBlock, toDisplayString, unref, watch, withCtx } from "vue";
 import { isEmpty } from "lodash-es";
+import { Plus } from "@element-plus/icons-vue";
 //#region packages/editor/src/fields/CodeSelect.vue?vue&type=script&setup=true&lang.ts
-var CodeSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var CodeSelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFieldsCodeSelect",
 	__name: "CodeSelect",
 	props: {
@@ -18,7 +19,10 @@ var CodeSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		disabled: { type: Boolean },
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {
@@ -39,11 +43,21 @@ var CodeSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		* 仅当存在历史值时才启用对比，避免 lastValues 缺失时退化为「全部新增」的空对比。
 		*/
 		const isCompareMode = computed(() => Boolean(props.isCompare && props.lastValues));
+		const newHandler = () => {
+			const defaultCode = {
+				codeType: HookCodeType.CODE,
+				codeId: ""
+			};
+			const name = props.config.name || "";
+			const hookData = props.model[name]?.hookData || [];
+			emit("change", defaultCode, { modifyKey: `hookData.${hookData.length}` });
+		};
 		const codeConfig = computed(() => ({
 			type: "group-list",
 			name: "hookData",
 			enableToggleMode: false,
 			expandAll: true,
+			addable: () => false,
 			title: (mForm, { model, index }) => {
 				if (model.codeType === HookCodeType.DATA_SOURCE_METHOD) {
 					if (Array.isArray(model.codeId)) {
@@ -56,45 +70,54 @@ var CodeSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 				if (codeContent) return codeContent.name;
 				return model.codeId || index;
 			},
-			items: [{
-				type: "row",
-				items: [
-					{
-						type: "select",
-						name: "codeType",
-						span: 6,
-						options: [{
-							value: HookCodeType.CODE,
-							text: "代码块"
-						}, {
-							value: HookCodeType.DATA_SOURCE_METHOD,
-							text: "数据源方法"
-						}],
-						defaultValue: "code",
-						onChange: (_mForm, v, { setModel }) => {
-							if (v === HookCodeType.DATA_SOURCE_METHOD) setModel("codeId", []);
-							else setModel("codeId", "");
-							return v;
-						}
-					},
-					{
-						type: "code-select-col",
-						name: "codeId",
-						span: 18,
-						labelWidth: 0,
-						display: (_mForm, { model }) => model.codeType !== HookCodeType.DATA_SOURCE_METHOD,
-						notEditable: () => !codeBlockService.getEditStatus()
-					},
-					{
-						type: "data-source-method-select",
-						name: "codeId",
-						span: 18,
-						labelWidth: 0,
-						display: (_mForm, { model }) => model.codeType === HookCodeType.DATA_SOURCE_METHOD,
-						notEditable: () => !dataSourceService.get("editable")
+			titlePrefix: props.config.name === void 0 ? void 0 : String(props.config.name),
+			items: [
+				{
+					text: "代码类型",
+					type: "select",
+					name: "codeType",
+					labelPosition: "right",
+					rules: [{
+						typeMatch: true,
+						trigger: "change"
+					}],
+					options: [{
+						value: HookCodeType.CODE,
+						text: "代码块"
+					}, {
+						value: HookCodeType.DATA_SOURCE_METHOD,
+						text: "数据源方法"
+					}],
+					defaultValue: HookCodeType.CODE,
+					onChange: (_mForm, v, { setModel }) => {
+						if (v === HookCodeType.DATA_SOURCE_METHOD) setModel("codeId", []);
+						else setModel("codeId", "");
+						return v;
 					}
-				]
-			}]
+				},
+				{
+					type: "code-select-col",
+					name: "codeId",
+					text: "代码块",
+					rules: [{
+						typeMatch: true,
+						trigger: "change"
+					}],
+					display: (_mForm, { model }) => model.codeType !== HookCodeType.DATA_SOURCE_METHOD,
+					notEditable: () => !codeBlockService.getEditStatus()
+				},
+				{
+					type: "data-source-method-select",
+					name: "codeId",
+					text: "数据源字段",
+					rules: [{
+						typeMatch: true,
+						trigger: "change"
+					}],
+					display: (_mForm, { model }) => model.codeType === HookCodeType.DATA_SOURCE_METHOD,
+					notEditable: () => !dataSourceService.get("editable")
+				}
+			]
 		}));
 		watch(() => props.model[props.name], (value) => {
 			if (isEmpty(value)) props.model[props.name] = {
@@ -104,10 +127,11 @@ var CodeSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 		}, { immediate: true });
 		const changeHandler = (v, eventData) => emit("change", v, eventData);
 		return (_ctx, _cache) => {
-			return openBlock(), createElementBlock("div", { class: normalizeClass(["m-fields-code-select", __props.config.className]) }, [createVNode(unref(TMagicCard), null, {
+			return openBlock(), createElementBlock("div", { class: normalizeClass(["m-fields-code-select", __props.config.className]) }, [createVNode(unref(TMagicCard), { flat: __props.config.flat }, {
 				default: withCtx(() => [createVNode(unref(MContainer), {
 					config: codeConfig.value,
 					size: __props.size,
+					class: "code-select-content",
 					prop: __props.prop,
 					disabled: __props.disabled,
 					"is-compare": isCompareMode.value,
@@ -122,9 +146,22 @@ var CodeSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 					"is-compare",
 					"last-values",
 					"model"
+				]), createVNode(unref(TMagicButton), {
+					class: "create-button fullWidth",
+					icon: unref(Plus),
+					size: __props.size,
+					disabled: __props.disabled,
+					onClick: _cache[0] || (_cache[0] = ($event) => newHandler())
+				}, {
+					default: withCtx(() => [createTextVNode("添加" + toDisplayString(__props.config.text), 1)]),
+					_: 1
+				}, 8, [
+					"icon",
+					"size",
+					"disabled"
 				])]),
 				_: 1
-			})], 2);
+			}, 8, ["flat"])], 2);
 		};
 	}
 });

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

@@ -10,7 +10,7 @@ import { Edit, View } from "@element-plus/icons-vue";
 //#region packages/editor/src/fields/CodeSelectCol.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "m-fields-code-select-col" };
 var _hoisted_2 = { class: "code-select-container" };
-var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFieldsCodeSelectCol",
 	__name: "CodeSelectCol",
 	props: {
@@ -26,7 +26,10 @@ var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 		},
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {
@@ -47,7 +50,8 @@ var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 		*/
 		const isCompareMode = computed(() => Boolean(props.isCompare && props.lastValues));
 		const notEditable = computed(() => filterFunction(mForm, props.config.notEditable, props));
-		const hasCodeBlockSidePanel = computed(() => (uiService.get("sideBarItems") || []).find((item) => item.$key === SideItemKey.CODE_BLOCK));
+		const codeBlockSidePanel = computed(() => (uiService.get("sideBarItems") || []).find((item) => item.$key === SideItemKey.CODE_BLOCK));
+		const hasCodeBlockSidePanel = computed(() => codeBlockSidePanel.value);
 		/**
 		* 根据代码块id获取代码块参数配置
 		* @param codeId 代码块ID
@@ -71,6 +75,7 @@ var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 			type: "select",
 			name: props.name,
 			disabled: props.disabled,
+			text: props.config.text,
 			options: () => {
 				if (codeDsl.value) return map(codeDsl.value, (value, key) => ({
 					text: `${value.name}（${key}）`,
@@ -102,6 +107,8 @@ var CodeSelectCol_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */
 			emit("change", props.model[props.name], eventData);
 		};
 		const editCode = (id) => {
+			const sideBarItem = codeBlockSidePanel.value;
+			if (sideBarItem) uiService.set("sideBarActiveTabName", sideBarItem.text || sideBarItem.$key || SideItemKey.CODE_BLOCK);
 			eventBus?.emit("edit-code", id);
 		};
 		return (_ctx, _cache) => {

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

@@ -1,10 +1,10 @@
-import { arrayOptions, eqOptions, numberOptions } from "../utils/props.js";
+import { getCondOpOptionsByFieldType } from "../utils/props.js";
 import { useServices } from "../hooks/use-services.js";
 import { getFieldType } from "../utils/data-source/index.js";
 import { TMagicSelect, getDesignConfig } from "@tmagic/design";
 import { Fragment, computed, createBlock, createElementBlock, defineComponent, mergeProps, openBlock, renderList, resolveDynamicComponent, unref, withCtx } from "vue";
 //#region packages/editor/src/fields/CondOpSelect.vue?vue&type=script&setup=true&lang.ts
-var CondOpSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var CondOpSelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MFieldsCondOpSelect",
 	__name: "CondOpSelect",
 	props: {
@@ -17,7 +17,10 @@ var CondOpSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ d
 		disabled: { type: Boolean },
 		size: {},
 		lastValues: {},
-		isCompare: { type: Boolean }
+		isCompare: { type: Boolean },
+		text: {},
+		labelWidth: {},
+		labelPosition: {}
 	},
 	emits: ["change"],
 	setup(__props, { emit: __emit }) {
@@ -27,22 +30,7 @@ var CondOpSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ d
 		const optionComponent = getDesignConfig("components")?.option;
 		const options = computed(() => {
 			const [id, ...fieldNames] = [...props.config.parentFields || [], ...props.model.field];
-			const type = getFieldType(dataSourceService.getDataSourceById(id), fieldNames);
-			if (type === "array") return arrayOptions;
-			if (type === "boolean" || type === "null") return [{
-				text: "是",
-				value: "is"
-			}, {
-				text: "不是",
-				value: "not"
-			}];
-			if (type === "number") return [...eqOptions, ...numberOptions];
-			if (type === "string") return [...arrayOptions, ...eqOptions];
-			return [
-				...arrayOptions,
-				...eqOptions,
-				...numberOptions
-			];
+			return getCondOpOptionsByFieldType(getFieldType(dataSourceService.getDataSourceById(id), fieldNames));
 		});
 		const fieldChangeHandler = (v) => {
 			emit("change", v);

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

@@ -9,9 +9,9 @@ import { Fragment, computed, createBlock, createCommentVNode, createElementBlock
 import { Edit, View } from "@element-plus/icons-vue";
 //#region packages/editor/src/fields/DataSourceFieldSelect/FieldSelect.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "m-editor-data-source-field-select" };
-var FieldSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var FieldSelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	__name: "FieldSelect",
-	props: /* @__PURE__ */ mergeModels({
+	props: /*@__PURE__*/ mergeModels({
 		value: {},
 		disabled: { type: Boolean },
 		checkStrictly: { type: Boolean },
@@ -23,7 +23,7 @@ var FieldSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ de
 		"modelValue": { default: [] },
 		"modelModifiers": {}
 	}),
-	emits: /* @__PURE__ */ mergeModels(["change"], ["update:modelValue"]),
+	emits: /*@__PURE__*/ mergeModels(["change"], ["update:modelValue"]),
 	setup(__props, { emit: __emit }) {
 		const props = __props;
 		const emit = __emit;
@@ -49,7 +49,8 @@ var FieldSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ de
 		const selectFieldsId = ref([]);
 		watch(modelValue, (value) => {
 			if (props.dataSourceId) {
-				selectDataSourceId.value = valueIsKey.value ? props.dataSourceId : `${DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX}${props.dataSourceId}`;
+				const dsIdValue = valueIsKey.value ? props.dataSourceId : `${DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX}${props.dataSourceId}`;
+				selectDataSourceId.value = dsIdValue;
 				selectFieldsId.value = Array.isArray(value) ? value : [];
 			} else if (Array.isArray(value) && value.length) {
 				const [dsId, ...fields] = value;
@@ -89,9 +90,15 @@ var FieldSelect_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ de
 			modelValue.value = v;
 			emit("change", v);
 		};
-		const hasDataSourceSidePanel = computed(() => uiService.get("sideBarItems").find((item) => item.$key === SideItemKey.DATA_SOURCE));
+		const dataSourceSidePanel = computed(() => uiService.get("sideBarItems").find((item) => item.$key === SideItemKey.DATA_SOURCE));
+		const hasDataSourceSidePanel = computed(() => dataSourceSidePanel.value);
 		const editHandler = (id) => {
-			eventBus?.emit("edit-data-source", removeDataSourceFieldPrefix(id));
+			const sideBarItem = dataSourceSidePanel.value;
+			if (sideBarItem) uiService.set("sideBarActiveTabName", sideBarItem.text || sideBarItem.$key || SideItemKey.DATA_SOURCE);
+			const dataSourceId = removeDataSourceFieldPrefix(id);
+			const fieldPath = selectFieldsId.value;
+			if (fieldPath.length) eventBus?.emit("edit-data-source-field", dataSourceId, [...fieldPath]);
+			else eventBus?.emit("edit-data-source", dataSourceId);
 		};
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", _hoisted_1, [__props.dataSourceId ? (openBlock(), createBlock(unref(TMagicCascader), {