diff --git a/react-ui/src/enums/index.ts b/react-ui/src/enums/index.ts index b75eeca4..5585725c 100644 --- a/react-ui/src/enums/index.ts +++ b/react-ui/src/enums/index.ts @@ -10,6 +10,12 @@ export enum CommonTabKeys { Public = 'Public', // 公开 } +// 公开还是私有 +export enum AvailableRange { + Public = 1, // 公开 + Private = 0, // 私有 +} + // 实验状态 export enum ExperimentStatus { Running = 'Running', // 运行中 diff --git a/react-ui/src/pages/CodeConfig/List/index.tsx b/react-ui/src/pages/CodeConfig/List/index.tsx index 6b2b6620..b5aec9be 100644 --- a/react-ui/src/pages/CodeConfig/List/index.tsx +++ b/react-ui/src/pages/CodeConfig/List/index.tsx @@ -5,7 +5,7 @@ import { to } from '@/utils/promise'; import { modalConfirm } from '@/utils/ui'; import { App, Button, Empty, Input, Pagination, PaginationProps } from 'antd'; import { useEffect, useState } from 'react'; -import AddCodeConfigModal, { OperationTypeEnum } from '../components/AddCodeConfigModal'; +import AddCodeConfigModal, { OperationType } from '../components/AddCodeConfigModal'; import CodeConfigItem from '../components/CodeConfigItem'; import styles from './index.less'; @@ -86,7 +86,7 @@ function CodeConfigList() { // 修改 const handleClick = (record: CodeConfigData) => { const { close } = openAntdModal(AddCodeConfigModal, { - opType: OperationTypeEnum.Update, + opType: OperationType.Update, codeConfigData: record, onOk: () => { getDataList(); @@ -98,7 +98,7 @@ function CodeConfigList() { // 新建 const createCodeConfig = () => { const { close } = openAntdModal(AddCodeConfigModal, { - opType: OperationTypeEnum.Create, + opType: OperationType.Create, onOk: () => { getDataList(); close(); diff --git a/react-ui/src/pages/CodeConfig/components/AddCodeConfigModal/index.tsx b/react-ui/src/pages/CodeConfig/components/AddCodeConfigModal/index.tsx index 4221213c..975e4f2e 100644 --- a/react-ui/src/pages/CodeConfig/components/AddCodeConfigModal/index.tsx +++ b/react-ui/src/pages/CodeConfig/components/AddCodeConfigModal/index.tsx @@ -1,21 +1,17 @@ import KFModal from '@/components/KFModal'; +import { AvailableRange } from '@/enums'; import { type CodeConfigData } from '@/pages/CodeConfig/List'; import { addCodeConfigReq, updateCodeConfigReq } from '@/services/codeConfig'; import { to } from '@/utils/promise'; import { Form, Input, Radio, message, type ModalProps } from 'antd'; import { omit } from 'lodash'; -export enum RepoVisibleEnum { - Private = 0, // 私有 - Public = 1, // 公开 -} - -export enum VerifyModeEnum { +export enum VerifyMode { Password = 0, // 用户名密码 SSH = 1, // SSH Key } -export enum OperationTypeEnum { +export enum OperationType { Create = 0, // 新建 Update = 1, // 更新 } @@ -23,7 +19,7 @@ export enum OperationTypeEnum { type FormData = Partial; interface AddCodeConfigModalProps extends Omit { - opType: OperationTypeEnum; + opType: OperationType; codeConfigData?: CodeConfigData; onOk: () => void; } @@ -35,21 +31,21 @@ function AddCodeConfigModal({ opType, codeConfigData, onOk, ...rest }: AddCodeCo ...formData, }; // 清除多余的信息 - if (formData.code_repo_vis === RepoVisibleEnum.Public) { + if (formData.code_repo_vis === AvailableRange.Public) { omit(params, ['verify_mode', 'git_user_name', 'git_password', 'ssh_key']); } - if (formData.verify_mode === VerifyModeEnum.Password) { + if (formData.verify_mode === VerifyMode.Password) { omit(params, ['ssh_key']); - } else if (formData.verify_mode === VerifyModeEnum.SSH) { + } else if (formData.verify_mode === VerifyMode.SSH) { omit(params, ['git_user_name', 'git_password']); } - if (opType === OperationTypeEnum.Update) { + if (opType === OperationType.Update) { params.id = codeConfigData?.id; } - const request = opType === OperationTypeEnum.Create ? addCodeConfigReq : updateCodeConfigReq; + const request = opType === OperationType.Create ? addCodeConfigReq : updateCodeConfigReq; const [res] = await to(request(params)); if (res) { - message.success(opType === OperationTypeEnum.Create ? '创建成功' : '修改成功'); + message.success(opType === OperationType.Create ? '创建成功' : '修改成功'); onOk?.(); } }; @@ -61,11 +57,11 @@ function AddCodeConfigModal({ opType, codeConfigData, onOk, ...rest }: AddCodeCo // 设置初始值 const initialValues: FormData = codeConfigData ?? { - code_repo_vis: RepoVisibleEnum.Public, - verify_mode: VerifyModeEnum.Password, + code_repo_vis: AvailableRange.Public, + verify_mode: VerifyMode.Password, }; if (initialValues.verify_mode === undefined || initialValues.verify_mode === null) { - initialValues.verify_mode = VerifyModeEnum.Password; + initialValues.verify_mode = VerifyMode.Password; } return ( @@ -114,8 +110,8 @@ function AddCodeConfigModal({ opType, codeConfigData, onOk, ...rest }: AddCodeCo ]} > - 公开 - 私有 + 公开 + 私有 {({ getFieldValue }) => { - return getFieldValue('code_repo_vis') === RepoVisibleEnum.Private ? ( + return getFieldValue('code_repo_vis') === AvailableRange.Private ? ( <> - 用户名/密码 - SSH Key + 用户名/密码 + SSH Key {({ getFieldValue }) => { - return getFieldValue('verify_mode') === VerifyModeEnum.Password ? ( + return getFieldValue('verify_mode') === VerifyMode.Password ? ( <> - record.url ? ( + record.url && record.status === DevEditorStatus.Running ? ( gotoEditorPage(e, record)}> {text}