@tmagic/form 1.7.0-beta.0 → 1.7.0-beta.1

package/dist/tmagic-form.js

@@ -2806,6 +2806,31 @@ const _sfc_main$g = /* @__PURE__ */ defineComponent({
         e.preventDefault();
       }
     };
+    const getTextByName = (name, config = props.config) => {
+      if (!name || !Array.isArray(config)) return void 0;
+      const nameParts = name.split(".");
+      const findInConfig = (configs, parts) => {
+        if (parts.length === 0) return void 0;
+        const [currentPart, ...remainingParts] = parts;
+        for (const item of configs) {
+          if (item.name === currentPart) {
+            if (remainingParts.length === 0) {
+              return typeof item.text === "string" ? item.text : void 0;
+            }
+            if (item.items && Array.isArray(item.items)) {
+              const result = findInConfig(item.items, remainingParts);
+              if (result !== void 0) return result;
+            }
+          }
+          if (item.items && Array.isArray(item.items)) {
+            const result = findInConfig(item.items, parts);
+            if (result !== void 0) return result;
+          }
+        }
+        return void 0;
+      };
+      return findInConfig(config, nameParts);
+    };
     __expose({
       values,
       lastValuesProcessed,
@@ -2819,22 +2844,26 @@ const _sfc_main$g = /* @__PURE__ */ defineComponent({
       },
       submitForm: async (native) => {
         try {
-          await tMagicFormRef.value?.validate();
+          const result = await tMagicFormRef.value?.validate();
+          if (result !== true) {
+            throw result;
+          }
           changeRecords.value = [];
           return native ? values.value : cloneDeep(toRaw(values.value));
         } catch (invalidFields) {
           emit("error", invalidFields);
           const error = [];
-          Object.entries(invalidFields).forEach(([, ValidateError]) => {
+          Object.entries(invalidFields).forEach(([prop, ValidateError]) => {
             ValidateError.forEach(({ field, message }) => {
-              if (field && message) error.push(`${field} -> ${message}`);
-              if (field && !message) error.push(`${field} -> 出现错误`);
-              if (!field && message) error.push(`${message}`);
+              const name = field || prop;
+              const text = getTextByName(name, props.config) || name;
+              error.push(`${text} -> ${message}`);
             });
           });
           throw new Error(error.join("<br>"));
         }
-      }
+      },
+      getTextByName
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(TMagicForm), {
@@ -4250,9 +4279,10 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
         clearable: "",
         placeholder: __props.config.placeholder,
         disabled: __props.disabled,
+        rows: __props.config.rows,
         "onUpdate:modelValue": changeHandler,
         onInput: inputHandler
-      }, null, 8, ["model-value", "size", "placeholder", "disabled"]);
+      }, null, 8, ["model-value", "size", "placeholder", "disabled", "rows"]);
     };
   }
 });

package/dist/tmagic-form.umd.cjs

@@ -5736,6 +5736,31 @@
           e.preventDefault();
         }
       };
+      const getTextByName = (name, config = props.config) => {
+        if (!name || !Array.isArray(config)) return void 0;
+        const nameParts = name.split(".");
+        const findInConfig = (configs, parts) => {
+          if (parts.length === 0) return void 0;
+          const [currentPart, ...remainingParts] = parts;
+          for (const item of configs) {
+            if (item.name === currentPart) {
+              if (remainingParts.length === 0) {
+                return typeof item.text === "string" ? item.text : void 0;
+              }
+              if (item.items && Array.isArray(item.items)) {
+                const result = findInConfig(item.items, remainingParts);
+                if (result !== void 0) return result;
+              }
+            }
+            if (item.items && Array.isArray(item.items)) {
+              const result = findInConfig(item.items, parts);
+              if (result !== void 0) return result;
+            }
+          }
+          return void 0;
+        };
+        return findInConfig(config, nameParts);
+      };
       __expose({
         values,
         lastValuesProcessed,
@@ -5749,22 +5774,26 @@
         },
         submitForm: async (native) => {
           try {
-            await tMagicFormRef.value?.validate();
+            const result = await tMagicFormRef.value?.validate();
+            if (result !== true) {
+              throw result;
+            }
             changeRecords.value = [];
             return native ? values.value : cloneDeep(vue.toRaw(values.value));
           } catch (invalidFields) {
             emit("error", invalidFields);
             const error = [];
-            Object.entries(invalidFields).forEach(([, ValidateError]) => {
+            Object.entries(invalidFields).forEach(([prop, ValidateError]) => {
               ValidateError.forEach(({ field, message }) => {
-                if (field && message) error.push(`${field} -> ${message}`);
-                if (field && !message) error.push(`${field} -> 出现错误`);
-                if (!field && message) error.push(`${message}`);
+                const name = field || prop;
+                const text = getTextByName(name, props.config) || name;
+                error.push(`${text} -> ${message}`);
               });
             });
             throw new Error(error.join("<br>"));
           }
-        }
+        },
+        getTextByName
       });
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createBlock(vue.unref(design.TMagicForm), {
@@ -7180,9 +7209,10 @@
           clearable: "",
           placeholder: __props.config.placeholder,
           disabled: __props.disabled,
+          rows: __props.config.rows,
           "onUpdate:modelValue": changeHandler,
           onInput: inputHandler
-        }, null, 8, ["model-value", "size", "placeholder", "disabled"]);
+        }, null, 8, ["model-value", "size", "placeholder", "disabled", "rows"]);
       };
     }
   });

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.0-beta.0",
+  "version": "1.7.0-beta.1",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -51,9 +51,9 @@
   "peerDependencies": {
     "vue": "^3.5.22",
     "typescript": "^5.9.3",
-    "@tmagic/design": "1.7.0-beta.0",
-    "@tmagic/form-schema": "1.7.0-beta.0",
-    "@tmagic/utils": "1.7.0-beta.0"
+    "@tmagic/design": "1.7.0-beta.1",
+    "@tmagic/form-schema": "1.7.0-beta.1",
+    "@tmagic/utils": "1.7.0-beta.1"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/Form.vue

@@ -196,6 +196,46 @@ const submitHandler = (e: SubmitEvent) => {
   }
 };
 
