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

package/dist/es/utils/form.js

@@ -1,10 +1,10 @@
 import { createTypeMatchValidator } from "./typeMatch.js";
 import { readonly } from "vue";
+import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc";
 import { cloneDeep } from "lodash-es";
 import { getDesignConfig } from "@tmagic/design";
 import { getValueByKeyPath } from "@tmagic/utils";
-import dayjs from "dayjs";
-import utc from "dayjs/plugin/utc";
 //#region packages/form/src/utils/form.ts
 var isTDesignAdapter = () => getDesignConfig("adapterType") === "tdesign-vue-next";
 /**
@@ -203,6 +203,36 @@ var sortChange = (data, { prop, order }) => {
 	if (order === "ascending") data.sort((a, b) => a[prop] - b[prop]);
 	else if (order === "descending") data.sort((a, b) => b[prop] - a[prop]);
 };
+/**
+* 将 extendState 返回的扩展字段合并进 formState。
+*
+* - data 描述符（普通字段）通过 `formState[key] = value` 写入，走 reactive proxy 的 set，
+*   触发依赖通知；
+* - accessor 描述符（`{ get stage() { return ... } }`）按原样 defineProperty，调用方
+*   可控制读时求值；强制 `configurable: true` 以便下一次合并可再 define。
+*
+* 注意：formState 上由 props 派生的字段（keyProp / popperClass / config / initValues /
+* isCompare / lastValues / parentValues）是只读 getter（无 setter），extendState 若以
+* 普通字段形式返回同名 key，直接赋值会让 proxy 的 set trap 失败并抛出
+* `TypeError: 'set' on proxy: trap returned falsish`，这里统一跳过并告警；
+* 如确需覆盖，可在 extendState 中以 get 访问器形式返回。
+*/
+var applyExtendState = (formState, state) => {
+	if (!state) return;
+	for (const [key, descriptor] of Object.entries(Object.getOwnPropertyDescriptors(state))) {
+		if (!("value" in descriptor)) {
+			descriptor.configurable = true;
+			Object.defineProperty(formState, key, descriptor);
+			continue;
+		}
+		const targetDescriptor = Object.getOwnPropertyDescriptor(formState, key);
+		if (targetDescriptor && !("value" in targetDescriptor) && typeof targetDescriptor.set !== "function") {
+			console.warn(`[MForm] extendState: "${key}" is a read-only field derived from props and cannot be assigned a plain value. Return it as a getter accessor if you really need to override it.`);
+			continue;
+		}
+		formState[key] = state[key];
+	}
+};
 var createObjectProp = (prop, key, name) => {
 	if (prop === "") return key;
 	const itemPath = `${prop}`.split(".");
@@ -212,4 +242,4 @@ var createObjectProp = (prop, key, name) => {
 	return `${[...itemPath, key].join(".")}`;
 };
 //#endregion
-export { adaptFormValidator, createObjectProp, createValues, datetimeFormatter, display, filterFunction, getDataByPage, getRules, initValue, sortArray, sortChange };
+export { adaptFormValidator, applyExtendState, createObjectProp, createValues, datetimeFormatter, display, filterFunction, getDataByPage, getRules, initValue, sortArray, sortChange };

package/dist/es/utils/typeMatch.js

@@ -1,15 +1,15 @@
 import { readonly } from "vue";
-import { appendValidateSuggestion } from "@tmagic/design";
-import { getValueByKeyPath } from "@tmagic/utils";
 import dayjs from "dayjs";
+import { appendValidateSuggestion } from "@tmagic/design";
+import { getValueByKeyPath, toLine } from "@tmagic/utils";
 import customParseFormat from "dayjs/plugin/customParseFormat";
 //#region packages/form/src/utils/typeMatch.ts
 dayjs.extend(customParseFormat);
 var typeMatchRuleRegistry = /* @__PURE__ */ new Map();
-var normalizeType = (type) => type.replace(/([A-Z])/g, "-$1").toLowerCase();
+var isPromise = (value) => typeof value === "object" && value !== null && typeof value.then === "function";
 /** 注册或覆盖某个字段 type 的 typeMatch 校验规则 */
 var registerTypeMatchRule = (type, validator) => {
-	typeMatchRuleRegistry.set(normalizeType(type), validator);
+	typeMatchRuleRegistry.set(toLine(type), validator);
 };
 /** 批量注册 typeMatch 校验规则 */
 var registerTypeMatchRules = (rules) => {
@@ -18,9 +18,9 @@ var registerTypeMatchRules = (rules) => {
 	});
 };
 /** 获取某个字段 type 的自定义 typeMatch 校验规则 */
