From a4a1e2d808cbac6b22543e05afdbbec55e24fa91 Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Fri, 10 Jan 2025 15:38:18 +0800
Subject: [PATCH] 1

---
 .../pages/Deploy/Application/List/schema.ts   | 19 +++++++++++----
 .../pages/Deploy/Application/List/types.ts    | 23 ++++---------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/frontend/src/pages/Deploy/Application/List/schema.ts b/frontend/src/pages/Deploy/Application/List/schema.ts
index da156544..95f2cbc1 100644
--- a/frontend/src/pages/Deploy/Application/List/schema.ts
+++ b/frontend/src/pages/Deploy/Application/List/schema.ts
@@ -9,13 +9,22 @@ export const searchFormSchema = z.object({
 });
 
 export const applicationFormSchema = z.object({
-    appCode: z.string().min(1, "请输入应用编码").max(50, "应用编码不能超过50个字符"),
-    appName: z.string().min(1, "请输入应用名称").max(50, "应用名称不能超过50个字符"),
+    appCode: z.string().min(1, '应用编码不能为空'),
+    appName: z.string().min(1, '应用名称不能为空'),
     appDesc: z.string().max(200, "应用描述不能超过200个字符").optional(),
-    gitInstanceId: z.number().min(1, "请选择Git实例"),
+    externalSystemId: z.number({
+        required_error: '请选择Git实例',
+        invalid_type_error: 'Git实例必须是数字',
+    }),
     projectGroupId: z.number().min(1, "请选择项目组"),
-    repoGroupId: z.number().min(1, "请选择代码仓库组"),
-    repoProjectId: z.number().min(1, "请选择代码仓库项目"),
+    repoGroupId: z.number({
+        required_error: '请选择代码仓库组',
+        invalid_type_error: '代码仓库组必须是数字',
+    }),
+    repoProjectId: z.number({
+        required_error: '请选择项目',
+        invalid_type_error: '项目必须是数字',
+    }),
     language: z.nativeEnum(DevelopmentLanguageTypeEnum, {
         required_error: "请选择开发语言",
     }),
diff --git a/frontend/src/pages/Deploy/Application/List/types.ts b/frontend/src/pages/Deploy/Application/List/types.ts
index 70118483..8732e429 100644
--- a/frontend/src/pages/Deploy/Application/List/types.ts
+++ b/frontend/src/pages/Deploy/Application/List/types.ts
@@ -12,32 +12,19 @@ export interface Application {
     id: number;
     appCode: string;
     appName: string;
-    appDesc?: string;
+    appDesc: string;
     language: DevelopmentLanguageTypeEnum;
     enabled: boolean;
     sort: number;
     projectGroupId: number;
+    externalSystemId: number;
     repoGroupId: number;
     repoProjectId: number;
-    gitInstanceId?: number;
 }
 
-export interface CreateApplicationRequest {
-    appCode: string;
-    appName: string;
-    appDesc?: string;
-    language: DevelopmentLanguageTypeEnum;
-    enabled: boolean;
-    sort: number;
-    projectGroupId: number;
-    repoGroupId: number;
-    repoProjectId: number;
-    gitInstanceId: number;
-}
-
-export interface UpdateApplicationRequest extends CreateApplicationRequest {
-    id: number;
-}
+export type CreateApplicationRequest = Omit<Application, 'id'>;
+export type UpdateApplicationRequest = Application;
+export type ApplicationFormValues = CreateApplicationRequest;
 
 export interface ApplicationQuery extends BaseQuery {
     projectGroupId?: number;