From 0a10f1def14d0ac5ff509f67a630036613f73b05 Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Fri, 28 Nov 2025 17:40:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=B6=88=E6=81=AF=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TeamApplicationManageDialog.tsx           |  5 ++--
 .../Deploy/Team/List/components/TeamModal.tsx | 23 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/frontend/src/pages/Deploy/Team/List/components/TeamApplicationManageDialog.tsx b/frontend/src/pages/Deploy/Team/List/components/TeamApplicationManageDialog.tsx
index efb66578..73b39c7c 100644
--- a/frontend/src/pages/Deploy/Team/List/components/TeamApplicationManageDialog.tsx
+++ b/frontend/src/pages/Deploy/Team/List/components/TeamApplicationManageDialog.tsx
@@ -136,8 +136,9 @@ export const TeamApplicationManageDialog: React.FC<
       environmentId: editingEnvironment.id,
       buildType: data.buildType || undefined,
       branch: data.branch,
-      deploySystemId: data.deploySystemId || undefined,
-      deployJob: data.deployJob,
+      // 只有当 buildType 为 JENKINS 时才传递 Jenkins 相关字段
+      deploySystemId: data.buildType === 'JENKINS' ? (data.deploySystemId || undefined) : undefined,
+      deployJob: data.buildType === 'JENKINS' ? data.deployJob : '',
       workflowDefinitionId: data.workflowDefinitionId || undefined,
       codeSourceSystemId: data.codeSourceSystemId || undefined,
       codeSourceProjectId: data.codeSourceProjectId || undefined,
diff --git a/frontend/src/pages/Deploy/Team/List/components/TeamModal.tsx b/frontend/src/pages/Deploy/Team/List/components/TeamModal.tsx
index 29eb5503..112d9e98 100644
--- a/frontend/src/pages/Deploy/Team/List/components/TeamModal.tsx
+++ b/frontend/src/pages/Deploy/Team/List/components/TeamModal.tsx
@@ -241,19 +241,20 @@ const TeamModal: React.FC<TeamModalProps> = ({
                                         control={form.control}
                                         name="enabled"
                                         render={({ field }) => (
-                                            <FormItem className="flex items-center justify-between rounded-lg border p-4">
-                                                <div className="space-y-0.5">
-                                                    <FormLabel>状态</FormLabel>
-                                                    <div className="text-sm text-muted-foreground">
-                                                        {field.value ? '启用' : '禁用'}
-                                                    </div>
-                                                </div>
+                                            <FormItem>
+                                                <FormLabel>状态</FormLabel>
                                                 <FormControl>
-                                                    <Switch
-                                                        checked={field.value}
-                                                        onCheckedChange={field.onChange}
-                                                    />
+                                                    <div className="flex items-center gap-2 h-10">
+                                                        <Switch
+                                                            checked={field.value}
+                                                            onCheckedChange={field.onChange}
+                                                        />
+                                                        <span className="text-sm text-muted-foreground">
+                                                            {field.value ? '启用' : '禁用'}
+                                                        </span>
+                                                    </div>
                                                 </FormControl>
+                                                <FormMessage />
                                             </FormItem>
                                         )}
                                     />