From fdfc951e2d2e159018e4b5932cf3efcd12a66aec Mon Sep 17 00:00:00 2001 From: dengqichen Date: Tue, 28 Oct 2025 16:46:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=8E=AF=E5=A2=83=E7=9A=84?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/Deploy/Deployment/List/types.ts | 8 +- .../List/components/DeleteDialog.tsx | 19 ++--- .../List/components/EditDialog.tsx | 47 +----------- .../List/components/EnvironmentModal.tsx | 35 +-------- .../pages/Deploy/Environment/List/index.tsx | 50 +----------- .../pages/Deploy/Environment/List/types.ts | 20 ----- .../pages/Deploy/Environment/List/utils.tsx | 76 ------------------- 7 files changed, 18 insertions(+), 237 deletions(-) delete mode 100644 frontend/src/pages/Deploy/Environment/List/utils.tsx diff --git a/frontend/src/pages/Deploy/Deployment/List/types.ts b/frontend/src/pages/Deploy/Deployment/List/types.ts index 0fd52d35..f63b2f2f 100644 --- a/frontend/src/pages/Deploy/Deployment/List/types.ts +++ b/frontend/src/pages/Deploy/Deployment/List/types.ts @@ -2,10 +2,16 @@ import {BaseResponse, BaseRequest, BaseQuery} from '@/types/base'; import {Environment} from '../../Environment/List/types'; import {Application} from '../../Application/List/types'; import {DevelopmentLanguageTypeEnum} from '../../Application/List/types'; -import {BuildTypeEnum} from '../../Environment/List/types'; import type {JsonNode} from '@/types/common'; import type {WorkflowDefinition} from '@/pages/Workflow/Definition/types'; +// 构建方式枚举 +export enum BuildTypeEnum { + JENKINS = 'JENKINS', + GITLAB_RUNNER = 'GITLAB_RUNNER', + GITHUB_ACTION = 'GITHUB_ACTION' +} + // 部署配置模板 export interface DeployConfigTemplate { code: string; diff --git a/frontend/src/pages/Deploy/Environment/List/components/DeleteDialog.tsx b/frontend/src/pages/Deploy/Environment/List/components/DeleteDialog.tsx index 1e6279ca..87998a45 100644 --- a/frontend/src/pages/Deploy/Environment/List/components/DeleteDialog.tsx +++ b/frontend/src/pages/Deploy/Environment/List/components/DeleteDialog.tsx @@ -8,12 +8,10 @@ import { DialogTitle, } from '@/components/ui/dialog'; import { Button } from '@/components/ui/button'; -import { Badge } from '@/components/ui/badge'; import { AlertCircle } from 'lucide-react'; import { useToast } from '@/components/ui/use-toast'; import { deleteEnvironment } from '../service'; import type { Environment } from '../types'; -import { getBuildTypeInfo, getDeployTypeInfo } from '../utils'; interface DeleteDialogProps { open: boolean; @@ -53,9 +51,6 @@ const DeleteDialog: React.FC = ({ if (!record) return null; - const buildInfo = getBuildTypeInfo(record.buildType); - const deployInfo = getDeployTypeInfo(record.deployType); - return ( @@ -75,14 +70,12 @@ const DeleteDialog: React.FC = ({ 环境名称: {record.envName} -
- 构建类型: - {buildInfo.label} -
-
- 部署类型: - {deployInfo.label} -
+ {record.envDesc && ( +
+ 环境描述: + {record.envDesc} +
+ )} diff --git a/frontend/src/pages/Deploy/Environment/List/components/EditDialog.tsx b/frontend/src/pages/Deploy/Environment/List/components/EditDialog.tsx index fccf74a3..1350954b 100644 --- a/frontend/src/pages/Deploy/Environment/List/components/EditDialog.tsx +++ b/frontend/src/pages/Deploy/Environment/List/components/EditDialog.tsx @@ -11,10 +11,9 @@ import { Input } from '@/components/ui/input'; import { Label } from '@/components/ui/label'; import { Textarea } from '@/components/ui/textarea'; import { Switch } from '@/components/ui/switch'; -import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import { useToast } from '@/components/ui/use-toast'; import { createEnvironment, updateEnvironment } from '../service'; -import type { Environment, CreateEnvironmentRequest, BuildTypeEnum, DeployTypeEnum } from '../types'; +import type { Environment, CreateEnvironmentRequest } from '../types'; interface EditDialogProps { open: boolean; @@ -46,8 +45,6 @@ const EditDialog: React.FC = ({ envCode: record.envCode, envName: record.envName, envDesc: record.envDesc, - buildType: record.buildType, - deployType: record.deployType, sort: record.sort, enabled: record.enabled, }); @@ -72,14 +69,6 @@ const EditDialog: React.FC = ({ toast({ title: '提示', description: '请输入环境名称', variant: 'destructive' }); return; } - if (!formData.buildType) { - toast({ title: '提示', description: '请选择构建类型', variant: 'destructive' }); - return; - } - if (!formData.deployType) { - toast({ title: '提示', description: '请选择部署类型', variant: 'destructive' }); - return; - } if (record) { await updateEnvironment({ ...formData, id: record.id } as any); @@ -151,40 +140,6 @@ const EditDialog: React.FC = ({ /> -
- - -
- -
- - -
-
= ({ /> - - - - - - - - { onChange={(e) => setQuery({ ...query, envName: e.target.value })} className="max-w-[200px]" /> - - @@ -196,9 +168,7 @@ const EnvironmentList: React.FC = () => { 环境编码 环境名称 - 环境描述 - 构建类型 - 部署类型 + 环境描述 排序 状态 操作 @@ -207,31 +177,17 @@ const EnvironmentList: React.FC = () => { {list.length === 0 ? ( - + 暂无数据 ) : ( list.map((item) => { - const buildInfo = getBuildTypeInfo(item.buildType); - const deployInfo = getDeployTypeInfo(item.deployType); return ( {item.envCode} {item.envName} {item.envDesc || '-'} - - - {buildInfo.icon} - {buildInfo.label} - - - - - {deployInfo.icon} - {deployInfo.label} - - {item.sort} diff --git a/frontend/src/pages/Deploy/Environment/List/types.ts b/frontend/src/pages/Deploy/Environment/List/types.ts index 89f1aa6e..4e753859 100644 --- a/frontend/src/pages/Deploy/Environment/List/types.ts +++ b/frontend/src/pages/Deploy/Environment/List/types.ts @@ -1,27 +1,11 @@ import {BaseResponse, BaseRequest, BaseQuery} from '@/types/base'; -// 构建方式枚举 -export enum BuildTypeEnum { - JENKINS = 'JENKINS', - GITLAB_RUNNER = 'GITLAB_RUNNER', - GITHUB_ACTION = 'GITHUB_ACTION' -} - -// 部署方式枚举 -export enum DeployTypeEnum { - K8S = 'K8S', - DOCKER = 'DOCKER', - VM = 'VM' -} - // 环境基础信息 export interface Environment extends BaseResponse { tenantCode: string; envCode: string; envName: string; envDesc?: string; - buildType: BuildTypeEnum; - deployType: DeployTypeEnum; sort: number; } @@ -31,8 +15,6 @@ export interface CreateEnvironmentRequest extends BaseRequest { envCode: string; envName: string; envDesc?: string; - buildType: BuildTypeEnum; - deployType: DeployTypeEnum; sort: number; } @@ -45,6 +27,4 @@ export interface UpdateEnvironmentRequest extends CreateEnvironmentRequest { export interface EnvironmentQueryParams extends BaseQuery { envCode?: string; envName?: string; - buildType?: BuildTypeEnum; - deployType?: DeployTypeEnum; } diff --git a/frontend/src/pages/Deploy/Environment/List/utils.tsx b/frontend/src/pages/Deploy/Environment/List/utils.tsx deleted file mode 100644 index 9bf76781..00000000 --- a/frontend/src/pages/Deploy/Environment/List/utils.tsx +++ /dev/null @@ -1,76 +0,0 @@ -import React from 'react'; -import { - GithubOutlined, - GitlabOutlined, - CloudServerOutlined, - CloudOutlined, - DesktopOutlined, - ApiOutlined, -} from '@ant-design/icons'; -import {BuildTypeEnum, DeployTypeEnum} from './types'; - -interface TypeInfo { - label: string; - color: string; - icon: React.ReactNode; -} - -// 获取构建方式信息 -export const getBuildTypeInfo = (type: BuildTypeEnum): TypeInfo => { - switch (type) { - case BuildTypeEnum.JENKINS: - return { - label: 'Jenkins构建', - color: '#D24939', - icon: , - }; - case BuildTypeEnum.GITLAB_RUNNER: - return { - label: 'GitLab Runner构建', - color: '#FC6D26', - icon: , - }; - case BuildTypeEnum.GITHUB_ACTION: - return { - label: 'GitHub Action构建', - color: '#2088FF', - icon: , - }; - default: - return { - label: type || '未知', - color: '#666666', - icon: , - }; - } -}; - -// 获取部署方式信息 -export const getDeployTypeInfo = (type: DeployTypeEnum): TypeInfo => { - switch (type) { - case DeployTypeEnum.K8S: - return { - label: 'Kubernetes集群部署', - color: '#326CE5', - icon: , - }; - case DeployTypeEnum.DOCKER: - return { - label: 'Docker容器部署', - color: '#2496ED', - icon: , - }; - case DeployTypeEnum.VM: - return { - label: '虚拟机部署', - color: '#F7B93E', - icon: , - }; - default: - return { - label: type || '未知', - color: '#666666', - icon: , - }; - } -}; \ No newline at end of file