diff --git a/frontend/src/pages/DataAnnotation/Create/components/CreateAnnotationTaskDialog.tsx b/frontend/src/pages/DataAnnotation/Create/components/CreateAnnotationTaskDialog.tsx
index 184ab89..8d0d2de 100644
--- a/frontend/src/pages/DataAnnotation/Create/components/CreateAnnotationTaskDialog.tsx
+++ b/frontend/src/pages/DataAnnotation/Create/components/CreateAnnotationTaskDialog.tsx
@@ -121,6 +121,7 @@ export default function CreateAnnotationTask({
   const [customXml, setCustomXml] = useState("");
   const [showPreview, setShowPreview] = useState(false);
   const [configMode, setConfigMode] = useState<"template" | "custom">("template");
+  const [templateEditTab, setTemplateEditTab] = useState<"visual" | "xml">("visual");
 
   const [selectAllClasses, setSelectAllClasses] = useState(true);
   const [selectedFilesMap, setSelectedFilesMap] = useState<Record<string, DatasetFile>>({});
@@ -174,6 +175,7 @@ export default function CreateAnnotationTask({
       setCustomXml("");
       setShowPreview(false);
       setConfigMode("template");
+      setTemplateEditTab("visual");
     }
   }, [open, manualForm, autoForm]);
 
@@ -222,23 +224,59 @@ export default function CreateAnnotationTask({
     return xml;
   };
 
+  // 从表单值同步生成 XML
+  const syncFormToXml = () => {
+    const objects = manualForm.getFieldValue("objects");
+    const labels = manualForm.getFieldValue("labels");
+    if (objects && objects.length > 0) {
+      const xml = generateXmlFromConfig(objects, labels || []);
+      setCustomXml(xml);
+    }
+  };
+
+  // 当选择模板时，加载模板配置到表单
+  const handleTemplateSelect = (value: string, option: any) => {
+    if (option && option.config) {
+      setCustomXml(option.config);
+    }
+
+    // 从模板列表中找到完整的模板数据
+    const selectedTemplate = templates.find(t => t.id === value);
+    if (selectedTemplate?.configuration) {
+      const { objects, labels } = selectedTemplate.configuration;
+      manualForm.setFieldsValue({
+        objects: objects || [{ name: "image", type: "Image", value: "$image" }],
+        labels: labels || [],
+      });
+    } else if (option && option.config) {
+      // 如果没有结构化配置，设置默认值
+      manualForm.setFieldsValue({
+        objects: [{ name: "image", type: "Image", value: "$image" }],
+        labels: [],
+      });
+    }
+  };
+
   const handleManualSubmit = async () => {
     try {
       const values = await manualForm.validateFields();
-      
+
       let finalLabelConfig = "";
+      const objects = values.objects;
+      const labels = values.labels;
 
       if (configMode === "template") {
-        if (!customXml.trim()) {
-           message.error("请配置标注模板或选择一个现有模板");
-           return;
+        // 模板模式：优先使用可视化配置生成 XML，回退到直接使用 XML 编辑器内容
+        if (templateEditTab === "visual" && objects && objects.length > 0) {
+          finalLabelConfig = generateXmlFromConfig(objects, labels || []);
+        } else if (customXml.trim()) {
+          finalLabelConfig = customXml;
+        } else {
+          message.error("请配置标注模板或选择一个现有模板");
+          return;
         }
-        finalLabelConfig = customXml;
       } else {
-        // Custom mode
-        const objects = values.objects;
-        const labels = values.labels;
-        
+        // 自定义模式
         if (!objects || objects.length === 0) {
           message.error("请至少配置一个数据对象");
           return;
@@ -247,7 +285,6 @@ export default function CreateAnnotationTask({
           message.error("请至少配置一个标签控件");
           return;
         }
-
         finalLabelConfig = generateXmlFromConfig(objects, labels);
       }
 
@@ -328,15 +365,17 @@ export default function CreateAnnotationTask({
   const handleConfigModeChange = (e: any) => {
     const mode = e.target.value;
     setConfigMode(mode);
-    if (mode === "custom") {
-      // Set default values for custom configuration if empty
-      const currentObjects = manualForm.getFieldValue("objects");
-      if (!currentObjects || currentObjects.length === 0) {
-        manualForm.setFieldsValue({
-          objects: [{ name: "image", type: "Image", value: "$image" }],
-          labels: [],
-        });
-      }
+    // 两种模式都需要初始化默认值
+    const currentObjects = manualForm.getFieldValue("objects");
+    if (!currentObjects || currentObjects.length === 0) {
+      manualForm.setFieldsValue({
+        objects: [{ name: "image", type: "Image", value: "$image" }],
+        labels: [],
+      });
+    }
+    // 切换到模板模式时，重置 tab 到可视化
+    if (mode === "template") {
+      setTemplateEditTab("visual");
     }
   };
 
@@ -451,24 +490,40 @@ export default function CreateAnnotationTask({
                          <Radio.Button value="custom">自定义配置</Radio.Button>
                        </Radio.Group>
 
-                       {configMode === 'template' && (
-                          <Button type="link" size="small" onClick={() => setShowPreview(true)} disabled={!customXml}>
-                            预览配置效果
-                          </Button>
-                       )}
+                       <Button
+                         type="link"
+                         size="small"
+                         onClick={() => {
+                           // 如果在可视化模式，先同步生成 XML
+                           if (configMode === 'template' && templateEditTab === 'visual') {
+                             syncFormToXml();
+                           } else if (configMode === 'custom') {
+                             // 自定义模式也从表单生成
+                             const objects = manualForm.getFieldValue("objects");
+                             const labels = manualForm.getFieldValue("labels");
+                             if (objects && objects.length > 0) {
+                               const xml = generateXmlFromConfig(objects, labels || []);
+                               setCustomXml(xml);
+                             }
+                           }
+                           setShowPreview(true);
+                         }}
+                       >
+                         预览配置效果
+                       </Button>
                      </div>
                   </div>
                   
                   {configMode === 'template' ? (
                     <div className="bg-gray-50 p-4 rounded-md border border-gray-200">
                       <Form.Item
-                        label="加载现有模板 (可选)"
+                        label="加载现有模板"
                         name="templateId"
                         style={{ marginBottom: 12 }}
-                        help="选择模板后，配置代码将自动填充到下方编辑器中，您可以继续修改。"
+                        help="选择模板后，配置将自动填充到可视化编辑器中，您可以继续修改。"
                       >
                         <Select
-                          placeholder="选择一个模板作为基础（可选）"
+                          placeholder="选择一个模板作为基础"
                           showSearch
                           allowClear
                           optionFilterProp="label"
@@ -478,11 +533,7 @@ export default function CreateAnnotationTask({
                             title: template.description,
                             config: template.labelConfig,
                           }))}
-                          onChange={(value, option: any) => {
-                            if (option && option.config) {
-                              setCustomXml(option.config);
-                            }
-                          }}
+                          onChange={handleTemplateSelect}
                           optionRender={(option) => (
                             <div>
                               <div style={{ fontWeight: 500 }}>{option.label}</div>
@@ -496,19 +547,46 @@ export default function CreateAnnotationTask({
                         />
                       </Form.Item>
 
-                      <Form.Item
-                        label="XML 配置编辑器"
-                        required
-                        style={{ marginBottom: 0 }}
-                      >
-                        <TextArea 
-                          rows={8} 
-                          value={customXml} 
-                          onChange={(e) => setCustomXml(e.target.value)}
-                          placeholder="<View>...</View>"
-                          style={{ fontFamily: 'monospace', fontSize: 12 }}
-                        />
-                      </Form.Item>
+                      <Tabs
+                        activeKey={templateEditTab}
+                        onChange={(key) => {
+                          // 切换到 XML 时，从表单同步生成 XML
+                          if (key === "xml") {
+                            syncFormToXml();
+                          }
+                          setTemplateEditTab(key as "visual" | "xml");
+                        }}
+                        size="small"
+                        items={[
+                          {
+                            key: "visual",
+                            label: "可视化配置",
+                            children: (
+                              <div style={{ maxHeight: '350px', overflowY: 'auto' }}>
+                                <TemplateConfigurationForm form={manualForm} />
+                              </div>
+                            ),
+                          },
+                          {
+                            key: "xml",
+                            label: "XML编辑器（高级）",
+                            children: (
+                              <div>
+                                <div className="mb-2 text-xs text-gray-500">
+                                  直接编辑 Label Studio XML 配置。注意：在此修改后切换回可视化配置可能会丢失部分高级设置。
+                                </div>
+                                <TextArea
+                                  rows={10}
+                                  value={customXml}
+                                  onChange={(e) => setCustomXml(e.target.value)}
+                                  placeholder="<View>...</View>"
+                                  style={{ fontFamily: 'monospace', fontSize: 12 }}
+                                />
+                              </div>
+                            ),
+                          },
+                        ]}
+                      />
                     </div>
                   ) : (
                     <div className="bg-gray-50 p-4 rounded-md border border-gray-200" style={{ maxHeight: '400px', overflowY: 'auto' }}>