+/**
+ * 通过 name 从 config 中查找对应的 text
+ * @param name - 字段名，支持点分隔的路径格式，如 'a.b.c'
+ * @param config - 表单配置数组
+ * @returns 找到的 text 值，如果未找到则返回 undefined
+ */
+const getTextByName = (name: string, config: FormConfig = props.config): string | undefined => {
+  if (!name || !Array.isArray(config)) return undefined;
+
+  const nameParts = name.split('.');
+
+  const findInConfig = (configs: FormConfig, parts: string[]): string | undefined => {
+    if (parts.length === 0) return undefined;
+
+    const [currentPart, ...remainingParts] = parts;
+
+    for (const item of configs) {
+      if (item.name === currentPart) {
+        if (remainingParts.length === 0) {
+          return typeof item.text === 'string' ? item.text : undefined;
+        }
+
+        if (item.items && Array.isArray(item.items)) {
+          const result = findInConfig(item.items, remainingParts);
+          if (result !== undefined) return result;
+        }
+      }
+
+      if (item.items && Array.isArray(item.items)) {
+        const result = findInConfig(item.items, parts);
+        if (result !== undefined) return result;
+      }
+    }
+
+    return undefined;
+  };
+
+  return findInConfig(config, nameParts);
+};
+
 defineExpose({
   values,
   lastValuesProcessed,
@@ -212,7 +252,12 @@ defineExpose({
 
   submitForm: async (native?: boolean): Promise<any> => {
     try {
-      await tMagicFormRef.value?.validate();
+      const result = await tMagicFormRef.value?.validate();
+      // tdesign 错误通过返回值返回
+      // element-plus 通过throw error
+      if (result !== true) {
+        throw result;
+      }
       changeRecords.value = [];
       return native ? values.value : cloneDeep(toRaw(values.value));
     } catch (invalidFields: any) {
@@ -220,16 +265,19 @@ defineExpose({
 
       const error: string[] = [];
 
-      Object.entries(invalidFields).forEach(([, ValidateError]) => {
+      Object.entries(invalidFields).forEach(([prop, ValidateError]) => {
         (ValidateError as ValidateError[]).forEach(({ field, message }) => {
-          if (field && message) error.push(`${field} -> ${message}`);
-          if (field && !message) error.push(`${field} -> 出现错误`);
-          if (!field && message) error.push(`${message}`);
+          const name = field || prop;
+          const text = getTextByName(name, props.config) || name;
+
+          error.push(`${text} -> ${message}`);
         });
       });
 
       throw new Error(error.join('<br>'));
     }
   },
+
+  getTextByName,
 });
 </script>

package/src/fields/Textarea.vue

@@ -6,6 +6,7 @@
     clearable
     :placeholder="config.placeholder"
     :disabled="disabled"
+    :rows="config.rows"
     @update:model-value="changeHandler"
     @input="inputHandler"
   >

package/types/index.d.ts

@@ -65,6 +65,7 @@ declare const __VLS_export$v: _vue_runtime_core.DefineComponent<__VLS_Props$u, {
     changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
     resetForm: () => void;
     submitForm: (native?: boolean) => Promise<any>;
+    getTextByName: (name: string, config?: FormConfig) => string | undefined;
 }, {}, {}, {}, _vue_runtime_core.ComponentOptionsMixin, _vue_runtime_core.ComponentOptionsMixin, {
     change: (...args: any[]) => void;
     error: (...args: any[]) => void;
@@ -152,6 +153,7 @@ declare const __VLS_base$4: _vue_runtime_core.DefineComponent<__VLS_Props$t, {
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        getTextByName: (name: string, config?: FormConfig) => string | undefined;
     }, {}, {}, {}, _vue_runtime_core.ComponentOptionsMixin, _vue_runtime_core.ComponentOptionsMixin, {
         change: (...args: any[]) => void;
         error: (...args: any[]) => void;
@@ -210,6 +212,7 @@ declare const __VLS_base$4: _vue_runtime_core.DefineComponent<__VLS_Props$t, {
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        getTextByName: (name: string, config?: FormConfig) => string | undefined;
     }, {}, {}, {}, {
         disabled: boolean;
         labelWidth: string;
@@ -255,6 +258,7 @@ declare const __VLS_base$4: _vue_runtime_core.DefineComponent<__VLS_Props$t, {
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        getTextByName: (name: string, config?: FormConfig) => string | undefined;
     }, {}, {}, {}, _vue_runtime_core.ComponentOptionsMixin, _vue_runtime_core.ComponentOptionsMixin, {
         change: (...args: any[]) => void;
         error: (...args: any[]) => void;
@@ -313,6 +317,7 @@ declare const __VLS_base$4: _vue_runtime_core.DefineComponent<__VLS_Props$t, {
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        getTextByName: (name: string, config?: FormConfig) => string | undefined;
     }, {}, {}, {}, {
         disabled: boolean;
         labelWidth: string;
@@ -418,6 +423,7 @@ declare const __VLS_base$3: _vue_runtime_core.DefineComponent<__VLS_Props$s, {
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        getTextByName: (name: string, config?: FormConfig) => string | undefined;
     }, {}, {}, {}, _vue_runtime_core.ComponentOptionsMixin, _vue_runtime_core.ComponentOptionsMixin, {
         change: (...args: any[]) => void;
         error: (...args: any[]) => void;
@@ -476,6 +482,7 @@ declare const __VLS_base$3: _vue_runtime_core.DefineComponent<__VLS_Props$s, {
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        getTextByName: (name: string, config?: FormConfig) => string | undefined;
     }, {}, {}, {}, {
         disabled: boolean;
         labelWidth: string;
@@ -521,6 +528,7 @@ declare const __VLS_base$3: _vue_runtime_core.DefineComponent<__VLS_Props$s, {
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        getTextByName: (name: string, config?: FormConfig) => string | undefined;
     }, {}, {}, {}, _vue_runtime_core.ComponentOptionsMixin, _vue_runtime_core.ComponentOptionsMixin, {
         change: (...args: any[]) => void;
         error: (...args: any[]) => void;
@@ -579,6 +587,7 @@ declare const __VLS_base$3: _vue_runtime_core.DefineComponent<__VLS_Props$s, {
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        getTextByName: (name: string, config?: FormConfig) => string | undefined;
     }, {}, {}, {}, {
         disabled: boolean;
         labelWidth: string;
@@ -686,6 +695,7 @@ declare const __VLS_base$2: _vue_runtime_core.DefineComponent<__VLS_Props$r, {
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        getTextByName: (name: string, config?: FormConfig) => string | undefined;
     }, {}, {}, {}, _vue_runtime_core.ComponentOptionsMixin, _vue_runtime_core.ComponentOptionsMixin, {
         change: (...args: any[]) => void;
         error: (...args: any[]) => void;
@@ -744,6 +754,7 @@ declare const __VLS_base$2: _vue_runtime_core.DefineComponent<__VLS_Props$r, {
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        getTextByName: (name: string, config?: FormConfig) => string | undefined;
     }, {}, {}, {}, {
         disabled: boolean;
         labelWidth: string;
@@ -789,6 +800,7 @@ declare const __VLS_base$2: _vue_runtime_core.DefineComponent<__VLS_Props$r, {
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        getTextByName: (name: string, config?: FormConfig) => string | undefined;
     }, {}, {}, {}, _vue_runtime_core.ComponentOptionsMixin, _vue_runtime_core.ComponentOptionsMixin, {
         change: (...args: any[]) => void;
         error: (...args: any[]) => void;
@@ -847,6 +859,7 @@ declare const __VLS_base$2: _vue_runtime_core.DefineComponent<__VLS_Props$r, {
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        getTextByName: (name: string, config?: FormConfig) => string | undefined;
     }, {}, {}, {}, {
         disabled: boolean;
         labelWidth: string;