diff --git a/src/pages/Suite/components/AddModal.tsx b/src/pages/Suite/components/AddModal.tsx
index fc3d2273140613676f257909de7cde7141d32b88..23a3fcdf6c88942ff68e7672899aa86183ba0e10 100644
--- a/src/pages/Suite/components/AddModal.tsx
+++ b/src/pages/Suite/components/AddModal.tsx
@@ -10,6 +10,7 @@ import { createCases } from "../services";
 import { createModule } from "@/pages/Suite/services"
 import { ReactComponent as CancelIcon } from "@/assets/case/cancel.svg"
 import { ReactComponent as ConfirmIcon } from "@/assets/case/confirm.svg"
+import { ToneCaseItem } from "@/pages/Suite/components/ToneCase"
 
 type IProps = {
     onOk: () => void;
@@ -315,27 +316,7 @@ const ReactComponent: React.ForwardRefRenderFunction<IRefs, IProps> = (props, re
                         <Form.Item label="测试类型" name="test_type" >
                             <Select placeholder="请选择" options={testTypeOptions} />
                         </Form.Item> :
-                        <Form.Item label="T-One用例">
-                            {
-                                isCheckedCase ?
-                                    <Casetag
-                                        onClick={() => selectSuiteModalRef.current?.show(isCheckedCase.id)}
-                                    >
-                                        <Space>
-                                            {isCheckedCase?.name}
-                                            <CloseOutlined />
-                                        </Space>
-                                    </Casetag> :
-                                    <span onClick={() => selectSuiteModalRef.current?.show()}>
-                                        <Typography.Link >
-                                            <Space>
-                                                +
-                                                添加用例
-                                            </Space>
-                                        </Typography.Link>
-                                    </span>
-                            }
-                        </Form.Item>
+                        <ToneCaseItem onChange={handleSelectOk} />
                 }
 
                 <Form.Item label="设备类型" name="device_type">
@@ -364,7 +345,6 @@ const ReactComponent: React.ForwardRefRenderFunction<IRefs, IProps> = (props, re
                     />
                 </div>
             </Space>
-            <SelectSuiteModal ref={selectSuiteModalRef} onOk={handleSelectOk} />
         </Modal>
     )
 }
