fix: 修复 Form 无法传入 ref 的类型问题

Signed-off-by: acring <liu-zhen@xsky.com>

Author: acring

apps/storybook/stories/Form.stories.tsx

@@ -1,6 +1,7 @@
-import { Button, Form, Input } from '@xsky/eris-ui';
+import { Button, Drawer, Form, Input } from '@xsky/eris-ui';
 import { StoryObj } from '@storybook/react';
 import * as yup from 'yup';
+import { useRef, useState } from 'react';
 
 export default {
   title: 'DATA ENTRY/Form/Form',
@@ -125,3 +126,65 @@ export const Default: FormStory = {
 export const WithWarningSchema: FormStory = {
   render: (args) => <Default.FormWithHook {...args} />,
 };
+
+export const WithRef: FormStory = {
+  render: (args) => {
+    function WithRef() {
+      const formRef = useRef<any>(null);
+      const defaultValues = {
+        name: '',
+      };
+      const schema = yup.object({
+        name: yup.string().required('名称不能为空'),
+      });
+      const handleSubmit = (data: any) => {
+        console.log('handleSubmit', data);
+        alert(JSON.stringify(data));
+      };
+      const [open, setOpen] = useState(false);
+
+      return (
+        <>
+          <Button onClick={() => setOpen(true)}>打开表单</Button>
+          <Drawer
+            open={open}
+            onCancel={() => setOpen(false)}
+            onOk={() => {
+              console.log('onOk');
+              const result = formRef.current.submit();
+              console.log('result', result);
+              // setOpen(false);
+            }}
+          >
+            <Form
+              ref={formRef}
+              defaultValues={defaultValues}
+              schema={schema}
+              onSubmit={handleSubmit}
+            >
+              <FormContent />
+            </Form>
+          </Drawer>
+        </>
+      );
+
+      function FormContent() {
+        const {
+          control,
+          formState: { errors },
+        } = Form.useFormContext();
+
+        return (
+          <Form.Field label="名称" required errors={errors} name="name">
+            <Form.Controller
+              name="name"
+              control={control}
+              render={({ field }) => <Input {...field} />}
+            />
+          </Form.Field>
+        );
+      }
+    }
+    return <WithRef />;
+  },
+};

packages/ui/components/Form/Form.tsx

@@ -34,7 +34,8 @@ export interface FormProps {
   id?: string;
 }
 
-interface FormWithStatics extends React.ForwardRefExoticComponent<FormProps> {
+interface FormWithStatics
+  extends React.ForwardRefExoticComponent<FormProps & React.RefAttributes<any>> {
   FieldGroup: typeof FieldGroup;
   Field: typeof Field;
   Errors: typeof Errors;
@@ -77,6 +78,7 @@ const Form = forwardRef((props: FormProps, ref) => {
 
   useImperativeHandle(ref, () => ({
     submit: () => {
+      debugger;
       if (Object.keys(errors).length === 0 && handleSubmit) {
         return handleSubmit();
       }

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xsky/eris-ui",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "license": "MIT",
   "scripts": {
     "dev": "concurrently \"yarn dev:js:cjs\" \"yarn dev:js:esm\"",
@@ -19,7 +19,8 @@
     "ut:coverage": "FORCE_COLOR=1 vitest run --coverage",
     "json2exc:vi": "node ./scripts/json2exc.js vi",
     "json2exc:en": "node ./scripts/json2exc.js en",
-    "i18n:scanner": "i18next-scanner --config ./i18next-scanner.config.js"
+    "i18n:scanner": "i18next-scanner --config ./i18next-scanner.config.js",
+    "release": "pnpm build && npm publish --access public"
   },
   "files": [
     "dist",