diff --git a/frontend/src/pages/DataAnnotation/Create/CreateTask.tsx b/frontend/src/pages/DataAnnotation/Create/CreateTask.tsx
index 8a0f8da..1d4f600 100644
--- a/frontend/src/pages/DataAnnotation/Create/CreateTask.tsx
+++ b/frontend/src/pages/DataAnnotation/Create/CreateTask.tsx
@@ -1,6 +1,6 @@
 import type React from "react";
 import { useEffect, useState } from "react";
-import { Card, Button, Input, Select, Divider, Form, message } from "antd";
+import { Card, Button, Input, Select, Divider, Form, message, Radio } from "antd";
 import TextArea from "antd/es/input/TextArea";
 import {
   DatabaseOutlined,
@@ -9,6 +9,7 @@ import {
 } from "@ant-design/icons";
 import { mockTemplates } from "@/mock/annotation";
 import CustomTemplateDialog from "./components/CustomTemplateDialog";
+import TemplateConfigurationForm from "../../components/TemplateConfigurationForm";
 import { Link, useNavigate } from "react-router";
 import { ArrowLeft } from "lucide-react";
 import { queryDatasetsUsingGet } from "../../DataManagement/dataset.api";
@@ -36,6 +37,7 @@ export default function AnnotationTaskCreate() {
   const [showCustomTemplateDialog, setShowCustomTemplateDialog] =
     useState(false);
   const [selectedCategory, setSelectedCategory] = useState("Computer Vision");
+  const [configMode, setConfigMode] = useState<"template" | "custom">("template");
   const [searchQuery, setSearchQuery] = useState("");
   const [datasetFilter, setDatasetFilter] = useState("all");
   const [selectedTemplate, setSelectedTemplate] = useState<Template | null>(
@@ -87,21 +89,67 @@ export default function AnnotationTaskCreate() {
     setFormValues({ ...formValues, ...allValues });
   };
 
+  const handleConfigModeChange = (e) => {
+    const mode = e.target.value;
+    setConfigMode(mode);
+    if (mode === "custom") {
+      // Initialize default values for custom configuration
+      form.setFieldsValue({
+        objects: [{ name: "image", type: "Image", value: "$image" }],
+        labels: [],
+      });
+      // Clear template selection
+      setSelectedTemplate(null);
+      setFormValues((prev) => ({ ...prev, templateId: "" }));
+    }
+  };
+
   const handleSubmit = async () => {
     try {
       const values = await form.validateFields();
       const dataset = datasets.find((ds) => ds.id === values.datasetId);
-      const template = mockTemplates.find(
-        (tpl) => tpl.id === values.templateId
-      );
+      
+      let template;
+      if (configMode === "template") {
+        template = mockTemplates.find(
+          (tpl) => tpl.id === values.templateId
+        );
+        if (!template) {
+          message.error("请选择标注模板");
+          return;
+        }
+      } else {
+        // Custom configuration
+        const objects = values.objects;
+        const labels = values.labels;
+        if (!objects || objects.length === 0) {
+          message.error("请至少配置一个数据对象");
+          return;
+        }
+        if (!labels || labels.length === 0) {
+          message.error("请至少配置一个标签控件");
+          return;
+        }
+        
+        // Construct a temporary custom template object
+        template = {
+          id: `custom-${Date.now()}`,
+          name: "自定义配置",
+          description: "任务特定的自定义配置",
+          type: selectedDataset?.type === DatasetType.PRETRAIN_TEXT ? "text" : "image",
+          isCustom: true,
+          configuration: {
+            objects,
+            labels
+          }
+        };
+      }
+
       if (!dataset) {
         message.error("请选择数据集");
         return;
       }
-      if (!template) {
-        message.error("请选择标注模板");
-        return;
-      }
+
       const taskData = {
         name: values.name,
         description: values.description,
@@ -109,10 +157,12 @@ export default function AnnotationTaskCreate() {
         template,
       };
       // onCreateTask(taskData); // 实际创建逻辑
+      console.log("Submitting task data:", taskData);
       message.success("标注任务创建成功");
       navigate("/data/annotation");
     } catch (e) {
       // 校验失败
+      console.error(e);
     }
   };
 
@@ -186,144 +236,157 @@ export default function AnnotationTaskCreate() {
               />
             </Form.Item>
 
-            {/* 模板选择 */}
-            <h2 className="font-medium text-gray-900 text-lg mt-6 mb-2 flex items-center gap-2">
-              模板选择
-            </h2>
-            <Form.Item
-              name="templateId"
-              rules={[{ required: true, message: "请选择标注模板" }]}
-            >
-              <div className="flex">
-                {/* Category Sidebar */}
-                <div className="w-64 pr-6 border-r border-gray-200">
-                  <div className="space-y-2">
-                    {templateCategories.map((category) => {
-                      const isAvailable =
-                        selectedDataset?.type === "image"
-                          ? category === "Computer Vision"
-                          : category === "Natural Language Processing";
-                      return (
-                        <Button
-                          key={category}
-                          type={
-                            selectedCategory === category && isAvailable
-                              ? "primary"
-                              : "default"
-                          }
-                          block
-                          disabled={!isAvailable}
-                          onClick={() =>
-                            isAvailable && setSelectedCategory(category)
-                          }
-                          style={{ textAlign: "left", marginBottom: 8 }}
-                        >
-                          {category}
-                        </Button>
-                      );
-                    })}
-                    <Button
-                      type="dashed"
-                      block
-                      icon={<PlusOutlined />}
-                      onClick={() => setShowCustomTemplateDialog(true)}
-                    >
-                      自定义模板
-                    </Button>
+            {/* 模板配置 */}
+            <div className="flex items-center justify-between mt-6 mb-2">
+              <h2 className="font-medium text-gray-900 text-lg flex items-center gap-2">
+                模板配置
+              </h2>
+              <Radio.Group value={configMode} onChange={handleConfigModeChange} buttonStyle="solid">
+                <Radio.Button value="template">选择现有模板</Radio.Button>
+                <Radio.Button value="custom">自定义配置</Radio.Button>
+              </Radio.Group>
+            </div>
+
+            {configMode === "template" ? (
+              <Form.Item
+                name="templateId"
+                rules={[{ required: true, message: "请选择标注模板" }]}
+              >
+                <div className="flex">
+                  {/* Category Sidebar */}
+                  <div className="w-64 pr-6 border-r border-gray-200">
+                    <div className="space-y-2">
+                      {templateCategories.map((category) => {
+                        const isAvailable =
+                          selectedDataset?.type === "image"
+                            ? category === "Computer Vision"
+                            : category === "Natural Language Processing";
+                        return (
+                          <Button
+                            key={category}
+                            type={
+                              selectedCategory === category && isAvailable
+                                ? "primary"
+                                : "default"
+                            }
+                            block
+                            disabled={!isAvailable}
+                            onClick={() =>
+                              isAvailable && setSelectedCategory(category)
+                            }
+                            style={{ textAlign: "left", marginBottom: 8 }}
+                          >
+                            {category}
+                          </Button>
+                        );
+                      })}
+                      <Button
+                        type="dashed"
+                        block
+                        icon={<PlusOutlined />}
+                        onClick={() => setShowCustomTemplateDialog(true)}
+                      >
+                        自定义模板
+                      </Button>
+                    </div>
                   </div>
-                </div>
-                {/* Template Grid */}
-                <div className="flex-1 pl-6">
-                  <div className="max-h-96 overflow-auto">
-                    <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-                      {filteredTemplates.map((template) => (
-                        <div
-                          key={template.id}
-                          className={`border rounded-lg cursor-pointer transition-all hover:shadow-md ${
-                            formValues.templateId === template.id
-                              ? "border-blue-500 bg-blue-50"
-                              : "border-gray-200"
-                          }`}
-                          onClick={() => handleTemplateSelect(template)}
-                        >
-                          {template.preview && (
-                            <div className="aspect-video bg-gray-100 rounded-t-lg overflow-hidden">
-                              <img
-                                src={template.preview || "/placeholder.svg"}
-                                alt={template.name}
-                                className="w-full h-full object-cover"
-                              />
+                  {/* Template Grid */}
+                  <div className="flex-1 pl-6">
+                    <div className="max-h-96 overflow-auto">
+                      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+                        {filteredTemplates.map((template) => (
+                          <div
+                            key={template.id}
+                            className={`border rounded-lg cursor-pointer transition-all hover:shadow-md ${
+                              formValues.templateId === template.id
+                                ? "border-blue-500 bg-blue-50"
+                                : "border-gray-200"
+                            }`}
+                            onClick={() => handleTemplateSelect(template)}
+                          >
+                            {template.preview && (
+                              <div className="aspect-video bg-gray-100 rounded-t-lg overflow-hidden">
+                                <img
+                                  src={template.preview || "/placeholder.svg"}
+                                  alt={template.name}
+                                  className="w-full h-full object-cover"
+                                />
+                              </div>
+                            )}
+                            <div className="p-3">
+                              <div className="flex items-center justify-between mb-2">
+                                <div className="flex items-center space-x-2">
+                                  {template.icon}
+                                  <span className="font-medium text-sm">
+                                    {template.name}
+                                  </span>
+                                </div>
+                              </div>
+                              <p className="text-xs text-gray-600">
+                                {template.description}
+                              </p>
                             </div>
-                          )}
+                          </div>
+                        ))}
+                        {/* Custom Template Option */}
+                        <div
+                          className={`border-2 border-dashed rounded-lg cursor-pointer transition-all hover:border-gray-400 ${
+                            selectedTemplate?.isCustom
+                              ? "border-blue-500 bg-blue-50"
+                              : "border-gray-300"
+                          }`}
+                          onClick={() => setShowCustomTemplateDialog(true)}
+                        >
+                          <div className="aspect-video bg-gray-50 rounded-t-lg flex items-center justify-center">
+                            <PlusOutlined
+                              style={{ fontSize: 32, color: "#bbb" }}
+                            />
+                          </div>
                           <div className="p-3">
                             <div className="flex items-center justify-between mb-2">
                               <div className="flex items-center space-x-2">
-                                {template.icon}
+                                <PlusOutlined />
                                 <span className="font-medium text-sm">
-                                  {template.name}
+                                  自定义模板
                                 </span>
                               </div>
+                              {selectedTemplate?.isCustom && (
+                                <CheckOutlined style={{ color: "#1677ff" }} />
+                              )}
                             </div>
                             <p className="text-xs text-gray-600">
-                              {template.description}
+                              创建符合特定需求的标注模板
                             </p>
                           </div>
                         </div>
-                      ))}
-                      {/* Custom Template Option */}
-                      <div
-                        className={`border-2 border-dashed rounded-lg cursor-pointer transition-all hover:border-gray-400 ${
-                          selectedTemplate?.isCustom
-                            ? "border-blue-500 bg-blue-50"
-                            : "border-gray-300"
-                        }`}
-                        onClick={() => setShowCustomTemplateDialog(true)}
-                      >
-                        <div className="aspect-video bg-gray-50 rounded-t-lg flex items-center justify-center">
-                          <PlusOutlined
-                            style={{ fontSize: 32, color: "#bbb" }}
-                          />
-                        </div>
-                        <div className="p-3">
-                          <div className="flex items-center justify-between mb-2">
-                            <div className="flex items-center space-x-2">
-                              <PlusOutlined />
-                              <span className="font-medium text-sm">
-                                自定义模板
-                              </span>
-                            </div>
-                            {selectedTemplate?.isCustom && (
-                              <CheckOutlined style={{ color: "#1677ff" }} />
-                            )}
-                          </div>
-                          <p className="text-xs text-gray-600">
-                            创建符合特定需求的标注模板
-                          </p>
-                        </div>
                       </div>
                     </div>
                   </div>
                 </div>
-              </div>
-              {selectedTemplate && (
-                <div className="mt-4 p-3 bg-blue-50 rounded-lg">
-                  <div className="flex items-center space-x-2">
-                    <span
-                      className="text-sm font-medium"
-                      style={{ color: "#1677ff" }}
+                {selectedTemplate && (
+                  <div className="mt-4 p-3 bg-blue-50 rounded-lg">
+                    <div className="flex items-center space-x-2">
+                      <span
+                        className="text-sm font-medium"
+                        style={{ color: "#1677ff" }}
+                      >
+                        已选择模板
+                      </span>
+                    </div>
+                    <p
+                      className="text-sm"
+                      style={{ color: "#1677ff", marginTop: 4 }}
                     >
-                      已选择模板
-                    </span>
+                      {selectedTemplate.name} - {selectedTemplate.description}
+                    </p>
                   </div>
-                  <p
-                    className="text-sm"
-                    style={{ color: "#1677ff", marginTop: 4 }}
-                  >
-                    {selectedTemplate.name} - {selectedTemplate.description}
-                  </p>
-                </div>
-              )}
-            </Form.Item>
+                )}
+              </Form.Item>
+            ) : (
+              <div className="border border-gray-200 rounded-lg p-6 bg-gray-50">
+                 <TemplateConfigurationForm form={form} />
+              </div>
+            )}
           </Form>
         </div>
         <div className="flex gap-2 justify-end border-t border-gray-200 p-6">
diff --git a/frontend/src/pages/DataAnnotation/Template/TemplateForm.tsx b/frontend/src/pages/DataAnnotation/Template/TemplateForm.tsx
index 073b9d6..421cdac 100644
--- a/frontend/src/pages/DataAnnotation/Template/TemplateForm.tsx
+++ b/frontend/src/pages/DataAnnotation/Template/TemplateForm.tsx
@@ -4,21 +4,16 @@ import {
     Form,
     Input,
     Select,
-    Button,
     Space,
     message,
-    Divider,
-    Card,
-    Checkbox,
 } from "antd";
-import { PlusOutlined, MinusCircleOutlined } from "@ant-design/icons";
 import {
     createAnnotationTemplateUsingPost,
     updateAnnotationTemplateByIdUsingPut,
 } from "../annotation.api";
 import type { AnnotationTemplate } from "../annotation.model";
 import { DataTypeMap, ClassificationMap, AnnotationTypeMap } from "../annotation.const";
-import TagSelector from "./components/TagSelector";
+import TemplateConfigurationForm from "../../components/TemplateConfigurationForm";
 
 const { TextArea } = Input;
 const { Option } = Select;
@@ -113,10 +108,6 @@ const TemplateForm: React.FC<TemplateFormProps> = ({
         }
     };
 
-    const needsOptions = (type: string) => {
-        return ["Choices", "RectangleLabels", "PolygonLabels", "Labels"].includes(type);
-    };
-
     return (
         <Modal
             title={mode === "create" ? "创建模板" : "编辑模板"}
@@ -199,222 +190,7 @@ const TemplateForm: React.FC<TemplateFormProps> = ({
                     </Form.Item>
                 </Space>
 
-                <Divider>数据对象</Divider>
-
-                <Form.List name="objects">
-                    {(fields, { add, remove }) => (
-                        <>
-                            {fields.map((field) => (
-                                <Card key={field.key} size="small" style={{ marginBottom: 8 }}>
-                                    <Space align="start" style={{ width: "100%" }}>
-                                        <Form.Item
-                                            {...field}
-                                            label="名称"
-                                            name={[field.name, "name"]}
-                                            rules={[{ required: true, message: "必填" }]}
-                                            style={{ marginBottom: 0, width: 150 }}
-                                        >
-                                            <Input placeholder="例如：image" />
-                                        </Form.Item>
-
-                                        <Form.Item
-                                            {...field}
-                                            label="类型"
-                                            name={[field.name, "type"]}
-                                            rules={[{ required: true, message: "必填" }]}
-                                            style={{ marginBottom: 0, width: 150 }}
-                                        >
-                                            <TagSelector type="object" />
-                                        </Form.Item>
-
-                                        <Form.Item
-                                            {...field}
-                                            label="值"
-                                            name={[field.name, "value"]}
-                                            rules={[
-                                                { required: true, message: "必填" },
-                                                { pattern: /^\$/, message: "必须以 $ 开头" },
-                                            ]}
-                                            style={{ marginBottom: 0, width: 150 }}
-                                        >
-                                            <Input placeholder="$image" />
-                                        </Form.Item>
-
-                                        {fields.length > 1 && (
-                                            <MinusCircleOutlined
-                                                style={{ marginTop: 30, color: "red" }}
-                                                onClick={() => remove(field.name)}
-                                            />
-                                        )}
-                                    </Space>
-                                </Card>
-                            ))}
-                            <Button type="dashed" onClick={() => add()} block icon={<PlusOutlined />}>
-                                添加对象
-                            </Button>
-                        </>
-                    )}
-                </Form.List>
-
-                <Divider>标签控件</Divider>
-
-                <Form.List name="labels">
-                    {(fields, { add, remove }) => (
-                        <>
-                            {fields.map((field) => (
-                                <Card
-                                    key={field.key}
-                                    size="small"
-                                    style={{ marginBottom: 12 }}
-                                    title={
-                                        <Space>
-                                            <span>控件 {fields.indexOf(field) + 1}</span>
-                                            <Form.Item noStyle shouldUpdate>
-                                                {() => {
-                                                    const controlType = form.getFieldValue(["labels", field.name, "type"]);
-                                                    const fromName = form.getFieldValue(["labels", field.name, "fromName"]);
-                                                    if (controlType || fromName) {
-                                                        return (
-                                                            <span style={{ fontSize: 12, fontWeight: 'normal', color: '#999' }}>
-                                                                ({fromName || '未命名'} - {controlType || '未设置类型'})
-                                                            </span>
-                                                        );
-                                                    }
-                                                    return null;
-                                                }}
-                                            </Form.Item>
-                                        </Space>
-                                    }
-                                    extra={
-                                        <MinusCircleOutlined
-                                            style={{ color: "red" }}
-                                            onClick={() => remove(field.name)}
-                                        />
-                                    }
-                                >
-                                    <Space direction="vertical" style={{ width: "100%" }} size="middle">
-                                        {/* Row 1: 控件名称, 标注目标对象, 控件类型 */}
-                                        <div style={{ display: 'grid', gridTemplateColumns: '180px 220px 1fr auto', gap: 12, alignItems: 'flex-end' }}>
-                                            <Form.Item
-                                                {...field}
-                                                label="来源名称"
-                                                name={[field.name, "fromName"]}
-                                                rules={[{ required: true, message: "必填" }]}
-                                                style={{ marginBottom: 0 }}
-                                                tooltip="此控件的唯一标识符"
-                                            >
-                                                <Input placeholder="例如：choice" />
-                                            </Form.Item>
-
-                                            <Form.Item
-                                                {...field}
-                                                label="标注目标对象"
-                                                name={[field.name, "toName"]}
-                                                rules={[{ required: true, message: "必填" }]}
-                                                style={{ marginBottom: 0 }}
-                                                tooltip="选择此控件将标注哪个数据对象"
-                                                dependencies={['objects']}
-                                            >
-                                                <Select placeholder="选择数据对象">
-                                                    {(form.getFieldValue("objects") || []).map((obj: any, idx: number) => (
-                                                        <Option key={idx} value={obj?.name || ''}>
-                                                            {obj?.name || `对象 ${idx + 1}`} ({obj?.type || '未知类型'})
-                                                        </Option>
-                                                    ))}
-                                                </Select>
-                                            </Form.Item>
-
-                                            <Form.Item
-                                                {...field}
-                                                label="控件类型"
-                                                name={[field.name, "type"]}
-                                                rules={[{ required: true, message: "必填" }]}
-                                                style={{ marginBottom: 0 }}
-                                            >
-                                                <TagSelector type="control" />
-                                            </Form.Item>
-
-                                            <Form.Item
-                                                {...field}
-                                                label=" "
-                                                name={[field.name, "required"]}
-                                                valuePropName="checked"
-                                                style={{ marginBottom: 0 }}
-                                            >
-                                                <Checkbox>必填</Checkbox>
-                                            </Form.Item>
-                                        </div>
-
-                                        {/* Row 2: 取值范围定义（添加选项） - Conditionally rendered based on type */}
-                                        <Form.Item
-                                            noStyle
-                                            shouldUpdate={(prevValues, currentValues) => {
-                                                const prevType = prevValues.labels?.[field.name]?.type;
-                                                const currType = currentValues.labels?.[field.name]?.type;
-                                                return prevType !== currType;
-                                            }}
-                                        >
-                                            {({ getFieldValue }) => {
-                                                const controlType = getFieldValue(["labels", field.name, "type"]);
-                                                const fieldName = controlType === "Choices" ? "options" : "labels";
-
-                                                if (needsOptions(controlType)) {
-                                                    return (
-                                                        <Form.Item
-                                                            {...field}
-                                                            label={controlType === "Choices" ? "选项" : "标签"}
-                                                            name={[field.name, fieldName]}
-                                                            rules={[{ required: true, message: "至少需要一个选项" }]}
-                                                            style={{ marginBottom: 0 }}
-                                                        >
-                                                            <Select
-                                                                mode="tags"
-                                                                open={false}
-                                                                placeholder={
-                                                                    controlType === "Choices"
-                                                                        ? "输入选项内容，按回车添加。例如：是、否、不确定"
-                                                                        : "输入标签名称，按回车添加。例如：人物、车辆、建筑物"
-                                                                }
-                                                                style={{ width: "100%" }}
-                                                            />
-                                                        </Form.Item>
-                                                    );
-                                                }
-                                                return null;
-                                            }}
-                                        </Form.Item>
-
-                                        {/* Row 3: 描述 */}
-                                        <Form.Item
-                                            {...field}
-                                            label="描述"
-                                            name={[field.name, "description"]}
-                                            style={{ marginBottom: 0 }}
-                                            tooltip="向标注人员显示的帮助信息"
-                                        >
-                                            <Input placeholder="为标注人员提供此控件的使用说明" maxLength={200} />
-                                        </Form.Item>
-                                    </Space>
-                                </Card>
-                            ))}
-                            <Button
-                                type="dashed"
-                                onClick={() =>
-                                    add({
-                                        fromName: "",
-                                        toName: "",
-                                        type: "Choices",
-                                        required: false,
-                                    })
-                                }
-                                block
-                                icon={<PlusOutlined />}
-                            >
-                                添加标签控件
-                            </Button>
-                        </>
-                    )}
-                </Form.List>
+                <TemplateConfigurationForm form={form} />
             </Form>
         </Modal>
     );
diff --git a/frontend/src/pages/DataAnnotation/components/TemplateConfigurationForm.tsx b/frontend/src/pages/DataAnnotation/components/TemplateConfigurationForm.tsx
new file mode 100644
index 0000000..90995ea
--- /dev/null
+++ b/frontend/src/pages/DataAnnotation/components/TemplateConfigurationForm.tsx
@@ -0,0 +1,294 @@
+import React from "react";
+import {
+  Form,
+  Input,
+  Select,
+  Button,
+  Space,
+  Divider,
+  Card,
+  Checkbox,
+} from "antd";
+import { PlusOutlined, MinusCircleOutlined } from "@ant-design/icons";
+import TagSelector from "../Template/components/TagSelector";
+
+const { Option } = Select;
+
+interface TemplateConfigurationFormProps {
+  form: any;
+}
+
+const TemplateConfigurationForm: React.FC<TemplateConfigurationFormProps> = ({
+  form,
+}) => {
+  const needsOptions = (type: string) => {
+    return ["Choices", "RectangleLabels", "PolygonLabels", "Labels"].includes(
+      type
+    );
+  };
+
+  return (
+    <>
+      <Divider orientation="left">数据对象</Divider>
+      <Form.List name="objects">
+        {(fields, { add, remove }) => (
+          <>
+            {fields.map((field) => (
+              <Card key={field.key} size="small" style={{ marginBottom: 8 }}>
+                <Space align="start" style={{ width: "100%" }}>
+                  <Form.Item
+                    {...field}
+                    label="名称"
+                    name={[field.name, "name"]}
+                    rules={[{ required: true, message: "必填" }]}
+                    style={{ marginBottom: 0, width: 150 }}
+                  >
+                    <Input placeholder="例如：image" />
+                  </Form.Item>
+
+                  <Form.Item
+                    {...field}
+                    label="类型"
+                    name={[field.name, "type"]}
+                    rules={[{ required: true, message: "必填" }]}
+                    style={{ marginBottom: 0, width: 150 }}
+                  >
+                    <TagSelector type="object" />
+                  </Form.Item>
+
+                  <Form.Item
+                    {...field}
+                    label="值"
+                    name={[field.name, "value"]}
+                    rules={[
+                      { required: true, message: "必填" },
+                      { pattern: /^\$/, message: "必须以 $ 开头" },
+                    ]}
+                    style={{ marginBottom: 0, width: 150 }}
+                  >
+                    <Input placeholder="$image" />
+                  </Form.Item>
+
+                  {fields.length > 1 && (
+                    <MinusCircleOutlined
+                      style={{ marginTop: 30, color: "red" }}
+                      onClick={() => remove(field.name)}
+                    />
+                  )}
+                </Space>
+              </Card>
+            ))}
+            <Button
+              type="dashed"
+              onClick={() => add()}
+              block
+              icon={<PlusOutlined />}
+            >
+              添加对象
+            </Button>
+          </>
+        )}
+      </Form.List>
+
+      <Divider orientation="left">标签控件</Divider>
+      <Form.List name="labels">
+        {(fields, { add, remove }) => (
+          <>
+            {fields.map((field) => (
+              <Card
+                key={field.key}
+                size="small"
+                style={{ marginBottom: 12 }}
+                title={
+                  <Space>
+                    <span>控件 {fields.indexOf(field) + 1}</span>
+                    <Form.Item noStyle shouldUpdate>
+                      {() => {
+                        const controlType = form.getFieldValue([
+                          "labels",
+                          field.name,
+                          "type",
+                        ]);
+                        const fromName = form.getFieldValue([
+                          "labels",
+                          field.name,
+                          "fromName",
+                        ]);
+                        if (controlType || fromName) {
+                          return (
+                            <span
+                              style={{
+                                fontSize: 12,
+                                fontWeight: "normal",
+                                color: "#999",
+                              }}
+                            >
+                              ({fromName || "未命名"} -{" "}
+                              {controlType || "未设置类型"})
+                            </span>
+                          );
+                        }
+                        return null;
+                      }}
+                    </Form.Item>
+                  </Space>
+                }
+                extra={
+                  <MinusCircleOutlined
+                    style={{ color: "red" }}
+                    onClick={() => remove(field.name)}
+                  />
+                }
+              >
+                <Space
+                  direction="vertical"
+                  style={{ width: "100%" }}
+                  size="middle"
+                >
+                  {/* Row 1: 控件名称, 标注目标对象, 控件类型 */}
+                  <div
+                    style={{
+                      display: "grid",
+                      gridTemplateColumns: "180px 220px 1fr auto",
+                      gap: 12,
+                      alignItems: "flex-end",
+                    }}
+                  >
+                    <Form.Item
+                      {...field}
+                      label="来源名称"
+                      name={[field.name, "fromName"]}
+                      rules={[{ required: true, message: "必填" }]}
+                      style={{ marginBottom: 0 }}
+                      tooltip="此控件的唯一标识符"
+                    >
+                      <Input placeholder="例如：choice" />
+                    </Form.Item>
+
+                    <Form.Item
+                      {...field}
+                      label="标注目标对象"
+                      name={[field.name, "toName"]}
+                      rules={[{ required: true, message: "必填" }]}
+                      style={{ marginBottom: 0 }}
+                      tooltip="选择此控件将标注哪个数据对象"
+                      dependencies={["objects"]}
+                    >
+                      <Select placeholder="选择数据对象">
+                        {(form.getFieldValue("objects") || []).map(
+                          (obj: any, idx: number) => (
+                            <Option key={idx} value={obj?.name || ""}>
+                              {obj?.name || `对象 ${idx + 1}`} (
+                              {obj?.type || "未知类型"})
+                            </Option>
+                          )
+                        )}
+                      </Select>
+                    </Form.Item>
+
+                    <Form.Item
+                      {...field}
+                      label="控件类型"
+                      name={[field.name, "type"]}
+                      rules={[{ required: true, message: "必填" }]}
+                      style={{ marginBottom: 0 }}
+                    >
+                      <TagSelector type="control" />
+                    </Form.Item>
+
+                    <Form.Item
+                      {...field}
+                      label=" "
+                      name={[field.name, "required"]}
+                      valuePropName="checked"
+                      style={{ marginBottom: 0 }}
+                    >
+                      <Checkbox>必填</Checkbox>
+                    </Form.Item>
+                  </div>
+
+                  {/* Row 2: 取值范围定义（添加选项） - Conditionally rendered based on type */}
+                  <Form.Item
+                    noStyle
+                    shouldUpdate={(prevValues, currentValues) => {
+                      const prevType = prevValues.labels?.[field.name]?.type;
+                      const currType = currentValues.labels?.[field.name]?.type;
+                      return prevType !== currType;
+                    }}
+                  >
+                    {({ getFieldValue }) => {
+                      const controlType = getFieldValue([
+                        "labels",
+                        field.name,
+                        "type",
+                      ]);
+                      const fieldName =
+                        controlType === "Choices" ? "options" : "labels";
+
+                      if (needsOptions(controlType)) {
+                        return (
+                          <Form.Item
+                            {...field}
+                            label={controlType === "Choices" ? "选项" : "标签"}
+                            name={[field.name, fieldName]}
+                            rules={[
+                              { required: true, message: "至少需要一个选项" },
+                            ]}
+                            style={{ marginBottom: 0 }}
+                          >
+                            <Select
+                              mode="tags"
+                              open={false}
+                              placeholder={
+                                controlType === "Choices"
+                                  ? "输入选项内容，按回车添加。例如：是、否、不确定"
+                                  : "输入标签名称，按回车添加。例如：人物、车辆、建筑物"
+                              }
+                              style={{ width: "100%" }}
+                            />
+                          </Form.Item>
+                        );
+                      }
+                      return null;
+                    }}
+                  </Form.Item>
+
+                  {/* Row 3: 描述 */}
+                  <Form.Item
+                    {...field}
+                    label="描述"
+                    name={[field.name, "description"]}
+                    style={{ marginBottom: 0 }}
+                    tooltip="向标注人员显示的帮助信息"
+                  >
+                    <Input
+                      placeholder="为标注人员提供此控件的使用说明"
+                      maxLength={200}
+                    />
+                  </Form.Item>
+                </Space>
+              </Card>
+            ))}
+            <Button
+              type="dashed"
+              onClick={() =>
+                add({
+                  fromName: "",
+                  toName: "",
+                  type: "Choices",
+                  required: false,
+                })
+              }
+              block
+              icon={<PlusOutlined />}
+            >
+              添加标签控件
+            </Button>
+          </>
+        )}
+      </Form.List>
+    </>
+  );
+};
+
+export default TemplateConfigurationForm;