@tmagic/editor 1.8.0-beta.13 → 1.8.0-beta.15

package/dist/es/utils/props.js

@@ -145,6 +145,7 @@ var advancedTabConfig = {
 			name: NODE_DISABLE_CODE_BLOCK_KEY,
 			text: "禁用代码块",
 			type: "switch",
+			labelPosition: "left",
 			defaultValue: false,
 			extra: "开启后，配置的代码块将不会被执行"
 		},
@@ -152,15 +153,16 @@ var advancedTabConfig = {
 			name: NODE_DISABLE_DATA_SOURCE_KEY,
 			text: "禁用数据源",
 			type: "switch",
+			labelPosition: "left",
 			defaultValue: false,
 			extra: "开启后，组件内配置的数据源相关配置将不会被编译，显隐条件将失效"
 		},
 		{
 			name: "created",
-			text: "created",
+			text: "Created",
 			labelPosition: "top",
 			type: "code-select",
-			extra: "组件初始化时执行",
+			titleExtra: "组件初始化时执行",
 			rules: [{
 				typeMatch: true,
 				trigger: "change"
@@ -171,10 +173,10 @@ var advancedTabConfig = {
 		},
 		{
 			name: "mounted",
-			text: "mounted",
+			text: "Mounted",
 			labelPosition: "top",
 			type: "code-select",
-			extra: "组件挂载到dom时执行",
+			titleExtra: "组件挂载到dom时执行",
 			rules: [{
 				typeMatch: true,
 				trigger: "change"
@@ -185,8 +187,8 @@ var advancedTabConfig = {
 		},
 		{
 			name: "display",
-			text: "display",
-			extra: "控制组件是否渲染，关系的代码块返回值为false时不渲染",
+			text: "Display",
+			titleExtra: "控制组件是否渲染，关系的代码块返回值为false时不渲染",
 			labelPosition: "top",
 			type: "code-select",
 			rules: [{
@@ -202,26 +204,36 @@ var advancedTabConfig = {
 var displayTabConfig = {
 	title: "显示条件",
 	display: (_state, { model }) => model.type !== "page",
-	items: [{
-		name: NODE_CONDS_RESULT_KEY,
-		type: "select",
-		text: "条件成立时",
-		defaultValue: false,
-		options: [{
-			text: "显示",
-			value: false
-		}, {
-			text: "隐藏",
-			value: true
-		}],
-		extra: (_state, { model }) => `条件成立时${model[NODE_CONDS_RESULT_KEY] ? "隐藏" : "显示"}，不成立时${model[NODE_CONDS_RESULT_KEY] ? "显示" : "隐藏"}；<br />同一条件组内的所有条件配置同时成立时表示该条件组成立，任意一个条件组成立时表示条件成立(条件组内为且的关系，条件组间为或的关系)；<br />条件为空时表示成立；`
-	}, {
-		type: "display-conds",
-		name: NODE_CONDS_KEY,
-		titlePrefix: "条件组",
-		defaultValue: [],
-		rules: [{ typeMatch: true }]
-	}]
+	items: [
+		{
+			name: NODE_CONDS_RESULT_KEY,
+			type: "select",
+			text: "条件成立时",
+			defaultValue: false,
+			options: [{
+				text: "显示",
+				value: false
+			}, {
+				text: "隐藏",
+				value: true
+			}],
+			extra: (_state, { model }) => `条件成立时${model[NODE_CONDS_RESULT_KEY] ? "隐藏" : "显示"}，不成立时${model[NODE_CONDS_RESULT_KEY] ? "显示" : "隐藏"}；<br />同一条件组内的所有条件配置同时成立时表示该条件组成立，任意一个条件组成立时表示条件成立(条件组内为且的关系，条件组间为或的关系)；<br />条件为空时表示成立；`
+		},
+		{
+			text: "条件组配置",
+			static: true,
+			className: "display-conds-title"
+		},
+		{
+			type: "display-conds",
+			name: NODE_CONDS_KEY,
+			titlePrefix: "条件组",
+			fixed: "right",
+			operateColWidth: 112,
+			defaultValue: [],
+			rules: [{ typeMatch: true }]
+		}
+	]
 };
 /**
 * 统一为组件属性表单加上事件、高级、样式配置
@@ -239,10 +251,11 @@ var fillConfig = (config = [], { labelWidth = "80px", disabledDataSource = false
 		name: "id",
 		text: "ID",
 		type: "text",
-		disabled: true,
+		static: true,
 		append: {
-			type: "button",
-			text: "复制",
+			type: "icon",
+			text: "https://vip.image.video.qpic.cn/vupload/20260615/36cf7e1781493669935.svg",
+			extra: "复制",
 			handler: (vm, { model }) => {
 				navigator.clipboard.writeText(`${model.id}`).then(() => {
 					tMagicMessage.success("已复制");
@@ -261,6 +274,7 @@ var fillConfig = (config = [], { labelWidth = "80px", disabledDataSource = false
 	const tabConfig = {
 		type: "tab",
 		labelWidth,
+		className: "magic-right-panel-tabs-top",
 		items: [
 			{
 				title: "属性",

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

@@ -3,6 +3,7 @@ import editor_default from "../services/editor.js";
 import { getFieldType, resolveFieldByPath } from "./data-source/index.js";
 import codeBlock_default from "../services/codeBlock.js";
 import dataSource_default from "../services/dataSource.js";
+import { validateTypeMatch } from "@tmagic/form";
 import { appendValidateSuggestion } from "@tmagic/design";
 import { DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, DATA_SOURCE_SET_DATA_METHOD_NAME, dataSourceTemplateRegExp, getKeysArray, removeDataSourceFieldPrefix } from "@tmagic/utils";
 import { NodeType } from "@tmagic/core";
@@ -181,10 +182,10 @@ var validateDataSourceFieldPath = (path, options = {}) => {
 		fieldNames = path.slice(1);
 	}
 	const ds = findDataSource(`${dsId}`);
-	if (!ds) return defaultMessage(options.message, "值不在可选项中", dataSourceIdSuggestion());
+	if (!ds) return defaultMessage(options.message, `数据源(${dsId})不存在`, dataSourceIdSuggestion());
 	if (!fieldNames.length) return;
-	const { field, ok } = resolveFieldByPath(ds.fields, fieldNames);
-	if (!ok) return defaultMessage(options.message, "值不在可选项中", dataSourceIdSuggestion());
+	const { field, ok, fields, failedName } = resolveFieldByPath(ds.fields, fieldNames);
+	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";
@@ -267,9 +268,15 @@ var isDataSourceFieldPathValue = (value, config) => {
 	if (config.value === "key") return true;
 	return `${value[0]}`.startsWith(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX);
 };
-var validateDataSourceFieldSelect = (value, { message, props }) => {
+var validateDataSourceFieldSelect = (value, { mForm, message, props }) => {
 	const config = props.config || {};
-	if (config.fieldConfig && !isDataSourceFieldPathValue(value, config)) return;
+	if (config.fieldConfig && !isDataSourceFieldPathValue(value, config)) return validateTypeMatch(value, mForm, {
+		...props,
+		config: {
+			name: config.name,
+			...config.fieldConfig
+		}
+	}, message);
 	if (!Array.isArray(value) || value.some((item) => typeof item !== "string")) return defaultMessage(message, `${value}类型应为字符串数组`, dataSourceFieldPathSuggestion());
 	return validateDataSourceFieldPath(value, {
 		dataSourceId: config.dataSourceId,