diff --git a/src/pages/Suite/components/Case/Base.tsx b/src/pages/Suite/components/Case/Base.tsx
index 1d8a3bd15a6c036a00bc494b6eb349872a600986..c6331e04362abf1150a7eb797568a0a29f219b2e 100644
--- a/src/pages/Suite/components/Case/Base.tsx
+++ b/src/pages/Suite/components/Case/Base.tsx
@@ -19,15 +19,12 @@ const BaseChild: React.FC<IProps> = (props) => {
     const { currentCase } = props
     const [form] = Form.useForm()
 
-    console.log(currentCase)
-
     const source = React.useMemo(() => {
-        console.log(currentCase)
         if (currentCase && JSON.stringify(currentCase) !== "{}") {
             const { base_fields } = currentCase
             return {
                 ...currentCase,
-                base_fields: base_fields ? JSON.parse(base_fields) : null
+                ...base_fields
             }
         }
         return {}
@@ -50,7 +47,7 @@ const BaseChild: React.FC<IProps> = (props) => {
                 {testTypeMap.get(currentCase?.type) || "-"}
             </Form.Item>
             <Form.Item label="运行方式">
-                {runMethodMap.get(currentCase?.type) || "-"}
+                {runMethodMap.get(currentCase?.run_method) || "-"}
             </Form.Item>
             <Form.Item label="状态">
                 {isAvailableMap.get(currentCase?.is_available) || "-"}
diff --git a/src/pages/Suite/components/Case/Edit.tsx b/src/pages/Suite/components/Case/Edit.tsx
index 415307595ee92d301d40d9932c077424b9279ac8..a1bf6aa08a819769cd1196dbb5e1bec779ab069b 100644
--- a/src/pages/Suite/components/Case/Edit.tsx
+++ b/src/pages/Suite/components/Case/Edit.tsx
@@ -4,6 +4,7 @@ import styled from "styled-components"
 import { deviceArchOptions, deviceTypeOptions, runMethodOptions, runModelOptions, testTypeOptions } from "../../utils"
 import RichTextEditor from "@/components/RichTextEditor"
 import { SlateTransforms } from '@wangeditor/editor'
+import { ToneCaseItem } from "@/pages/Suite/components/ToneCase"
 
 type IProps = {
     [k: string]: any
@@ -19,28 +20,59 @@ const EditChild: React.ForwardRefRenderFunction<{}, IProps> = (props, ref) => {
     const { currentCase } = props
     const [form] = Form.useForm()
     const vm = React.useRef(null) as any
+    const [checkCase, setCheckCase] = React.useState<any>(null)
+    const [runMethod, setRunMethod] = React.useState<any>(null)
 
     React.useImperativeHandle(ref, () => {
         return {
             ...form,
             vm: vm.current,
+            formResultChangeValue() {
+                let params: any = {}
+
+                const values = form.getFieldsValue()
+                const { tools, version } = values
+                if (vm.current) {
+                    const { children } = vm.current
+                    if (children) params.custom_fields = children
+                }
+                let base_fields: any = { tools, version }
+                if (runMethod !== "manual" && checkCase) {
+                    const { id, name } = checkCase
+                    if (id && name) {
+                        params = {
+                            ...params,
+                            tone_case: id,
+                        }
+                        base_fields = { ...base_fields, tone_case_name: name }
+                    }
+                }
+
+                return {
+                    ...values,
+                    ...params,
+                    base_fields
+                }
+            },
         }
     })
 
     React.useEffect(() => {
-        if (JSON.stringify(currentCase) !== "{}") {
-            form.setFieldsValue(currentCase)
-            // const { custom_fields } = currentCase
-            // if (custom_fields) {
-            //     SlateTransforms.insertNodes(vm.current, custom_fields)
-            // }
+        if (currentCase && JSON.stringify(currentCase) !== "{}") {
+            const { base_fields, tone_case, run_method } = currentCase
+            const { tone_case_name } = base_fields
+            form.setFieldsValue({ ...currentCase, ...base_fields })
+            if (tone_case_name && tone_case)
+                setCheckCase({ name: tone_case_name, id: tone_case })
+            setRunMethod(run_method)
         }
         return () => {
             form.resetFields()
+            setCheckCase(null)
+            setRunMethod(null)
         }
     }, [currentCase])
 
-
     const richEditerChange = (editor: any) => {
         vm.current = editor
     }
@@ -58,14 +90,22 @@ const EditChild: React.ForwardRefRenderFunction<{}, IProps> = (props, ref) => {
             <Form.Item>
                 <Typography.Text strong>基础信息</Typography.Text>
             </Form.Item>
-            <Form.Item label="测试类型" name="type">
-                <Select options={testTypeOptions} />
-            </Form.Item>
+
             <Form.Item label="运行方式" name="run_method">
                 <Radio.Group
                     options={runMethodOptions}
+                    onChange={({ target }) => setRunMethod(target.value)}
                 />
             </Form.Item>
+
+            {
+                runMethod === "manual" ?
+                    <Form.Item label="测试类型" name="type">
+                        <Select options={testTypeOptions} />
+                    </Form.Item> :
+                    <ToneCaseItem onChange={setCheckCase} defaultValue={checkCase} />
+            }
+
             <Form.Item label="状态" name="is_available">
                 <Switch checkedChildren="开启" unCheckedChildren="关闭" defaultChecked />
             </Form.Item>
@@ -91,13 +131,13 @@ const EditChild: React.ForwardRefRenderFunction<{}, IProps> = (props, ref) => {
                 <Typography.Text strong>基础信息</Typography.Text>
             </Form.Item>
             <Form.Item label="工具" name="tools">
-                <Input />
+                <Input placeholder="请输入" />
             </Form.Item>
             <Form.Item label="版本" name="version">
-                <Input />
+                <Input placeholder="请输入" />
             </Form.Item>
             <Form.Item label="相关说明" />
-            <div style={{ height: 500, border: "1px solid rgba(0,0,0,0.15)" }}>
+            <div style={{ height: 300, border: "1px solid rgba(0,0,0,0.15)" }}>
                 <RichTextEditor defaultValue={currentCase?.custom_fields} onEditorChange={richEditerChange} />
             </div>
         </CustomFilterForm>
diff --git a/src/pages/Suite/components/Case/index.tsx b/src/pages/Suite/components/Case/index.tsx
index 8fb4c434c1111e707d09f76e8b70628a96ec6034..b6141373dc78dfc52111a7ec834414eb447ad147 100644
--- a/src/pages/Suite/components/Case/index.tsx
+++ b/src/pages/Suite/components/Case/index.tsx
@@ -6,7 +6,7 @@ import Logo from "@/assets/logo.png"
 import { ReactComponent as Priority } from "@/assets/case/priority.svg"
 import BaseChild from "./Base"
 import EditChild from "./Edit"
-import { renameCase, deleteCases } from "@/pages/Suite/services"
+import { renameCase, deleteCases, updateCase } from "@/pages/Suite/services"
 import { IDomEditor } from "@wangeditor/editor"
 
 type IProps = {
@@ -44,16 +44,23 @@ const Case: React.FC<IProps> = (props) => {
         const { code, msg } = await deleteCases({ id: [currentCase.id] })
         if (code !== 200) return message.error(msg)
         refresh()
+        message.success("操作成功！")
     }
 
     const handleSave = () => {
-        const infoForm: FormInstance = editInfoRef.current
+        const infoForm: FormInstance & any = editInfoRef.current
         infoForm.validateFields()
-            .then((values) => {
-                console.log(values)
-                const { vm }: any = infoForm
-                const custom_fields = vm.children
-                
+            .then(async (values: any) => {
+                const params = infoForm?.formResultChangeValue()
+
+                const { code, msg } = await updateCase(currentCase.id, params)
+                if (code !== 200) {
+                    message.error(msg)
+                    return
+                }
+                refresh()
+                message.success("操作成功！")
+                handleCancelSave()
             })
     }
 
@@ -65,8 +72,6 @@ const Case: React.FC<IProps> = (props) => {
 
     const handleCancelSave = () => {
         setEditing(false)
-        const infoForm: FormInstance = editInfoRef.current
-        infoForm.resetFields()
     }
 
     return (
diff --git a/src/pages/Suite/components/RightContent/index.tsx b/src/pages/Suite/components/RightContent/index.tsx
index b6f1f7488f71cd52679dd9ef9f3a616fc67570e7..a578636a0fe6a0f2e242b20456816d01fa70527e 100644
--- a/src/pages/Suite/components/RightContent/index.tsx
+++ b/src/pages/Suite/components/RightContent/index.tsx
@@ -56,7 +56,12 @@ const RightContent: React.FC<IProps> = (props) => {
         }
         setCases(data)
         if (data.length > 0) {
-            if (!activeCase || !data.map((i: any) => i.id).includes(activeCase.id))
+            if (activeCase && activeCase.id) {
+                const idx = data.findIndex((i: any) => i.id === activeCase.id)
+                if (!idx)
+                    setActiveCase(data[idx])
+            }
+            else
                 setActiveCase(data[0])
         }
         setLoading(false)
diff --git a/src/pages/Suite/components/ToneCase.tsx b/src/pages/Suite/components/ToneCase.tsx
new file mode 100644
index 0000000000000000000000000000000000000000..07e2ad5df8fad986b06fbc3256f31dea207d9fbe
--- /dev/null
+++ b/src/pages/Suite/components/ToneCase.tsx
@@ -0,0 +1,60 @@
+import React from "react"
+import { Form, Space, Typography } from "antd"
+import styled from "styled-components"
+import SelectSuiteModal from "./RightContent/SelectSuiteModal"
+import { CloseOutlined } from "@ant-design/icons"
+
+const Casetag = styled.div`
+    background-color: rgba(0,0,0,0.05);
+    border-radius: 2px;
+    padding: 3px 6px;
+    display: inline-block;
+    cursor: pointer;
+    :hover {
+        color: rgba(24,144,255,1);
+        background-color: rgba(24,144,255,0.05);
+    }
+`
+type IProps = {
+    [k: string]: any
+}
+
+export const ToneCaseItem: React.FC<IProps> = (props) => {
+    const { onChange, defaultValue = null } = props
+    const ref = React.useRef(null) as any
+    const [isChecked, setIsChecked] = React.useState<any>(defaultValue)
+
+    React.useEffect(() => {
+        setIsChecked(defaultValue)
+    }, [defaultValue])
+
+    const onOk = (conf: any) => {
+        setIsChecked(conf)
+        onChange(conf)
+    }
+
+    return <>
+        <Form.Item label="T-One用例">
+            {
+                isChecked ?
+                    <Casetag
+                        onClick={() => ref.current?.show(isChecked?.id)}
+                    >
+                        <Space>
+                            {isChecked?.name}
+                            <CloseOutlined />
+                        </Space>
+                    </Casetag> :
+                    <span onClick={() => ref.current?.show()}>
+                        <Typography.Link >
+                            <Space>
+                                +
+                                添加用例
+                            </Space>
+                        </Typography.Link>
+                    </span>
+            }
+        </Form.Item>
+        <SelectSuiteModal ref={ref} onOk={onOk} />
+    </>
+}
\ No newline at end of file
diff --git a/src/pages/Suite/services.ts b/src/pages/Suite/services.ts
index eb9922c1be03766f6abbac2af919d39c318ec56a..5227b9a9f287411bfaa001795e66318ad160133c 100644
--- a/src/pages/Suite/services.ts
+++ b/src/pages/Suite/services.ts
@@ -42,8 +42,8 @@ export const moveCase = async (data: { parent: any, cases: any[] }) => {
 }
 
 //更新测试用例
-export const editCase = async (case_id: string, data: ICase) => {
-    return request(`/api/case/edit/${case_id}`, { method: "delete", data })
+export const updateCase = async (case_id: string, data: ICase) => {
+    return request(`/api/case/edit/${case_id}`, { method: "post", data })
 }
 
 export type IModule = {