From a4a5a44009a5c8738e29560989f6eb1d51dfde84 Mon Sep 17 00:00:00 2001
From: luocong2016 <luocong2016@126.com>
Date: Fri, 10 Feb 2023 07:44:29 +0800
Subject: [PATCH] feat<useLogin>: original Form.validate (#2535)

---
 src/views/sys/login/useLogin.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/sys/login/useLogin.ts b/src/views/sys/login/useLogin.ts
index 78b73fc6..d13728e9 100644
--- a/src/views/sys/login/useLogin.ts
+++ b/src/views/sys/login/useLogin.ts
@@ -1,5 +1,5 @@
-import type { ValidationRule } from 'ant-design-vue/lib/form/Form';
-import type { RuleObject } from 'ant-design-vue/lib/form/interface';
+import type { ValidationRule, FormInstance } from 'ant-design-vue/lib/form/Form';
+import type { RuleObject, NamePath } from 'ant-design-vue/lib/form/interface';
 import { ref, computed, unref, Ref } from 'vue';
 import { useI18n } from '/@/hooks/web/useI18n';
 
@@ -27,7 +27,12 @@ export function useLoginState() {
   return { setLoginState, getLoginState, handleBackLogin };
 }
 
-export function useFormValid<T extends Object = any>(formRef: Ref<any>) {
+export function useFormValid<T extends Object = any>(formRef: Ref<FormInstance>) {
+  const validate = computed(() => {
+    const form = unref(formRef);
+    return form?.validate ?? ((_nameList?: NamePath) => Promise.resolve());
+  });
+  
   async function validForm() {
     const form = unref(formRef);
     if (!form) return;
@@ -35,7 +40,7 @@ export function useFormValid<T extends Object = any>(formRef: Ref<any>) {
     return data as T;
   }
 
-  return { validForm };
+  return { validate, validForm };
 }
 
 export function useFormRules(formData?: Recordable) {
-- 
GitLab