diff --git a/frontend/src/pages/DataAnnotation/Create/components/CreateAnnotationTaskDialog.tsx b/frontend/src/pages/DataAnnotation/Create/components/CreateAnnotationTaskDialog.tsx
index 840ebd1..8ae25dc 100644
--- a/frontend/src/pages/DataAnnotation/Create/components/CreateAnnotationTaskDialog.tsx
+++ b/frontend/src/pages/DataAnnotation/Create/components/CreateAnnotationTaskDialog.tsx
@@ -6,22 +6,30 @@ import { useEffect, useState } from "react";
 import { Eye } from "lucide-react";
 import {
   createAnnotationTaskUsingPost,
+  getAnnotationTaskByIdUsingGet,
+  updateAnnotationTaskByIdUsingPut,
   queryAnnotationTemplatesUsingGet,
 } from "../../annotation.api";
 import { type Dataset } from "@/pages/DataManagement/dataset.model";
-import type { AnnotationTemplate } from "../../annotation.model";
+import type { AnnotationTemplate, AnnotationTask } from "../../annotation.model";
 import LabelStudioEmbed from "@/components/business/LabelStudioEmbed";
 import TemplateConfigurationForm from "../../components/TemplateConfigurationForm";
 
+interface AnnotationTaskDialogProps {
+  open: boolean;
+  onClose: () => void;
+  onRefresh: () => void;
+  /** 编辑模式：传入要编辑的任务数据 */
+  editTask?: AnnotationTask | null;
+}
+
 export default function CreateAnnotationTask({
   open,
   onClose,
   onRefresh,
-}: {
-  open: boolean;
-  onClose: () => void;
-  onRefresh: () => void;
-}) {
+  editTask,
+}: AnnotationTaskDialogProps) {
+  const isEditMode = !!editTask;
   const { message } = App.useApp();
   const [manualForm] = Form.useForm();
   const [datasets, setDatasets] = useState<Dataset[]>([]);
@@ -34,6 +42,8 @@ export default function CreateAnnotationTask({
   const [showPreview, setShowPreview] = useState(false);
   const [previewTaskData, setPreviewTaskData] = useState<Record<string, any>>({});
   const [configMode, setConfigMode] = useState<"template" | "custom">("template");
+  // 模板编辑模式切换（可视化 vs XML）
+  const [templateEditTab, setTemplateEditTab] = useState<"visual" | "xml">("visual");
   // 是否已选择模板（用于启用受限编辑模式）
   const [hasSelectedTemplate, setHasSelectedTemplate] = useState(false);
 
@@ -51,6 +61,9 @@ export default function CreateAnnotationTask({
   const [previewFileType, setPreviewFileType] = useState<"text" | "image" | "video" | "audio">("text");
   const [previewMediaUrl, setPreviewMediaUrl] = useState("");
 
+  // 任务详情加载状态（编辑模式）
+  const [taskDetailLoading, setTaskDetailLoading] = useState(false);
+
   useEffect(() => {
     if (!open) return;
     const fetchData = async () => {
@@ -83,7 +96,7 @@ export default function CreateAnnotationTask({
     fetchData();
   }, [open]);
 
-  // Reset form and manual-edit flag when modal opens
+  // Reset form and manual-edit flag when modal opens, or load task data in edit mode
   useEffect(() => {
     if (open) {
       manualForm.resetFields();
@@ -91,12 +104,58 @@ export default function CreateAnnotationTask({
       setCustomXml("");
       setShowPreview(false);
       setPreviewTaskData({});
-      setConfigMode("template");
-      setHasSelectedTemplate(false);
-      setSelectedDatasetId(null);
       setDatasetPreviewData([]);
+
+      if (isEditMode && editTask) {
+        // 编辑模式：加载任务详情
+        setTaskDetailLoading(true);
+        getAnnotationTaskByIdUsingGet(editTask.id)
+          .then((res: any) => {
+            if (res.code === 200 && res.data) {
+              const taskDetail = res.data;
+              // 填充基本信息
+              manualForm.setFieldsValue({
+                name: taskDetail.name,
+                description: taskDetail.description,
+                datasetId: taskDetail.datasetId,
+              });
+              setSelectedDatasetId(taskDetail.datasetId);
+
+              // 填充模板配置
+              if (taskDetail.configuration) {
+                const { objects, labels } = taskDetail.configuration;
+                manualForm.setFieldsValue({
+                  objects: objects || [],
+                  labels: labels || [],
+                });
+              }
+
+              // 设置 XML 配置用于预览
+              if (taskDetail.labelConfig) {
+                setCustomXml(taskDetail.labelConfig);
+              }
+
+              // 编辑模式始终使用 custom 配置模式（不改变结构，只改标签）
+              setConfigMode("custom");
+              // 编辑模式下启用受限编辑
+              setHasSelectedTemplate(true);
+            }
+          })
+          .catch((err) => {
+            console.error("Failed to load task detail:", err);
+            message.error("加载任务详情失败");
+          })
+          .finally(() => {
+            setTaskDetailLoading(false);
+          });
+      } else {
+        // 创建模式：重置为默认状态
+        setConfigMode("template");
+        setHasSelectedTemplate(false);
+        setSelectedDatasetId(null);
+      }
     }
-  }, [open, manualForm]);
+  }, [open, manualForm, isEditMode, editTask, message]);
 
   // 预览数据集
   const handlePreviewDataset = async () => {
@@ -342,14 +401,27 @@ export default function CreateAnnotationTask({
         datasetId: values.datasetId,
         templateId: configMode === 'template' ? values.templateId : undefined,
         labelConfig: finalLabelConfig,
+        // 编辑模式需要传递配置结构，用于后端保存
+        configuration: {
+          objects: objects || [],
+          labels: labels || [],
+        },
       };
-      await createAnnotationTaskUsingPost(requestData);
-      message.success("创建标注任务成功");
+
+      if (isEditMode && editTask) {
+        // 编辑模式：调用更新接口
+        await updateAnnotationTaskByIdUsingPut(editTask.id, requestData);
+        message.success("更新标注任务成功");
+      } else {
+        // 创建模式：调用创建接口
+        await createAnnotationTaskUsingPost(requestData);
+        message.success("创建标注任务成功");
+      }
       onClose();
       onRefresh();
     } catch (err: any) {
-      console.error("Create annotation task failed", err);
-      const msg = err?.message || err?.data?.message || "创建失败，请稍后重试";
+      console.error(isEditMode ? "Update annotation task failed" : "Create annotation task failed", err);
+      const msg = err?.message || err?.data?.message || (isEditMode ? "更新失败，请稍后重试" : "创建失败，请稍后重试");
       message.error(msg);
     } finally {
       setSubmitting(false);
@@ -378,7 +450,8 @@ export default function CreateAnnotationTask({
       <Modal
         open={open}
         onCancel={onClose}
-        title="创建标注任务"
+        title={isEditMode ? "编辑标注任务" : "创建标注任务"}
+        loading={taskDetailLoading}
         footer={
           <>
             <Button onClick={onClose} disabled={submitting}>
@@ -417,9 +490,11 @@ export default function CreateAnnotationTask({
               }
               name="datasetId"
               rules={[{ required: true, message: "请选择数据集" }]}
+              help={isEditMode ? "数据集不可修改" : undefined}
             >
               <Select
                 placeholder="请选择数据集"
+                disabled={isEditMode}
                 options={datasets.map((dataset) => {
                   return {
                     label: (
@@ -487,10 +562,12 @@ export default function CreateAnnotationTask({
               <span className="text-sm font-medium text-gray-700 after:content-['*'] after:text-red-500 after:ml-1">标注配置</span>
 
               <div className="flex gap-2">
-                <Radio.Group value={configMode} onChange={handleConfigModeChange} size="small" buttonStyle="solid">
-                  <Radio.Button value="template">现有模板</Radio.Button>
-                  <Radio.Button value="custom">自定义配置</Radio.Button>
-                </Radio.Group>
+                {!isEditMode && (
+                  <Radio.Group value={configMode} onChange={handleConfigModeChange} size="small" buttonStyle="solid">
+                    <Radio.Button value="template">现有模板</Radio.Button>
+                    <Radio.Button value="custom">自定义配置</Radio.Button>
+                  </Radio.Group>
+                )}
 
                 <Button
                   type="link"
@@ -517,7 +594,20 @@ export default function CreateAnnotationTask({
               </div>
           </div>
 
-          {configMode === 'template' ? (
+          {isEditMode ? (
+            // 编辑模式：只允许修改标签取值
+            <div className="bg-gray-50 p-4 rounded-md border border-gray-200">
+              <div className="text-sm text-gray-500 mb-3 bg-blue-50 p-2 rounded border border-blue-200">
+                编辑模式下，模板结构（数据对象、控件类型等）不可修改，仅可修改标签/选项的取值。
+              </div>
+              <div style={{ maxHeight: '350px', overflowY: 'auto' }}>
+                <TemplateConfigurationForm
+                  form={manualForm}
+                  restrictedMode={true}
+                />
+              </div>
+            </div>
+          ) : configMode === 'template' ? (
             <div className="bg-gray-50 p-4 rounded-md border border-gray-200">
               <Form.Item
                 label="加载现有模板"
diff --git a/frontend/src/pages/DataAnnotation/Home/DataAnnotation.tsx b/frontend/src/pages/DataAnnotation/Home/DataAnnotation.tsx
index c31c88a..9331708 100644
--- a/frontend/src/pages/DataAnnotation/Home/DataAnnotation.tsx
+++ b/frontend/src/pages/DataAnnotation/Home/DataAnnotation.tsx
@@ -3,6 +3,7 @@ import { Card, Button, Table, message, Modal, Tabs } from "antd";
 import {
   PlusOutlined,
   EditOutlined,
+  FormOutlined,
   DeleteOutlined,
   DownloadOutlined,
 } from "@ant-design/icons";
@@ -29,6 +30,7 @@ export default function DataAnnotation() {
   const [viewMode, setViewMode] = useState<"list" | "card">("list");
   const [showCreateDialog, setShowCreateDialog] = useState(false);
   const [exportTask, setExportTask] = useState<AnnotationTask | null>(null);
+  const [editTask, setEditTask] = useState<AnnotationTask | null>(null);
 
   const {
     loading,
@@ -56,6 +58,10 @@ export default function DataAnnotation() {
     setExportTask(task);
   };
 
+  const handleEdit = (task: AnnotationTask) => {
+    setEditTask(task);
+  };
+
   const handleDelete = (task: AnnotationTask) => {
     Modal.confirm({
       title: `确认删除标注任务「${task.name}」吗？`,
@@ -116,6 +122,12 @@ export default function DataAnnotation() {
       ),
       onClick: handleAnnotate,
     },
+    {
+      key: "edit",
+      label: "编辑",
+      icon: <FormOutlined className="w-4 h-4" style={{ color: "#722ed1" }} />,
+      onClick: handleEdit,
+    },
     {
       key: "export",
       label: "导出",
@@ -264,9 +276,13 @@ export default function DataAnnotation() {
                 )}
 
                 <CreateAnnotationTask
-                  open={showCreateDialog}
-                  onClose={() => setShowCreateDialog(false)}
+                  open={showCreateDialog || !!editTask}
+                  onClose={() => {
+                    setShowCreateDialog(false);
+                    setEditTask(null);
+                  }}
                   onRefresh={() => fetchData()}
+                  editTask={editTask}
                 />
 
                 <ExportAnnotationDialog
diff --git a/frontend/src/pages/DataAnnotation/annotation.api.ts b/frontend/src/pages/DataAnnotation/annotation.api.ts
index 22561d7..6e9e8bc 100644
--- a/frontend/src/pages/DataAnnotation/annotation.api.ts
+++ b/frontend/src/pages/DataAnnotation/annotation.api.ts
@@ -21,6 +21,14 @@ export function deleteAnnotationTaskByIdUsingDelete(mappingId: string) {
   return del(`/api/annotation/project/${mappingId}`);
 }
 
+export function getAnnotationTaskByIdUsingGet(taskId: string) {
+  return get(`/api/annotation/project/${taskId}`);
+}
+
+export function updateAnnotationTaskByIdUsingPut(taskId: string, data: any) {
+  return put(`/api/annotation/project/${taskId}`, data);
+}
+
 // 标签配置管理
 export function getTagConfigUsingGet() {
   return get("/api/annotation/tags/config");