@tmagic/editor 1.8.0 → 1.8.1

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

@@ -1,4 +1,5 @@
 import { useServices } from "../../hooks/use-services.js";
+import { resolveFieldByPath } from "../../utils/data-source/index.js";
 import Icon_default from "../../components/Icon.js";
 import DatasourceIcon_default from "../../icons/DatasourceIcon.js";
 import FieldSelect_default from "./FieldSelect.js";
@@ -86,15 +87,11 @@ var Index_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComp
 				emit("change", value, eventData);
 				return;
 			}
-			let fields = dataSource.fields || [];
-			let field;
-			(keys || []).forEach((key) => {
-				field = fields.find((f) => f.name === key);
-				fields = field?.fields || [];
-			});
+			const { field, ok, untypedArrayElement } = resolveFieldByPath(dataSource.fields, keys, { allowArrayIndex: true });
 			const dataSourceFieldType = props.config.dataSourceFieldType || ["any"];
 			if (!dataSourceFieldType.length) dataSourceFieldType.push("any");
-			if (!keys.length || field?.type && (field.type === "any" || dataSourceFieldType.includes("any") || dataSourceFieldType.includes(field.type))) emit("change", value, eventData);
+			const typeMatches = ok && !!field?.type && (dataSourceFieldType.includes("any") || !untypedArrayElement && (field.type === "any" || dataSourceFieldType.includes(field.type)));
+			if (!keys.length || typeMatches) emit("change", value, eventData);
 			else {
 				tMagicMessage.error(`请选择类型为${dataSourceFieldType.join("或")}的字段`);
 				emit("change", [dsId], eventData);

package/dist/es/fields/configs/displayConds.js

@@ -1,4 +1,4 @@
-import { getCascaderOptionsFromFields, getFieldType } from "../../utils/data-source/index.js";
+import { getCascaderOptionsFromFields, getFieldType, resolveFieldByPath } from "../../utils/data-source/index.js";
 import dataSource_default from "../../services/dataSource.js";
 import { stickyAddButton } from "./stickyAddButton.js";
 import { removeDataSourceFieldPrefix } from "@tmagic/utils";
@@ -34,11 +34,8 @@ var createDisplayCondsConfig = (config, name, parentFields) => {
 		options: () => {
 			const { ds, fieldNames } = resolveFieldPath(parentFields);
 			if (!ds) return [];
-			let fields = ds.fields || [];
-			fieldNames.forEach((key) => {
-				fields = fields.find((f) => f.name === key)?.fields || [];
-			});
-			return getCascaderOptionsFromFields(fields, [
+			const resolved = resolveFieldByPath(ds.fields, fieldNames, { allowArrayIndex: true });
+			return getCascaderOptionsFromFields(resolved.ok ? resolved.fields : [], [
 				"string",
 				"number",
 				"boolean",

package/dist/es/utils/data-source/index.js

@@ -1,6 +1,6 @@
 import base_default from "./formConfigs/base.js";
 import http_default from "./formConfigs/http.js";
-import { dataSourceTemplateRegExp, getKeysArray, isNumber } from "@tmagic/utils";
+import { dataSourceTemplateRegExp, getKeysArray, isArrayIndex, isNumber } from "@tmagic/utils";
 //#region packages/editor/src/utils/data-source/index.ts
 var dataSourceFormConfig = {
 	type: "tab",
@@ -192,25 +192,59 @@ var getCascaderOptionsFromFields = (fields = [], dataSourceFieldType = ["any"])
 /**
 * 按字段名路径下钻 DataSchema。
 * @param skipNumberIndices 为 true 时跳过数字段（模板路径中的数组下标，如 arr[0].x）
+* @param allowArrayIndex 为 true 时识别数组下标。`number` 只能是下标；数字字符串先按当前层字段名匹配，没有同名字段时才当中下标
 */
 var resolveFieldByPath = (fields, fieldNames, options = {}) => {
 	let currentFields = fields || [];
 	let field;
+	/** 刚消费了数组下标，路径若在此结束则当前值是数组元素 */
+	let atArrayElement = false;
+	let arrayIndexName = "";
 	for (const name of fieldNames) {
 		if (options.skipNumberIndices && isNumber(name)) continue;
+		const segment = `${name}`;
+		if (options.allowArrayIndex && isArrayIndex(name) && field?.type === "array" && !atArrayElement) {
+			if (!(typeof name === "string" ? currentFields.find((item) => item.name === segment) : void 0)) {
+				atArrayElement = true;
+				arrayIndexName = segment;
+				continue;
+			}
+		}
+		if (options.allowArrayIndex && typeof name === "number") return {
+			ok: false,
+			fields: currentFields,
+			failedName: segment,
+			invalidArrayIndex: true
+		};
+		atArrayElement = false;
 		if (!currentFields.length) return {
 			ok: false,
 			fields: currentFields,
-			failedName: name
+			failedName: segment
 		};
-		field = currentFields.find((item) => item.name === name);
+		field = currentFields.find((item) => item.name === segment);
 		if (!field) return {
 			ok: false,
 			fields: currentFields,
-			failedName: name
+			failedName: segment
 		};
 		currentFields = field.fields || [];
 	}
+	if (atArrayElement && field?.type === "array") {
+		const elementFields = field.fields || [];
+		const untypedArrayElement = elementFields.length === 0;
+		return {
+			ok: true,
+			arrayElement: true,
+			untypedArrayElement,
+			field: {
+				name: arrayIndexName,
+				type: untypedArrayElement ? "any" : "object",
+				fields: elementFields
+			},
+			fields: elementFields
+		};
+	}
 	return {
 		field,
 		ok: true,
@@ -218,8 +252,8 @@ var resolveFieldByPath = (fields, fieldNames, options = {}) => {
 	};
 };
 var getFieldType = (ds, fieldNames) => {
-	const { ok, field } = resolveFieldByPath(ds?.fields, fieldNames);
-	if (!ok) return "";
+	const { ok, field, untypedArrayElement } = resolveFieldByPath(ds?.fields, fieldNames, { allowArrayIndex: true });
+	if (!ok || untypedArrayElement) return "";
 	return field?.type || "";
 };
 //#endregion

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

@@ -3,7 +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 { DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, DATA_SOURCE_SET_DATA_METHOD_NAME, dataSourceTemplateRegExp, getKeysArray, removeDataSourceFieldPrefix } from "@tmagic/utils";
+import { DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, DATA_SOURCE_SET_DATA_METHOD_NAME, dataSourceTemplateRegExp, getKeysArray, isArrayIndex, removeDataSourceFieldPrefix } from "@tmagic/utils";
 import { NodeType } from "@tmagic/core";
 import { appendValidateSuggestion } from "@tmagic/design/headless";
 import { MAX_SUGGESTION_OPTIONS, optionSuggestion, stringifyExampleValue, validateTypeMatch } from "@tmagic/form/headless";
@@ -157,14 +157,18 @@ var validateDataSourceFieldPath = (path, options = {}) => {
 	const ds = findDataSource(`${dsId}`);
 	if (!ds) return defaultMessage(options.message, `数据源(${dsId})不存在`, dataSourceIdSuggestion());
 	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 { field, ok, fields, failedName, invalidArrayIndex, arrayElement, untypedArrayElement } = resolveFieldByPath(ds.fields, path, { allowArrayIndex: true });
+	if (!ok) {
+		if (invalidArrayIndex) return defaultMessage(options.message, `数组下标(${failedName})只能接在数组字段后面`);
+		return defaultMessage(options.message, `数据源字段(${failedName})不存在`, listSuggestion(fields.map((item) => item.name)));
+	}
 	const allowedTypes = options.dataSourceFieldType || ["any"];
 	if (!allowedTypes.length || allowedTypes.includes("any")) return;
+	if (untypedArrayElement) return defaultMessage(options.message, `数组下标(${field?.name ?? path[path.length - 1]})的元素类型未定义，请选择具体字段`);
 	const leafType = field?.type || "any";
 	if (leafType !== "any" && !allowedTypes.includes(leafType)) {
 		const fieldName = field?.name || path[path.length - 1];
-		return defaultMessage(options.message, `请选择类型为${allowedTypes.join("或")}的字段，字段(${fieldName})的类型为${leafType}`);
+		return defaultMessage(options.message, arrayElement ? `请选择类型为${allowedTypes.join("或")}的字段，数组元素的类型为${leafType}` : `请选择类型为${allowedTypes.join("或")}的字段，字段(${fieldName})的类型为${leafType}`);
 	}
 };
 var validateDataSourceMethodTuple = (value, message) => {
@@ -238,8 +242,10 @@ var validateDataSourceInput = (value, { message }) => {
 	return validateDataSourceTemplateBindings(value, message);
 };
 var validateDataSourceMethodSelect = (value, { message }) => validateDataSourceMethodTuple(value, message);
+/** 字段名，或非负整数下标（number）。数字字符串本身是 string，走字段名分支。 */
+var isDataSourceFieldPathSegment = (item) => typeof item === "string" || typeof item === "number" && isArrayIndex(item);
 var isDataSourceFieldPathValue = (value, config) => {
-	if (!Array.isArray(value) || !value.length || value.some((item) => typeof item !== "string")) return false;
+	if (!Array.isArray(value) || !value.length || value.some((item) => !isDataSourceFieldPathSegment(item))) return false;
 	if (config.dataSourceId) return true;
 	if (config.value === "key") return true;
 	return `${value[0]}`.startsWith(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX);
@@ -260,11 +266,13 @@ var validateDataSourceFieldSelect = (value, context, options) => {
 			}
 		}, message);
 	}
-	if (!Array.isArray(value) || value.some((item) => typeof item !== "string")) return defaultMessage(message, `${value}类型应为字符串数组`, dataSourceFieldPathSuggestion());
+	if (!Array.isArray(value) || value.some((item) => !isDataSourceFieldPathSegment(item))) return defaultMessage(message, `${value}类型应为字符串数组，数组字段后可接数字下标`, dataSourceFieldPathSuggestion());
 	let dataSourceId = config.dataSourceId ? `${config.dataSourceId}` : void 0;
 	let fieldNames = value;
 	if (!dataSourceId) {
-		dataSourceId = value.length ? removeDataSourceFieldPrefix(value[0]) : void 0;
+		const dsId = value[0];
+		if (value.length && typeof dsId !== "string") return defaultMessage(message, `${value}类型应为字符串数组，数组字段后可接数字下标`, dataSourceFieldPathSuggestion());
+		dataSourceId = value.length ? removeDataSourceFieldPrefix(dsId) : void 0;
 		fieldNames = value.slice(1);
 	}
 	return validateDataSourceFieldPath(fieldNames, {

package/dist/tmagic-editor-headless.umd.cjs

@@ -8023,25 +8023,59 @@
 	/**
 	* 按字段名路径下钻 DataSchema。
 	* @param skipNumberIndices 为 true 时跳过数字段（模板路径中的数组下标，如 arr[0].x）
+	* @param allowArrayIndex 为 true 时识别数组下标。`number` 只能是下标；数字字符串先按当前层字段名匹配，没有同名字段时才当中下标
 	*/
 	var resolveFieldByPath = (fields, fieldNames, options = {}) => {
 		let currentFields = fields || [];
 		let field;
+		/** 刚消费了数组下标，路径若在此结束则当前值是数组元素 */
+		let atArrayElement = false;
+		let arrayIndexName = "";
 		for (const name of fieldNames) {
 			if (options.skipNumberIndices && (0, _tmagic_utils.isNumber)(name)) continue;
+			const segment = `${name}`;
+			if (options.allowArrayIndex && (0, _tmagic_utils.isArrayIndex)(name) && field?.type === "array" && !atArrayElement) {
+				if (!(typeof name === "string" ? currentFields.find((item) => item.name === segment) : void 0)) {
+					atArrayElement = true;
+					arrayIndexName = segment;
+					continue;
+				}
+			}
+			if (options.allowArrayIndex && typeof name === "number") return {
+				ok: false,
+				fields: currentFields,
+				failedName: segment,
+				invalidArrayIndex: true
+			};
+			atArrayElement = false;
 			if (!currentFields.length) return {
 				ok: false,
 				fields: currentFields,
-				failedName: name
+				failedName: segment
 			};
-			field = currentFields.find((item) => item.name === name);
+			field = currentFields.find((item) => item.name === segment);
 			if (!field) return {
 				ok: false,
 				fields: currentFields,
-				failedName: name
+				failedName: segment
 			};
 			currentFields = field.fields || [];
 		}
+		if (atArrayElement && field?.type === "array") {
+			const elementFields = field.fields || [];
+			const untypedArrayElement = elementFields.length === 0;
+			return {
+				ok: true,
+				arrayElement: true,
+				untypedArrayElement,
+				field: {
+					name: arrayIndexName,
+					type: untypedArrayElement ? "any" : "object",
+					fields: elementFields
+				},
+				fields: elementFields
+			};
+		}
 		return {
 			field,
 			ok: true,
@@ -8049,8 +8083,8 @@
 		};
 	};
 	var getFieldType = (ds, fieldNames) => {
-		const { ok, field } = resolveFieldByPath(ds?.fields, fieldNames);
-		if (!ok) return "";
+		const { ok, field, untypedArrayElement } = resolveFieldByPath(ds?.fields, fieldNames, { allowArrayIndex: true });
+		if (!ok || untypedArrayElement) return "";
 		return field?.type || "";
 	};
 	//#endregion
@@ -8628,14 +8662,18 @@
 		const ds = findDataSource(`${dsId}`);
 		if (!ds) return defaultMessage(options.message, `数据源(${dsId})不存在`, dataSourceIdSuggestion());
 		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 { field, ok, fields, failedName, invalidArrayIndex, arrayElement, untypedArrayElement } = resolveFieldByPath(ds.fields, path, { allowArrayIndex: true });
+		if (!ok) {
+			if (invalidArrayIndex) return defaultMessage(options.message, `数组下标(${failedName})只能接在数组字段后面`);
+			return defaultMessage(options.message, `数据源字段(${failedName})不存在`, listSuggestion(fields.map((item) => item.name)));
+		}
 		const allowedTypes = options.dataSourceFieldType || ["any"];
 		if (!allowedTypes.length || allowedTypes.includes("any")) return;
+		if (untypedArrayElement) return defaultMessage(options.message, `数组下标(${field?.name ?? path[path.length - 1]})的元素类型未定义，请选择具体字段`);
 		const leafType = field?.type || "any";
 		if (leafType !== "any" && !allowedTypes.includes(leafType)) {
 			const fieldName = field?.name || path[path.length - 1];
-			return defaultMessage(options.message, `请选择类型为${allowedTypes.join("或")}的字段，字段(${fieldName})的类型为${leafType}`);
+			return defaultMessage(options.message, arrayElement ? `请选择类型为${allowedTypes.join("或")}的字段，数组元素的类型为${leafType}` : `请选择类型为${allowedTypes.join("或")}的字段，字段(${fieldName})的类型为${leafType}`);
 		}
 	};
 	var validateDataSourceMethodTuple = (value, message) => {
@@ -8708,8 +8746,10 @@
 		return validateDataSourceTemplateBindings(value, message);
 	};
 	var validateDataSourceMethodSelect = (value, { message }) => validateDataSourceMethodTuple(value, message);
+	/** 字段名，或非负整数下标（number）。数字字符串本身是 string，走字段名分支。 */
+	var isDataSourceFieldPathSegment = (item) => typeof item === "string" || typeof item === "number" && (0, _tmagic_utils.isArrayIndex)(item);
 	var isDataSourceFieldPathValue = (value, config) => {
-		if (!Array.isArray(value) || !value.length || value.some((item) => typeof item !== "string")) return false;
+		if (!Array.isArray(value) || !value.length || value.some((item) => !isDataSourceFieldPathSegment(item))) return false;
 		if (config.dataSourceId) return true;
 		if (config.value === "key") return true;
 		return `${value[0]}`.startsWith(_tmagic_utils.DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX);
@@ -8730,11 +8770,13 @@
 				}
 			}, message);
 		}
-		if (!Array.isArray(value) || value.some((item) => typeof item !== "string")) return defaultMessage(message, `${value}类型应为字符串数组`, dataSourceFieldPathSuggestion());
+		if (!Array.isArray(value) || value.some((item) => !isDataSourceFieldPathSegment(item))) return defaultMessage(message, `${value}类型应为字符串数组，数组字段后可接数字下标`, dataSourceFieldPathSuggestion());
 		let dataSourceId = config.dataSourceId ? `${config.dataSourceId}` : void 0;
 		let fieldNames = value;
 		if (!dataSourceId) {
-			dataSourceId = value.length ? (0, _tmagic_utils.removeDataSourceFieldPrefix)(value[0]) : void 0;
+			const dsId = value[0];
+			if (value.length && typeof dsId !== "string") return defaultMessage(message, `${value}类型应为字符串数组，数组字段后可接数字下标`, dataSourceFieldPathSuggestion());
+			dataSourceId = value.length ? (0, _tmagic_utils.removeDataSourceFieldPrefix)(dsId) : void 0;
 			fieldNames = value.slice(1);
 		}
 		return validateDataSourceFieldPath(fieldNames, {
@@ -8967,11 +9009,8 @@
 			options: () => {
 				const { ds, fieldNames } = resolveFieldPath(parentFields);
 				if (!ds) return [];
-				let fields = ds.fields || [];
-				fieldNames.forEach((key) => {
-					fields = fields.find((f) => f.name === key)?.fields || [];
-				});
-				return getCascaderOptionsFromFields(fields, [
+				const resolved = resolveFieldByPath(ds.fields, fieldNames, { allowArrayIndex: true });
+				return getCascaderOptionsFromFields(resolved.ok ? resolved.fields : [], [
 					"string",
 					"number",
 					"boolean",

package/dist/tmagic-editor.umd.cjs

@@ -9630,25 +9630,59 @@
 	/**
 	* 按字段名路径下钻 DataSchema。
 	* @param skipNumberIndices 为 true 时跳过数字段（模板路径中的数组下标，如 arr[0].x）
+	* @param allowArrayIndex 为 true 时识别数组下标。`number` 只能是下标；数字字符串先按当前层字段名匹配，没有同名字段时才当中下标
 	*/
 	var resolveFieldByPath = (fields, fieldNames, options = {}) => {
 		let currentFields = fields || [];
 		let field;
+		/** 刚消费了数组下标，路径若在此结束则当前值是数组元素 */
+		let atArrayElement = false;
+		let arrayIndexName = "";
 		for (const name of fieldNames) {
 			if (options.skipNumberIndices && (0, _tmagic_utils.isNumber)(name)) continue;
+			const segment = `${name}`;
+			if (options.allowArrayIndex && (0, _tmagic_utils.isArrayIndex)(name) && field?.type === "array" && !atArrayElement) {
+				if (!(typeof name === "string" ? currentFields.find((item) => item.name === segment) : void 0)) {
+					atArrayElement = true;
+					arrayIndexName = segment;
+					continue;
+				}
+			}
+			if (options.allowArrayIndex && typeof name === "number") return {
+				ok: false,
+				fields: currentFields,
+				failedName: segment,
+				invalidArrayIndex: true
+			};
+			atArrayElement = false;
 			if (!currentFields.length) return {
 				ok: false,
 				fields: currentFields,
-				failedName: name
+				failedName: segment
 			};
-			field = currentFields.find((item) => item.name === name);
+			field = currentFields.find((item) => item.name === segment);
 			if (!field) return {
 				ok: false,
 				fields: currentFields,
-				failedName: name
+				failedName: segment
 			};
 			currentFields = field.fields || [];
 		}
+		if (atArrayElement && field?.type === "array") {
+			const elementFields = field.fields || [];
+			const untypedArrayElement = elementFields.length === 0;
+			return {
+				ok: true,
+				arrayElement: true,
+				untypedArrayElement,
+				field: {
+					name: arrayIndexName,
+					type: untypedArrayElement ? "any" : "object",
+					fields: elementFields
+				},
+				fields: elementFields
+			};
+		}
 		return {
 			field,
 			ok: true,
@@ -9656,8 +9690,8 @@
 		};
 	};
 	var getFieldType = (ds, fieldNames) => {
-		const { ok, field } = resolveFieldByPath(ds?.fields, fieldNames);
-		if (!ok) return "";
+		const { ok, field, untypedArrayElement } = resolveFieldByPath(ds?.fields, fieldNames, { allowArrayIndex: true });
+		if (!ok || untypedArrayElement) return "";
 		return field?.type || "";
 	};
 	//#endregion
@@ -10993,14 +11027,18 @@
 		const ds = findDataSource(`${dsId}`);
 		if (!ds) return defaultMessage(options.message, `数据源(${dsId})不存在`, dataSourceIdSuggestion());
 		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 { field, ok, fields, failedName, invalidArrayIndex, arrayElement, untypedArrayElement } = resolveFieldByPath(ds.fields, path, { allowArrayIndex: true });
+		if (!ok) {
+			if (invalidArrayIndex) return defaultMessage(options.message, `数组下标(${failedName})只能接在数组字段后面`);
+			return defaultMessage(options.message, `数据源字段(${failedName})不存在`, listSuggestion(fields.map((item) => item.name)));
+		}
 		const allowedTypes = options.dataSourceFieldType || ["any"];
 		if (!allowedTypes.length || allowedTypes.includes("any")) return;
+		if (untypedArrayElement) return defaultMessage(options.message, `数组下标(${field?.name ?? path[path.length - 1]})的元素类型未定义，请选择具体字段`);
 		const leafType = field?.type || "any";
 		if (leafType !== "any" && !allowedTypes.includes(leafType)) {
 			const fieldName = field?.name || path[path.length - 1];
-			return defaultMessage(options.message, `请选择类型为${allowedTypes.join("或")}的字段，字段(${fieldName})的类型为${leafType}`);
+			return defaultMessage(options.message, arrayElement ? `请选择类型为${allowedTypes.join("或")}的字段，数组元素的类型为${leafType}` : `请选择类型为${allowedTypes.join("或")}的字段，字段(${fieldName})的类型为${leafType}`);
 		}
 	};
 	var validateDataSourceMethodTuple = (value, message) => {
@@ -11073,8 +11111,10 @@
 		return validateDataSourceTemplateBindings(value, message);
 	};
 	var validateDataSourceMethodSelect = (value, { message }) => validateDataSourceMethodTuple(value, message);
+	/** 字段名，或非负整数下标（number）。数字字符串本身是 string，走字段名分支。 */
+	var isDataSourceFieldPathSegment = (item) => typeof item === "string" || typeof item === "number" && (0, _tmagic_utils.isArrayIndex)(item);
 	var isDataSourceFieldPathValue = (value, config) => {
-		if (!Array.isArray(value) || !value.length || value.some((item) => typeof item !== "string")) return false;
+		if (!Array.isArray(value) || !value.length || value.some((item) => !isDataSourceFieldPathSegment(item))) return false;
 		if (config.dataSourceId) return true;
 		if (config.value === "key") return true;
 		return `${value[0]}`.startsWith(_tmagic_utils.DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX);
@@ -11095,11 +11135,13 @@
 				}
 			}, message);
 		}
-		if (!Array.isArray(value) || value.some((item) => typeof item !== "string")) return defaultMessage(message, `${value}类型应为字符串数组`, dataSourceFieldPathSuggestion());
+		if (!Array.isArray(value) || value.some((item) => !isDataSourceFieldPathSegment(item))) return defaultMessage(message, `${value}类型应为字符串数组，数组字段后可接数字下标`, dataSourceFieldPathSuggestion());
 		let dataSourceId = config.dataSourceId ? `${config.dataSourceId}` : void 0;
 		let fieldNames = value;
 		if (!dataSourceId) {
-			dataSourceId = value.length ? (0, _tmagic_utils.removeDataSourceFieldPrefix)(value[0]) : void 0;
+			const dsId = value[0];
+			if (value.length && typeof dsId !== "string") return defaultMessage(message, `${value}类型应为字符串数组，数组字段后可接数字下标`, dataSourceFieldPathSuggestion());
+			dataSourceId = value.length ? (0, _tmagic_utils.removeDataSourceFieldPrefix)(dsId) : void 0;
 			fieldNames = value.slice(1);
 		}
 		return validateDataSourceFieldPath(fieldNames, {
@@ -22885,15 +22927,11 @@
 					emit("change", value, eventData);
 					return;
 				}
-				let fields = dataSource.fields || [];
-				let field;
-				(keys || []).forEach((key) => {
-					field = fields.find((f) => f.name === key);
-					fields = field?.fields || [];
-				});
+				const { field, ok, untypedArrayElement } = resolveFieldByPath(dataSource.fields, keys, { allowArrayIndex: true });
 				const dataSourceFieldType = props.config.dataSourceFieldType || ["any"];
 				if (!dataSourceFieldType.length) dataSourceFieldType.push("any");
-				if (!keys.length || field?.type && (field.type === "any" || dataSourceFieldType.includes("any") || dataSourceFieldType.includes(field.type))) emit("change", value, eventData);
+				const typeMatches = ok && !!field?.type && (dataSourceFieldType.includes("any") || !untypedArrayElement && (field.type === "any" || dataSourceFieldType.includes(field.type)));
+				if (!keys.length || typeMatches) emit("change", value, eventData);
 				else {
 					_tmagic_design.tMagicMessage.error(`请选择类型为${dataSourceFieldType.join("或")}的字段`);
 					emit("change", [dsId], eventData);
@@ -23650,11 +23688,8 @@
 			options: () => {
 				const { ds, fieldNames } = resolveFieldPath(parentFields);
 				if (!ds) return [];
-				let fields = ds.fields || [];
-				fieldNames.forEach((key) => {
-					fields = fields.find((f) => f.name === key)?.fields || [];
-				});
-				return getCascaderOptionsFromFields(fields, [
+				const resolved = resolveFieldByPath(ds.fields, fieldNames, { allowArrayIndex: true });
+				return getCascaderOptionsFromFields(resolved.ok ? resolved.fields : [], [
 					"string",
 					"number",
 					"boolean",

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.0",
+  "version": "1.8.1",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -63,11 +63,11 @@
     "moveable": "^0.53.0",
     "serialize-javascript": "^7.1.1",
     "sortablejs": "^1.15.7",
-    "@tmagic/design": "1.8.0",
-    "@tmagic/form": "1.8.0",
-    "@tmagic/stage": "1.8.0",
-    "@tmagic/utils": "1.8.0",
-    "@tmagic/table": "1.8.0"
+    "@tmagic/design": "1.8.1",
+    "@tmagic/form": "1.8.1",
+    "@tmagic/stage": "1.8.1",
+    "@tmagic/table": "1.8.1",
+    "@tmagic/utils": "1.8.1"
   },
   "devDependencies": {
     "@types/events": "^3.0.3",
@@ -81,7 +81,7 @@
     "type-fest": "^5.2.0",
     "typescript": "^6.0.3",
     "vue": "^3.5.43",
-    "@tmagic/core": "1.8.0"
+    "@tmagic/core": "1.8.1"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/fields/DataSourceFieldSelect/Index.vue

@@ -51,7 +51,6 @@
 <script setup lang="ts">
 import { computed, inject, ref, resolveComponent, watch } from 'vue';
 
-import { DataSchema } from '@tmagic/core';
 import { TMagicButton, tMagicMessage, TMagicTooltip } from '@tmagic/design';
 import {
   type ContainerChangeEventData,
@@ -64,6 +63,7 @@ import { DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, removeDataSourceFieldPrefix } f
 
 import MIcon from '@editor/components/Icon.vue';
 import { useServices } from '@editor/hooks/use-services';
+import { resolveFieldByPath } from '@editor/utils/data-source';
 
 import dataSourceIcon from '../../icons/DatasourceIcon.vue';
 
@@ -175,11 +175,8 @@ const onChangeHandler = (value: string[], eventData?: ContainerChangeEventData)
     return;
   }
 
-  let fields = dataSource.fields || [];
-  let field: DataSchema | undefined;
-  (keys || []).forEach((key) => {
-    field = fields.find((f) => f.name === key);
-    fields = field?.fields || [];
+  const { field, ok, untypedArrayElement } = resolveFieldByPath(dataSource.fields, keys, {
+    allowArrayIndex: true,
   });
 
   const dataSourceFieldType = props.config.dataSourceFieldType || ['any'];
@@ -187,11 +184,14 @@ const onChangeHandler = (value: string[], eventData?: ContainerChangeEventData)
     dataSourceFieldType.push('any');
   }
 
-  if (
-    !keys.length ||
-    (field?.type &&
-      (field.type === 'any' || dataSourceFieldType.includes('any') || dataSourceFieldType.includes(field.type)))
-  ) {
+  // 未声明元素结构的下标不是显式 any，限定了具体类型时不放行
+  const typeMatches =
+    ok &&
+    !!field?.type &&
+    (dataSourceFieldType.includes('any') ||
+      (!untypedArrayElement && (field.type === 'any' || dataSourceFieldType.includes(field.type))));
+
+  if (!keys.length || typeMatches) {
     emit('change', value, eventData);
   } else {
     tMagicMessage.error(`请选择类型为${dataSourceFieldType.join('或')}的字段`);

package/src/fields/configs/displayConds.ts

@@ -20,7 +20,7 @@ import type { DisplayCondsConfig, FormState, GroupListConfig } from '@tmagic/for
 import { removeDataSourceFieldPrefix } from '@tmagic/utils';
 
 import dataSourceService from '@editor/services/dataSource';
-import { getCascaderOptionsFromFields, getFieldType } from '@editor/utils/data-source';
+import { getCascaderOptionsFromFields, getFieldType, resolveFieldByPath } from '@editor/utils/data-source';
 
 import { stickyAddButton } from './stickyAddButton';
 
@@ -38,7 +38,7 @@ export const createDisplayCondsConfig = (
   name: string,
   parentFields: string[],
 ): GroupListConfig => {
-  const resolveFieldPath = (path: string[]) => {
+  const resolveFieldPath = (path: Array<string | number>) => {
     const [id, ...fieldNames] = path;
     const ds = id ? dataSourceService.getDataSourceById(removeDataSourceFieldPrefix(`${id}`)) : undefined;
     return { ds, fieldNames };
@@ -69,13 +69,13 @@ export const createDisplayCondsConfig = (
             return [];
           }
 
-          let fields = ds.fields || [];
-          fieldNames.forEach((key) => {
-            const field = fields.find((f) => f.name === key);
-            fields = field?.fields || [];
-          });
-
-          return getCascaderOptionsFromFields(fields, ['string', 'number', 'boolean', 'any']);
+          const resolved = resolveFieldByPath(ds.fields, fieldNames, { allowArrayIndex: true });
+          return getCascaderOptionsFromFields(resolved.ok ? resolved.fields : [], [
+            'string',
+            'number',
+            'boolean',
+            'any',
+          ]);
         },
         name: 'field',
         value: 'key',

package/src/utils/data-source/index.ts

@@ -1,6 +1,6 @@
 import type { DataSchema, DataSourceFieldType, DataSourceSchema } from '@tmagic/core';
 import { type CascaderOption, type FormConfig, type TabConfig } from '@tmagic/form';
-import { dataSourceTemplateRegExp, getKeysArray, isNumber } from '@tmagic/utils';
+import { dataSourceTemplateRegExp, getKeysArray, isArrayIndex, isNumber } from '@tmagic/utils';
 
 import BaseFormConfig from './formConfigs/base';
 import HttpFormConfig from './formConfigs/http';
@@ -239,34 +239,86 @@ export const getCascaderOptionsFromFields = (
 /**
  * 按字段名路径下钻 DataSchema。
  * @param skipNumberIndices 为 true 时跳过数字段（模板路径中的数组下标，如 arr[0].x）
+ * @param allowArrayIndex 为 true 时识别数组下标。`number` 只能是下标；数字字符串先按当前层字段名匹配，没有同名字段时才当中下标
  */
 export const resolveFieldByPath = (
   fields: DataSchema[] | undefined,
-  fieldNames: string[],
-  options: { skipNumberIndices?: boolean } = {},
-): { ok: boolean; field?: DataSchema; fields: DataSchema[]; failedName?: string } => {
+  fieldNames: Array<string | number>,
+  options: { skipNumberIndices?: boolean; allowArrayIndex?: boolean } = {},
+): {
+  ok: boolean;
+  field?: DataSchema;
+  fields: DataSchema[];
+  failedName?: string;
+  /** number 下标没有紧跟在数组字段后面 */
+  invalidArrayIndex?: boolean;
+  /** 路径停在数组下标上，当前值是数组元素 */
+  arrayElement?: boolean;
+  /** 数组没有子字段，元素类型未知 */
+  untypedArrayElement?: boolean;
+} => {
   let currentFields = fields || [];
   let field: DataSchema | undefined;
+  /** 刚消费了数组下标，路径若在此结束则当前值是数组元素 */
+  let atArrayElement = false;
+  let arrayIndexName = '';
 
   for (const name of fieldNames) {
     if (options.skipNumberIndices && isNumber(name)) {
       continue;
     }
+
+    const segment = `${name}`;
+    // number 不能当字段名。数字字符串仅在当前层没有同名字段时才当中下标，避免盖住名为 "0" 的子字段。
+    if (options.allowArrayIndex && isArrayIndex(name) && field?.type === 'array' && !atArrayElement) {
+      const namedField = typeof name === 'string' ? currentFields.find((item) => item.name === segment) : undefined;
+      if (!namedField) {
+        atArrayElement = true;
+        arrayIndexName = segment;
+        continue;
+      }
+    }
+
+    if (options.allowArrayIndex && typeof name === 'number') {
+      return { ok: false, fields: currentFields, failedName: segment, invalidArrayIndex: true };
+    }
+
+    atArrayElement = false;
+
     if (!currentFields.length) {
-      return { ok: false, fields: currentFields, failedName: name };
+      return { ok: false, fields: currentFields, failedName: segment };
     }
-    field = currentFields.find((item) => item.name === name);
+    field = currentFields.find((item) => item.name === segment);
     if (!field) {
-      return { ok: false, fields: currentFields, failedName: name };
+      return { ok: false, fields: currentFields, failedName: segment };
     }
     currentFields = field.fields || [];
   }
 
+  if (atArrayElement && field?.type === 'array') {
+    const elementFields = field.fields || [];
+    const untypedArrayElement = elementFields.length === 0;
+    return {
+      ok: true,
+      arrayElement: true,
+      untypedArrayElement,
+      field: {
+        name: arrayIndexName,
+        // 有子字段时元素是这些字段组成的对象；没有子字段时类型未知，不能当成显式 any
+        type: untypedArrayElement ? 'any' : 'object',
+        fields: elementFields,
+      },
+      fields: elementFields,
+    };
+  }
+
   return { field, ok: true, fields: currentFields };
 };
 
-export const getFieldType = (ds: DataSourceSchema | undefined, fieldNames: string[]) => {
-  const { ok, field } = resolveFieldByPath(ds?.fields, fieldNames);
-  if (!ok) return '';
+export const getFieldType = (ds: DataSourceSchema | undefined, fieldNames: Array<string | number>) => {
+  const { ok, field, untypedArrayElement } = resolveFieldByPath(ds?.fields, fieldNames, {
+    allowArrayIndex: true,
+  });
+  if (!ok || untypedArrayElement) return '';
   return field?.type || '';
 };

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

@@ -31,6 +31,7 @@ import {
   DATA_SOURCE_SET_DATA_METHOD_NAME,
   dataSourceTemplateRegExp,
   getKeysArray,
+  isArrayIndex,
   removeDataSourceFieldPrefix,
 } from '@tmagic/utils';
 
@@ -211,7 +212,7 @@ const displayCondSuggestion = (): string => {
 };
 
 const validateDataSourceFieldPath = (
-  path: string[],
+  path: Array<string | number>,
   options: {
     dataSourceId?: string;
     dataSourceFieldType?: DataSourceFieldType[];
@@ -239,8 +240,17 @@ const validateDataSourceFieldPath = (
     return undefined;
   }
 
-  const { field, ok, fields, failedName } = resolveFieldByPath(ds.fields, path);
+  const { field, ok, fields, failedName, invalidArrayIndex, arrayElement, untypedArrayElement } = resolveFieldByPath(
+    ds.fields,
+    path,
+    {
+      allowArrayIndex: true,
+    },
+  );
   if (!ok) {
+    if (invalidArrayIndex) {
+      return defaultMessage(options.message, `数组下标(${failedName})只能接在数组字段后面`);
+    }
     return defaultMessage(
       options.message,
       `数据源字段(${failedName})不存在`,
@@ -253,6 +263,13 @@ const validateDataSourceFieldPath = (
     return undefined;
   }
 
+  if (untypedArrayElement) {
+    return defaultMessage(
+      options.message,
+      `数组下标(${field?.name ?? path[path.length - 1]})的元素类型未定义，请选择具体字段`,
+    );
+  }
+
   const leafType = field?.type || 'any';
   if (leafType !== 'any' && !allowedTypes.includes(leafType)) {
     const fieldName = field?.name || path[path.length - 1];
@@ -260,7 +277,9 @@ const validateDataSourceFieldPath = (
     // 文案已点明当前字段类型与要求类型，无需再列同级可选字段
     return defaultMessage(
       options.message,
-      `请选择类型为${allowedTypes.join('或')}的字段，字段(${fieldName})的类型为${leafType}`,
+      arrayElement
+        ? `请选择类型为${allowedTypes.join('或')}的字段，数组元素的类型为${leafType}`
+        : `请选择类型为${allowedTypes.join('或')}的字段，字段(${fieldName})的类型为${leafType}`,
     );
   }
 };
@@ -437,8 +456,12 @@ const validateDataSourceInput: TypeMatchValidator = (value, { message }) => {
 const validateDataSourceMethodSelect: TypeMatchValidator = (value, { message }) =>
   validateDataSourceMethodTuple(value, message);
 
-const isDataSourceFieldPathValue = (value: any, config: any): value is string[] => {
-  if (!Array.isArray(value) || !value.length || value.some((item) => typeof item !== 'string')) {
+/** 字段名，或非负整数下标（number）。数字字符串本身是 string，走字段名分支。 */
+const isDataSourceFieldPathSegment = (item: unknown): item is string | number =>
+  typeof item === 'string' || (typeof item === 'number' && isArrayIndex(item));
+
+const isDataSourceFieldPathValue = (value: any, config: any): value is Array<string | number> => {
+  if (!Array.isArray(value) || !value.length || value.some((item) => !isDataSourceFieldPathSegment(item))) {
     return false;
   }
   if (config.dataSourceId) {
@@ -488,16 +511,29 @@ export const validateDataSourceFieldSelect = (
     }
   }
 
-  if (!Array.isArray(value) || value.some((item) => typeof item !== 'string')) {
-    return defaultMessage(message, `${value}类型应为字符串数组`, dataSourceFieldPathSuggestion());
+  if (!Array.isArray(value) || value.some((item) => !isDataSourceFieldPathSegment(item))) {
+    return defaultMessage(
+      message,
+      `${value}类型应为字符串数组，数组字段后可接数字下标`,
+      dataSourceFieldPathSuggestion(),
+    );
   }
 
   // 未指定 dataSourceId 时，路径首项为数据源 id，其余为字段名。
   // value 模式的首项带 ds-field:: 前缀、key 模式不带，removeDataSourceFieldPrefix 对后者是幂等的，无需分支。
+  // 数组下标只出现在字段段，数据源 id 仍必须是字符串。
   let dataSourceId = config.dataSourceId ? `${config.dataSourceId}` : undefined;
-  let fieldNames = value;
+  let fieldNames: Array<string | number> = value;
   if (!dataSourceId) {
-    dataSourceId = value.length ? removeDataSourceFieldPrefix(value[0]) : undefined;
+    const dsId = value[0];
+    if (value.length && typeof dsId !== 'string') {
+      return defaultMessage(
+        message,
+        `${value}类型应为字符串数组，数组字段后可接数字下标`,
+        dataSourceFieldPathSuggestion(),
+      );
+    }
+    dataSourceId = value.length ? removeDataSourceFieldPrefix(dsId) : undefined;
     fieldNames = value.slice(1);
   }
 

package/types/index.d.ts

@@ -3261,16 +3261,24 @@ export declare const getCascaderOptionsFromFields: (fields?: DataSchema[], dataS
 /**
  * 按字段名路径下钻 DataSchema。
  * @param skipNumberIndices 为 true 时跳过数字段（模板路径中的数组下标，如 arr[0].x）
+ * @param allowArrayIndex 为 true 时识别数组下标。`number` 只能是下标；数字字符串先按当前层字段名匹配，没有同名字段时才当中下标
  */
-export declare const resolveFieldByPath: (fields: DataSchema[] | undefined, fieldNames: string[], options?: {
+export declare const resolveFieldByPath: (fields: DataSchema[] | undefined, fieldNames: Array<string | number>, options?: {
   skipNumberIndices?: boolean;
+  allowArrayIndex?: boolean;
 }) => {
   ok: boolean;
   field?: DataSchema;
   fields: DataSchema[];
   failedName?: string;
+  /** number 下标没有紧跟在数组字段后面 */
+  invalidArrayIndex?: boolean;
+  /** 路径停在数组下标上，当前值是数组元素 */
+  arrayElement?: boolean;
+  /** 数组没有子字段，元素类型未知 */
+  untypedArrayElement?: boolean;
 };
-export declare const getFieldType: (ds: DataSourceSchema | undefined, fieldNames: string[]) => "" | DataSourceFieldType;
+export declare const getFieldType: (ds: DataSourceSchema | undefined, fieldNames: Array<string | number>) => "" | DataSourceFieldType;
 //#endregion
 //#region temp/packages/editor/src/utils/dep/idle-task.d.ts
 export interface IdleTaskEvents {