From 0ac624ed2a458ceecffd0e1612076d1041317f9d Mon Sep 17 00:00:00 2001
From: cp3hnu <cp3hnu@gmail.com>
Date: Thu, 22 May 2025 08:43:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9E=E9=AA=8C=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9B=B4=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutoML/components/ExperimentInstanceList/instance.tsx    | 4 ++--
 .../src/pages/AutoML/components/ExperimentList/index.tsx     | 2 +-
 .../components/ExperimentInstanceList/instance.tsx           | 4 ++--
 react-ui/src/pages/Experiment/index.jsx                      | 5 +++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/react-ui/src/pages/AutoML/components/ExperimentInstanceList/instance.tsx b/react-ui/src/pages/AutoML/components/ExperimentInstanceList/instance.tsx
index b9250e23..598e83a7 100644
--- a/react-ui/src/pages/AutoML/components/ExperimentInstanceList/instance.tsx
+++ b/react-ui/src/pages/AutoML/components/ExperimentInstanceList/instance.tsx
@@ -5,7 +5,7 @@ import { experimentStatusInfo } from '@/pages/Experiment/status';
 import { ExperimentInstance, NodeStatus } from '@/types';
 import { ExperimentCompleted } from '@/utils/constant';
 import { formatDate } from '@/utils/date';
-import { getExperimentInstanceStatus, getWorkflowStatus } from '@/utils/experiment';
+import { getWorkflowStatus } from '@/utils/experiment';
 import { Typography } from 'antd';
 import React, { useCallback } from 'react';
 import styles from './index.less';
@@ -18,7 +18,7 @@ type ExperimentInstanceComponentProps = {
 function ExperimentInstanceComponent({ experimentId, instance }: ExperimentInstanceComponentProps) {
   const { id, argo_ins_name, argo_ins_ns, node_status } = instance;
   const workflowStatus = getWorkflowStatus(node_status) as NodeStatus | undefined;
-  const status = getExperimentInstanceStatus(instance.status as ExperimentStatus);
+  const status = instance.status as ExperimentStatus;
   const createTime = workflowStatus?.startedAt;
   const finishTime = workflowStatus?.finishedAt;
   const statusInfo = experimentStatusInfo[status];
diff --git a/react-ui/src/pages/AutoML/components/ExperimentList/index.tsx b/react-ui/src/pages/AutoML/components/ExperimentList/index.tsx
index 1305efb9..036f0d01 100644
--- a/react-ui/src/pages/AutoML/components/ExperimentList/index.tsx
+++ b/react-ui/src/pages/AutoML/components/ExperimentList/index.tsx
@@ -343,7 +343,7 @@ function ExperimentList({ type }: ExperimentListProps) {
         return item;
       });
     });
-    // 刷新实验列表
+    // 刷新实验列表和实例列表
     refreshExperimentList(true);
     if (expandedRowKeys.length > 0) {
       refreshExperimentIns(expandedRowKeys[0]);
diff --git a/react-ui/src/pages/Experiment/components/ExperimentInstanceList/instance.tsx b/react-ui/src/pages/Experiment/components/ExperimentInstanceList/instance.tsx
index c081c5e0..2c879ae7 100644
--- a/react-ui/src/pages/Experiment/components/ExperimentInstanceList/instance.tsx
+++ b/react-ui/src/pages/Experiment/components/ExperimentInstanceList/instance.tsx
@@ -5,7 +5,7 @@ import { experimentStatusInfo } from '@/pages/Experiment/status';
 import { ExperimentInstance, NodeStatus } from '@/types';
 import { ExperimentCompleted } from '@/utils/constant';
 import { formatDate } from '@/utils/date';
-import { getExperimentInstanceStatus, getWorkflowStatus } from '@/utils/experiment';
+import { getWorkflowStatus } from '@/utils/experiment';
 import { Typography } from 'antd';
 import React, { useCallback } from 'react';
 import styles from './index.less';
@@ -18,7 +18,7 @@ function ExperimentInstanceComponent({ instance }: ExperimentInstanceComponentPr
   const { id, experiment_id, argo_ins_name, argo_ins_ns, nodes_status, create_time, finish_time } =
     instance;
   const workflowStatus = getWorkflowStatus(nodes_status) as NodeStatus | undefined;
-  const status = getExperimentInstanceStatus(instance.status as ExperimentStatus);
+  const status = instance.status as ExperimentStatus;
   const createTime = workflowStatus?.startedAt ?? create_time;
   const finishTime = workflowStatus?.finishedAt ?? finish_time;
   const statusInfo = experimentStatusInfo[status];
diff --git a/react-ui/src/pages/Experiment/index.jsx b/react-ui/src/pages/Experiment/index.jsx
index 9705ede5..219e7c0d 100644
--- a/react-ui/src/pages/Experiment/index.jsx
+++ b/react-ui/src/pages/Experiment/index.jsx
@@ -435,6 +435,7 @@ function Experiment() {
 
   // 实验实例终止
   const handleInstanceTerminate = async (experimentIn) => {
+    // 修改实例的状态和结束时间
     setExperimentInsList((prevList) => {
       return prevList.map((item) => {
         if (item.id === experimentIn.id) {
@@ -447,7 +448,7 @@ function Experiment() {
         return item;
       });
     });
-    // 刷新实验列表
+    // 刷新实验列表和实例列表
     refreshExperimentList(true);
     refreshExperimentIns(experimentIn.experiment_id);
   };
@@ -474,7 +475,7 @@ function Experiment() {
   // 加载更多实验实例
   const loadMoreExperimentIns = () => {
     const page = Math.round(experimentInsList.length / 5);
-    getExperimentInsList(expandedRowKeys, page, 5);
+    getExperimentInsList(expandedRowKeys[0], page, 5);
   };
 
   // 处理删除