fix:修复drawerlist 浮层中校验相关问题

Author: 昔梦

packages/form-render/src/models/useForm.ts

@@ -96,7 +96,7 @@ const useForm = () => {
 
   const setStoreData = (data: any) => {
     const { setState } = storeRef.current;
-    
+
     if (!setState) {
       setTimeout(() => {
         setState({ schema: schemaRef.current, flattenSchema: flattenSchemaRef.current });
@@ -195,7 +195,7 @@ const useForm = () => {
         form.setFieldValue(name, value);
       }
     } catch (error) {
-      
+
     }
   }
 
@@ -324,13 +324,14 @@ const useForm = () => {
   }
 
   // 触发表单验证
-  xform.validateFields = (pathList?: string[]) => {
+  xform.validateFields = (pathList?: string[], config?: object) => {
     const nameList = (pathList || []).map(path => getFieldName(path));
     if (nameList.length > 0) {
-      return validateFields(nameList);
+      return validateFields(nameList, config);
     }
     return validateFields();
-  }
+  };
+
 
   xform.getFlattenSchema = (path?: string) => {
     if (!path) {
@@ -356,4 +357,4 @@ const useForm = () => {
   return xform as FormInstance;
 };
 
-export default useForm;
+export default useForm;

packages/form-render/src/widgets/listDrawer/index.tsx

@@ -105,17 +105,6 @@ const TableList: React.FC<Props> = (props: any) => {
     indexRef.current = null;
   };
 
-  const hanldeConfirm = () => {
-    form
-      .validateFields()
-      .then(res => {
-        handleCloseDrawer();
-      })
-      .catch(error => {
-        console.log('表单校验错误', error);
-      });
-  };
-
   const columns: any = sortProperties(Object.entries(columnSchema))
     .map(([dataIndex, item]) => {
       const { required, title, tooltip, width, columnHidden } = item;
@@ -251,6 +240,19 @@ const TableList: React.FC<Props> = (props: any) => {
 
   const drawerIndex = indexRef.current ?? (fields.length - 1);
 
+  const hanldeConfirm = () => {
+    const path = [...rootPath, drawerIndex]?.join('.');
+    form
+      .validateFields([path], { recursive: true })
+      .then(res => {
+        handleCloseDrawer();
+      })
+      .catch(error => {
+        console.log('表单校验错误', error);
+      });
+  };
+
+
   return (
     <div className='fr-list-drawer'>
       <Table