@tmagic/editor 1.8.0-beta.24 → 1.8.0-beta.25

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

@@ -2,6 +2,7 @@ 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 { removeDataSourceFieldPrefix } from "@tmagic/utils";
 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({
@@ -29,8 +30,8 @@ var CondOpSelect_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ def
 		const props = __props;
 		const optionComponent = getDesignConfig("components")?.option;
 		const options = computed(() => {
-			const [id, ...fieldNames] = [...props.config.parentFields || [], ...props.model.field];
-			const ds = dataSourceService.getDataSourceById(id);
+			const [id, ...fieldNames] = [...props.config.parentFields || [], ...props.model.field || []];
+			const ds = id ? dataSourceService.getDataSourceById(removeDataSourceFieldPrefix(id)) : void 0;
 			const type = getFieldType(ds, fieldNames);
 			return getCondOpOptionsByFieldType(type);
 		});

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

@@ -60,7 +60,9 @@ var Index_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComp
 			let value;
 			if (typeof props.config.checkStrictly !== "function") value = props.config.checkStrictly;
 			else {
-				const dsId = removeDataSourceFieldPrefix(props.model[0]);
+				const fieldValue = props.model[props.name];
+				const rawDsId = props.config.dataSourceId ?? (Array.isArray(fieldValue) ? fieldValue[0] : fieldValue);
+				const dsId = removeDataSourceFieldPrefix(`${rawDsId}`);
 				const dataSource = dataSources.value.find((ds) => ds.id === dsId);
 				value = props.config.checkStrictly(mForm, {
 					values: mForm?.initValues || {},

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

@@ -1,6 +1,7 @@
 import { useServices } from "../hooks/use-services.js";
 import { getCascaderOptionsFromFields, getFieldType } from "../utils/data-source/index.js";
 import { MGroupList, filterFunction } from "@tmagic/form";
+import { removeDataSourceFieldPrefix } from "@tmagic/utils";
 import { computed, createBlock, defineComponent, inject, openBlock, unref } from "vue";
 //#region packages/editor/src/fields/DisplayConds.vue?vue&type=script&setup=true&lang.ts
 var DisplayConds_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
@@ -31,9 +32,15 @@ var DisplayConds_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ def
 		const { dataSourceService } = useServices();
 		const mForm = inject("mForm");
 		const parentFields = computed(() => filterFunction(mForm, props.config.parentFields, props) || []);
+		const resolveFieldPath = (path) => {
+			const [id, ...fieldNames] = path;
+			return {
+				ds: id ? dataSourceService.getDataSourceById(removeDataSourceFieldPrefix(`${id}`)) : void 0,
+				fieldNames
+			};
+		};
 		const fieldOnChange = (_formState, v, { model }) => {
-			const [id, ...fieldNames] = [...parentFields.value, ...v];
-			const ds = dataSourceService.getDataSourceById(id);
+			const { ds, fieldNames } = resolveFieldPath([...parentFields.value, ...v]);
 			const type = getFieldType(ds, fieldNames);
 			if (type === "number") model.value = Number(model.value);
 			else if (type === "boolean") model.value = Boolean(model.value);
@@ -59,11 +66,10 @@ var DisplayConds_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ def
 					parentFields.value.length ? {
 						type: "cascader",
 						options: () => {
-							const [dsId, ...keys] = parentFields.value;
-							const ds = dataSourceService.getDataSourceById(dsId);
+							const { ds, fieldNames } = resolveFieldPath(parentFields.value);
 							if (!ds) return [];
 							let fields = ds.fields || [];
-							keys.forEach((key) => {
+							fieldNames.forEach((key) => {
 								fields = fields.find((f) => f.name === key)?.fields || [];
 							});
 							return getCascaderOptionsFromFields(fields, [
@@ -131,8 +137,7 @@ var DisplayConds_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ def
 						items: [{
 							name: "value",
 							type: (_mForm, { model }) => {
-								const [id, ...fieldNames] = [...parentFields.value, ...model.field];
-								const ds = dataSourceService.getDataSourceById(id);
+								const { ds, fieldNames } = resolveFieldPath([...parentFields.value, ...model.field || []]);
 								const type = getFieldType(ds, fieldNames);
 								if (type === "number") return "number";
 								if (type === "boolean") return "select";

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

@@ -1,4 +1,4 @@
-import { validateDataSourceFieldSelectValue } from "../../../utils/type-match-rules.js";
+import { validateDataSourceFieldSelect } from "../../../utils/type-match-rules.js";
 import Left_default from "../icons/text-align/Left.js";
 import Center_default from "../icons/text-align/Center.js";
 import Right_default from "../icons/text-align/Right.js";
@@ -56,7 +56,7 @@ var Font_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineCompo
 				},
 				rules: [{ typeMatch: false }, { validator: ({ value, callback }, { config, model, prop }, mForm) => {
 					if (value === "" || value === null || value === void 0) return callback();
-					const result = validateDataSourceFieldSelectValue(value, {
+					const result = validateDataSourceFieldSelect(value, {
 						fieldType: "data-source-field-select",
 						mForm,
 						props: {

package/dist/es/index.js

@@ -31,7 +31,7 @@ import { IdleTask } from "./utils/dep/idle-task.js";
 import { ScrollViewer } from "./utils/scroll-viewer.js";
 import codeBlock_default from "./services/codeBlock.js";
 import dataSource_default from "./services/dataSource.js";
-import { ALL_COND_OPS, editorTypeMatchRules, validateDataSourceFieldSelectValue } from "./utils/type-match-rules.js";
+import { ALL_COND_OPS, editorTypeMatchRules, validateDataSourceFieldSelect } from "./utils/type-match-rules.js";
 import events_default from "./services/events.js";
 import { EVENT_NAME_VALUE_SEPARATOR, collectEventNameOptionValues, getCompActionAllowedValues, getCompActionOptions, getEventNameAllowedValues, getEventNameOptions, isEventNameCheckStrictly, normalizeCompActionValue } from "./utils/event.js";
 import monaco_editor_default from "./utils/monaco-editor.js";
@@ -92,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, 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, 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, validateDataSourceFieldSelectValue, 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, 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, validateDataSourceFieldSelect, warn };

package/dist/es/style.css

@@ -572,7 +572,11 @@ fieldset.m-fieldset .m-form-tip {
 .m-form-box .el-box__header {
   margin: 0;
 }
+.m-form-box .m-box-body {
+  min-height: 0;
+}
 .m-form-box .dialog-footer {
+  flex-shrink: 0;
   display: flex;
   align-items: center;
   justify-content: space-between;

package/dist/es/utils/type-match-rules.js

@@ -152,24 +152,20 @@ var displayCondSuggestion = () => {
 };
 var validateDataSourceFieldPath = (path, options = {}) => {
 	if (!getDataSources().length) return;
-	let dsId = options.dataSourceId;
-	let fieldNames = path;
-	if (!dsId) {
-		if (!path.length) return defaultMessage(options.message, "值不在可选项中", dataSourceIdSuggestion());
-		const rawDsId = path[0];
-		dsId = options.valueMode === "key" || !`${rawDsId}`.startsWith(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX) ? `${rawDsId}` : removeDataSourceFieldPrefix(`${rawDsId}`);
-		fieldNames = path.slice(1);
-	}
+	const dsId = options.dataSourceId;
+	if (!dsId) return defaultMessage(options.message, "数据源不存在", dataSourceIdSuggestion());
 	const ds = findDataSource(`${dsId}`);
 	if (!ds) return defaultMessage(options.message, `数据源(${dsId})不存在`, dataSourceIdSuggestion());
-	if (!fieldNames.length) return;
-	const { field, ok, fields, failedName } = resolveFieldByPath(ds.fields, fieldNames);
+	if (!path.length) return;
+	const { field, ok, fields, failedName } = resolveFieldByPath(ds.fields, path);
 	if (!ok) return defaultMessage(options.message, `数据源字段(${failedName})不存在`, listSuggestion(fields.map((item) => item.name)));
 	const allowedTypes = options.dataSourceFieldType || ["any"];
 	if (!allowedTypes.length || allowedTypes.includes("any")) return;
 	const leafType = field?.type || "any";
-	if (leafType === "any" || allowedTypes.includes(leafType)) return;
-	return defaultMessage(options.message, "值不在可选项中", dataSourceIdSuggestion());
+	if (leafType !== "any" && !allowedTypes.includes(leafType)) {
+		const fieldName = field?.name || path[path.length - 1];
+		return defaultMessage(options.message, `请选择类型为${allowedTypes.join("或")}的字段，字段(${fieldName})的类型为${leafType}`);
+	}
 };
 var validateDataSourceMethodTuple = (value, message) => {
 	if (!Array.isArray(value) || value.length !== 2 || value.some((item) => typeof item !== "string")) return defaultMessage(message, `${value}类型应为长度为 2 的字符串数组`, methodTupleSuggestion());
@@ -215,7 +211,7 @@ var validateCondOpSelect = (value, { message, props }) => {
 	const parentFields = props.config?.parentFields || [];
 	const fieldPath = Array.isArray(props.model?.field) ? props.model.field : [];
 	const [id, ...fieldNames] = [...parentFields, ...fieldPath];
-	const ds = id ? findDataSource(`${id}`) : void 0;
+	const ds = id ? findDataSource(removeDataSourceFieldPrefix(`${id}`)) : void 0;
 	const allowed = getCondOpsByFieldType(getFieldType(ds, fieldNames));
 	if (!allowed.has(value)) return defaultMessage(message, `${value} 不在可选项中`, listSuggestion([...allowed]));
 };
@@ -251,7 +247,7 @@ var isDataSourceFieldPathValue = (value, config) => {
 /**
 * data-source-field-select 的 typeMatch 校验逻辑，可供自定义 rules.validator 复用。
 */
-var validateDataSourceFieldSelectValue = (value, context, options) => {
+var validateDataSourceFieldSelect = (value, context, options) => {
 	const { mForm, message, props } = context;
 	const config = props.config || {};
 	if (!isDataSourceFieldPathValue(value, config)) {
@@ -265,14 +261,18 @@ var validateDataSourceFieldSelectValue = (value, context, options) => {
 		}, message);
 	}
 	if (!Array.isArray(value) || value.some((item) => typeof item !== "string")) return defaultMessage(message, `${value}类型应为字符串数组`, dataSourceFieldPathSuggestion());
-	return validateDataSourceFieldPath(value, {
-		dataSourceId: config.dataSourceId,
-		valueMode: config.value,
+	let dataSourceId = config.dataSourceId ? `${config.dataSourceId}` : void 0;
+	let fieldNames = value;
+	if (!dataSourceId) {
+		dataSourceId = value.length ? removeDataSourceFieldPrefix(value[0]) : void 0;
+		fieldNames = value.slice(1);
+	}
+	return validateDataSourceFieldPath(fieldNames, {
+		dataSourceId,
 		dataSourceFieldType: config.dataSourceFieldType,
 		message
 	});
 };
-var validateDataSourceFieldSelect = (value, context) => validateDataSourceFieldSelectValue(value, context);
 var validateDataSourceSelect = (value, { message, props }) => {
 	const config = props.config || {};
 	const dataSources = getDataSources();
@@ -342,7 +342,8 @@ var editorTypeMatchRules = {
 	"ui-select": validateUiSelect,
 	"data-source-input": validateDataSourceInput,
 	"data-source-method-select": validateDataSourceMethodSelect,
-	"data-source-field-select": validateDataSourceFieldSelect,
+	/** 注册进 typeMatch 规则表的入口，收窄为 TypeMatchValidator，避免调用方误传第三个参数 */
+	"data-source-field-select": (value, context) => validateDataSourceFieldSelect(value, context),
 	"data-source-select": validateDataSourceSelect,
 	"code-select": validateCodeSelect,
 	"data-source-fields": validateDataSourceFields,
@@ -352,4 +353,4 @@ var editorTypeMatchRules = {
 	"display-conds": validateDisplayConds
 };
 //#endregion
-export { ALL_COND_OPS, editorTypeMatchRules, validateDataSourceFieldSelectValue };
+export { ALL_COND_OPS, editorTypeMatchRules, validateDataSourceFieldSelect };

package/dist/style.css

@@ -572,7 +572,11 @@ fieldset.m-fieldset .m-form-tip {
 .m-form-box .el-box__header {
   margin: 0;
 }
+.m-form-box .m-box-body {
+  min-height: 0;
+}
 .m-form-box .dialog-footer {
+  flex-shrink: 0;
   display: flex;
   align-items: center;
   justify-content: space-between;

package/dist/themes/magic-admin.css

@@ -603,7 +603,11 @@ fieldset.m-fieldset .m-form-tip {
 .m-form-box .el-box__header {
   margin: 0;
 }
+.m-form-box .m-box-body {
+  min-height: 0;
+}
 .m-form-box .dialog-footer {
+  flex-shrink: 0;
   display: flex;
   align-items: center;
   justify-content: space-between;

package/dist/tmagic-editor.umd.cjs

@@ -10967,24 +10967,20 @@
 	};
 	var validateDataSourceFieldPath = (path, options = {}) => {
 		if (!getDataSources().length) return;
-		let dsId = options.dataSourceId;
-		let fieldNames = path;
-		if (!dsId) {
-			if (!path.length) return defaultMessage(options.message, "值不在可选项中", dataSourceIdSuggestion());
-			const rawDsId = path[0];
-			dsId = options.valueMode === "key" || !`${rawDsId}`.startsWith(_tmagic_utils.DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX) ? `${rawDsId}` : (0, _tmagic_utils.removeDataSourceFieldPrefix)(`${rawDsId}`);
-			fieldNames = path.slice(1);
-		}
+		const dsId = options.dataSourceId;
+		if (!dsId) return defaultMessage(options.message, "数据源不存在", dataSourceIdSuggestion());
 		const ds = findDataSource(`${dsId}`);
 		if (!ds) return defaultMessage(options.message, `数据源(${dsId})不存在`, dataSourceIdSuggestion());
-		if (!fieldNames.length) return;
-		const { field, ok, fields, failedName } = resolveFieldByPath(ds.fields, fieldNames);
+		if (!path.length) return;
+		const { field, ok, fields, failedName } = resolveFieldByPath(ds.fields, path);
 		if (!ok) return defaultMessage(options.message, `数据源字段(${failedName})不存在`, listSuggestion(fields.map((item) => item.name)));
 		const allowedTypes = options.dataSourceFieldType || ["any"];
 		if (!allowedTypes.length || allowedTypes.includes("any")) return;
 		const leafType = field?.type || "any";
-		if (leafType === "any" || allowedTypes.includes(leafType)) return;
-		return defaultMessage(options.message, "值不在可选项中", dataSourceIdSuggestion());
+		if (leafType !== "any" && !allowedTypes.includes(leafType)) {
+			const fieldName = field?.name || path[path.length - 1];
+			return defaultMessage(options.message, `请选择类型为${allowedTypes.join("或")}的字段，字段(${fieldName})的类型为${leafType}`);
+		}
 	};
 	var validateDataSourceMethodTuple = (value, message) => {
 		if (!Array.isArray(value) || value.length !== 2 || value.some((item) => typeof item !== "string")) return defaultMessage(message, `${value}类型应为长度为 2 的字符串数组`, methodTupleSuggestion());
@@ -11030,7 +11026,7 @@
 		const parentFields = props.config?.parentFields || [];
 		const fieldPath = Array.isArray(props.model?.field) ? props.model.field : [];
 		const [id, ...fieldNames] = [...parentFields, ...fieldPath];
-		const allowed = getCondOpsByFieldType(getFieldType(id ? findDataSource(`${id}`) : void 0, fieldNames));
+		const allowed = getCondOpsByFieldType(getFieldType(id ? findDataSource((0, _tmagic_utils.removeDataSourceFieldPrefix)(`${id}`)) : void 0, fieldNames));
 		if (!allowed.has(value)) return defaultMessage(message, `${value} 不在可选项中`, listSuggestion([...allowed]));
 	};
 	var validateCodeSelectCol = (value, { message }) => {
@@ -11065,7 +11061,7 @@
 	/**
 	* data-source-field-select 的 typeMatch 校验逻辑，可供自定义 rules.validator 复用。
 	*/
-	var validateDataSourceFieldSelectValue = (value, context, options) => {
+	var validateDataSourceFieldSelect = (value, context, options) => {
 		const { mForm, message, props } = context;
 		const config = props.config || {};
 		if (!isDataSourceFieldPathValue(value, config)) {
@@ -11079,14 +11075,18 @@
 			}, message);
 		}
 		if (!Array.isArray(value) || value.some((item) => typeof item !== "string")) return defaultMessage(message, `${value}类型应为字符串数组`, dataSourceFieldPathSuggestion());
-		return validateDataSourceFieldPath(value, {
-			dataSourceId: config.dataSourceId,
-			valueMode: config.value,
+		let dataSourceId = config.dataSourceId ? `${config.dataSourceId}` : void 0;
+		let fieldNames = value;
+		if (!dataSourceId) {
+			dataSourceId = value.length ? (0, _tmagic_utils.removeDataSourceFieldPrefix)(value[0]) : void 0;
+			fieldNames = value.slice(1);
+		}
+		return validateDataSourceFieldPath(fieldNames, {
+			dataSourceId,
 			dataSourceFieldType: config.dataSourceFieldType,
 			message
 		});
 	};
-	var validateDataSourceFieldSelect = (value, context) => validateDataSourceFieldSelectValue(value, context);
 	var validateDataSourceSelect = (value, { message, props }) => {
 		const config = props.config || {};
 		const dataSources = getDataSources();
@@ -11156,7 +11156,8 @@
 		"ui-select": validateUiSelect,
 		"data-source-input": validateDataSourceInput,
 		"data-source-method-select": validateDataSourceMethodSelect,
-		"data-source-field-select": validateDataSourceFieldSelect,
+		/** 注册进 typeMatch 规则表的入口，收窄为 TypeMatchValidator，避免调用方误传第三个参数 */
+		"data-source-field-select": (value, context) => validateDataSourceFieldSelect(value, context),
 		"data-source-select": validateDataSourceSelect,
 		"code-select": validateCodeSelect,
 		"data-source-fields": validateDataSourceFields,
@@ -22804,7 +22805,9 @@
 				let value;
 				if (typeof props.config.checkStrictly !== "function") value = props.config.checkStrictly;
 				else {
-					const dsId = (0, _tmagic_utils.removeDataSourceFieldPrefix)(props.model[0]);
+					const fieldValue = props.model[props.name];
+					const rawDsId = props.config.dataSourceId ?? (Array.isArray(fieldValue) ? fieldValue[0] : fieldValue);
+					const dsId = (0, _tmagic_utils.removeDataSourceFieldPrefix)(`${rawDsId}`);
 					const dataSource = dataSources.value.find((ds) => ds.id === dsId);
 					value = props.config.checkStrictly(mForm, {
 						values: mForm?.initValues || {},
@@ -23650,9 +23653,16 @@
 			const { dataSourceService } = useServices();
 			const mForm = (0, vue.inject)("mForm");
 			const parentFields = (0, vue.computed)(() => (0, _tmagic_form.filterFunction)(mForm, props.config.parentFields, props) || []);
+			const resolveFieldPath = (path) => {
+				const [id, ...fieldNames] = path;
+				return {
+					ds: id ? dataSourceService.getDataSourceById((0, _tmagic_utils.removeDataSourceFieldPrefix)(`${id}`)) : void 0,
+					fieldNames
+				};
+			};
 			const fieldOnChange = (_formState, v, { model }) => {
-				const [id, ...fieldNames] = [...parentFields.value, ...v];
-				const type = getFieldType(dataSourceService.getDataSourceById(id), fieldNames);
+				const { ds, fieldNames } = resolveFieldPath([...parentFields.value, ...v]);
+				const type = getFieldType(ds, fieldNames);
 				if (type === "number") model.value = Number(model.value);
 				else if (type === "boolean") model.value = Boolean(model.value);
 				else if (type === "null") model.value = null;
@@ -23677,11 +23687,10 @@
 						parentFields.value.length ? {
 							type: "cascader",
 							options: () => {
-								const [dsId, ...keys] = parentFields.value;
-								const ds = dataSourceService.getDataSourceById(dsId);
+								const { ds, fieldNames } = resolveFieldPath(parentFields.value);
 								if (!ds) return [];
 								let fields = ds.fields || [];
-								keys.forEach((key) => {
+								fieldNames.forEach((key) => {
 									fields = fields.find((f) => f.name === key)?.fields || [];
 								});
 								return getCascaderOptionsFromFields(fields, [
@@ -23749,8 +23758,8 @@
 							items: [{
 								name: "value",
 								type: (_mForm, { model }) => {
-									const [id, ...fieldNames] = [...parentFields.value, ...model.field];
-									const type = getFieldType(dataSourceService.getDataSourceById(id), fieldNames);
+									const { ds, fieldNames } = resolveFieldPath([...parentFields.value, ...model.field || []]);
+									const type = getFieldType(ds, fieldNames);
 									if (type === "number") return "number";
 									if (type === "boolean") return "select";
 									if (type === "null") return "display";
@@ -23834,8 +23843,8 @@
 			const props = __props;
 			const optionComponent = (0, _tmagic_design.getDesignConfig)("components")?.option;
 			const options = (0, vue.computed)(() => {
-				const [id, ...fieldNames] = [...props.config.parentFields || [], ...props.model.field];
-				return getCondOpOptionsByFieldType(getFieldType(dataSourceService.getDataSourceById(id), fieldNames));
+				const [id, ...fieldNames] = [...props.config.parentFields || [], ...props.model.field || []];
+				return getCondOpOptionsByFieldType(getFieldType(id ? dataSourceService.getDataSourceById((0, _tmagic_utils.removeDataSourceFieldPrefix)(id)) : void 0, fieldNames));
 			});
 			const fieldChangeHandler = (v) => {
 				emit("change", v);
@@ -24310,7 +24319,7 @@
 					},
 					rules: [{ typeMatch: false }, { validator: ({ value, callback }, { config, model, prop }, mForm) => {
 						if (value === "" || value === null || value === void 0) return callback();
-						const result = validateDataSourceFieldSelectValue(value, {
+						const result = validateDataSourceFieldSelect(value, {
 							fieldType: "data-source-field-select",
 							mForm,
 							props: {
@@ -26337,7 +26346,7 @@
 	exports.useServices = useServices;
 	exports.useStage = useStage;
 	exports.useWindowRect = useWindowRect;
-	exports.validateDataSourceFieldSelectValue = validateDataSourceFieldSelectValue;
+	exports.validateDataSourceFieldSelect = validateDataSourceFieldSelect;
 	exports.warn = warn;
 	Object.keys(_tmagic_form).forEach(function(k) {
 		if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.0-beta.24",
+  "version": "1.8.0-beta.25",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -58,11 +58,11 @@
     "moveable": "^0.53.0",
     "serialize-javascript": "^7.0.7",
     "sortablejs": "^1.15.7",
-    "@tmagic/design": "1.8.0-beta.24",
-    "@tmagic/form": "1.8.0-beta.24",
-    "@tmagic/utils": "1.8.0-beta.24",
-    "@tmagic/stage": "1.8.0-beta.24",
-    "@tmagic/table": "1.8.0-beta.24"
+    "@tmagic/design": "1.8.0-beta.25",
+    "@tmagic/stage": "1.8.0-beta.25",
+    "@tmagic/utils": "1.8.0-beta.25",
+    "@tmagic/table": "1.8.0-beta.25",
+    "@tmagic/form": "1.8.0-beta.25"
   },
   "devDependencies": {
     "@types/events": "^3.0.3",
@@ -76,7 +76,7 @@
     "type-fest": "^5.2.0",
     "typescript": "^6.0.3",
     "vue": "^3.5.41",
-    "@tmagic/core": "1.8.0-beta.24"
+    "@tmagic/core": "1.8.0-beta.25"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/fields/CondOpSelect.vue

@@ -31,6 +31,7 @@ import { computed } from 'vue';
 
 import { getDesignConfig, TMagicSelect } from '@tmagic/design';
 import type { CondOpSelectConfig, FieldProps } from '@tmagic/form';
+import { removeDataSourceFieldPrefix } from '@tmagic/utils';
 
 import { useServices } from '@editor/hooks/use-services';
 import { getCondOpOptionsByFieldType, getFieldType } from '@editor/utils';
@@ -50,8 +51,8 @@ const props = defineProps<FieldProps<CondOpSelectConfig>>();
 const optionComponent = getDesignConfig('components')?.option;
 
 const options = computed(() => {
-  const [id, ...fieldNames] = [...(props.config.parentFields || []), ...props.model.field];
-  const ds = dataSourceService.getDataSourceById(id);
+  const [id, ...fieldNames] = [...(props.config.parentFields || []), ...(props.model.field || [])];
+  const ds = id ? dataSourceService.getDataSourceById(removeDataSourceFieldPrefix(id)) : undefined;
   const type = getFieldType(ds, fieldNames);
   return getCondOpOptionsByFieldType(type);
 });

package/src/fields/DataSourceFieldSelect/Index.vue

@@ -143,7 +143,10 @@ const checkStrictly = computed(() => {
   if (typeof props.config.checkStrictly !== 'function') {
     value = props.config.checkStrictly;
   } else {
-    const dsId = removeDataSourceFieldPrefix(props.model[0]);
+    const fieldValue = props.model[props.name];
+    // 指定了 dataSourceId 时取值里只有字段名，数据源 id 只能取自 config
+    const rawDsId = props.config.dataSourceId ?? (Array.isArray(fieldValue) ? fieldValue[0] : fieldValue);
+    const dsId = removeDataSourceFieldPrefix(`${rawDsId}`);
     const dataSource = dataSources.value.find((ds) => ds.id === dsId);
 
     value = props.config.checkStrictly(mForm, {

package/src/fields/DisplayConds.vue

@@ -25,6 +25,7 @@ import {
   type GroupListConfig,
   MGroupList,
 } from '@tmagic/form';
+import { removeDataSourceFieldPrefix } from '@tmagic/utils';
 
 import { useServices } from '@editor/hooks/use-services';
 import { getCascaderOptionsFromFields, getFieldType } from '@editor/utils';
@@ -46,9 +47,14 @@ const mForm = inject<FormState | undefined>('mForm');
 
 const parentFields = computed(() => filterFunction<string[]>(mForm, props.config.parentFields, props) || []);
 
+const resolveFieldPath = (path: string[]) => {
+  const [id, ...fieldNames] = path;
+  const ds = id ? dataSourceService.getDataSourceById(removeDataSourceFieldPrefix(`${id}`)) : undefined;
+  return { ds, fieldNames };
+};
+
 const fieldOnChange = (_formState: FormState | undefined, v: string[], { model }: { model: Record<string, any> }) => {
-  const [id, ...fieldNames] = [...parentFields.value, ...v];
-  const ds = dataSourceService.getDataSourceById(id);
+  const { ds, fieldNames } = resolveFieldPath([...parentFields.value, ...v]);
   const type = getFieldType(ds, fieldNames);
   if (type === 'number') {
     model.value = Number(model.value);
@@ -82,14 +88,13 @@ const config = computed<GroupListConfig>(() => ({
           ? {
               type: 'cascader',
               options: () => {
-                const [dsId, ...keys] = parentFields.value;
-                const ds = dataSourceService.getDataSourceById(dsId);
+                const { ds, fieldNames } = resolveFieldPath(parentFields.value);
                 if (!ds) {
                   return [];
                 }
 
                 let fields = ds.fields || [];
-                keys.forEach((key) => {
+                fieldNames.forEach((key) => {
                   const field = fields.find((f) => f.name === key);
                   fields = field?.fields || [];
                 });
@@ -139,8 +144,7 @@ const config = computed<GroupListConfig>(() => ({
             {
               name: 'value',
               type: (_mForm, { model }) => {
-                const [id, ...fieldNames] = [...parentFields.value, ...model.field];
-                const ds = dataSourceService.getDataSourceById(id);
+                const { ds, fieldNames } = resolveFieldPath([...parentFields.value, ...(model.field || [])]);
                 const type = getFieldType(ds, fieldNames);
 
                 if (type === 'number') {

package/src/fields/StyleSetter/pro/Font.vue

@@ -21,7 +21,7 @@ import { appendValidateSuggestion } from '@tmagic/design';
 import { type ContainerChangeEventData, defineFormConfig, MContainer } from '@tmagic/form';
 import type { StyleSchema } from '@tmagic/schema';
 
-import { validateDataSourceFieldSelectValue } from '@editor/utils/type-match-rules';
+import { validateDataSourceFieldSelect } from '@editor/utils/type-match-rules';
 
 import { AlignCenter, AlignLeft, AlignRight } from '../icons/text-align';
 
@@ -99,7 +99,7 @@ const formConfig = defineFormConfig([
             return callback();
           }
 
-          const result = validateDataSourceFieldSelectValue(
+          const result = validateDataSourceFieldSelect(
             value,
             {
               fieldType: 'data-source-field-select',

package/src/utils/type-match-rules.ts

@@ -209,7 +209,6 @@ const validateDataSourceFieldPath = (
   path: string[],
   options: {
     dataSourceId?: string;
-    valueMode?: 'key' | 'value';
     dataSourceFieldType?: DataSourceFieldType[];
     message?: string;
   } = {},
@@ -219,19 +218,11 @@ const validateDataSourceFieldPath = (
     return undefined;
   }
 
-  let dsId = options.dataSourceId;
-  let fieldNames = path;
-
+  const dsId = options.dataSourceId;
   if (!dsId) {
-    if (!path.length) {
-      return defaultMessage(options.message, '值不在可选项中', dataSourceIdSuggestion());
-    }
-    const rawDsId = path[0];
-    dsId =
-      options.valueMode === 'key' || !`${rawDsId}`.startsWith(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX)
-        ? `${rawDsId}`
-        : removeDataSourceFieldPrefix(`${rawDsId}`);
-    fieldNames = path.slice(1);
+    // 仅当取值为空数组或首项为空串时命中。表单校验管道里 validateTypeMatch 对空数组会短路，
+    // 因此这里只可能来自直接调用 validateDataSourceFieldSelect 的自定义 validator
+    return defaultMessage(options.message, '数据源不存在', dataSourceIdSuggestion());
   }
 
   const ds = findDataSource(`${dsId}`);
@@ -239,11 +230,11 @@ const validateDataSourceFieldPath = (
     return defaultMessage(options.message, `数据源(${dsId})不存在`, dataSourceIdSuggestion());
   }
 
-  if (!fieldNames.length) {
+  if (!path.length) {
     return undefined;
   }
 
-  const { field, ok, fields, failedName } = resolveFieldByPath(ds.fields, fieldNames);
+  const { field, ok, fields, failedName } = resolveFieldByPath(ds.fields, path);
   if (!ok) {
     return defaultMessage(
       options.message,
@@ -258,11 +249,15 @@ const validateDataSourceFieldPath = (
   }
 
   const leafType = field?.type || 'any';
-  if (leafType === 'any' || allowedTypes.includes(leafType)) {
-    return undefined;
-  }
+  if (leafType !== 'any' && !allowedTypes.includes(leafType)) {
+    const fieldName = field?.name || path[path.length - 1];
 
-  return defaultMessage(options.message, '值不在可选项中', dataSourceIdSuggestion());
+    // 文案已点明当前字段类型与要求类型，无需再列同级可选字段
+    return defaultMessage(
+      options.message,
+      `请选择类型为${allowedTypes.join('或')}的字段，字段(${fieldName})的类型为${leafType}`,
+    );
+  }
 };
 
 const validateDataSourceMethodTuple = (value: any, message?: string): string | undefined => {
@@ -367,7 +362,7 @@ const validateCondOpSelect: TypeMatchValidator = (value, { message, props }) =>
   const parentFields = props.config?.parentFields || [];
   const fieldPath = Array.isArray(props.model?.field) ? props.model.field : [];
   const [id, ...fieldNames] = [...parentFields, ...fieldPath];
-  const ds = id ? findDataSource(`${id}`) : undefined;
+  const ds = id ? findDataSource(removeDataSourceFieldPrefix(`${id}`)) : undefined;
   const fieldType = getFieldType(ds, fieldNames);
   const allowed = getCondOpsByFieldType(fieldType);
 
@@ -464,7 +459,7 @@ export type ValidateDataSourceFieldSelectOptions = {
 /**
  * data-source-field-select 的 typeMatch 校验逻辑，可供自定义 rules.validator 复用。
  */
-export const validateDataSourceFieldSelectValue = (
+export const validateDataSourceFieldSelect = (
   value: any,
   context: TypeMatchValidateContext,
   options?: ValidateDataSourceFieldSelectOptions,
@@ -492,17 +487,22 @@ export const validateDataSourceFieldSelectValue = (
     return defaultMessage(message, `${value}类型应为字符串数组`, dataSourceFieldPathSuggestion());
   }
 
-  return validateDataSourceFieldPath(value, {
-    dataSourceId: config.dataSourceId,
-    valueMode: config.value,
+  // 未指定 dataSourceId 时，路径首项为数据源 id，其余为字段名。
+  // value 模式的首项带 ds-field:: 前缀、key 模式不带，removeDataSourceFieldPrefix 对后者是幂等的，无需分支。
+  let dataSourceId = config.dataSourceId ? `${config.dataSourceId}` : undefined;
+  let fieldNames = value;
+  if (!dataSourceId) {
+    dataSourceId = value.length ? removeDataSourceFieldPrefix(value[0]) : undefined;
+    fieldNames = value.slice(1);
+  }
+
+  return validateDataSourceFieldPath(fieldNames, {
+    dataSourceId,
     dataSourceFieldType: config.dataSourceFieldType,
     message,
   });
 };
 
-const validateDataSourceFieldSelect: TypeMatchValidator = (value, context) =>
-  validateDataSourceFieldSelectValue(value, context);
-
 const validateDataSourceSelect: TypeMatchValidator = (value, { message, props }) => {
   const config = props.config || {};
   const dataSources = getDataSources();
@@ -678,7 +678,8 @@ export const editorTypeMatchRules: Record<string, TypeMatchValidator> = {
   'ui-select': validateUiSelect,
   'data-source-input': validateDataSourceInput,
   'data-source-method-select': validateDataSourceMethodSelect,
-  'data-source-field-select': validateDataSourceFieldSelect,
+  /** 注册进 typeMatch 规则表的入口，收窄为 TypeMatchValidator，避免调用方误传第三个参数 */
+  'data-source-field-select': (value, context) => validateDataSourceFieldSelect(value, context),
   'data-source-select': validateDataSourceSelect,
   'code-select': validateCodeSelect,
   'data-source-fields': validateDataSourceFields,

package/types/index.d.ts

@@ -3498,7 +3498,7 @@ type ValidateDataSourceFieldSelectOptions = {
 /**
  * data-source-field-select 的 typeMatch 校验逻辑，可供自定义 rules.validator 复用。
  */
-declare const validateDataSourceFieldSelectValue: (value: any, context: TypeMatchValidateContext, options?: ValidateDataSourceFieldSelectOptions) => string | undefined | Promise<string | undefined>;
+declare const validateDataSourceFieldSelect: (value: any, context: TypeMatchValidateContext, options?: ValidateDataSourceFieldSelectOptions) => string | undefined | Promise<string | undefined>;
 declare const editorTypeMatchRules: Record<string, TypeMatchValidator>;
 //#endregion
 //#region temp/packages/editor/src/utils/event.d.ts
@@ -6880,4 +6880,4 @@ declare const _default$43: {
   install: (app: App, opt?: Partial<EditorInstallOptions | DesignPluginOptions | FormInstallOptions>) => void;
 };
 //#endregion
-export { ALL_COND_OPS, AddMNode, AddPrefixToObject, AsyncAfterHook, AsyncBeforeHook, AsyncHookPlugin, AsyncMethodName, BaseStepValue, BeforeAdd, CODE_DRAFT_STORAGE_KEY, COPY_CODE_STORAGE_KEY, COPY_DS_STORAGE_KEY, COPY_STORAGE_KEY, CanDropInFunction, CanDropInScene, _default as CodeBlockEditor, _default$1 as CodeBlockList, _default$2 as CodeBlockListPanel, CodeBlockListPanelSlots, CodeBlockListSlots, CodeBlockStepValue, CodeDeleteErrorType, CodeDslItem, CodeParamStatement, CodeRelation, _default$3 as CodeSelect, _default$4 as CodeSelectCol, CodeState, ColumnLayout, CombineInfo, CompareCategory, _default$5 as CompareForm, CompareFormBaseProps, CompareFormLoadConfig, CompareFormLoadConfigContext, ComponentGroup, ComponentGroupState, ComponentItem, _default$6 as ComponentListPanel, ComponentListPanelSlots, _default$7 as CondOpSelect, ConfirmAndRevertOptions, _default$8 as ContentMenu, ContentMenuTarget, ContentMenuType, CustomContentMenuFunction, CustomDiffFormOptions, DEFAULT_LEFT_COLUMN_WIDTH, DEFAULT_RIGHT_COLUMN_WIDTH, _default$9 as DataSourceAddButton, _default$10 as DataSourceConfigPanel, _default$11 as DataSourceFieldSelect, _default$12 as DataSourceFields, _default$13 as DataSourceInput, DataSourceListSlots, _default$14 as DataSourceMethodSelect, _default$15 as DataSourceMethods, _default$16 as DataSourceMocks, _default$17 as DataSourceSelect, DataSourceStepValue, DatasourceTypeOption, DepTargetType, DiffDialogPayload, _default$18 as DisplayConds, DragClassification, DragType, DslOpOptions, DslOpWithHistoryIdsResult, EVENT_NAME_VALUE_SEPARATOR, EditorChangeEvent, EditorChangeEventHistoryMeta, EditorChangeItem, EditorEvents, EditorInstallOptions, EditorNodeInfo, EditorSlots, EditorUpdateChangeItem, EventBus, EventBusEvent, EventNameOption, EventNameSelectOption, _default$19 as EventSelect, Fixed2Other, _default$20 as FloatingBox, FrameworkSlots, GetCodeBlockFormConfigOptions, GetColumnWidth, GetConfig, H_GUIDE_LINE_STORAGE_KEY, HistoryBucketConfig, _default$21 as HistoryDiffDialog, HistoryEvents, HistoryGroup, _default$22 as HistoryListBucket, _default$23 as HistoryListBucketTab, HistoryListExtraTab, HistoryOpOptions, HistoryOpOptionsWithChangeRecords, HistoryOpSource, HistoryOpType, HistoryPersistOptions, HistoryRowDescriptor, HistoryState, HistoryStepEntry, HistoryStepType, HistorySteps, _default$24 as Icon, IdleTask, IdleTaskEvents, IsExpandableFunction, KeyBindingCacheItem, KeyBindingCommand, KeyBindingItem, _default$25 as KeyValue, Keys, LEFT_COLUMN_WIDTH_STORAGE_KEY, _default$26 as LayerNodeContent, LayerNodeSlots, LayerNodeStatus, LayerOffset, _default$27 as LayerPanel, LayerPanelSlots, Layout, _default$28 as LayoutContainer, _default$28 as SplitView, ListState, MIN_CENTER_COLUMN_WIDTH, MIN_LEFT_COLUMN_WIDTH, MIN_RIGHT_COLUMN_WIDTH, MenuBarData, MenuButton, MenuComponent, MenuItem, NodeInvalidInfo, NodeInvalidSource, type OnDrag, PROPS_PANEL_WIDTH_STORAGE_KEY, PageBarSortOptions, _default$29 as PageFragmentSelect, PartSortableOptions, PastePosition, PersistedHistoryState, PropsFormConfigFunction, _default$30 as PropsFormPanel, PropsFormValueFunction, _default$31 as PropsPanel, PropsPanelSlots, PropsState, RIGHT_COLUMN_WIDTH_STORAGE_KEY, _default$32 as Resizer, ScrollViewer, ScrollViewerEvent, ScrollViewerSlots, SerializedUndoRedo, Services, SetColumnWidth, SideBarData, SideComponent, SideItem, SideItemKey, SidebarSlots, StageCore, StageOptions, StageOverlayState, StageRect, StageSlots, StepDiffItem, StepExtra, StepValue, StoreState, StoreStateKey, _default$33 as StyleSetter, SyncAfterHook, SyncBeforeHook, SyncHookPlugin, _default$34 as TMagicCodeEditor, _default$35 as TMagicEditor, _default$36 as ToolButton, _default$37 as Tree, _default$38 as TreeNode, TreeNodeData, type TypeMatchValidateContext, UI_SELECT_MODE_EVENT_NAME, UiState, UndoRedo, UpdateOptions, UseCompareFormReturn, UseHistoryRevertOptions, V_GUIDE_LINE_STORAGE_KEY, ValidateDataSourceFieldSelectOptions, _default$39 as ViewForm, WorkspaceSlots, advancedTabConfig, arrayOptions, beforePaste, booleanOptions, buildChangeRecords, calcAlignCenterStyle, calcLayerTargetIndex, calcMoveStyle, canUsePluginMethods, change2Fixed, classifyDragSources, _default$40 as codeBlockService, collectEventNameOptionValues, collectRelatedNodes, _default$41 as componentListService, confirmHistoryAction, createStackStep, _default$42 as dataSourceService, debug, _default$43 as default, defaultIsExpandable, _default$44 as depService, describeRevertStep, describeStepForRevert, deserializeStacks, designPlugin, detectStackOpType, detectTargetId, detectTargetName, displayTabConfig, editorNodeMergeCustomizer, _default$45 as editorService, editorTypeMatchRules, eqOptions, error, eventTabConfig, _default$46 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, _default$47 as historyService, idbDelete, idbGet, idbSet, info, isEventNameCheckStrictly, isGlobalFlat, isIncludeDataSource, isIndexedDBSupported, _default$48 as keybindingService, _default$49 as loadMonaco, log, markStackSaved, mergeSteps, moveItemsInContainer, normalizeCompActionValue, numberOptions, openIndexedDB, _default$50 as propsService, resolveFieldByPath, resolveSelectedNode, serializeConfig, serializeStacks, setChildrenLayout, setEditorConfig, setLayout, _default$51 as stageOverlayService, _default$52 as storageService, styleTabConfig, tablePlugin, toggleFixedPosition, _default$53 as uiService, undoFloor, updateStatus, useCodeBlockEdit, useCompareForm, useEditorContentHeight, useFilter, useFloatBox, useGetSo, useHistoryRevert, useNextFloatBoxPosition, useNodeStatus, useServices, useStage, useWindowRect, validateDataSourceFieldSelectValue, warn };
+export { ALL_COND_OPS, AddMNode, AddPrefixToObject, AsyncAfterHook, AsyncBeforeHook, AsyncHookPlugin, AsyncMethodName, BaseStepValue, BeforeAdd, CODE_DRAFT_STORAGE_KEY, COPY_CODE_STORAGE_KEY, COPY_DS_STORAGE_KEY, COPY_STORAGE_KEY, CanDropInFunction, CanDropInScene, _default as CodeBlockEditor, _default$1 as CodeBlockList, _default$2 as CodeBlockListPanel, CodeBlockListPanelSlots, CodeBlockListSlots, CodeBlockStepValue, CodeDeleteErrorType, CodeDslItem, CodeParamStatement, CodeRelation, _default$3 as CodeSelect, _default$4 as CodeSelectCol, CodeState, ColumnLayout, CombineInfo, CompareCategory, _default$5 as CompareForm, CompareFormBaseProps, CompareFormLoadConfig, CompareFormLoadConfigContext, ComponentGroup, ComponentGroupState, ComponentItem, _default$6 as ComponentListPanel, ComponentListPanelSlots, _default$7 as CondOpSelect, ConfirmAndRevertOptions, _default$8 as ContentMenu, ContentMenuTarget, ContentMenuType, CustomContentMenuFunction, CustomDiffFormOptions, DEFAULT_LEFT_COLUMN_WIDTH, DEFAULT_RIGHT_COLUMN_WIDTH, _default$9 as DataSourceAddButton, _default$10 as DataSourceConfigPanel, _default$11 as DataSourceFieldSelect, _default$12 as DataSourceFields, _default$13 as DataSourceInput, DataSourceListSlots, _default$14 as DataSourceMethodSelect, _default$15 as DataSourceMethods, _default$16 as DataSourceMocks, _default$17 as DataSourceSelect, DataSourceStepValue, DatasourceTypeOption, DepTargetType, DiffDialogPayload, _default$18 as DisplayConds, DragClassification, DragType, DslOpOptions, DslOpWithHistoryIdsResult, EVENT_NAME_VALUE_SEPARATOR, EditorChangeEvent, EditorChangeEventHistoryMeta, EditorChangeItem, EditorEvents, EditorInstallOptions, EditorNodeInfo, EditorSlots, EditorUpdateChangeItem, EventBus, EventBusEvent, EventNameOption, EventNameSelectOption, _default$19 as EventSelect, Fixed2Other, _default$20 as FloatingBox, FrameworkSlots, GetCodeBlockFormConfigOptions, GetColumnWidth, GetConfig, H_GUIDE_LINE_STORAGE_KEY, HistoryBucketConfig, _default$21 as HistoryDiffDialog, HistoryEvents, HistoryGroup, _default$22 as HistoryListBucket, _default$23 as HistoryListBucketTab, HistoryListExtraTab, HistoryOpOptions, HistoryOpOptionsWithChangeRecords, HistoryOpSource, HistoryOpType, HistoryPersistOptions, HistoryRowDescriptor, HistoryState, HistoryStepEntry, HistoryStepType, HistorySteps, _default$24 as Icon, IdleTask, IdleTaskEvents, IsExpandableFunction, KeyBindingCacheItem, KeyBindingCommand, KeyBindingItem, _default$25 as KeyValue, Keys, LEFT_COLUMN_WIDTH_STORAGE_KEY, _default$26 as LayerNodeContent, LayerNodeSlots, LayerNodeStatus, LayerOffset, _default$27 as LayerPanel, LayerPanelSlots, Layout, _default$28 as LayoutContainer, _default$28 as SplitView, ListState, MIN_CENTER_COLUMN_WIDTH, MIN_LEFT_COLUMN_WIDTH, MIN_RIGHT_COLUMN_WIDTH, MenuBarData, MenuButton, MenuComponent, MenuItem, NodeInvalidInfo, NodeInvalidSource, type OnDrag, PROPS_PANEL_WIDTH_STORAGE_KEY, PageBarSortOptions, _default$29 as PageFragmentSelect, PartSortableOptions, PastePosition, PersistedHistoryState, PropsFormConfigFunction, _default$30 as PropsFormPanel, PropsFormValueFunction, _default$31 as PropsPanel, PropsPanelSlots, PropsState, RIGHT_COLUMN_WIDTH_STORAGE_KEY, _default$32 as Resizer, ScrollViewer, ScrollViewerEvent, ScrollViewerSlots, SerializedUndoRedo, Services, SetColumnWidth, SideBarData, SideComponent, SideItem, SideItemKey, SidebarSlots, StageCore, StageOptions, StageOverlayState, StageRect, StageSlots, StepDiffItem, StepExtra, StepValue, StoreState, StoreStateKey, _default$33 as StyleSetter, SyncAfterHook, SyncBeforeHook, SyncHookPlugin, _default$34 as TMagicCodeEditor, _default$35 as TMagicEditor, _default$36 as ToolButton, _default$37 as Tree, _default$38 as TreeNode, TreeNodeData, type TypeMatchValidateContext, UI_SELECT_MODE_EVENT_NAME, UiState, UndoRedo, UpdateOptions, UseCompareFormReturn, UseHistoryRevertOptions, V_GUIDE_LINE_STORAGE_KEY, ValidateDataSourceFieldSelectOptions, _default$39 as ViewForm, WorkspaceSlots, advancedTabConfig, arrayOptions, beforePaste, booleanOptions, buildChangeRecords, calcAlignCenterStyle, calcLayerTargetIndex, calcMoveStyle, canUsePluginMethods, change2Fixed, classifyDragSources, _default$40 as codeBlockService, collectEventNameOptionValues, collectRelatedNodes, _default$41 as componentListService, confirmHistoryAction, createStackStep, _default$42 as dataSourceService, debug, _default$43 as default, defaultIsExpandable, _default$44 as depService, describeRevertStep, describeStepForRevert, deserializeStacks, designPlugin, detectStackOpType, detectTargetId, detectTargetName, displayTabConfig, editorNodeMergeCustomizer, _default$45 as editorService, editorTypeMatchRules, eqOptions, error, eventTabConfig, _default$46 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, _default$47 as historyService, idbDelete, idbGet, idbSet, info, isEventNameCheckStrictly, isGlobalFlat, isIncludeDataSource, isIndexedDBSupported, _default$48 as keybindingService, _default$49 as loadMonaco, log, markStackSaved, mergeSteps, moveItemsInContainer, normalizeCompActionValue, numberOptions, openIndexedDB, _default$50 as propsService, resolveFieldByPath, resolveSelectedNode, serializeConfig, serializeStacks, setChildrenLayout, setEditorConfig, setLayout, _default$51 as stageOverlayService, _default$52 as storageService, styleTabConfig, tablePlugin, toggleFixedPosition, _default$53 as uiService, undoFloor, updateStatus, useCodeBlockEdit, useCompareForm, useEditorContentHeight, useFilter, useFloatBox, useGetSo, useHistoryRevert, useNextFloatBoxPosition, useNodeStatus, useServices, useStage, useWindowRect, validateDataSourceFieldSelect, warn };