-var getTypeMatchRule = (type) => typeMatchRuleRegistry.get(normalizeType(type));
+var getTypeMatchRule = (type) => typeMatchRuleRegistry.get(toLine(type));
 /** 删除某个字段 type 的自定义 typeMatch 校验规则 */
-var deleteTypeMatchRule = (type) => typeMatchRuleRegistry.delete(normalizeType(type));
+var deleteTypeMatchRule = (type) => typeMatchRuleRegistry.delete(toLine(type));
 /** 清空所有自定义 typeMatch 校验规则 */
 var clearTypeMatchRules = () => {
 	typeMatchRuleRegistry.clear();
@@ -124,7 +124,9 @@ var toggleSuggestion = (activeValue, inactiveValue) => `请使用以下某一个
 var resolveFieldDefaultValue = (mForm, props) => {
 	const { defaultValue } = props.config || {};
 	if (typeof defaultValue === "undefined" || defaultValue === "undefined") return void 0;
-	return resolveConfig(mForm, defaultValue, props);
+	const resolvedDefaultValue = resolveConfig(mForm, defaultValue, props);
+	if (isPromise(resolvedDefaultValue)) return;
+	return resolvedDefaultValue;
 };
 var isNumberValue = (value) => typeof value === "number" && !Number.isNaN(value);
 var isStringValue = (value) => typeof value === "string";
@@ -175,12 +177,6 @@ var dateRangeSuggestion = (valueFormat) => {
 	return `请参考以下示例值：["${example}", "${example}"]`;
 };
 var dateValueFormatErrorMessage = (message, valueFormat) => defaultMessage(message, isTimestampValueFormat(valueFormat) ? "值类型应为时间戳数字" : `值格式应为 ${valueFormat}`, dateSuggestion(valueFormat));
-var resolveFieldType = (mForm, props) => {
-	let type = "type" in (props.config || {}) ? props.config.type : "";
-	type = type ? resolveConfig(mForm, type, props) || "" : "";
-	if (type === "form" || type === "container") return "";
-	return normalizeType(type || "") || (props.config?.items ? "" : "text");
-};
 var resolveToggleValues = (config) => {
 	const filterIsNumber = config.filter === "number";
 	const { activeValue: configActiveValue, inactiveValue: configInactiveValue } = config;
@@ -206,11 +202,9 @@ var flattenSelectOptions = (options) => {
 	});
 	return values;
 };
-var resolveOptions = (mForm, props) => {
+var resolveOptions = (props) => {
 	const { options } = props.config || {};
-	if (Array.isArray(options)) return options;
-	if (typeof options === "function") return resolveConfig(mForm, options, props) || [];
-	return [];
+	return Array.isArray(options) ? options : [];
 };
 var includesOptionValue = (optionValues, value) => optionValues.some((item) => Object.is(item, value));
 var collectCascaderLeafValues = (options, result = []) => {
@@ -263,6 +257,7 @@ var cascaderExampleSuggestion = (options, config, valueSeparator, fallbackExampl
 	return `请参考以下示例值：${stringifyExampleValue(example)}`;
 };
 var validateSelectValue = (value, config, optionValues, message) => {
+	if (optionValues.length === 0) return;
 	if (config.allowCreate || config.remote) {
 		if (config.multiple) {
 			if (!Array.isArray(value)) return defaultMessage(message, `${value} 类型应为数组`, optionExampleSuggestion(optionValues, "[\"选项1\", \"选项2\"]", true));
@@ -280,10 +275,12 @@ var validateSelectValue = (value, config, optionValues, message) => {
 	if (isStaticOptions && !includesOptionValue(optionValues, value)) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
 };
 var validateCascaderValue = (value, config, props, mForm, message) => {
+	const options = resolveOptions(props);
+	if (!options.length) return;
 	const valueSeparator = resolveConfig(mForm, config.valueSeparator, props);
+	if (isPromise(valueSeparator)) return;
 	const emitPath = config.emitPath !== false;
 	const multiple = Boolean(config.multiple);
-	const options = resolveOptions(mForm, props);
 	const cascaderExample = (fallbackExample) => cascaderExampleSuggestion(options, config, valueSeparator, fallbackExample);
 	if (valueSeparator) {
 		if (typeof value !== "string" && !Array.isArray(value)) return defaultMessage(message, `${value} 类型应为字符串或数组`, cascaderExample("\"选项1,选项2\" 或 [\"选项1\", \"选项2\"]"));
@@ -337,14 +334,16 @@ var validateBuiltinTypeMatch = (value, fieldType, mForm, props, message) => {
 		if (!Object.is(value, activeValue) && !Object.is(value, inactiveValue)) return defaultMessage(message, `${value} 不在合法开关值中`, toggleSuggestion(activeValue, inactiveValue));
 		return;
 	}
-	if (fieldType === "select") return validateSelectValue(value, config, flattenSelectOptions(resolveOptions(mForm, props)), message);
+	if (fieldType === "select") return validateSelectValue(value, config, flattenSelectOptions(resolveOptions(props)), message);
 	if (fieldType === "radio-group") {
-		const optionValues = flattenSelectOptions(resolveOptions(mForm, props));
+		const optionValues = flattenSelectOptions(resolveOptions(props));
+		if (optionValues.length === 0) return;
 		if (!includesOptionValue(optionValues, value)) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
 		return;
 	}
 	if (fieldType === "checkbox-group") {
-		const optionValues = flattenSelectOptions(resolveOptions(mForm, props));
+		const optionValues = flattenSelectOptions(resolveOptions(props));
+		if (optionValues.length === 0) return;
 		if (!Array.isArray(value)) return defaultMessage(message, `${value} 类型应为数组`, optionExampleSuggestion(optionValues, "[\"选项1\", \"选项2\"]", true));
 		if (value.some((item) => !includesOptionValue(optionValues, item))) return defaultMessage(message, `${value} 不在可选项中`, optionSuggestion(optionValues));
 		return;
@@ -363,7 +362,9 @@ var validateBuiltinTypeMatch = (value, fieldType, mForm, props, message) => {
 };
 var validateTypeMatch = (value, mForm, props, message) => {
 	if (isEmptyValue(value) || isEmptyArray(value)) return;
-	const fieldType = resolveFieldType(mForm, props);
+	const rawFieldType = "type" in (props.config || {}) ? props.config.type : "";
+	if (typeof rawFieldType !== "string" || !rawFieldType) return;
+	const fieldType = toLine(rawFieldType);
 	const customValidator = getTypeMatchRule(fieldType);
 	if (customValidator) return customValidator(value, {
 		fieldType,
@@ -377,10 +378,14 @@ var createTypeMatchValidator = (mForm, props, rule) => {
 	const originalValidator = typeof rule.validator === "function" ? rule.validator : void 0;
 	return (asyncValidatorRule, value, callback, source, options) => {
 		const actualValue = props.config?.names ? props.model : value;
-		const error = validateTypeMatch(actualValue, mForm, props, rule.message);
-		if (error) {
-			callback(new Error(error));
-			return;
+		try {
+			const error = validateTypeMatch(actualValue, mForm, props, rule.message);
+			if (error) {
+				callback(new Error(error));
+				return;
+			}
+		} catch (error) {
+			console.error(error);
 		}
 		if (originalValidator) return originalValidator({
 			rule: asyncValidatorRule,

package/dist/style.css

@@ -16,6 +16,9 @@
 .m-form-container .tmagic-design-form-item.show-before-diff {
   background: #f7dadd;
 }
+.m-form-container .m-form-title-extra {
+  margin-left: 8px;
+}
 
 .m-form-dialog .el-dialog__body {
   padding: 0 !important;
@@ -76,6 +79,10 @@
   margin-bottom: var(--td-comp-margin-xxl);
 }
 
+.m-form-container .m-form-container-expand {
+  text-align: center;
+}
+
 .magic-datetime-picker-popper .el-picker-panel__footer button:first-child {
   display: none;
 }
@@ -85,6 +92,24 @@
   align-items: center;
   width: 100%;
 }
+.m-fields-text--static {
+  gap: 6px;
+  min-height: 32px;
+}
+.m-fields-text--static .m-fields-text__prepend {
+  color: var(--el-text-color-secondary, #909399);
+}
+.m-fields-text--static .m-fields-text__value {
+  color: var(--el-text-color-regular, #606266);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.m-fields-text--static .m-fields-text__icon {
+  width: 16px;
+  height: 16px;
+  cursor: pointer;
+}
 
 .m-form-validate__warning {
   color: var(--el-color-warning);
@@ -110,6 +135,16 @@
   outline: none;
 }
 
+.m-container-text.m-fields-title-container .tmagic-design-form-item .el-form-item__label {
+  color: #0f1113;
+  font-weight: 500;
+  font-size: 16px;
+}
+.m-container-text.m-fields-title-container .tmagic-design-form-item {
+  line-height: 24px;
+  margin-bottom: 16px;
+}
+
 .tmagic-form-text-popper[data-popper-placement^=top] > .tmagic-form-text-popper-arrow {
   bottom: -4px;
 }
@@ -148,6 +183,66 @@ div.m-fields-link {
   width: fit-content;
 }
 
+a.magic-admin-link {
+  width: 100%;
+  box-sizing: border-box;
+  border-radius: 4px;
+  border: 1px solid #e6e6e6;
+  background-color: #fafafa;
+  padding: 0 8px;
+  height: 28px;
+  display: inline-flex;
+  gap: 4px;
+  align-items: center;
+  text-decoration: none;
+}
+a.magic-admin-link i {
+  margin-right: 4px;
+}
+
+.m-container-fieldset.no-border-fieldset.fieldset-in-row > fieldset.m-fieldset legend {
+  left: 0;
+}
+.m-container-fieldset.no-border-fieldset > fieldset.m-fieldset {
+  border: 0;
+}
+.m-container-fieldset.no-border-fieldset > fieldset.m-fieldset legend {
+  position: relative;
+  left: -5px;
+  font-size: 16px;
+  font-weight: 500;
+  line-height: 24px;
+  padding: 0;
+}
+.m-container-fieldset.fieldset-in-card-fit {
+  border-bottom: 1px solid #e6e6e6;
+}
+.m-container-fieldset.fieldset-in-card-fit > fieldset.m-fieldset {
+  padding: 16px 0 16px 0 !important;
+  border: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+.m-container-fieldset.fieldset-in-card-fit > fieldset.m-fieldset legend {
+  position: relative;
+  top: 10px;
+  background-color: transparent;
+}
+.m-container-fieldset.fieldset-in-card-fit.fieldset-in-card-fit-last {
+  padding-bottom: 0 !important;
+  border-bottom: 0;
+}
+.m-container-fieldset.fieldset-in-card-fit.fieldset-in-card-fit-first {
+  padding-top: 0 !important;
+}
+.m-container-fieldset.fieldset-in-card-fit:last-child {
+  padding-bottom: 0 !important;
+  border-bottom: 0;
+}
+.m-container-fieldset.fieldset-in-card-fit:first {
+  padding-top: 0 !important;
+}
+
 fieldset.m-fieldset {
   position: relative;
   border: 1px solid rgb(229, 229, 229);
@@ -174,6 +269,9 @@ fieldset.m-fieldset .m-form-tip {
   margin-left: 5px;
 }
 
+.m-fields-group-list .m-fields-group-list-item.tmagic-design-card--flat:last-child {
+  border: 0;
+}
 .m-fields-group-list .el-button--text {
   padding: 0;
   margin-bottom: 7px;
@@ -192,23 +290,23 @@ fieldset.m-fieldset .m-form-tip {
 .m-fields-group-list .m-fields-group-list-item:last-of-type {
   border-bottom: 0;
 }
-.m-fields-group-list .tmagic-design-card .el-card__header {
-  padding: 5px 20px;
-}
-.m-fields-group-list .tmagic-design-card .t-card__header {
-  padding: 5px 0;
+.m-fields-group-list .m-fields-group-list-item .m-fields-group-list-item-header {
+  display: flex;
+  align-items: center;
+  gap: 8px;
 }
 .m-fields-group-list .m-fields-group-list-footer {
   display: flex;
   justify-content: space-between;
   margin-top: 10px;
+  margin-bottom: 16px;
 }
 
 .m-form-panel .el-card__header:hover {
   background: #f2f6fc;
 }
 .m-form-panel .el-card__header a {
-  color: #409eff;
+  color: var(--el-color-primary, #409eff);
 }
 .m-form-panel .el-card__body {
   padding: 10px;
@@ -291,8 +389,8 @@ fieldset.m-fieldset .m-form-tip {
   margin-right: auto;
   min-width: 50px;
   outline: none;
-  border-color: #409eff;
-  color: #409eff;
+  border-color: var(--el-color-primary, #409eff);
+  color: var(--el-color-primary, #409eff);
   width: 10px;
 }
 .magic-form-dynamic-tab .el-tabs__header.is-top .el-tabs__new-tab::before {
@@ -329,4 +427,20 @@ fieldset.m-fieldset .m-form-tip {
   display: flex;
   align-items: center;
   justify-content: space-between;
+}
+
+.m-fields-radio-group__option {
+  display: flex;
+  align-items: center;
+}
+
+.m-fields-radio-group__text {
+  display: inline-block;
+  vertical-align: middle;
+  white-space: pre-line;
+  line-height: 20px;
+}
+
+.m-fields-radio-group__icon_with_text {
+  margin-right: 8px;
 }/*$vite$:1*/