fix(ProForm): 优化ts

Author: ChenlingasMx

packages/components/src/ProForm/formdom.tsx

@@ -1,6 +1,6 @@
 import React, { useRef, useEffect } from 'react';
 import { Form, Button, Col, Row, FormFieldsProps } from 'uiw';
-import { ProFormProps } from './type';
+import { ProFormProps, UseFormStateProps } from './type';
 import { useStore, useColPropsContext } from './hooks/store';
 import { fromValidate } from './utils';
 import './style/form-item.less';
@@ -19,9 +19,11 @@ function FormDom({
   formInstanceRef,
 }: ProFormProps & {
   formfields: Record<string, FormFieldsProps<{}>> | undefined;
-  formInstanceRef: any;
+  formInstanceRef: React.MutableRefObject<
+    { current: UseFormStateProps | null } | undefined
+  >;
 }) {
-  const baseRef = useRef(null);
+  const baseRef: React.MutableRefObject<null> = useRef(null);
   const store = useStore();
   const colProps = useColPropsContext();
 

packages/components/src/ProForm/index.tsx

@@ -3,12 +3,16 @@ import { Collapse, Card } from 'uiw';
 import FormDom from './formdom';
 import ReadFormDom from './readform';
 import { getFormFields } from './widgets';
-import { ProFormProps, UseFormStateProps } from './type';
+import { ProFormProps, UseFormStateProps, UseFormProps } from './type';
 import { StoreCtx, ColPropsContext } from './hooks/store';
-import { isObjectEmpty } from './utils';
 import './style/form-item.less';
 
-function ProForm(props: ProFormProps, ref: any) {
+function ProForm(
+  props: ProFormProps,
+  ref: React.ForwardedRef<
+    Partial<React.LegacyRef<UseFormProps>> | undefined | null
+  >,
+) {
   const {
     formDatas = [],
     title = '',
@@ -34,37 +38,7 @@ function ProForm(props: ProFormProps, ref: any) {
 
   // 通过ref导出实例方法
   const formInstanceRef = useRef<{ current: UseFormStateProps }>();
-  useImperativeHandle(ref, () => {
-    // 表单验证(同时兼容老api submitvalidate和新api onSubmit )
-    const submitvalidate = () =>
-      formInstanceRef.current?.current?.onSubmit() || null;
-    // 获取表单的值
-    const getFieldValues = () =>
-      formInstanceRef.current?.current?.getFieldValues() || {};
-    // 获取表单错误信息
-    const getError = () => formInstanceRef?.current?.current?.getError() || {};
-
-    // 验证并获取表单值
-    const validateFieldsAndGetValue = () => {
-      return new Promise(async function (resolve, reject) {
-        await submitvalidate();
-        const errors = getError();
-        if (isObjectEmpty(errors)) {
-          const value = getFieldValues();
-          resolve(value);
-        } else {
-          reject(errors);
-        }
-      });
-    };
-    return {
-      ...formInstanceRef.current?.current,
-      submitvalidate,
-      getFieldValues,
-      getError,
-      validateFieldsAndGetValue,
-    };
-  });
+  useImperativeHandle(ref, () => ({ ...form }));
 
   let children: React.ReactNode;
   const formDomProps = { ...props, formfields, formInstanceRef };