diff --git a/src/modal/__tests__/modalWithForm.test.tsx b/src/modal/__tests__/modalWithForm.test.tsx
deleted file mode 100644
index 85446d811..000000000
--- a/src/modal/__tests__/modalWithForm.test.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import React from 'react';
-import { cleanup, fireEvent, render, screen } from '@testing-library/react';
-import { Form, Input } from 'antd';
-import '@testing-library/jest-dom/extend-expect';
-
-import Modal from '../';
-
-const FormItem = Form.Item;
-const EnhancedModal = Modal.Form((_props: any) => {
-    return (
-        <FormItem label="test-label" name="test" rules={[{ max: 10 }]}>
-            <Input data-testid="test-input" />
-        </FormItem>
-    );
-});
-
-class App extends React.Component<any, any> {
-    constructor(props: any) {
-        super(props);
-        this.state = {
-            visible: false,
-        };
-    }
-    hideModalHandler = () => {
-        const { visible } = this.state;
-        this.setState({ visible: !visible });
-    };
-    render() {
-        return (
-            <>
-                <button onClick={this.hideModalHandler}>click</button>
-                <EnhancedModal
-                    title="test-title"
-                    visible={this.state.visible}
-                    hideModalHandler={this.hideModalHandler}
-                    okText="ok"
-                    cancelText="quit"
-                    record="hi"
-                    okButtonProps={{ danger: true }}
-                    width={400}
-                />
-            </>
-        );
-    }
-}
-
-let wrapper: any, element: any;
-
-beforeEach(() => {
-    wrapper = render(
-        <div data-testid="form">
-            <App />
-        </div>
-    );
-    element = wrapper.getByTestId('form');
-    jest.spyOn(console, 'error').mockImplementation(() => {
-        return null;
-    });
-});
-
-afterEach(cleanup);
-
-test('should not render modalWithForm', () => {
-    expect(element).toBeValid();
-});
-
-test('should toggle modalWithForm when click button', () => {
-    fireEvent.click(wrapper.getByText('click'));
-    expect(screen.getByText('test-title')).toBeInTheDocument();
-    // 关掉模态框
-    const ele = wrapper.getByText('quit');
-    fireEvent.click(ele);
-    expect(element).toBeValid();
-});
-
-test('should trigger submit methond when form validate successful', () => {
-    fireEvent.click(wrapper.getByText('click'));
-    const eleInput = wrapper.getByTestId('test-input');
-    const eleOk = wrapper.getByText('ok');
-
-    eleInput.onchange = jest.fn();
-    fireEvent.change(eleInput, { target: { value: '1' } });
-    eleOk.onclick = jest.fn();
-    fireEvent.click(eleOk);
-    expect(eleOk.onclick).toHaveBeenCalled();
-});
diff --git a/src/modal/components/form/index.tsx b/src/modal/components/form/index.tsx
deleted file mode 100644
index 4f9f8fff2..000000000
--- a/src/modal/components/form/index.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import React, { ReactElement, useMemo } from 'react';
-import { FormProps, Modal, ModalProps } from 'antd';
-
-import Form from '../../../form';
-import Utils from '../../../utils';
-import { FORM_PROPS, MODAL_PROPS } from '../../../utils/antdProps';
-
-export interface IModalFormProps<Values = any>
-    extends Omit<FormProps, 'title'>,
-        Omit<ModalProps, 'children'> {
-    /**
-     * modal className
-     * @param {string}
-     */
-    modalClassName?: string;
-    /**
-     * 点击提交，数据验证成功后的会调事件
-     * @param values
-     * @param record
-     * @returns
-     */
-    onSubmit?: (values: Values) => void;
-}
-
-const ModalForm = (props: IModalFormProps) => {
-    const {
-        okText = '确定',
-        cancelText = '取消',
-        layout = 'vertical',
-        maskClosable = false,
-        children,
-        onSubmit,
-        modalClassName,
-    } = props;
-
-    const [formProps, modalProps] = useMemo(
-        () => Utils.filterAttrByArrays(props, [FORM_PROPS, MODAL_PROPS]),
-        [props]
-    );
-
-    const [form] = Form.useForm();
-
-    const okHandler = async () => {
-        try {
-            const values = await form.validateFields();
-            onSubmit?.(values);
-        } catch (error) {}
-    };
-
-    const onCancel = (e: React.MouseEvent<HTMLElement, MouseEvent>) => {
-        props.onCancel?.(e);
-    };
-
-    const afterClose = () => {
-        form.resetFields();
-    };
-
-    return (
-        <Modal
-            {...modalProps}
-            afterClose={afterClose}
-            onOk={okHandler}
-            onCancel={onCancel}
-            okText={okText}
-            cancelText={cancelText}
-            maskClosable={maskClosable}
-            className={modalClassName}
-        >
-            <Form form={form} layout={layout} {...formProps}>
-                {React.cloneElement(children as ReactElement, { form, ...props })}
-            </Form>
-        </Modal>
-    );
-};
-
-function InternalForm<P = any, V = any>(
-    FormComponent: React.ComponentType<IModalFormProps<V> & P>
-): React.FC<IModalFormProps<V> & P> {
-    return (props: IModalFormProps<V> & P) => (
-        <ModalForm {...props}>
-            <FormComponent {...(props as IModalFormProps<V> & P)} />
-        </ModalForm>
-    );
-}
-
-export default InternalForm;
diff --git a/src/modal/components/modal/index.tsx b/src/modal/components/modal/index.tsx
deleted file mode 100644
index 65dd6a5a0..000000000
--- a/src/modal/components/modal/index.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import React from 'react';
-import { Alert, type AlertProps, Modal, type ModalProps } from 'antd';
-import classNames from 'classnames';
-import { omit } from 'lodash';
-
-import './index.scss';
-
-export interface IModalProps extends ModalProps {
-    size?: 'small' | 'default' | 'middle' | 'large';
-    banner?: AlertProps['message'] | Omit<AlertProps, 'banner'>;
-}
-
-const getWidthFromSize = (size: IModalProps['size']) => {
-    if (size === 'small') return 400;
-    if (size === 'middle') return 640;
-    if (size === 'large') return 900;
-    return 520;
-};
-
-const isValidBanner = (banner: IModalProps['banner']): banner is AlertProps['message'] => {
-    if (typeof banner === 'object') return React.isValidElement(banner);
-    return true;
-};
-
-export default function InternalModal({
-    bodyStyle,
-    banner,
-    size = 'default',
-    children,
-    width,
-    className,
-    ...rest
-}: IModalProps) {
-    const finalWidth = width ?? getWidthFromSize(size);
-
-    return (
-        <Modal
-            className={classNames('dt-modal', className)}
-            bodyStyle={{ padding: 0, ...bodyStyle }}
-            width={finalWidth}
-            {...rest}
-        >
-            {banner && (
-                <Alert
-                    message={isValidBanner(banner) ? banner : banner.message}
-                    banner
-                    {...(isValidBanner(banner) ? {} : omit(banner, 'message'))}
-                />
-            )}
-            <section className="dt-modal-body">{children}</section>
-        </Modal>
-    );
-}
diff --git a/src/modal/demos/basic/banner.tsx b/src/modal/demos/banner.tsx
similarity index 93%
rename from src/modal/demos/basic/banner.tsx
rename to src/modal/demos/banner.tsx
index e6348c677..bce030366 100644
--- a/src/modal/demos/basic/banner.tsx
+++ b/src/modal/demos/banner.tsx
@@ -8,7 +8,7 @@ export default function Banner() {
     return (
         <>
             <Modal
-                title="dt-react-component"
+                title="支持 banner 属性"
                 visible={visible}
                 banner="模态框可以支持 banner 属性"
                 onCancel={() => setVisible(false)}
diff --git a/src/modal/demos/basic/bannerProps.tsx b/src/modal/demos/bannerProps.tsx
similarity index 92%
rename from src/modal/demos/basic/bannerProps.tsx
rename to src/modal/demos/bannerProps.tsx
index de702ab48..602c64468 100644
--- a/src/modal/demos/basic/bannerProps.tsx
+++ b/src/modal/demos/bannerProps.tsx
@@ -8,7 +8,7 @@ export default function BannerProps() {
     return (
         <>
             <Modal
-                title="dt-react-component"
+                title="支持传 banner 的 Props 属性"
                 visible={visible}
                 banner={{
                     message: '模态框可以支持 banner 属性',
diff --git a/src/modal/demos/basic/basic.tsx b/src/modal/demos/basic.tsx
similarity index 100%
rename from src/modal/demos/basic/basic.tsx
rename to src/modal/demos/basic.tsx
diff --git a/src/modal/demos/form/advance.tsx b/src/modal/demos/form/advance.tsx
deleted file mode 100644
index 237958f4f..000000000
--- a/src/modal/demos/form/advance.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import React, { useState } from 'react';
-import { Button, Form, Input, InputNumber, Table } from 'antd';
-import { Modal } from 'dt-react-component';
-
-interface FormValues {
-    name: string;
-    age: number;
-    address: string;
-}
-
-interface TableData extends FormValues {
-    key: string;
-}
-
-interface CustomModalFormProps {
-    customAttr: string;
-}
-
-const data: TableData[] = [
-    {
-        key: '1',
-        name: 'UED',
-        age: 22,
-        address: '袋鼠家园1号',
-    },
-    {
-        key: '2',
-        name: '数栈',
-        age: 12,
-        address: '袋鼠家园13号',
-    },
-];
-
-const ModalForm = Modal.Form<CustomModalFormProps, FormValues>((props) => {
-    return (
-        <>
-            <Form.Item label="我是自定义参数" name={'name'} initialValue={props.customAttr}>
-                <Input disabled />
-            </Form.Item>
-            <Form.Item label="name" name={'name'}>
-                <Input />
-            </Form.Item>
-            <Form.Item label="age" name={'age'}>
-                <InputNumber />
-            </Form.Item>
-            <Form.Item label="address" name={'address'}>
-                <Input />
-            </Form.Item>
-        </>
-    );
-});
-
-export default () => {
-    const [visible, setVisible] = useState(false);
-    const [index, setIndex] = useState<number>(0);
-    const [dataSource, setDataSource] = useState<TableData[]>(data);
-
-    const columns = [
-        {
-            title: '姓名',
-            dataIndex: 'name',
-            key: 'name',
-        },
-        {
-            title: '年龄',
-            dataIndex: 'age',
-            key: 'age',
-        },
-        {
-            title: '住址',
-            dataIndex: 'address',
-            key: 'address',
-        },
-        {
-            title: '操作',
-            dataIndex: 'operate',
-            key: 'operate',
-            render: (_: void, _record: TableData, index: number) => {
-                return (
-                    <Button
-                        onClick={() => {
-                            changeVisible();
-                            setIndex(index + 1);
-                        }}
-                        type="primary"
-                    >
-                        添加
-                    </Button>
-                );
-            },
-        },
-    ];
-
-    const onSubmit = (values: FormValues) => {
-        dataSource.splice(index, 0, { ...values, key: new Date() + '' });
-        setDataSource([...dataSource]);
-
-        changeVisible();
-    };
-
-    const changeVisible = () => setVisible((v) => !v);
-
-    return (
-        <>
-            <Table columns={columns} dataSource={dataSource} />
-            <ModalForm
-                title="advanceModalForm"
-                visible={visible}
-                onCancel={changeVisible}
-                onSubmit={onSubmit}
-                customAttr={'customAttr'}
-            />
-        </>
-    );
-};
diff --git a/src/modal/demos/form/basics.tsx b/src/modal/demos/form/basics.tsx
deleted file mode 100644
index b68882212..000000000
--- a/src/modal/demos/form/basics.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React, { useState } from 'react';
-import { Button, Form, Input } from 'antd';
-import { Modal } from 'dt-react-component';
-
-interface FormValues {
-    username: string;
-}
-
-interface CustomModalFormProps {
-    customAttr: string;
-}
-
-const ModalForm = Modal.Form<CustomModalFormProps, FormValues>((props) => {
-    return (
-        <>
-            <Form.Item label="我是自定义参数" name={'name'} initialValue={props.customAttr}>
-                <Input disabled />
-            </Form.Item>
-            <Form.Item label="username" name={'username'} rules={[{ max: 10 }]}>
-                <Input />
-            </Form.Item>
-        </>
-    );
-});
-
-export default () => {
-    const [visible, setVisible] = useState(false);
-    return (
-        <>
-            <Button onClick={() => setVisible(true)}>click</Button>
-            <ModalForm
-                title="BasicModalForm"
-                visible={visible}
-                onCancel={() => setVisible((v) => !v)}
-                onSubmit={(value) => {
-                    console.log(value);
-                }}
-                customAttr={'customAttr'}
-            />
-        </>
-    );
-};
diff --git a/src/modal/demos/form/classComponent.tsx b/src/modal/demos/form/classComponent.tsx
deleted file mode 100644
index bd0d8cd02..000000000
--- a/src/modal/demos/form/classComponent.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import React, { useState } from 'react';
-import { Button, Form, Input } from 'antd';
-import { Modal } from 'dt-react-component';
-
-import { IModalFormProps } from '../form';
-
-interface FormValue {
-    username: string;
-}
-
-interface CustomModalFormProps {
-    customAttr: string;
-}
-
-type FormItemsProps = CustomModalFormProps & IModalFormProps<FormValue>;
-
-class FormItems extends React.Component<FormItemsProps> {
-    render(): React.ReactNode {
-        return (
-            <>
-                <Form.Item
-                    label="我是自定义参数"
-                    name={'name'}
-                    initialValue={this.props.customAttr}
-                >
-                    <Input disabled />
-                </Form.Item>
-                <Form.Item label="username" name={'username'} rules={[{ max: 10 }]}>
-                    <Input />
-                </Form.Item>
-            </>
-        );
-    }
-}
-
-const ModalForm = Modal.Form<CustomModalFormProps, FormValue>(FormItems);
-
-export default () => {
-    const [visible, setVisible] = useState(false);
-    return (
-        <>
-            <Button onClick={() => setVisible(true)}>click</Button>
-            <ModalForm
-                title="BasicModalForm"
-                visible={visible}
-                onCancel={() => setVisible((v) => !v)}
-                onSubmit={(value) => {
-                    console.log(value);
-                }}
-                customAttr={'customAttr'}
-            />
-        </>
-    );
-};
diff --git a/src/modal/demos/basic/size.tsx b/src/modal/demos/size.tsx
similarity index 97%
rename from src/modal/demos/basic/size.tsx
rename to src/modal/demos/size.tsx
index 8035535a7..6d419e0e6 100644
--- a/src/modal/demos/basic/size.tsx
+++ b/src/modal/demos/size.tsx
@@ -48,7 +48,7 @@ export default function Size() {
                 </Button>
             </Space>
             <Modal
-                title="最大高度限制 600px"
+                title={`${size} 尺寸的 Modal`}
                 visible={visible}
                 onCancel={() => setVisible(false)}
                 onOk={() => setVisible(false)}
diff --git a/src/modal/index.$tab-form.md b/src/modal/index.$tab-form.md
deleted file mode 100644
index 67464376e..000000000
--- a/src/modal/index.$tab-form.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title: Modal.Form
----
-
-# Modal.Form 带 Form 表单的模态框
-
-## 何时使用
-
-当需要在模态框中收集用户的表单信息，可以在这个组件中传入自己想要的表单元素
-
-## 示例
-
-<code src="./demos/form/basics.tsx" title="基础使用"></code>
-<code src="./demos/form/advance.tsx" title="接收函数组件"></code>
-<code src="./demos/form/classComponent.tsx" title="接收类组件"></code>
-
-## API
-
-| 参数           | 说明                                                                                           | 类型        | 默认值     |
-| -------------- | ---------------------------------------------------------------------------------------------- | ----------- | ---------- |
-| onSubmit       | 点击确定按钮后，表单的值验证无误后的回调，接受两个参数 value:表单的值，record:其他想要提交的值 | `Function`  | -          |
-| cancelText     | 模态框取消按钮的文本                                                                           | `string`    | 取消       |
-| okText         | 模态框确定按钮的文本                                                                           | `string`    | 确定       |
-| okType         | 确认按钮类型                                                                                   | `string`    | `primary`  |
-| visible        | 模态框显示隐藏的状态                                                                           | `boolean`   | -          |
-| title          | 标题                                                                                           | `ReactNode` | -          |
-| modalClassName | 模态框样式类名                                                                                 | `string`    | -          |
-| children       | 传入模态框的表单元素                                                                           | `ReactNode` | -          |
-| layout         | 表单布局                                                                                       | `string`    | `vertical` |
-| maskClosable   | 点击蒙层是否允许关闭                                                                           | `boolean`   | `false`    |
-
-:::info
-其余参数继承 antd4.x 的 [Form](https://ant.design/components/form-cn/#API) 和 [Modal](https://4x.ant.design/components/modal-cn/#API)
-:::
diff --git a/src/modal/index.md b/src/modal/index.md
index f626b034d..d50924168 100644
--- a/src/modal/index.md
+++ b/src/modal/index.md
@@ -8,12 +8,16 @@ toc: content
 
 ## 何时使用
 
+-   使用模态框时，使用该组件替换 antd 的 Modal
+-   支持 size 属性来快速设置宽度；限制 Modal 的高度为 600px，超出内部滚动
+-   支持 banner 属性来快速实现 Modal 内部提示
+
 ## 示例
 
-<code src="./demos/basic/basic.tsx" title="最大高度限制"></code>
-<code src="./demos/basic/size.tsx" title="尺寸"></code>
-<code src="./demos/basic/banner.tsx" title="支持 banner"></code>
-<code src="./demos/basic/bannerProps.tsx" title="支持传 banner 的 Props 属性"></code>
+<code src="./demos/basic.tsx" title="最大高度限制"></code>
+<code src="./demos/size.tsx" title="尺寸"></code>
+<code src="./demos/banner.tsx" title="支持 banner"></code>
+<code src="./demos/bannerProps.tsx" title="支持传 banner 的 Props 属性"></code>
 
 ## API
 
diff --git a/src/modal/components/modal/index.scss b/src/modal/index.scss
similarity index 100%
rename from src/modal/components/modal/index.scss
rename to src/modal/index.scss
diff --git a/src/modal/index.tsx b/src/modal/index.tsx
index df9969bd5..65dd6a5a0 100644
--- a/src/modal/index.tsx
+++ b/src/modal/index.tsx
@@ -1,26 +1,53 @@
-import { Modal } from 'antd';
+import React from 'react';
+import { Alert, type AlertProps, Modal, type ModalProps } from 'antd';
+import classNames from 'classnames';
+import { omit } from 'lodash';
 
-import InternalForm from './components/form';
-import InternalModal from './components/modal';
+import './index.scss';
 
-type OriginalInterface = typeof Modal;
+export interface IModalProps extends ModalProps {
+    size?: 'small' | 'default' | 'middle' | 'large';
+    banner?: AlertProps['message'] | Omit<AlertProps, 'banner'>;
+}
 
-const WrapperModal: any = new Proxy(InternalModal, {
-    get(_, key) {
-        if (key in Modal) {
-            // Skip defaultProps
-            if (key === 'defaultProps') return undefined;
-            return Modal[key as keyof OriginalInterface];
-        } else if (key === 'Form') {
-            return InternalForm;
-        }
-    },
-});
+const getWidthFromSize = (size: IModalProps['size']) => {
+    if (size === 'small') return 400;
+    if (size === 'middle') return 640;
+    if (size === 'large') return 900;
+    return 520;
+};
 
-type ModalStaticFunctionType = Pick<OriginalInterface, keyof OriginalInterface>;
-type ModalInterface = typeof InternalModal &
-    ModalStaticFunctionType & { Form: typeof InternalForm };
+const isValidBanner = (banner: IModalProps['banner']): banner is AlertProps['message'] => {
+    if (typeof banner === 'object') return React.isValidElement(banner);
+    return true;
+};
 
-export type { IModalProps } from './components/modal';
+export default function InternalModal({
+    bodyStyle,
+    banner,
+    size = 'default',
+    children,
+    width,
+    className,
+    ...rest
+}: IModalProps) {
+    const finalWidth = width ?? getWidthFromSize(size);
 
-export default WrapperModal as ModalInterface;
+    return (
+        <Modal
+            className={classNames('dt-modal', className)}
+            bodyStyle={{ padding: 0, ...bodyStyle }}
+            width={finalWidth}
+            {...rest}
+        >
+            {banner && (
+                <Alert
+                    message={isValidBanner(banner) ? banner : banner.message}
+                    banner
+                    {...(isValidBanner(banner) ? {} : omit(banner, 'message'))}
+                />
+            )}
+            <section className="dt-modal-body">{children}</section>
+        </Modal>
+    );
+}
diff --git a/src/utils/__tests__/uttils.tests.tsx b/src/utils/__tests__/uttils.tests.tsx
deleted file mode 100644
index e53a85573..000000000
--- a/src/utils/__tests__/uttils.tests.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { FORM_PROPS, MODAL_PROPS } from '../antdProps';
-import Utils from '../index';
-
-test('test Utils filterAttrByArrays', () => {
-    const [modalProps, formProps, restProps] = Utils.filterAttrByArrays(
-        { a: 123, b: 321, visible: false, disabled: true },
-        [MODAL_PROPS, FORM_PROPS]
-    );
-    expect(modalProps).toEqual({
-        visible: false,
-    });
-
-    expect(formProps).toEqual({
-        disabled: true,
-    });
-    expect(restProps).toEqual({
-        a: 123,
-        b: 321,
-    });
-});
diff --git a/src/utils/antdProps.ts b/src/utils/antdProps.ts
deleted file mode 100644
index b4349b041..000000000
--- a/src/utils/antdProps.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-export const MODAL_PROPS = [
-    'afterClose',
-    'bodyStyle',
-    'cancelButtonProps',
-    'cancelText',
-    'centered',
-    'closable',
-    'closeIcon',
-    'confirmLoading',
-    'destroyOnClose',
-    'focusTriggerAfterClose',
-    'footer',
-    'forceRender',
-    'getContainer',
-    'keyboard',
-    'mask',
-    'maskClosable',
-    'maskStyle',
-    'modalRender',
-    'okButtonProps',
-    'okText',
-    'okType',
-    'style',
-    'title',
-    'open',
-    'visible', // 兼容老版本
-    'width',
-    'zIndex',
-    'wrapClassName',
-    'onCancel',
-    'onOk',
-];
-
-export const FORM_PROPS = [
-    'colon',
-    'disabled',
-    'component',
-    'fields',
-    'form',
-    'initialValues',
-    'labelAlign',
-    'labelWrap',
-    'labelCol',
-    'layout',
-    'name',
-    'preserve',
-    'requiredMark',
-    'scrollToFirstError',
-    'size',
-    'validateMessages',
-    'validateTrigger',
-    'wrapperCol',
-    'onFieldsChange',
-    'onFinish',
-    'onFinishFailed',
-    'onValuesChange',
-];
diff --git a/src/utils/index.ts b/src/utils/index.ts
deleted file mode 100644
index 129e90537..000000000
--- a/src/utils/index.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-const utils = {
-    /**
-     * 根据 arrays 过滤当前的 attr，结果会根据 arrays 中的顺序进行排序，最后一个为未命中的集合
-     * @param attr  \{ a: 123, b: 321, onCancel: () => {}, disabled: true }
-     * @param arrays [MODAL_PROPS, FORM_PROPS]
-     * @returns {attr[]} [{ onCancel: () => {} }, { disabled: true }, { a: 123, b: 321 }]
-     */
-    filterAttrByArrays(attr: { [key: string]: any }, arrays: string[][] = []) {
-        const result = new Array(arrays.length + 1); // 多出来一个用来存放 restProps
-        for (let index = 0; index < result.length; index++) {
-            result[index] = {};
-        }
-
-        Object.keys(attr).forEach((key: string) => {
-            const isFind = arrays.find((array, index) => {
-                if (array.includes(key)) {
-                    result[index][key] = attr[key];
-                    return true;
-                }
-                return false;
-            });
-
-            if (!isFind) {
-                result[arrays.length][key] = attr[key];
-            }
-        });
-        return result;
-    },
-};
-
-export default utils;