From b11b4d9f78cdb5bef825f8b914f5dfeff32af7e6 Mon Sep 17 00:00:00 2001 From: zhaowei Date: Fri, 6 Jun 2025 14:31:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E3=80=81?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=89=88=E6=9C=AC=E4=B8=8D=E8=83=BD=E6=98=AF?= =?UTF-8?q?origin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/Dataset/components/AddDatasetModal/index.tsx | 6 ++++-- .../pages/Dataset/components/AddModelModal/index.tsx | 6 ++++-- .../pages/Dataset/components/AddVersionModal/index.tsx | 6 ++++-- .../Experiment/components/ExportModelModal/index.tsx | 10 +++++++++- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/react-ui/src/pages/Dataset/components/AddDatasetModal/index.tsx b/react-ui/src/pages/Dataset/components/AddDatasetModal/index.tsx index 624ef833..8bb68cf9 100644 --- a/react-ui/src/pages/Dataset/components/AddDatasetModal/index.tsx +++ b/react-ui/src/pages/Dataset/components/AddDatasetModal/index.tsx @@ -118,12 +118,14 @@ function AddDatasetModal({ typeList, tagList, onOk, ...rest }: AddDatasetModalPr }, { pattern: /^[a-zA-Z0-9._-]+$/, - message: '版本只支持字母、数字、点(.)、下划线(_)、中横线(-)', + message: '数据集版本只支持字母、数字、点(.)、下划线(_)、中横线(-)', }, { validator: (_rule, value) => { if (value === 'master') { - return Promise.reject(`版本不能为 master`); + return Promise.reject(`数据集版本不能为 master`); + } else if (value === 'origin') { + return Promise.reject(`数据集版本不能为 origin`); } return Promise.resolve(); }, diff --git a/react-ui/src/pages/Dataset/components/AddModelModal/index.tsx b/react-ui/src/pages/Dataset/components/AddModelModal/index.tsx index 9e641699..9d69b14e 100644 --- a/react-ui/src/pages/Dataset/components/AddModelModal/index.tsx +++ b/react-ui/src/pages/Dataset/components/AddModelModal/index.tsx @@ -109,12 +109,14 @@ function AddModelModal({ typeList, tagList, onOk, ...rest }: AddModelModalProps) }, { pattern: /^[a-zA-Z0-9._-]+$/, - message: '版本只支持字母、数字、点(.)、下划线(_)、中横线(-)', + message: '模型版本只支持字母、数字、点(.)、下划线(_)、中横线(-)', }, { validator: (_rule, value) => { if (value === 'master') { - return Promise.reject(`版本不能为 master`); + return Promise.reject(`模型版本不能为 master`); + } else if (value === 'origin') { + return Promise.reject(`模型版本不能为 origin`); } return Promise.resolve(); }, diff --git a/react-ui/src/pages/Dataset/components/AddVersionModal/index.tsx b/react-ui/src/pages/Dataset/components/AddVersionModal/index.tsx index ad7cf13f..1ff282fd 100644 --- a/react-ui/src/pages/Dataset/components/AddVersionModal/index.tsx +++ b/react-ui/src/pages/Dataset/components/AddVersionModal/index.tsx @@ -132,12 +132,14 @@ function AddVersionModal({ }, { pattern: /^[a-zA-Z0-9._-]+$/, - message: '版本只支持字母、数字、点(.)、下划线(_)、中横线(-)', + message: `${name}版本只支持字母、数字、点(.)、下划线(_)、中横线(-)`, }, { validator: (_rule, value) => { if (value === 'master') { - return Promise.reject(`版本不能为 master`); + return Promise.reject(`${name}版本不能为 master`); + } else if (value === 'origin') { + return Promise.reject(`${name}版本不能为 origin`); } return Promise.resolve(); }, diff --git a/react-ui/src/pages/Experiment/components/ExportModelModal/index.tsx b/react-ui/src/pages/Experiment/components/ExportModelModal/index.tsx index 883ab49c..60f0555b 100644 --- a/react-ui/src/pages/Experiment/components/ExportModelModal/index.tsx +++ b/react-ui/src/pages/Experiment/components/ExportModelModal/index.tsx @@ -195,9 +195,17 @@ function ExportModelModal({ } rules={[ { required: true, message: `请输入${config.name}版本` }, + { + pattern: /^[a-zA-Z0-9._-]+$/, + message: `${config.name}版本只支持字母、数字、点(.)、下划线(_)、中横线(-)`, + }, { validator: (_, value) => { - if (value && versions.map((item) => item.name).includes(value)) { + if (value === 'master') { + return Promise.reject(`${config.name}版本不能为 master`); + } else if (value === 'origin') { + return Promise.reject(`${config.name}版本不能为 origin`); + } else if (value && versions.map((item) => item.name).includes(value)) { return Promise.reject(`${config.name}版本已存在`); } else { return Promise.resolve();