From ef23ae23b32eabfd875a6c3a6fe118fac470414e Mon Sep 17 00:00:00 2001 From: zhaowei Date: Wed, 23 Apr 2025 16:12:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9C=8D=E5=8A=A1=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/AutoML/components/ExperimentHistory/index.tsx | 2 +- .../src/pages/AutoML/components/TrialStatusCell/index.tsx | 7 ++++++- .../pages/Dataset/components/VersionCompareModal/index.tsx | 6 +++--- .../ModelDeployment/components/VersionBasicInfo/index.tsx | 3 ++- .../components/VersionCompareModal/index.tsx | 3 +++ react-ui/src/utils/format.ts | 6 +++--- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/react-ui/src/pages/AutoML/components/ExperimentHistory/index.tsx b/react-ui/src/pages/AutoML/components/ExperimentHistory/index.tsx index 0441a623..f2e9482f 100644 --- a/react-ui/src/pages/AutoML/components/ExperimentHistory/index.tsx +++ b/react-ui/src/pages/AutoML/components/ExperimentHistory/index.tsx @@ -93,7 +93,7 @@ function ExperimentHistory({ calcMetrics, fileUrl, isClassification }: Experimen title: '状态', dataIndex: 'status', key: 'status', - width: 120, + width: 150, render: TrialStatusCell, }, ]; diff --git a/react-ui/src/pages/AutoML/components/TrialStatusCell/index.tsx b/react-ui/src/pages/AutoML/components/TrialStatusCell/index.tsx index 89b4e074..433a007e 100644 --- a/react-ui/src/pages/AutoML/components/TrialStatusCell/index.tsx +++ b/react-ui/src/pages/AutoML/components/TrialStatusCell/index.tsx @@ -40,6 +40,11 @@ export const statusInfo: Record = { color: themes.textColor, icon: '/assets/images/experiment-status/omitted-icon.png', }, + [AutoMLTrailStatus.MEMOUT]: { + label: '内存溢出', + color: themes.errorColor, + icon: '/assets/images/experiment-status/fail-icon.png', + }, }; function TrialStatusCell(status?: AutoMLTrailStatus | null) { @@ -58,7 +63,7 @@ function TrialStatusCell(status?: AutoMLTrailStatus | null) { style={{ color: statusInfo[status] ? statusInfo[status].color : themes.textColor }} className={styles['trial-status-cell__label']} > - {statusInfo[status] ? statusInfo[status].label : status} + {statusInfo[status] ? statusInfo[status].label : '未知'} ); diff --git a/react-ui/src/pages/Dataset/components/VersionCompareModal/index.tsx b/react-ui/src/pages/Dataset/components/VersionCompareModal/index.tsx index 5e2292f8..a5b37131 100644 --- a/react-ui/src/pages/Dataset/components/VersionCompareModal/index.tsx +++ b/react-ui/src/pages/Dataset/components/VersionCompareModal/index.tsx @@ -36,7 +36,7 @@ interface VersionCompareModalProps extends Omit { repo_id: number; } -const formatDataset = (datasets?: DatasetData[]) => { +const formatDatasets = (datasets?: DatasetData[]) => { if (!datasets || datasets.length === 0) { return undefined; } @@ -105,12 +105,12 @@ function VersionCompareModal({ { key: 'train_datasets', text: '训练数据集', - format: formatDataset, + format: formatDatasets, }, { key: 'test_datasets', text: '测试数据集', - format: formatDataset, + format: formatDatasets, }, { key: 'model_source', diff --git a/react-ui/src/pages/ModelDeployment/components/VersionBasicInfo/index.tsx b/react-ui/src/pages/ModelDeployment/components/VersionBasicInfo/index.tsx index 3a2f3280..35916272 100644 --- a/react-ui/src/pages/ModelDeployment/components/VersionBasicInfo/index.tsx +++ b/react-ui/src/pages/ModelDeployment/components/VersionBasicInfo/index.tsx @@ -3,7 +3,7 @@ import { ServiceRunStatus } from '@/enums'; import { useComputingResource } from '@/hooks/useComputingResource'; import { ServiceVersionData } from '@/pages/ModelDeployment/types'; import { formatDate } from '@/utils/date'; -import { formatCodeConfig, formatModel } from '@/utils/format'; +import { formatCodeConfig, formatMirror, formatModel } from '@/utils/format'; import { Flex } from 'antd'; import ModelDeployStatusCell from '../ModelDeployStatusCell'; @@ -55,6 +55,7 @@ function VersionBasicInfo({ info }: BasicInfoProps) { { label: '镜像', value: info?.image, + format: formatMirror, }, { label: '状态', diff --git a/react-ui/src/pages/ModelDeployment/components/VersionCompareModal/index.tsx b/react-ui/src/pages/ModelDeployment/components/VersionCompareModal/index.tsx index b38ff770..85faf6a8 100644 --- a/react-ui/src/pages/ModelDeployment/components/VersionCompareModal/index.tsx +++ b/react-ui/src/pages/ModelDeployment/components/VersionCompareModal/index.tsx @@ -60,6 +60,9 @@ function VersionCompareModal({ version1, version2, ...rest }: VersionCompareModa { key: 'image', text: '镜像', + format: (data: any) => { + return data?.path; + }, }, { key: 'code_config', diff --git a/react-ui/src/utils/format.ts b/react-ui/src/utils/format.ts index 32e7d7d4..456ae834 100644 --- a/react-ui/src/utils/format.ts +++ b/react-ui/src/utils/format.ts @@ -30,7 +30,7 @@ export const formatDatasets = (datasets?: DatasetData[]): BasicInfoLink[] | unde return undefined; } return datasets.map((item) => ({ - value: item.name, + value: `${item.name}:${item.version}`, link: `/dataset/dataset/info/${item.id}?tab=${ResourceInfoTabKeys.Introduction}&version=${item.version}&name=${item.name}&owner=${item.owner}&identifier=${item.identifier}`, })); }; @@ -46,7 +46,7 @@ export const formatDataset = (dataset?: DatasetData): BasicInfoLink | undefined return undefined; } return { - value: dataset.name, + value: `${dataset.name}:${dataset.version}`, link: `/dataset/dataset/info/${dataset.id}?tab=${ResourceInfoTabKeys.Introduction}&version=${dataset.version}&name=${dataset.name}&owner=${dataset.owner}&identifier=${dataset.identifier}`, }; }; @@ -62,7 +62,7 @@ export const formatModel = (model: ModelData): BasicInfoLink | undefined => { return undefined; } return { - value: model.name, + value: `${model.name}:${model.version}`, link: `/dataset/model/info/${model.id}?tab=${ResourceInfoTabKeys.Introduction}&version=${model.version}&name=${model.name}&owner=${model.owner}&identifier=${model.identifier}`, }; };