@tmagic/form 1.8.0-beta.21 → 1.8.0-beta.22

package/dist/es/utils/form.js

@@ -162,6 +162,9 @@ var getRules = function(mForm, r = [], props, typeMatchValid) {
 			}, mForm));
 		}
 		return item;
+	}).filter((item) => {
+		if (item.typeMatch === false && typeof item.validator !== "function") return false;
+		return true;
 	});
 };
 var initValue = async (mForm, { initValues, config }) => {

package/dist/tmagic-form.umd.cjs

@@ -3368,6 +3368,9 @@
 				}, mForm));
 			}
 			return item;
+		}).filter((item) => {
+			if (item.typeMatch === false && typeof item.validator !== "function") return false;
+			return true;
 		});
 	};
 	var initValue = async (mForm, { initValues, config }) => {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.0-beta.21",
+  "version": "1.8.0-beta.22",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -52,9 +52,9 @@
   "peerDependencies": {
     "vue": "^3.5.40",
     "typescript": "^6.0.3",
-    "@tmagic/design": "1.8.0-beta.21",
-    "@tmagic/utils": "1.8.0-beta.21",
-    "@tmagic/form-schema": "1.8.0-beta.21"
+    "@tmagic/utils": "1.8.0-beta.22",
+    "@tmagic/design": "1.8.0-beta.22",
+    "@tmagic/form-schema": "1.8.0-beta.22"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/utils/form.ts

@@ -327,39 +327,48 @@ export const getRules = function (
     });
   }
 
-  return rules.map((item) => {
-    if (item.typeMatch) {
-      (item as any).validator = adaptFormValidator(createTypeMatchValidator(mForm, props, item));
-      return item;
-    }
+  return rules
+    .map((item) => {
+      if (item.typeMatch) {
+        (item as any).validator = adaptFormValidator(createTypeMatchValidator(mForm, props, item));
+        return item;
+      }
 
-    if (typeof item.validator === 'function') {
-      const fnc = item.validator;
-
-      (item as any).validator = adaptFormValidator(
-        (rule: any, value: any, callback: Function, source: any, options: any) =>
-          fnc(
-            {
-              rule,
-              value: props.config.names ? props.model : value,
-              callback,
-              source,
-              options,
-            },
-            {
-              values: mForm?.initValues || {},
-              model: props.model,
-              parent: mForm?.parentValues || {},
-              formValue: mForm?.values || props.model,
-              prop: props.prop,
-              config: props.config,
-            },
-            mForm,
-          ),
-      );
-    }
-    return item;
-  });
+      if (typeof item.validator === 'function') {
+        const fnc = item.validator;
+
+        (item as any).validator = adaptFormValidator(
+          (rule: any, value: any, callback: Function, source: any, options: any) =>
+            fnc(
+              {
+                rule,
+                value: props.config.names ? props.model : value,
+                callback,
+                source,
+                options,
+              },
+              {
+                values: mForm?.initValues || {},
+                model: props.model,
+                parent: mForm?.parentValues || {},
+                formValue: mForm?.values || props.model,
+                prop: props.prop,
+                config: props.config,
+              },
+              mForm,
+            ),
+        );
+      }
+      return item;
+    })
+    .filter((item) => {
+      // typeMatch: false 仅用于关闭自动注入，本身没有校验能力。
+      // 若原样交给 async-validator，会因默认 type=string 误杀 number 等合法值。
+      if (item.typeMatch === false && typeof item.validator !== 'function') {
+        return false;
+      }
+      return true;
+    });
 };
 
 export const initValue = async (